diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index f09746ff2aa..3ba25d6755e 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -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. - + - - 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. + - 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 ? for a list of super-speedy keyboard shortcuts. - + ## Replying - - to the **topic in general**, use Reply at the very bottom of the topic. + - To reply to the **topic in general**, use at the very bottom of the topic. - - to a **specific person**, use Reply on their post. + - To reply to a **specific person**, use on their post. - - with **a linked topic**, use Reply as linked Topic to the right of the post. + - To reply with **a new topic**, use 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! - + - 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. - + - 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 `;)` - + ## Actions - There are action buttons at the bottom of each post. + There are action buttons at the bottom of each post: - + - 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 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 any notifications that arrive when you are away. ## 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. + - + 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. - - + To change any of these settings, see [your user preferences](%{base_url}/my/preferences). ## 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: subject_template: "Welcome to %{site_name}!" diff --git a/public/images/welcome/emoji-completion.png b/public/images/welcome/emoji-completion-2x.png similarity index 100% rename from public/images/welcome/emoji-completion.png rename to public/images/welcome/emoji-completion-2x.png diff --git a/public/images/welcome/like-link-flag-bookmark.png b/public/images/welcome/like-link-flag-bookmark-2x.png similarity index 100% rename from public/images/welcome/like-link-flag-bookmark.png rename to public/images/welcome/like-link-flag-bookmark-2x.png diff --git a/public/images/welcome/notification-panel.png b/public/images/welcome/notification-panel-2x.png similarity index 100% rename from public/images/welcome/notification-panel.png rename to public/images/welcome/notification-panel-2x.png diff --git a/public/images/welcome/progress-bar.png b/public/images/welcome/progress-bar-2x.png similarity index 100% rename from public/images/welcome/progress-bar.png rename to public/images/welcome/progress-bar-2x.png diff --git a/public/images/welcome/quote-reply.png b/public/images/welcome/quote-reply-2x.png similarity index 100% rename from public/images/welcome/quote-reply.png rename to public/images/welcome/quote-reply-2x.png diff --git a/public/images/welcome/reply-as-linked-topic.png b/public/images/welcome/reply-as-linked-topic-2x.png similarity index 100% rename from public/images/welcome/reply-as-linked-topic.png rename to public/images/welcome/reply-as-linked-topic-2x.png diff --git a/public/images/welcome/reply-post.png b/public/images/welcome/reply-post-2x.png similarity index 100% rename from public/images/welcome/reply-post.png rename to public/images/welcome/reply-post-2x.png diff --git a/public/images/welcome/reply-topic.png b/public/images/welcome/reply-topic-2x.png similarity index 100% rename from public/images/welcome/reply-topic.png rename to public/images/welcome/reply-topic-2x.png diff --git a/public/images/welcome/topic-list-select-areas.png b/public/images/welcome/topic-list-select-areas-2x.png similarity index 100% rename from public/images/welcome/topic-list-select-areas.png rename to public/images/welcome/topic-list-select-areas-2x.png diff --git a/public/images/welcome/topic-notification-control.png b/public/images/welcome/topic-notification-control-2x.png similarity index 100% rename from public/images/welcome/topic-notification-control.png rename to public/images/welcome/topic-notification-control-2x.png diff --git a/public/images/welcome/topics-new-unread.png b/public/images/welcome/topics-new-unread-2x.png similarity index 100% rename from public/images/welcome/topics-new-unread.png rename to public/images/welcome/topics-new-unread-2x.png diff --git a/public/images/welcome/username-completion.png b/public/images/welcome/username-completion-2x.png similarity index 100% rename from public/images/welcome/username-completion.png rename to public/images/welcome/username-completion-2x.png