Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor copy updates

This commit is contained in:
Jeff Atwood 2014-08-31 04:46:16 -07:00
parent bdd3dd8a5b
commit 6221a84ce8
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/locales/client.en.yml
View File

@ -407,7 +407,7 @@ en:
locale:
title: "Interface language"
instructions: "The language used by the forum interface. It will change when you refresh the page."
instructions: "User interface language. It will change when you refresh the page."
default: "(default)"
password_confirmation:
@ -429,7 +429,7 @@ en:
email_direct: "Receive an email when someone quotes you, replies to your post, or mentions your @username"
email_private_messages: "Receive an email when someone sends you a private message"
email_always: "Receive email notifications and email digests even if you are active on the forum"
email_always: "Do not suppress email notifications when I am active on the site"
other_settings: "Other"
categories_settings: "Categories"
@ -1568,7 +1568,7 @@ en:
confirm_revoke: "Are you sure you want to revoke that key?"
info_html: "Your API key will allow you to create and update topics using JSON calls."
all_users: "All Users"
note_html: "Keep this key <strong>secret</strong>, all users that have it may create arbitrary posts on the forum as any user."
note_html: "Keep this key <strong>secret</strong>, all users that have it may create arbitrary posts as any user."
backups:
title: "Backups"

2
config/locales/server.en.yml
View File

@ -726,7 +726,7 @@ en:
track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs"
topics_per_page: "How many topics are loaded by default on the topic list, and when scrolling down to load more topics"
posts_per_page: "How many posts are loaded by default on a topic, and when scrolling down to load more posts"
site_contact_username: "All automated private messages sent by the forum will be from this user; if left blank the default System account will be used."
site_contact_username: "All automated private messages will be from this user; if left blank the default System account will be used."
send_welcome_message: "Send all new users a welcome private message with a quick start guide."
suppress_reply_directly_below: "Don't show the expandable reply count on a post when there is only a single reply directly below this post."
suppress_reply_directly_above: "Don't show the expandable in-reply-to on a post when there is only a single reply directly above this post."

2
docs/ADMIN-QUICK-START-GUIDE.md
View File

@ -183,7 +183,7 @@ These defaults are safe, but they may be too conservative for your site:
Out of the box, Discourse defaults to [Creative Commons licensing](https://creativecommons.org/).
> Your users will always retain copyright on their posts, and will always grant the forum owner enough rights to include their content on the forum.
> Your users will always retain copyright on their posts, and will always grant the site owner enough rights to include their content on the site.
>
> Who is allowed to republish the content posted on this forum?
>

2
docs/INSTALL-email.md
View File

@ -126,7 +126,7 @@ Login to Discourse, go to the Admin page and select 'Settings'.
Filter with the string 'system'.
* Ensure that `site_contact_username` is set to an email address for an appropriate "owner" of the forum
* Ensure that `site_contact_username` is set to an email address for an appropriate "owner" of the site
* Set `notification_email` to 'noreply@', 'nobody@' as appropriate.
Filter with the string 'contact_email'