From 5194313133c7b1bc1a8451c12ec67114b323216e Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 2 Nov 2018 10:58:28 -0400 Subject: [PATCH] Revert "Add base_url to config locales (#6510)" This reverts commit 8a443e051b447646136529f6589e3d553145f811. --- config/locales/server.en.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index bc5cb030217..189919bbfa6 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -772,8 +772,8 @@ en: email_body: "%{link}\n\n%{message}" inappropriate: title: 'Inappropriate' - description: 'This post contains content that a reasonable person would consider offensive, abusive, or a violation of our community guidelines.' - short_description: 'A violation of our community guidelines' + description: 'This post contains content that a reasonable person would consider offensive, abusive, or a violation of our community guidelines.' + short_description: 'A violation of our community guidelines' long_form: 'flagged this as inappropriate' notify_user: title: 'Send @{{username}} a message' @@ -824,12 +824,12 @@ en: short_description: 'This is an advertisement' inappropriate: title: 'Inappropriate' - description: 'This topic contains content that a reasonable person would consider offensive, abusive, or a violation of our community guidelines.' + description: 'This topic contains content that a reasonable person would consider offensive, abusive, or a violation of our community guidelines.' long_form: 'flagged this as inappropriate' - short_description: 'A violation of our community guidelines' + short_description: 'A violation of our community guidelines' notify_moderators: title: "Something Else" - description: 'This topic requires general staff attention based on the guidelines, TOS, or for another reason not listed above.' + description: 'This topic requires general staff attention based on the guidelines, TOS, or for another reason not listed above.' long_form: 'flagged this for moderator attention' short_description: 'Requires staff attention for another reason' email_title: 'The topic "%{title}" requires moderator attention' @@ -1137,14 +1137,14 @@ en: sidekiq_warning: 'Sidekiq is not running. Many tasks, like sending emails, are executed asynchronously by sidekiq. Please ensure at least one sidekiq process is running. Learn about Sidekiq here.' queue_size_warning: 'The number of queued jobs is %{queue_size}, which is high. This could indicate a problem with the Sidekiq process(es), or you may need to add more Sidekiq workers.' memory_warning: 'Your server is running with less than 1 GB of total memory. At least 1 GB of memory is recommended.' - google_oauth2_config_warning: 'The server is configured to allow signup and log in with Google OAuth2 (enable_google_oauth2_logins), but the client id and client secret values are not set. Go to the Site Settings and update the settings. See this guide to learn more.' - facebook_config_warning: 'The server is configured to allow signup and log in with Facebook (enable_facebook_logins), but the app id and app secret values are not set. Go to the Site Settings and update the settings. See this guide to learn more.' - twitter_config_warning: 'The server is configured to allow signup and log in with Twitter (enable_twitter_logins), but the key and secret values are not set. Go to the Site Settings and update the settings. See this guide to learn more.' - github_config_warning: 'The server is configured to allow signup and log in with GitHub (enable_github_logins), but the client id and secret values are not set. Go to the Site Settings and update the settings. See this guide to learn more.' - s3_config_warning: 'The server is configured to upload files to s3, but at least one the following setting is not set: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, or s3_upload_bucket. Go to the Site Settings and update the settings. See "How to set up image uploads to S3?" to learn more.' - s3_backup_config_warning: 'The server is configured to upload backups to s3, but at least one the following setting is not set: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, or s3_backup_bucket. Go to the Site Settings and update the settings. See "How to set up image uploads to S3?" to learn more.' + google_oauth2_config_warning: 'The server is configured to allow signup and log in with Google OAuth2 (enable_google_oauth2_logins), but the client id and client secret values are not set. Go to the Site Settings and update the settings. See this guide to learn more.' + facebook_config_warning: 'The server is configured to allow signup and log in with Facebook (enable_facebook_logins), but the app id and app secret values are not set. Go to the Site Settings and update the settings. See this guide to learn more.' + twitter_config_warning: 'The server is configured to allow signup and log in with Twitter (enable_twitter_logins), but the key and secret values are not set. Go to the Site Settings and update the settings. See this guide to learn more.' + github_config_warning: 'The server is configured to allow signup and log in with GitHub (enable_github_logins), but the client id and secret values are not set. Go to the Site Settings and update the settings. See this guide to learn more.' + s3_config_warning: 'The server is configured to upload files to s3, but at least one the following setting is not set: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, or s3_upload_bucket. Go to the Site Settings and update the settings. See "How to set up image uploads to S3?" to learn more.' + s3_backup_config_warning: 'The server is configured to upload backups to s3, but at least one the following setting is not set: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, or s3_backup_bucket. Go to the Site Settings and update the settings. See "How to set up image uploads to S3?" to learn more.' image_magick_warning: 'The server is configured to create thumbnails of large images, but ImageMagick is not installed. Install ImageMagick using your favorite package manager or download the latest release.' - failing_emails_warning: 'There are %{num_failed_jobs} email jobs that failed. Check your app.yml and ensure that the mail server settings are correct. See the failed jobs in Sidekiq.' + failing_emails_warning: 'There are %{num_failed_jobs} email jobs that failed. Check your app.yml and ensure that the mail server settings are correct. See the failed jobs in Sidekiq.' subfolder_ends_in_slash: "Your subfolder setup is incorrect; the DISCOURSE_RELATIVE_URL_ROOT ends in a slash." email_polling_errored_recently: one: "Email polling has generated an error in the past 24 hours. Look at the logs for more details." @@ -3280,7 +3280,7 @@ en: terms_of_service: title: "Terms of Service" - signup_form_message: 'I have read and accept the Terms of Service.' + signup_form_message: 'I have read and accept the Terms of Service.' deleted: 'deleted'