From e2f4302e3183a3b653c996f5e48b43e6442f0e4d Mon Sep 17 00:00:00 2001
From: Eric Gregory <eric@yorba.org>
Date: Mon, 25 Feb 2013 18:29:01 -0800
Subject: [PATCH] Closes #6044 Shortcuts in tooltips

---
 src/client/geary-controller.vala |  8 ++++----
 ui/composer.glade                | 22 +++++++++++-----------
 ui/toolbar.glade                 |  8 ++++----
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/client/geary-controller.vala b/src/client/geary-controller.vala
index 3b85cbff..ee11cc97 100644
--- a/src/client/geary-controller.vala
+++ b/src/client/geary-controller.vala
@@ -32,13 +32,13 @@ public class GearyController {
     public const int FETCH_EMAIL_CHUNK_COUNT = 50;
     
     private const string DELETE_MESSAGE_LABEL = _("_Delete");
-    private const string DELETE_MESSAGE_TOOLTIP_SINGLE = _("Delete the selected conversation");
-    private const string DELETE_MESSAGE_TOOLTIP_MULTIPLE = _("Delete the selected conversations");
+    private const string DELETE_MESSAGE_TOOLTIP_SINGLE = _("Delete conversation (Delete, Backspace, A)");
+    private const string DELETE_MESSAGE_TOOLTIP_MULTIPLE = _("Delete conversations (Delete, Backspace, A)");
     private const string DELETE_MESSAGE_ICON_NAME = "user-trash-full";
     
     private const string ARCHIVE_MESSAGE_LABEL = _("_Archive");
-    private const string ARCHIVE_MESSAGE_TOOLTIP_SINGLE = _("Archive the selected conversation");
-    private const string ARCHIVE_MESSAGE_TOOLTIP_MULTIPLE = _("Archive the selected conversations");
+    private const string ARCHIVE_MESSAGE_TOOLTIP_SINGLE = _("Archive conversation (Delete, Backspace, A)");
+    private const string ARCHIVE_MESSAGE_TOOLTIP_MULTIPLE = _("Archive conversations (Delete, Backspace, A)");
     private const string ARCHIVE_MESSAGE_ICON_NAME = "mail-archive";
     
     private const string MARK_AS_SPAM_LABEL = _("Mark as s_pam");
diff --git a/ui/composer.glade b/ui/composer.glade
index 1c442b24..f4a7628a 100644
--- a/ui/composer.glade
+++ b/ui/composer.glade
@@ -420,7 +420,7 @@
             <property name="related_action">bold</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Bold</property>
+            <property name="tooltip_text" translatable="yes" comments="Toggle bold text">Bold (Ctrl+B)</property>
             <property name="label" translatable="yes">Bold</property>
             <property name="use_underline">True</property>
           </object>
@@ -434,7 +434,7 @@
             <property name="related_action">italic</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Italic</property>
+            <property name="tooltip_text" translatable="yes" comments="Toggle italic text">Italic (Ctrl+I)</property>
             <property name="label" translatable="yes">Italic</property>
             <property name="use_underline">True</property>
           </object>
@@ -448,7 +448,7 @@
             <property name="related_action">underline</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Underline</property>
+            <property name="tooltip_text" translatable="yes" comments="Toggle underlined text">Underline (Ctrl+U)</property>
             <property name="label" translatable="yes">Underline</property>
             <property name="use_underline">True</property>
           </object>
@@ -462,7 +462,7 @@
             <property name="related_action">strikethrough</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Strikethrough</property>
+            <property name="tooltip_text" translatable="yes" comments="Toggle strikethrough text">Strikethrough (Ctrl+K)</property>
             <property name="label" translatable="yes">Strikethrough</property>
             <property name="use_underline">True</property>
           </object>
@@ -486,7 +486,7 @@
             <property name="related_action">indent</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Indent</property>
+            <property name="tooltip_text" translatable="yes" comments="Indent text">Indent (Ctrl+])</property>
             <property name="label" translatable="yes">Indent</property>
             <property name="use_underline">True</property>
           </object>
@@ -500,7 +500,7 @@
             <property name="related_action">outdent</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Un-indent</property>
+            <property name="tooltip_text" translatable="yes" comments="Removes an indent level">Un-indent (Ctrl+[)</property>
             <property name="label" translatable="yes">Un-indent</property>
             <property name="use_underline">True</property>
           </object>
@@ -524,7 +524,7 @@
             <property name="related_action">font</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Fonts</property>
+            <property name="tooltip_text" translatable="yes" comments="Opens font drop-down menu">Fonts</property>
             <property name="label" translatable="yes">Fonts</property>
             <property name="use_underline">True</property>
           </object>
@@ -538,7 +538,7 @@
             <property name="related_action">fontsize</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Font size</property>
+            <property name="tooltip_text" translatable="yes" comments="Opens font size drop-down menu">Font size</property>
             <property name="label" translatable="yes">Font size</property>
             <property name="use_underline">True</property>
           </object>
@@ -552,7 +552,7 @@
             <property name="related_action">color</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Color</property>
+            <property name="tooltip_text" translatable="yes" comments="Opens font color dialog">Color (Ctrl+R)</property>
             <property name="label" translatable="yes">Color</property>
             <property name="use_underline">True</property>
           </object>
@@ -566,7 +566,7 @@
             <property name="related_action">insertlink</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Link</property>
+            <property name="tooltip_text" translatable="yes" comments="Add an HTML link">Link (Ctrl+L)</property>
             <property name="label" translatable="yes">Link</property>
             <property name="use_underline">True</property>
           </object>
@@ -580,7 +580,7 @@
             <property name="related_action">removeformat</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Remove formatting</property>
+            <property name="tooltip_text" translatable="yes" comments="Resets formatting to the default style">Remove formatting (Ctrl+Space)</property>
             <property name="label" translatable="yes">Remove formatting</property>
             <property name="use_underline">True</property>
           </object>
diff --git a/ui/toolbar.glade b/ui/toolbar.glade
index 7591fd7b..5ce08853 100644
--- a/ui/toolbar.glade
+++ b/ui/toolbar.glade
@@ -9,7 +9,7 @@
         <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="tooltip_text" translatable="yes" comments="Button for creating a new email message">Start new conversation</property>
+        <property name="tooltip_text" translatable="yes" comments="Button for creating a new email message">Start new conversation (Ctrl+N, N)</property>
         <property name="use_action_appearance">False</property>
         <property name="is_important">True</property>
         <property name="label" translatable="yes">New Message</property>
@@ -37,7 +37,7 @@
         <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="tooltip_text" translatable="yes">Reply to last message in conversation</property>
+        <property name="tooltip_text" translatable="yes">Reply to last message in conversation (Ctrl+R, R)</property>
         <property name="use_action_appearance">False</property>
         <property name="is_important">True</property>
         <property name="label" translatable="yes">Reply</property>
@@ -54,7 +54,7 @@
         <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="tooltip_text" translatable="yes">Reply to everyone in last message of conversation</property>
+        <property name="tooltip_text" translatable="yes">Reply to everyone in last message of conversation (Ctrl+Shift+R, Shift+R)</property>
         <property name="use_action_appearance">False</property>
         <property name="is_important">True</property>
         <property name="label" translatable="yes">Reply All</property>
@@ -71,7 +71,7 @@
         <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="tooltip_text" translatable="yes">Send copy of last message in conversation</property>
+        <property name="tooltip_text" translatable="yes">Send copy of last message in conversation (Ctrl+L, F)</property>
         <property name="use_action_appearance">False</property>
         <property name="is_important">True</property>
         <property name="label" translatable="yes">Forward</property>