[geary/wip/279-convo-list-context-labels: 4/4] Update other trash/delete menu items for consistency

[Michael Gratton <mjog src gnome org>]

commit c5d0561c001382011a8c5c8dec0117c33da6ad0a
Author: Michael Gratton <mike vee net>
Date:   Sun Aug 4 12:51:41 2019 +1000

    Update other trash/delete menu items for consistency

 src/client/components/main-toolbar.vala | 12 ++++++------
 ui/conversation-email-menus.ui          |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/client/components/main-toolbar.vala b/src/client/components/main-toolbar.vala
index e492d721..8896f1df 100644
--- a/src/client/components/main-toolbar.vala
+++ b/src/client/components/main-toolbar.vala
@@ -151,8 +151,8 @@ public class MainToolbar : Gtk.Box {
             this.selected_conversations
         );
         this.archive_button.tooltip_text = ngettext(
-            "Archive conversation (A)",
-            "Archive conversations (A)",
+            "Archive conversation",
+            "Archive conversations",
             this.selected_conversations
         );
 
@@ -160,16 +160,16 @@ public class MainToolbar : Gtk.Box {
             this.trash_delete_button.action_name = "win."+Application.Controller.ACTION_TRASH_CONVERSATION;
             this.trash_delete_button.image = trash_image;
             this.trash_delete_button.tooltip_text = ngettext(
-                "Move conversation to Trash (Delete, Backspace)",
-                "Move conversations to Trash (Delete, Backspace)",
+                "Move conversation to Trash",
+                "Move conversations to Trash",
                 this.selected_conversations
             );
         } else {
             this.trash_delete_button.action_name = "win."+Application.Controller.ACTION_DELETE_CONVERSATION;
             this.trash_delete_button.image = delete_image;
             this.trash_delete_button.tooltip_text = ngettext(
-                "Delete conversation (Shift+Delete)",
-                "Delete conversations (Shift+Delete)",
+                "Delete conversation",
+                "Delete conversations",
                 this.selected_conversations
             );
         }
diff --git a/ui/conversation-email-menus.ui b/ui/conversation-email-menus.ui
index a863c620..098e1f2a 100644
--- a/ui/conversation-email-menus.ui
+++ b/ui/conversation-email-menus.ui
@@ -46,15 +46,15 @@
     <section id="email_menu_trash">
       <item>
         <!-- Translators: Menu item to move a single, specific message
-             to the trash -->
-        <attribute name="label" translatable="yes">_Trash</attribute>
+             to the trash folder -->
+        <attribute name="label" translatable="yes">Move message to _Trash</attribute>
         <attribute name="action">eml.trash_msg</attribute>
       </item>
     </section>
     <section id="email_menu_delete">
       <item>
         <!-- Translators: Menu item to delete a single, specific message -->
-        <attribute name="label" translatable="yes">_Delete…</attribute>
+        <attribute name="label" translatable="yes">_Delete message…</attribute>
         <attribute name="action">eml.delete_msg</attribute>
       </item>
     </section>