From 7b3fa06ac1e2154e89ac7206882e015bf11e45db Mon Sep 17 00:00:00 2001
From: Eric Gregory <eric@yorba.org>
Date: Fri, 22 Feb 2013 12:45:03 -0800
Subject: [PATCH] Closes #5884 Closes #5854 Closes #5816 Closes #6367 String
 changes * "Reply To" now labelled "Reply" * Toolbar overflow menu labels no
 longer say "translated" * .desktop file contains keywords * For generic
 servers, "Remember password" now says "Remember passwords"

---
 desktop/geary.desktop.in               | 1 +
 src/client/accounts/add-edit-page.vala | 3 ++-
 src/client/geary-controller.vala       | 3 +++
 ui/toolbar.glade                       | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/desktop/geary.desktop.in b/desktop/geary.desktop.in
index e0e587c7..1735c355 100644
--- a/desktop/geary.desktop.in
+++ b/desktop/geary.desktop.in
@@ -2,6 +2,7 @@
 _Name=Geary Mail
 _GenericName=Mail Client
 _Comment=Send and receive email
+_Keywords=Email;E-mail;Mail
 Icon=geary
 TryExec=geary
 Exec=geary %U
diff --git a/src/client/accounts/add-edit-page.vala b/src/client/accounts/add-edit-page.vala
index e44c5306..319ed329 100644
--- a/src/client/accounts/add-edit-page.vala
+++ b/src/client/accounts/add-edit-page.vala
@@ -547,13 +547,14 @@ public class AddEditPage : Gtk.Box {
             entry_password.hide();
             other_info.show();
             set_other_info_sensitive(true);
+            check_remember_password.label = _("Re_member passwords"); // Plural
         } else {
             // For special-cased providers, only display necessary info.
             label_password.show();
             entry_password.show();
             other_info.hide();
-            
             set_other_info_sensitive(mode == PageMode.WELCOME);
+            check_remember_password.label = _("Re_member password");
         }
         
         // In edit mode, certain fields are not sensitive.
diff --git a/src/client/geary-controller.vala b/src/client/geary-controller.vala
index 3b57f460..f0066882 100644
--- a/src/client/geary-controller.vala
+++ b/src/client/geary-controller.vala
@@ -225,16 +225,19 @@ public class GearyController {
 
         Gtk.ActionEntry reply_to_message = { ACTION_REPLY_TO_MESSAGE, null, TRANSLATABLE, "<Ctrl>R",
             null, on_reply_to_message_action };
+        reply_to_message.label = _("_Reply");
         entries += reply_to_message;
         add_accelerator("R", ACTION_REPLY_TO_MESSAGE);
         
         Gtk.ActionEntry reply_all_message = { ACTION_REPLY_ALL_MESSAGE, null, TRANSLATABLE,
             "<Ctrl><Shift>R", null, on_reply_all_message_action };
+        reply_all_message.label = _("Reply _all");
         entries += reply_all_message;
         add_accelerator("<Shift>R", ACTION_REPLY_ALL_MESSAGE);
         
         Gtk.ActionEntry forward_message = { ACTION_FORWARD_MESSAGE, null, TRANSLATABLE, "<Ctrl>L", null,
             on_forward_message_action };
+        forward_message.label = _("_Forward");
         entries += forward_message;
         add_accelerator("F", ACTION_FORWARD_MESSAGE);
         
diff --git a/ui/toolbar.glade b/ui/toolbar.glade
index 6b32f2ac..c89b9de9 100644
--- a/ui/toolbar.glade
+++ b/ui/toolbar.glade
@@ -40,7 +40,7 @@
         <property name="tooltip_text" translatable="yes">Reply to sender</property>
         <property name="use_action_appearance">False</property>
         <property name="is_important">True</property>
-        <property name="label" translatable="yes">Reply To</property>
+        <property name="label" translatable="yes">Reply</property>
         <property name="use_underline">True</property>
         <property name="icon_name">mail-reply-sender</property>
       </object>