diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 2f7854c1a03..f09746ff2aa 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1462,69 +1462,77 @@ en: ## Reading - To read more, **just keep scrolling down!** As new posts or new topics arrive, they will appear automatically – no need to refresh the page. + To read more, **just keep scrolling down!** + + As new replies or new topics arrive, they will appear automatically – no need to refresh the page. ## Navigation - For search, your user page, or the ☰ menu, use the **icon buttons at upper right**. - - Selecting a topic title will always take you to the next unread post in the topic. To enter at the top or bottom instead, 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. - - While reading a topic, jump to the top ↑ by selecting the topic title. Select the progress bar at the bottom right for full navigation controls, or use the home and end keys. + - 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 home and end keys. ## Replying - - to the **topic in general**, use Reply at the very bottom of the topic. + - to the **topic in general**, use Reply at the very bottom of the topic. - - to a **specific person**, use Reply on their post. + - to a **specific person**, use Reply on their post. - - with **a linked topic**, use Reply as linked Topic to the right of the post. + - with **a linked topic**, use Reply as linked Topic to the right of the post. To insert a quote, simply select the text you wish to quote, then press any Reply button. - + To notify someone in your reply, mention their name. Type `@` to begin selecting a name. - + - To use [standard Emoji](http://www.emoji.codes/), just type `:` or the traditional smileys `:)` :smile: + To use [standard Emoji](http://www.emoji.codes/), just type `:` or the traditional smileys `:)` + + ## Actions There are action buttons at the bottom of each post. - + - To let someone know that you enjoyed their post, use the **like** button. If you see a problem with a post, privately let them, or our staff, know about it with the **flag** button. + To let someone know that you enjoyed their post, use the **like** 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 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. ## Notifications - When someone replies to your post, quotes your post, or mentions your `@username`, a number will immediately appear at the top right of the page. Use it 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**. - + - Don't worry about missing a reply – you'll be emailed 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 - By default all conversations less than two days old are considered new, and any conversation you've actively participated in (by replying, creating the topic, or reading for an extended period) will automatically be tracked. + By default: - You will see the blue new and number indicators next to these topics: + - 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 automatically be tracked. + + You will see the blue new and unread number indicators next to these topics. + + 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. - To change 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 diff --git a/public/images/welcome/emoji-completion.png b/public/images/welcome/emoji-completion.png new file mode 100644 index 00000000000..8f861983422 Binary files /dev/null and b/public/images/welcome/emoji-completion.png differ diff --git a/public/images/welcome/like-link-flag-bookmark.png b/public/images/welcome/like-link-flag-bookmark.png index 3160491e1d8..97f3e16540a 100644 Binary files a/public/images/welcome/like-link-flag-bookmark.png and b/public/images/welcome/like-link-flag-bookmark.png differ diff --git a/public/images/welcome/notification-panel.png b/public/images/welcome/notification-panel.png index cbf6be4d834..57a79c6631b 100644 Binary files a/public/images/welcome/notification-panel.png and b/public/images/welcome/notification-panel.png differ diff --git a/public/images/welcome/quote-reply.png b/public/images/welcome/quote-reply.png index 56c2cbac0d4..7e1c0455ae1 100644 Binary files a/public/images/welcome/quote-reply.png and b/public/images/welcome/quote-reply.png differ diff --git a/public/images/welcome/reply-as-linked-topic.png b/public/images/welcome/reply-as-linked-topic.png index cdfc51c7fe9..66e129862dc 100644 Binary files a/public/images/welcome/reply-as-linked-topic.png and b/public/images/welcome/reply-as-linked-topic.png differ diff --git a/public/images/welcome/reply-as-new-topic.png b/public/images/welcome/reply-as-new-topic.png deleted file mode 100644 index 54e68bdafcd..00000000000 Binary files a/public/images/welcome/reply-as-new-topic.png and /dev/null differ diff --git a/public/images/welcome/reply-post.png b/public/images/welcome/reply-post.png index 4f32155ca2c..4d3362c0ab2 100644 Binary files a/public/images/welcome/reply-post.png and b/public/images/welcome/reply-post.png differ diff --git a/public/images/welcome/reply-topic.png b/public/images/welcome/reply-topic.png index 9ff8a62aa89..96df6749e4f 100644 Binary files a/public/images/welcome/reply-topic.png and b/public/images/welcome/reply-topic.png differ diff --git a/public/images/welcome/topics-new-unread.png b/public/images/welcome/topics-new-unread.png index 2e1360009d9..c39089b18f9 100644 Binary files a/public/images/welcome/topics-new-unread.png and b/public/images/welcome/topics-new-unread.png differ diff --git a/public/images/welcome/username-completion.png b/public/images/welcome/username-completion.png index 9af666db933..d5237923fea 100644 Binary files a/public/images/welcome/username-completion.png and b/public/images/welcome/username-completion.png differ