From 1d9ea39dd16da3353d765fb63830f5fe16cb4972 Mon Sep 17 00:00:00 2001
From: Jim Nelson <jim@yorba.org>
Date: Wed, 4 Sep 2013 19:15:24 -0700
Subject: [PATCH] Several mnemonic and capitalization fixes

Missing mnemonics in composer context menu: Closes #7439
Context menu items need capitazliation: Closes #6862
No tooltip for remove button in Accounts window: Closes #6551
Print menu item needs ellipsis: Closes #7259
"Saving..." -> "Saving" in composer: Refs #7365
---
 src/client/composer/composer-window.vala  |  4 ++--
 src/client/geary-controller.vala          |  2 +-
 src/client/ui/stock.vala                  |  4 ++--
 src/client/views/conversation-viewer.vala |  2 +-
 ui/account_list.glade                     |  8 +++----
 ui/composer.glade                         | 28 +++++++++++------------
 6 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/client/composer/composer-window.vala b/src/client/composer/composer-window.vala
index d591d469..55a5bc4d 100644
--- a/src/client/composer/composer-window.vala
+++ b/src/client/composer/composer-window.vala
@@ -39,8 +39,8 @@ public class ComposerWindow : Gtk.Window {
     
     private const string DEFAULT_TITLE = _("New Message");
     private const string DRAFT_SAVED_TEXT = _("Saved");
-    private const string DRAFT_SAVING_TEXT = _("Saving draft...");
-    private const string DRAFT_ERROR_TEXT = _("Error saving draft");
+    private const string DRAFT_SAVING_TEXT = _("Saving");
+    private const string DRAFT_ERROR_TEXT = _("Error saving");
     
     private const string URI_LIST_MIME_TYPE = "text/uri-list";
     private const string FILE_URI_PREFIX = "file://";
diff --git a/src/client/geary-controller.vala b/src/client/geary-controller.vala
index 1277cba6..f44a4484 100644
--- a/src/client/geary-controller.vala
+++ b/src/client/geary-controller.vala
@@ -1307,7 +1307,7 @@ public class GearyController : Geary.BaseObject {
             QuestionDialog ask_to_open = new QuestionDialog.with_checkbox(main_window,
                 _("Are you sure you want to open \"%s\"?").printf(attachment.filename),
                 _("Attachments may cause damage to your system if opened.  Only open files from trusted sources."),
-                Stock._OPEN, Stock._CANCEL, _("Don't _ask me again"), false);
+                Stock._OPEN_BUTTON, Stock._CANCEL, _("Don't _ask me again"), false);
             if (ask_to_open.run() != Gtk.ResponseType.OK)
                 return;
             
diff --git a/src/client/ui/stock.vala b/src/client/ui/stock.vala
index a79d4c3b..a7f3fc12 100644
--- a/src/client/ui/stock.vala
+++ b/src/client/ui/stock.vala
@@ -23,9 +23,9 @@ public const string _ADD = _("_Add");
 public const string _CLOSE = _("_Close");
 public const string _DISCARD = _("_Discard");
 public const string _HELP = _("_Help");
-public const string _OPEN = _("_Open");
+public const string _OPEN_BUTTON = _("_Open");
 public const string _PREFERENCES = _("_Preferences");
-public const string _PRINT = _("_Print");
+public const string _PRINT_MENU = _("_Print...");
 public const string _QUIT = _("_Quit");
 public const string _REMOVE = _("_Remove");
 public const string _SAVE = _("_Save");
diff --git a/src/client/views/conversation-viewer.vala b/src/client/views/conversation-viewer.vala
index ca43e337..fc9529b1 100644
--- a/src/client/views/conversation-viewer.vala
+++ b/src/client/views/conversation-viewer.vala
@@ -1429,7 +1429,7 @@ public class ConversationViewer : Gtk.Box {
         }
         
         // Print a message.
-        Gtk.MenuItem print_item = new Gtk.MenuItem.with_mnemonic(Stock._PRINT);
+        Gtk.MenuItem print_item = new Gtk.MenuItem.with_mnemonic(Stock._PRINT_MENU);
         print_item.activate.connect(() => on_print_message(email));
         menu.append(print_item);
 
diff --git a/ui/account_list.glade b/ui/account_list.glade
index 5023ca55..2265a77e 100644
--- a/ui/account_list.glade
+++ b/ui/account_list.glade
@@ -68,8 +68,7 @@
             <property name="related_action">add_account</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Add an account</property>
-            <property name="label" translatable="yes">toolbutton1</property>
+            <property name="tooltip_text" translatable="yes">Add account</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
@@ -82,8 +81,7 @@
             <property name="related_action">edit_account</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Edit an account</property>
-            <property name="label" translatable="yes">toolbutton1</property>
+            <property name="tooltip_text" translatable="yes">Edit account</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
@@ -96,7 +94,7 @@
             <property name="related_action">delete_account</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">toolbutton1</property>
+            <property name="tooltip_text" translatable="yes">Remove account</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
diff --git a/ui/composer.glade b/ui/composer.glade
index d7a542fc..8c2e4a55 100644
--- a/ui/composer.glade
+++ b/ui/composer.glade
@@ -4,35 +4,35 @@
   <object class="GtkActionGroup" id="compose actions">
     <child>
       <object class="GtkAction" id="undo">
-        <property name="label" translatable="yes">Undo</property>
+        <property name="label" translatable="yes">_Undo</property>
         <property name="icon_name">undo</property>
       </object>
       <accelerator key="z" modifiers="GDK_CONTROL_MASK"/>
     </child>
     <child>
       <object class="GtkAction" id="redo">
-        <property name="label" translatable="yes">Redo</property>
+        <property name="label" translatable="yes">_Redo</property>
         <property name="icon_name">redo</property>
       </object>
       <accelerator key="z" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
     </child>
     <child>
       <object class="GtkAction" id="cut">
-        <property name="label" translatable="yes">Cut</property>
+        <property name="label" translatable="yes">Cu_t</property>
         <property name="icon_name">edit-cut</property>
       </object>
       <accelerator key="x" modifiers="GDK_CONTROL_MASK"/>
     </child>
     <child>
       <object class="GtkAction" id="copy">
-        <property name="label" translatable="yes">Copy</property>
+        <property name="label" translatable="yes">_Copy</property>
         <property name="icon_name">edit-copy</property>
       </object>
       <accelerator key="c" modifiers="GDK_CONTROL_MASK"/>
     </child>
     <child>
       <object class="GtkAction" id="paste">
-        <property name="label" translatable="yes">Paste</property>
+        <property name="label" translatable="yes">_Paste</property>
         <property name="icon_name">edit-paste</property>
       </object>
       <accelerator key="v" modifiers="GDK_CONTROL_MASK"/>
@@ -99,13 +99,13 @@
     </child>
     <child>
       <object class="GtkAction" id="paste with formatting">
-        <property name="label" translatable="yes" context="Clipboard paste with rich text">Paste _with formatting</property>
+        <property name="label" translatable="yes" context="Clipboard paste with rich text">Paste _With Formatting</property>
       </object>
       <accelerator key="v" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
     </child>
     <child>
       <object class="GtkAction" id="copy link">
-        <property name="label" translatable="yes">Copy _link</property>
+        <property name="label" translatable="yes">Copy _Link</property>
       </object>
     </child>
     <child>
@@ -138,7 +138,7 @@
     </child>
     <child>
       <object class="GtkToggleAction" id="compose as html">
-        <property name="label" translatable="yes">Rich Text</property>
+        <property name="label" translatable="yes">_Rich Text</property>
         <property name="icon_name">text-html</property>
       </object>
     </child>
@@ -148,37 +148,37 @@
     </child>
     <child>
       <object class="GtkAction" id="font_large">
-        <property name="label" translatable="yes">Large</property>
+        <property name="label" translatable="yes">Lar_ge</property>
         <property name="short_label" translatable="yes">Large</property>
       </object>
     </child>
     <child>
       <object class="GtkAction" id="font_medium">
-        <property name="label" translatable="yes">Medium</property>
+        <property name="label" translatable="yes">_Medium</property>
         <property name="short_label" translatable="yes">Medium</property>
       </object>
     </child>
     <child>
       <object class="GtkAction" id="font_small">
-        <property name="label" translatable="yes">Small</property>
+        <property name="label" translatable="yes">_Small</property>
         <property name="short_label" translatable="yes">Small</property>
       </object>
     </child>
     <child>
       <object class="GtkAction" id="font_sans">
-        <property name="label" translatable="yes">Sans Serif</property>
+        <property name="label" translatable="yes">S_ans Serif</property>
         <property name="short_label" translatable="yes">Sans Serif</property>
       </object>
     </child>
     <child>
       <object class="GtkAction" id="font_serif">
-        <property name="label" translatable="yes">Serif</property>
+        <property name="label" translatable="yes">S_erif</property>
         <property name="short_label" translatable="yes">Serif</property>
       </object>
     </child>
     <child>
       <object class="GtkAction" id="font_monospace">
-        <property name="label" translatable="yes">Fixed Width</property>
+        <property name="label" translatable="yes">_Fixed Width</property>
         <property name="short_label" translatable="yes">Fixed Width</property>
       </object>
     </child>