more copyedits on welcome PM

This commit is contained in:
Jeff Atwood 2015-06-11 01:06:56 -07:00
parent 8bf07c02c8
commit 9028c1d908
13 changed files with 24 additions and 26 deletions

View File

@ -1472,71 +1472,69 @@ en:
- Selecting a topic title will always take you to the next unread post in the topic. To enter at the top or bottom, select the date or post count instead. - Selecting a topic title will always take you to the next unread post in the topic. To enter at the top or bottom, select the date or post count instead.
<img src="/images/welcome/topic-list-select-areas.png" width="593" height="59"> <img src="/images/welcome/topic-list-select-areas-2x.png" width="593" height="59">
- While reading a topic, jump back to the top by selecting the topic title, select the progress bar at the bottom right for full navigation controls, or use the <kbd>home</kbd> and <kbd>end</kbd> keys. - While reading a topic, select the progress bar at the bottom right for full navigation controls. Quickly jump back to the top by selecting the topic title. Press <kbd>?</kbd> for a list of super-speedy keyboard shortcuts.
<img src="/images/welcome/progress-bar.png" width="153" height="181"> <img src="/images/welcome/progress-bar-2x.png" width="153" height="181">
## Replying ## Replying
- to the **topic in general**, use Reply <img src="/images/welcome/reply-topic.png" width="25" height="23"> at the very bottom of the topic. - To reply to the **topic in general**, use <img src="/images/welcome/reply-topic-2x.png" width="25" height="23"> at the very bottom of the topic.
- to a **specific person**, use Reply <img src="/images/welcome/reply-post.png" width="25" height="23"> on their post. - To reply to a **specific person**, use <img src="/images/welcome/reply-post-2x.png" width="25" height="23"> on their post.
- with **a linked topic**, use <img src="/images/welcome/reply-as-linked-topic.png" width="20" height="25"> Reply as linked Topic to the right of the post. - To reply with **a new topic**, use <img src="/images/welcome/reply-as-linked-topic-2x.png" width="20" height="25"> to the right of the post. Both old and new topics will be automatically linked together.
To insert a quote, simply select the text you wish to quote, then press any Reply button. To insert a quote, select the text you wish to quote, then press any Reply button. Repeat for multiple quotes!
<img src="/images/welcome/quote-reply.png" width="326" height="128"> <img src="/images/welcome/quote-reply-2x.png" width="326" height="128">
To notify someone in your reply, mention their name. Type `@` to begin selecting a name. To notify someone in your reply, mention their name. Type `@` to begin selecting a username.
<img src="/images/welcome/username-completion.png" width="191" height="125"> <img src="/images/welcome/username-completion-2x.png" width="191" height="125">
To use [standard Emoji](http://www.emoji.codes/), just type `:` or the traditional smileys `:)` To use [standard Emoji](http://www.emoji.codes/), just type `:` to match by name, or use the traditional smileys `;)`
<img src="/images/welcome/emoji-completion.png" width="144" height="153"> <img src="/images/welcome/emoji-completion-2x.png" width="144" height="153">
## Actions ## Actions
There are action buttons at the bottom of each post. There are action buttons at the bottom of each post:
<img src="/images/welcome/like-link-flag-bookmark.png" width="162" height="42"> <img src="/images/welcome/like-link-flag-bookmark-2x.png" width="162" height="42">
To let someone know that you enjoyed their post, use the **like** button. To let someone know that you enjoyed and appreciated their post, use the **like** button. Share the love!
If you see a problem with a post, privately let them, or our staff, know about it with the **flag** button. You can also **share** a link to a post, or **bookmark** it for later reference on your user page. If you see a problem with someone's post, privately let them, or [our staff](/about), know about it with the **flag** button. You can also **share** a link to a post, or **bookmark** it for later reference on your user page.
## Notifications ## Notifications
When someone replies to you, quotes your post, or mentions your `@username`, a number will immediately appear at the top right of the page. Use it to access your **notifications**. When someone replies to you, quotes your post, or mentions your `@username`, a number will immediately appear at the top right of the page. Use it to access your **notifications**.
<img src="/images/welcome/notification-panel.png" width="160" height="54"> <img src="/images/welcome/notification-panel-2x.png" width="160" height="54">
Don't worry about missing a reply you'll be emailed any notifications that arrive when you are away. Don't worry about missing a reply you'll be emailed any notifications that arrive when you are away.
## Your Preferences ## Your Preferences
By default: - All topics less than **two days old** are considered new.
- all topics less than two days old are considered new - Any topic you've **actively participated in** (by creating it, replying, or reading for an extended period) will be automatically tracked.
- any topic you've actively participated in (by creating it, replying, or reading for an extended period) will automatically be tracked. You will see the blue new and unread number indicators next to these topics:
You will see the blue new and unread number indicators next to these topics. <img src="/images/welcome/topics-new-unread-2x.png" width="341" height="106">
<img src="/images/welcome/topics-new-unread.png" width="341" height="106"> You can change your notifications for any topic via the notification control at the bottom of the topic. You can also set notification state per category.
You can change the individual notification state of a topic via the notification control at the bottom of the topic. You can also set notification state per category. <img src="/images/welcome/topic-notification-control-2x.png" width="608" height="312">
<img src="/images/welcome/topic-notification-control.png" width="608" height="312">
To change any of these settings, see [your user preferences](%{base_url}/my/preferences). To change any of these settings, see [your user preferences](%{base_url}/my/preferences).
## Community Trust ## Community Trust
New users are somewhat limited for safety reasons. As you participate here, you'll gain the trust of the community, become a full citizen, and those limitations will automatically be removed. At a high enough [trust level](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), you'll gain even more abilities to help us manage our community together. New users are somewhat limited for safety reasons. As you participate here, over time you'll gain the trust of the community, become a full citizen, and those limitations will be lifted. At a high enough [trust level](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), you'll gain new abilities to help us manage our community together.
welcome_user: welcome_user:
subject_template: "Welcome to %{site_name}!" subject_template: "Welcome to %{site_name}!"

View File

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 395 B

View File

Before

Width:  |  Height:  |  Size: 549 B

After

Width:  |  Height:  |  Size: 549 B

View File

Before

Width:  |  Height:  |  Size: 484 B

After

Width:  |  Height:  |  Size: 484 B

View File

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

View File

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

View File

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

View File

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB