From dcbaf2f21398ffd998eab0e5c387cc4dc25f0847 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Mon, 8 Jan 2018 15:55:41 -0800 Subject: [PATCH] copyedit: personal, not private, message throughout --- config/locales/client.en.yml | 10 +++++----- config/locales/server.en.yml | 12 ++++++------ docs/ADMIN-QUICK-START-GUIDE.md | 2 +- .../config/locales/server.en.yml | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 0874271f332..4af1df836d7 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -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" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index f1fac13f172..5e829c0fc99 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -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. diff --git a/docs/ADMIN-QUICK-START-GUIDE.md b/docs/ADMIN-QUICK-START-GUIDE.md index f02868df86e..045b964c3ab 100644 --- a/docs/ADMIN-QUICK-START-GUIDE.md +++ b/docs/ADMIN-QUICK-START-GUIDE.md @@ -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 diff --git a/plugins/discourse-narrative-bot/config/locales/server.en.yml b/plugins/discourse-narrative-bot/config/locales/server.en.yml index da2fd0c677e..7f115e1c71f 100644 --- a/plugins/discourse-narrative-bot/config/locales/server.en.yml +++ b/plugins/discourse-narrative-bot/config/locales/server.en.yml @@ -233,7 +233,7 @@ en: bookmark: instructions: |- - If you’d like to learn more, select below and **bookmark this private message**. If you do, there may be a :gift: in your future! + If you’d like to learn more, select below and **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 ↗ not_found: |-