From e076682bc680099d5b7f28516c9bcc657ec36701 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Mon, 13 Jan 2014 10:11:40 +1100
Subject: [PATCH] BUGFIX: Improve copy and correct instruction alignment

---
 .../discourse/templates/user/preferences.js.handlebars      | 6 +++---
 app/assets/stylesheets/desktop/user.scss                    | 3 ++-
 config/locales/client.en.yml                                | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
index 3164c285630..68cc0fd14c7 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 @@
       <div class="controls">
         <label>{{i18n user.watched_categories}}</label>
         {{category-group categories=watchedCategories}}
-        <div class="instructions">{{i18n user.watched_categories_instructions}}</div>
       </div>
+      <div class="instructions">{{i18n user.watched_categories_instructions}}</div>
       <div class="controls">
         <label>{{i18n user.tracked_categories}}</label>
         {{category-group categories=trackedCategories}}
-        <div class="instructions">{{i18n user.tracked_categories_instructions}}</div>
       </div>
+      <div class="instructions">{{i18n user.tracked_categories_instructions}}</div>
       <div class="controls">
         <label>{{i18n user.muted_categories}}</label>
         {{category-group categories=mutedCategories}}
-        <div class="instructions">{{i18n user.muted_categories_instructions}}</div>
       </div>
+      <div class="instructions">{{i18n user.muted_categories_instructions}}</div>
     </div>
 
     <div class="control-group">
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index 445e96461ca..1a642fa27b1 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 291d86b3ef9..2c58bb1ac09 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"