diff --git a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars index 3164c2856..68cc0fd14 100644 --- a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars +++ b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars @@ -139,18 +139,18 @@
{{category-group categories=watchedCategories}} -
{{i18n user.watched_categories_instructions}}
+
{{i18n user.watched_categories_instructions}}
{{category-group categories=trackedCategories}} -
{{i18n user.tracked_categories_instructions}}
+
{{i18n user.tracked_categories_instructions}}
{{category-group categories=mutedCategories}} -
{{i18n user.muted_categories_instructions}}
+
{{i18n user.muted_categories_instructions}}
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss index 445e96461..1a642fa27 100644 --- a/app/assets/stylesheets/desktop/user.scss +++ b/app/assets/stylesheets/desktop/user.scss @@ -43,8 +43,9 @@ } .instructions { color: $dark_gray; - margin-left: 165px; + margin-left: 160px; margin-top: 5px; + margin-bottom: 10px; } .avatar { margin-left: 3px; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 291d86b3e..2c58bb1ac 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -230,11 +230,11 @@ en: suspended_reason: "Reason: " watch_new_topics: "Automatically watch all new topics posted on the forum" watched_categories: "Watched" - watched_categories_instructions: "You will automatically watch all topics in these categories" + watched_categories_instructions: "Same as Tracking, plus you will be notified of all new posts and topics." tracked_categories: "Tracked" - tracked_categories_instructions: "You will automatically receive notifications for topics in these categories" + tracked_categories_instructions: "You will automatically track all new and existing topics providing you a count of unread and new posts" muted_categories: "Muted" - muted_categories_instructions: "You will automatically mute all topics in these categories" + muted_categories_instructions: "You will not be notified of anything about this topic, and it will not appear on your unread tab." messages: all: "All"