From bc81c8b2a04ce197a33a2ff411b0bf28ab6a5d3d Mon Sep 17 00:00:00 2001 From: Erick Guan Date: Thu, 28 Jul 2016 09:22:04 +0800 Subject: [PATCH] Explicit on site settings and fixing minor parts --- config/locales/client.en.yml | 2 +- config/locales/server.en.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 1609e9ba674..d917815581a 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1362,7 +1362,7 @@ en: title: change how often you get notified about this topic reasons: mailing_list_mode: "You have mailing list mode enabled, so you will be notified of replies to this topic via email." - "3_10": 'You will receive notifications because you are watching this a tag on this topic.' + "3_10": 'You will receive notifications because you are watching a tag on this topic.' "3_6": 'You will receive notifications because you are watching this category.' "3_5": 'You will receive notifications because you started watching this topic automatically.' "3_2": 'You will receive notifications because you are watching this topic.' diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index a3ffb33f877..a7b37d194b3 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1191,7 +1191,7 @@ en: reply_by_email_enabled: "Enable replying to topics via email." reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com" - alternative_reply_by_email_addresses: "List of alternative templates for reply by email incoming email addresses." + alternative_reply_by_email_addresses: "List of alternative templates for reply by email incoming email addresses. Example: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com" incoming_email_prefer_html: "Use the HTML instead of the text for incoming email. May cause unexpected formatting issues!" disable_emails: "Prevent Discourse from sending any kind of emails" @@ -1207,15 +1207,15 @@ en: max_emails_per_day_per_user: "Maximum number of emails to send users per day. 0 to disable the limit" enable_staged_users: "Automatically create staged users when processing incoming emails." maximum_staged_users_per_email: "Maximum number of staged users created when processing an incoming email." - auto_generated_whitelist: "List of email addresses that won't be checked for auto-generated content." + auto_generated_whitelist: "List of email addresses that won't be checked for auto-generated content. Example: foo@bar.com|discourse@bar.com" block_auto_generated_emails: "Block incoming emails identified as being auto generated." ignore_by_title: "Ignore incoming emails based on their title." mailgun_api_key: "Mailgun Secret API key used to verify webhook messages." - soft_bounce_score: "Score added to the user when a temporary bounce happens." - hard_bounce_score: "Score added to the user when a permanent bounce happens." - bounce_score_threshold: "Max score before we will stop emailing a user." - bounce_score_threshold_deactivate: "Max score before we will deactive a user." + soft_bounce_score: "Bounce score added to the user when a temporary bounce happens." + hard_bounce_score: "Bounce score added to the user when a permanent bounce happens." + bounce_score_threshold: "Max bounce score before we will stop emailing a user." + bounce_score_threshold_deactivate: "Max bounce score before we will deactivate a user." reset_bounce_score_after_days: "Automatically reset bounce score after X days." manual_polling_enabled: "Push emails using the API for email replies." @@ -1688,7 +1688,7 @@ en: - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master) - - Visit [meta.discourse.org](http://meta.discourse.org) for news, discussion, and support for Discourse + - Visit [meta.discourse.org](https://meta.discourse.org) for news, discussion, and support for Discourse new_version_mailer_with_notes: subject_template: "[%{site_name}] update available" @@ -1702,7 +1702,7 @@ en: - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master) - - Visit [meta.discourse.org](http://meta.discourse.org) for news, discussion, and support for Discourse + - Visit [meta.discourse.org](https://meta.discourse.org) for news, discussion, and support for Discourse ### Release notes