github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-18 12:53:17 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

copyedit: personal, not private, message throughout

Browse Source
This commit is contained in:
Jeff Atwood 2018-01-08 15:55:41 -08:00
parent ee76636b76
commit dcbaf2f213
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -605,7 +605,7 @@ en:
disable_jump_reply: "Don't jump to my post after I reply"
dynamic_favicon: "Show new / updated topic count on browser icon"
theme_default_on_all_devices: "Make this my default theme on all my devices"
allow_private_messages: "Allow other users to send me private messages"
allow_private_messages: "Allow other users to send me personal messages"
external_links_in_new_tab: "Open all external links in a new tab"
enable_quoting: "Enable quote reply for highlighted text"
change: "change"
@ -1334,8 +1334,8 @@ en:
posted: "Post by"
edited: "Edit your post by"
liked: "Liked your post"
private_message: "Private message from"
invited_to_private_message: "Invited to a private message from"
private_message: "Personal message from"
invited_to_private_message: "Invited to a personal message from"
invited_to_topic: "Invited to a topic from"
invitee_accepted: "Invite accepted by"
moved_post: "Your post was moved by"
@ -1350,7 +1350,7 @@ en:
quoted: '{{username}} quoted you in "{{topic}}" - {{site_title}}'
replied: '{{username}} replied to you in "{{topic}}" - {{site_title}}'
posted: '{{username}} posted in "{{topic}}" - {{site_title}}'
private_message: '{{username}} sent you a private message in "{{topic}}" - {{site_title}}'
private_message: '{{username}} sent you a personal message in "{{topic}}" - {{site_title}}'
linked: '{{username}} linked to your post from "{{topic}}" - {{site_title}}'
upload_selector:
@ -1718,7 +1718,7 @@ en:
visible: "Make Listed"
reset_read: "Reset Read Data"
make_public: "Make Public Topic"
make_private: "Make Private Message"
make_private: "Make Personal Message"
feature:
pin: "Pin Topic"

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

@ -250,7 +250,7 @@ en:
top_weekly: "Weekly top topics"
top_daily: "Daily top topics"
posts: "Latest posts"
private_posts: "Latest private messages"
private_posts: "Latest personal messages"
group_posts: "Latest posts from %{group_name}"
group_mentions: "Latest mentions from %{group_name}"
user_posts: "Latest posts by @%{username}"
@ -385,9 +385,9 @@ en:
topic:
attributes:
base:
warning_requires_pm: "You can only attach warnings to private messages."
warning_requires_pm: "You can only attach warnings to personal messages."
too_many_users: "You can only send warnings to one user at a time."
cant_send_pm: "Sorry, you cannot send a private message to that user."
cant_send_pm: "Sorry, you cannot send a personal message to that user."
no_user_selected: "You must select a valid user."
reply_by_email_disabled: "Reply by email has been disabled."
featured_link:
@ -1279,9 +1279,9 @@ en:
min_trust_to_allow_self_wiki: "The minimum trust level required to make user's own post wiki."
min_trust_to_send_messages: "The minimum trust level required to create new private messages."
min_trust_to_send_messages: "The minimum trust level required to create new personal messages."
min_trust_to_send_email_messages: "The minimum trust level required to send new private messages via email (to staged users)."
min_trust_to_send_email_messages: "The minimum trust level required to send new personal messages via email (to staged users)."
newuser_max_links: "How many links a new user can add to a post."
newuser_max_images: "How many images a new user can add to a post."
@ -1510,7 +1510,7 @@ en:
allowed_href_schemes: "Schemes allowed in links in addition to http and https."
embed_post_limit: "Maximum number of posts to embed."
embed_username_required: "The username for topic creation is required."
notify_about_flags_after: "If there are flags that haven't been handled after this many hours, send a private message to staff. Set to 0 to disable."
notify_about_flags_after: "If there are flags that haven't been handled after this many hours, send a personal message to staff. Set to 0 to disable."
show_create_topics_notice: "If the site has fewer than 5 public topics, show a notice asking admins to create some topics."
delete_drafts_older_than_n_days: Delete drafts older than (n) days.

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

@ -83,7 +83,7 @@ All new users start out in a sandbox with restrictions for everyone's safety. **
- post more than 2 hyperlinks
- post any images or file attachments
- send private messages
- send personal messages
- flag posts or topics
- have actual links in the "about me" field of their profile
- @name mention more than 2 users in a post

2
plugins/discourse-narrative-bot/config/locales/server.en.yml
View File

@ -233,7 +233,7 @@ en:
bookmark:
instructions: |-
If you’d like to learn more, select <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> below and <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this private message**. If you do, there may be a :gift: in your future!
If you’d like to learn more, select <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> below and <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this personal message**. If you do, there may be a :gift: in your future!
reply: |-
Excellent! Now you can easily find your way back to our private conversation any time, right from [the bookmarks tab on your profile](%{profile_page_url}/activity/bookmarks). Just select your profile picture at the upper right &#8599;
not_found: |-