From ddbcba145d0958d5291a8ce4c69e5f6c5bf7121f Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Thu, 7 Aug 2014 16:39:12 -0700
Subject: [PATCH] add ellipsis to flag buttons, better tooltips

---
 .../javascripts/admin/templates/flags.js.handlebars       | 4 ++--
 config/locales/client.en.yml                              | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/flags.js.handlebars b/app/assets/javascripts/admin/templates/flags.js.handlebars
index d630f739758..150a5bb4395 100644
--- a/app/assets/javascripts/admin/templates/flags.js.handlebars
+++ b/app/assets/javascripts/admin/templates/flags.js.handlebars
@@ -135,14 +135,14 @@
             <tr>
               <td colspan="4" class="action">
                 {{#if adminActiveFlagsView}}
-                  <button title='{{i18n admin.flags.agree_title}}' class='btn' {{action showAgreeFlagModal flaggedPost}}><i class="fa fa-thumbs-o-up"></i>{{i18n admin.flags.agree}}</button>
+                  <button title='{{i18n admin.flags.agree_title}}' class='btn' {{action showAgreeFlagModal flaggedPost}}><i class="fa fa-thumbs-o-up"></i>{{i18n admin.flags.agree}}&hellip;</button>
                   {{#if flaggedPost.postHidden}}
                     <button title='{{i18n admin.flags.disagree_flag_unhide_post_title}}' class='btn' {{action disagreeFlags flaggedPost}}><i class="fa fa-thumbs-o-down"></i>{{i18n admin.flags.disagree_flag_unhide_post}}</button>
                   {{else}}
                     <button title='{{i18n admin.flags.disagree_flag_title}}' class='btn' {{action disagreeFlags flaggedPost}}><i class="fa fa-thumbs-o-down"></i>{{i18n admin.flags.disagree_flag}}</button>
                   {{/if}}
                   <button title='{{i18n admin.flags.defer_flag_title}}' class='btn' {{action deferFlags flaggedPost}}><i class="fa fa-external-link"></i>{{i18n admin.flags.defer_flag}}</button>
-                  <button title='{{i18n admin.flags.delete_title}}' class='btn btn-danger' {{action showDeleteFlagModal flaggedPost}}><i class="fa fa-trash-o"></i>{{i18n admin.flags.delete}}</button>
+                  <button title='{{i18n admin.flags.delete_title}}' class='btn btn-danger' {{action showDeleteFlagModal flaggedPost}}><i class="fa fa-trash-o"></i>{{i18n admin.flags.delete}}&hellip;</button>
                 {{/if}}
               </td>
             </tr>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 06a064f09c4..f8499072f3e 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1445,16 +1445,16 @@ en:
         active: "Active"
 
         agree: "Agree"
-        agree_title: "Agree"
+        agree_title: "Confirm this flag as valid and correct"
         agree_flag_modal_title: "Agree and..."
         agree_flag_hide_post: "Agree (hide post + send PM)"
         agree_flag_hide_post_title: "Hide this post and automatically send the user a private message urging them to edit it"
         agree_flag: "Agree with flag"
         agree_flag_title: "Agree with flag and keep the post unchanged"
         defer_flag: "Defer"
-        defer_flag_title: "No action is necessary at this time, defer any action on this flag until a later date, or never"
+        defer_flag_title: "Remove this flag; it requires no action at this time."
         delete: "Delete"
-        delete_title: "Delete"
+        delete_title: "Delete the post this flag refers to."
         delete_post_defer_flag: "Delete post and Defer flag"
         delete_post_defer_flag_title: "Delete post; if the first post, delete the topic"
         delete_post_agree_flag: "Delete post and Agree with flag"
@@ -1465,7 +1465,7 @@ en:
         disagree_flag_unhide_post: "Disagree (unhide post)"
         disagree_flag_unhide_post_title: "Remove any flags from this post and make the post visible again"
         disagree_flag: "Disagree"
-        disagree_flag_title: "Disagree with flag, remove any flags from this post"
+        disagree_flag_title: "Deny this flag as invalid or incorrect"
         clear_topic_flags: "Done"
         clear_topic_flags_title: "The topic has been investigated and issues have been resolved. Click Done to remove the flags."
         more: "(more...)"