diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 54b9783a9f1..7ced35f7812 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -37,31 +37,31 @@ en:
thousands: "{{number}}k"
millions: "{{number}}M"
dates:
- # Use Moment.js format string: http://momentjs.com/docs/#/displaying/format/
+ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
time: "h:mm a"
- # Use Moment.js format string: http://momentjs.com/docs/#/displaying/format/
+ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
timeline_date: "MMM YYYY"
- # Use Moment.js format string: http://momentjs.com/docs/#/displaying/format/
+ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
long_no_year: "MMM D h:mm a"
- # Use Moment.js format string: http://momentjs.com/docs/#/displaying/format/
+ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
long_no_year_no_time: "MMM D"
- # Use Moment.js format string: http://momentjs.com/docs/#/displaying/format/
+ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
full_no_year_no_time: "MMMM Do"
- # Use Moment.js format string: http://momentjs.com/docs/#/displaying/format/
+ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
long_with_year: "MMM D, YYYY h:mm a"
- # Use Moment.js format string: http://momentjs.com/docs/#/displaying/format/
+ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
long_with_year_no_time: "MMM D, YYYY"
- # Use Moment.js format string: http://momentjs.com/docs/#/displaying/format/
+ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
full_with_year_no_time: "MMMM Do, YYYY"
- # Use Moment.js format string: http://momentjs.com/docs/#/displaying/format/
+ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
long_date_with_year: "MMM D, 'YY LT"
- # Use Moment.js format string: http://momentjs.com/docs/#/displaying/format/
+ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
long_date_without_year: "MMM D, LT"
- # Use Moment.js format string: http://momentjs.com/docs/#/displaying/format/
+ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
long_date_with_year_without_time: "MMM D, 'YY"
- # Use Moment.js format string: http://momentjs.com/docs/#/displaying/format/
+ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
long_date_without_year_with_linebreak: "MMM D
LT"
- # Use Moment.js format string: http://momentjs.com/docs/#/displaying/format/
+ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
long_date_with_year_with_linebreak: "MMM D, 'YY
LT"
wrap_ago: "%{date} ago"
@@ -1086,9 +1086,9 @@ en:
enabled: "This site is in read only mode. Please continue to browse, but replying, likes, and other actions are disabled for now."
login_disabled: "Login is disabled while the site is in read only mode."
logout_disabled: "Logout is disabled while the site is in read only mode."
- too_few_topics_and_posts_notice: "Let's get this discussion started! There are currently %{currentTopics} / %{requiredTopics} topics and %{currentPosts} / %{requiredPosts} posts. New visitors need some conversations to read and respond to."
- too_few_topics_notice: "Let's get this discussion started! There are currently %{currentTopics} / %{requiredTopics} topics. New visitors need some conversations to read and respond to."
- too_few_posts_notice: "Let's get this discussion started! There are currently %{currentPosts} / %{requiredPosts} posts. New visitors need some conversations to read and respond to."
+ too_few_topics_and_posts_notice: "Let's get this discussion started! There are currently %{currentTopics} / %{requiredTopics} topics and %{currentPosts} / %{requiredPosts} posts. New visitors need some conversations to read and respond to."
+ too_few_topics_notice: "Let's get this discussion started! There are currently %{currentTopics} / %{requiredTopics} topics. New visitors need some conversations to read and respond to."
+ too_few_posts_notice: "Let's get this discussion started! There are currently %{currentPosts} / %{requiredPosts} posts. New visitors need some conversations to read and respond to."
logs_error_rate_notice:
reached: "%{relativeAge} – %{rate} reached site setting limit of %{siteSettingRate}."
exceeded: "%{relativeAge} – %{rate} exceeds site setting limit of %{siteSettingRate}."
@@ -1409,7 +1409,7 @@ en:
link_description: "enter link description here"
link_dialog_title: "Insert Hyperlink"
link_optional_text: "optional title"
- link_url_placeholder: "http://example.com"
+ link_url_placeholder: "https://example.com"
quote_title: "Blockquote"
quote_text: "Blockquote"
code_title: "Preformatted text"
@@ -2564,7 +2564,7 @@ en:
today: "Today"
other_periods: "see top"
- browser_update: 'Unfortunately, your browser is too old to work on this site. Please upgrade your browser.'
+ browser_update: 'Unfortunately, your browser is too old to work on this site. Please upgrade your browser.'
permission_types:
full: "Create / Reply / See"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 0b18cc22c98..1695ddd85cb 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -16,22 +16,22 @@
en:
dates:
- # Use Moment.js format string: http://momentjs.com/docs/#/displaying/format/
+ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
short_date_no_year: "D MMM"
- # Use Moment.js format string: http://momentjs.com/docs/#/displaying/format/
+ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
short_date: "D MMM, YYYY"
- # Use Moment.js format string: http://momentjs.com/docs/#/displaying/format/
+ # Use Moment.js format string: https://momentjs.com/docs/#/displaying/format/
long_date: "MMMM D, YYYY h:mma"
datetime_formats: &datetime_formats
formats:
- # Format directives: http://ruby-doc.org/core-2.3.1/Time.html#method-i-strftime
+ # Format directives: https://ruby-doc.org/core-2.3.1/Time.html#method-i-strftime
short: "%m-%d-%Y"
- # Format directives: http://ruby-doc.org/core-2.3.1/Time.html#method-i-strftime
+ # Format directives: https://ruby-doc.org/core-2.3.1/Time.html#method-i-strftime
short_no_year: "%B %-d"
- # Format directives: http://ruby-doc.org/core-2.3.1/Time.html#method-i-strftime
+ # Format directives: https://ruby-doc.org/core-2.3.1/Time.html#method-i-strftime
date_only: "%B %-d, %Y"
- # Format directives: http://ruby-doc.org/core-2.3.1/Time.html#method-i-strftime
+ # Format directives: https://ruby-doc.org/core-2.3.1/Time.html#method-i-strftime
long: "%B %-d, %Y, %l:%M%P"
date:
# Do not remove the brackets and commas and do not translate the first month name. It should be "null".
@@ -527,7 +527,7 @@ en:
* Edit the title of any topic
* Change the category of any topic
- * Have all your links followed ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)
+ * Have all your links followed ([automatic nofollow](https://en.wikipedia.org/wiki/Nofollow) is removed)
* Access a private Lounge category only visible to users at trust level 3 and higher
* Hide spam with a single flag
@@ -1107,7 +1107,7 @@ en:
dashboard:
rails_env_warning: "Your server is running in %{env} mode."
host_names_warning: "Your config/database.yml file is using the default localhost hostname. Update it to use your site's hostname."
- gc_warning: 'Your server is using default ruby garbage collection parameters, which will not give you the best performance. Read this topic on performance tuning: Tuning Ruby and Rails for Discourse.'
+ gc_warning: 'Your server is using default ruby garbage collection parameters, which will not give you the best performance. Read this topic on performance tuning: Tuning Ruby and Rails for Discourse.'
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.'
@@ -1115,9 +1115,9 @@ en:
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.'
+ 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.'
subfolder_ends_in_slash: "Your subfolder setup is incorrect; the DISCOURSE_RELATIVE_URL_ROOT ends in a slash."
email_polling_errored_recently:
@@ -1196,8 +1196,8 @@ en:
logo_url: "The logo image at the top left of your site, should be a wide rectangle shape. If left blank site title text will be shown."
digest_logo_url: "The alternate logo image used at the top of your site's email summary. Should be a wide rectangle shape. Should not be an SVG image. If left blank `logo_url` will be used."
logo_small_url: "The small logo image at the top left of your site, should be a square shape, seen when scrolling down. If left blank a home glyph will be shown."
- favicon_url: "A favicon for your site, see http://en.wikipedia.org/wiki/Favicon, to work correctly over a CDN it must be a png"
- mobile_logo_url: "Custom logo url used on mobile version of your site. If left blank, `logo_url` will be used. eg: http://example.com/uploads/default/logo.png"
+ favicon_url: "A favicon for your site, see https://en.wikipedia.org/wiki/Favicon, to work correctly over a CDN it must be a png"
+ mobile_logo_url: "Custom logo url used on mobile version of your site. If left blank, `logo_url` will be used. eg: https://example.com/uploads/default/logo.png"
large_icon_url: "Image used as logo/splash image on Android. Recommended size is 512px by 512px."
apple_touch_icon_url: "Icon used for Apple touch devices. Recommended size is 144px by 144px."
@@ -1240,14 +1240,14 @@ en:
traditional_markdown_linebreaks: "Use traditional linebreaks in Markdown, which require two trailing spaces for a linebreak."
enable_markdown_typographer: "Use typography rules to improve readability of text: replace straight quotes ' with curly quotes ’, (c) (tm) with symbols, -- with emdash –, etc"
- enable_markdown_linkify: "Automatically treat text that looks like a link as a link: www.site.com and http://site.com will be automatically linked"
+ enable_markdown_linkify: "Automatically treat text that looks like a link as a link: www.example.com and https://example.com will be automatically linked"
markdown_linkify_tlds: "List of top level domains that get automatically treated as links"
post_undo_action_window_mins: "Number of minutes users are allowed to undo recent actions on a post (like, flag, etc)."
must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site. WARNING: enabling this for a live site will revoke access for existing non-staff users!"
pending_users_reminder_delay: "Notify moderators if new users have been waiting for approval for longer than this many hours. Set to -1 to disable notifications."
maximum_session_age: "User will remain logged in for n hours since last visit"
- ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics"
- ga_universal_domain_name: "Google Universal Analytics (analytics.js) domain name, eg: mysite.com; see http://google.com/analytics"
+ ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code code, eg: UA-12345678-9; see https://google.com/analytics"
+ ga_universal_domain_name: "Google Universal Analytics (analytics.js) domain name, eg: mysite.com; see https://google.com/analytics"
ga_universal_auto_link_domains: "Enable Google Universal Analytics (analytics.js) cross-domain tracking. Outgoing links to these domains will have the client id added to them. See Google's Cross-Domain Tracking guide."
gtm_container_id: "Google Tag Manager container id. eg: GTM-ABCDEF"
enable_escaped_fragments: "Fall back to Google's Ajax-Crawling API if no webcrawler is detected. See https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
@@ -1509,7 +1509,7 @@ en:
body_min_entropy: "The minimum entropy (unique characters, non-english count for more) required for a post body."
allow_uppercase_posts: "Allow all caps in a topic title or a post body."
- title_fancy_entities: "Convert common ASCII characters to fancy HTML entities in topic titles, ala SmartyPants http://daringfireball.net/projects/smartypants/"
+ title_fancy_entities: "Convert common ASCII characters to fancy HTML entities in topic titles, ala SmartyPants https://daringfireball.net/projects/smartypants/"
min_title_similar_length: "The minimum length of a title before it will be checked for similar topics."
min_body_similar_length: "The minimum length of a post's body before it will be checked for similar topics."
@@ -1639,7 +1639,7 @@ en:
delete_all_posts_max: "The maximum number of posts that can be deleted at once with the Delete All Posts button. If a user has more than this many posts, the posts cannot all be deleted at once and the user can't be deleted."
username_change_period: "The maximum number of days after registration that accounts can change their username (0 to disallow username change)."
email_editable: "Allow users to change their e-mail address after registration."
- logout_redirect: "Location to redirect browser to after logout (eg: http://example.com/logout)"
+ logout_redirect: "Location to redirect browser to after logout (eg: https://example.com/logout)"
allow_uploaded_avatars: "Allow users to upload custom profile pictures."
allow_animated_avatars: "Allow users to use animated gif profile pictures. WARNING: run the avatars:refresh rake task after changing this setting."
@@ -2205,7 +2205,7 @@ en:
title: "New Version Mailer"
subject_template: "[%{email_prefix}] New Discourse version, update available"
text_body_template: |
- Hooray, a new version of [Discourse](http://www.discourse.org) is available!
+ Hooray, a new version of [Discourse](https://www.discourse.org) is available!
Your version: %{installed_version}
New version: **%{new_version}**
@@ -2220,7 +2220,7 @@ en:
title: "New Version Mailer with Notes"
subject_template: "[%{email_prefix}] update available"
text_body_template: |
- Hooray, a new version of [Discourse](http://www.discourse.org) is available!
+ Hooray, a new version of [Discourse](https://www.discourse.org) is available!
Your version: %{installed_version}
New version: **%{new_version}**
@@ -2427,7 +2427,7 @@ en:
The above download link will be valid for 48 hours.
- The data is compressed as a gzip archive. If the archive does not extract itself when you open it, use the tools recommended here: http://www.gzip.org/#faq4
+ The data is compressed as a gzip archive. If the archive does not extract itself when you open it, use the tools recommended here: https://www.gzip.org/#faq4
csv_export_failed:
title: "CSV Export Failed"
@@ -3445,7 +3445,7 @@ en:
## [3. User Content License](#3)
- User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid.
+ User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](https://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid.
@@ -3492,7 +3492,7 @@ en:
## [8. Copyright Infringement and DMCA Policy](#8)
- As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}.
+ As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](https://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}.
@@ -3522,7 +3522,7 @@ en:
## [13. Disclaimer of Warranties](#13)
- The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.
+ The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](https://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.
@@ -3550,7 +3550,7 @@ en:
This document is CC-BY-SA. It was last updated January 1, 2018.
- Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/).
+ Originally adapted from the [WordPress Terms of Service](https://en.wordpress.com/tos/).
privacy_topic:
title: "Privacy Policy"
@@ -3976,7 +3976,7 @@ en:
description: "Email address for the person or group responsible for this community. Used for critical notifications such as unhandled flags, security updates, and on your about page for urgent community contact."
contact_url:
label: "Web Page"
- placeholder: "http://www.example.com/contact-us"
+ placeholder: "https://www.example.com/contact-us"
description: "General contact web page for you or your organization. Will be displayed on your about page."
site_contact:
label: "Automated Messages"