[shotwell/wip/dedeprecate: 30/38] WIP

From: Jens Georg <jensgeorg src gnome org>
To: commits-list gnome org
Cc:
Subject: [shotwell/wip/dedeprecate: 30/38] WIP
Date: Wed, 2 Nov 2016 19:59:05 +0000 (UTC)
commit 3ac1a1b35e35db24f58b82450af1a7f49ee63e8c
Author: Jens Georg <mail jensge org>
Date:   Sat Oct 29 22:22:41 2016 +0200

    WIP

 ui/direct.ui           |   92 ++++++++++++++++++++++--------------
 ui/direct_context.ui   |    7 ++-
 ui/event.ui            |   11 ++--
 ui/events_directory.ui |   69 ++++++++++++++++-----------
 ui/import.ui           |   60 ++++++++++++++----------
 ui/import_queue.ui     |   30 +++++++-----
 ui/media.ui            |   79 +++++++++++++++++++-------------
 ui/offline.ui          |   56 +++++++++++++---------
 ui/photo.ui            |  121 +++++++++++++++++++++++++++++-------------------
 ui/photo_context.ui    |   12 +++--
 ui/savedsearch.ui      |    6 +-
 ui/tags.ui             |    2 +-
 ui/top.ui              |   16 +++---
 ui/trash.ui            |   62 +++++++++++++++----------
 14 files changed, 368 insertions(+), 255 deletions(-)
---
diff --git a/ui/direct.ui b/ui/direct.ui
index 8447104..8db551b 100644
--- a/ui/direct.ui
+++ b/ui/direct.ui
@@ -2,14 +2,16 @@
 <interface domain="shotwell">
   <menu id="MenuBar">
     <submenu>
-      <attribute name="label" translatable="yes">FileMenu</attribute>
+      <attribute name="label" translatable="yes">_File</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">Save</attribute>
+          <attribute name="label" translatable="yes">_Save</attribute>
+          <attribute name="accel">&lt;Primary&gt;s</attribute>
           <attribute name="action">Save</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">SaveAs</attribute>
+          <attribute name="label" translatable="yes">Save _As…</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;s</attribute>
           <attribute name="action">SaveAs</attribute>
         </item>
       </section>
@@ -18,157 +20,175 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">SendTo</attribute>
+          <attribute name="label" translatable="yes">Send _To…</attribute>
           <attribute name="action">SendTo</attribute>
         </item>
       <attribute name="id">SetBackgroundPlaceholder</attribute>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonJumpToFile</attribute>
+          <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;q</attribute>
           <attribute name="action">CommonJumpToFile</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonQuit</attribute>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
           <attribute name="action">CommonQuit</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">EditMenu</attribute>
+      <attribute name="label" translatable="yes">_Edit</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonUndo</attribute>
+          <attribute name="label" translatable="yes">_Undo</attribute>
+          <attribute name="accel">&lt;Primary&gt;z</attribute>
           <attribute name="action">CommonUndo</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonRedo</attribute>
+          <attribute name="label" translatable="yes">_Redo</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;z</attribute>
           <attribute name="action">CommonRedo</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">ViewMenu</attribute>
+      <attribute name="label" translatable="yes">_View</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonFullscreen</attribute>
+          <attribute name="label" translatable="yes">Fulls_creen</attribute>
+          <attribute name="accel">F11</attribute>
           <attribute name="action">CommonFullscreen</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">IncreaseSize</attribute>
+          <attribute name="label" translatable="yes">Zoom _In</attribute>
+          <attribute name="accel">&lt;Primary&gt;plus</attribute>
           <attribute name="action">IncreaseSize</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">DecreaseSize</attribute>
+          <attribute name="label" translatable="yes">Zoom _Out</attribute>
+          <attribute name="accel">&lt;Primary&gt;minus</attribute>
           <attribute name="action">DecreaseSize</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">ZoomFit</attribute>
+          <attribute name="label" translatable="yes">Fit to _Page</attribute>
+          <attribute name="accel">&lt;Primary&gt;0</attribute>
           <attribute name="action">ZoomFit</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">Zoom100</attribute>
+          <attribute name="label" translatable="yes">Zoom _100%</attribute>
+          <attribute name="accel">&lt;Primary&gt;1</attribute>
           <attribute name="action">Zoom100</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">Zoom200</attribute>
+          <attribute name="label" translatable="yes">Zoom _200%</attribute>
+          <attribute name="accel">&lt;Primary&gt;2</attribute>
           <attribute name="action">Zoom200</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">PhotoMenu</attribute>
+      <attribute name="label" translatable="yes">_Photo</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">PrevPhoto</attribute>
+          <attribute name="label" translatable="yes">_Previous Photo</attribute>
           <attribute name="action">PrevPhoto</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">NextPhoto</attribute>
+          <attribute name="label" translatable="yes">_Next Photo</attribute>
           <attribute name="action">NextPhoto</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">RotateClockwise</attribute>
+          <attribute name="label" translatable="yes">Rotate _Right</attribute>
+          <attribute name="accel">&lt;Primary&gt;r</attribute>
           <attribute name="action">RotateClockwise</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">RotateCounterclockwise</attribute>
+          <attribute name="label" translatable="yes">Rotate _Left</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;r</attribute>
           <attribute name="action">RotateCounterclockwise</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">FlipHorizontally</attribute>
+          <attribute name="label" translatable="yes">Flip Hori_zontally</attribute>
           <attribute name="action">FlipHorizontally</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">FlipVertically</attribute>
+          <attribute name="label" translatable="yes">Flip Verti_cally</attribute>
           <attribute name="action">FlipVertically</attribute>
         </item>
       </section>
       <section>
         <submenu>
-          <attribute name="label" translatable="yes">Tools</attribute>
+          <attribute name="label" translatable="yes">T_ools</attribute>
           <section>
             <item>
-              <attribute name="label" translatable="yes">Enhance</attribute>
+              <attribute name="label" translatable="yes">_Enhance</attribute>
+              <attribute name="accel">&lt;Primary&gt;e</attribute>
               <attribute name="action">Enhance</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">Crop</attribute>
+              <attribute name="label" translatable="yes">_Crop</attribute>
+              <attribute name="accel">&lt;Primary&gt;o</attribute>
               <attribute name="action">Crop</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">Straighten</attribute>
+              <attribute name="label" translatable="yes">_Straighten</attribute>
+              <attribute name="accel">&lt;Primary&gt;a</attribute>
               <attribute name="action">Straighten</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RedEye</attribute>
+              <attribute name="label" translatable="yes">_Red-eye</attribute>
+              <attribute name="accel">&lt;Primary&gt;y</attribute>
               <attribute name="action">RedEye</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">Adjust</attribute>
+              <attribute name="label" translatable="yes">_Adjust</attribute>
+              <attribute name="accel">&lt;Primary&gt;d</attribute>
               <attribute name="action">Adjust</attribute>
             </item>
           </section>
         </submenu>
         <item>
-          <attribute name="label" translatable="yes">Revert</attribute>
+          <attribute name="label" translatable="yes">Re_vert to Original</attribute>
           <attribute name="action">Revert</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">AdjustDateTime</attribute>
+          <attribute name="label" translatable="yes">_Adjust Date and Time…</attribute>
           <attribute name="action">AdjustDateTime</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">HelpMenu</attribute>
+      <attribute name="label" translatable="yes">_Help</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpContents</attribute>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
           <attribute name="action">CommonHelpContents</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpFAQ</attribute>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
           <attribute name="action">CommonHelpFAQ</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpReportProblem</attribute>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
           <attribute name="action">CommonHelpReportProblem</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonAbout</attribute>
+          <attribute name="label" translatable="yes">_About</attribute>
           <attribute name="action">CommonAbout</attribute>
         </item>
       </section>
diff --git a/ui/direct_context.ui b/ui/direct_context.ui
index 7e1e572..d746c1a 100644
--- a/ui/direct_context.ui
+++ b/ui/direct_context.ui
@@ -5,18 +5,19 @@
       <attribute name="label" translatable="yes">DirectContextMenu</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">Enhance</attribute>
+          <attribute name="label" translatable="yes">_Enhance</attribute>
+          <attribute name="accel">&lt;Primary&gt;e</attribute>
           <attribute name="action">Enhance</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">Revert</attribute>
+          <attribute name="label" translatable="yes">Re_vert to Original</attribute>
           <attribute name="action">Revert</attribute>
         </item>
       </section>
       <section>
       <attribute name="id">ContextJumpPlaceholder</attribute>
         <item>
-          <attribute name="label" translatable="yes">SendTo</attribute>
+          <attribute name="label" translatable="yes">Send _To…</attribute>
           <attribute name="action">SendTo</attribute>
         </item>
       </section>
diff --git a/ui/event.ui b/ui/event.ui
index 93b2da4..66cb167 100644
--- a/ui/event.ui
+++ b/ui/event.ui
@@ -2,25 +2,26 @@
 <interface domain="shotwell">
   <menu id="MenuBar">
     <submenu>
-      <attribute name="label" translatable="yes">PhotosMenu</attribute>
+      <attribute name="label" translatable="yes">_Photos</attribute>
       <section>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">MakePrimary</attribute>
+          <attribute name="label" translatable="yes">Make _Key Photo for Event</attribute>
           <attribute name="action">MakePrimary</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">EventsMenu</attribute>
+      <attribute name="label" translatable="yes">Even_ts</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">Rename</attribute>
+          <attribute name="label" translatable="yes">Re_name Event…</attribute>
+          <attribute name="accel">F2</attribute>
           <attribute name="action">Rename</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">EditComment</attribute>
+          <attribute name="label" translatable="yes">Edit _Comment…</attribute>
           <attribute name="action">EditComment</attribute>
         </item>
       </section>
diff --git a/ui/events_directory.ui b/ui/events_directory.ui
index 0b1dec1..dd56911 100644
--- a/ui/events_directory.ui
+++ b/ui/events_directory.ui
@@ -2,78 +2,87 @@
 <interface domain="shotwell">
   <menu id="MenuBar">
     <submenu>
-      <attribute name="label" translatable="yes">FileMenu</attribute>
+      <attribute name="label" translatable="yes">_File</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonFileImport</attribute>
+          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="accel">&lt;Primary&gt;i</attribute>
           <attribute name="action">CommonFileImport</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">ExternalLibraryImport</attribute>
+          <attribute name="label" translatable="yes">Import From _Application…</attribute>
           <attribute name="action">ExternalLibraryImport</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonEmptyTrash</attribute>
+          <attribute name="label" translatable="yes">Empty T_rash</attribute>
           <attribute name="action">CommonEmptyTrash</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonQuit</attribute>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
           <attribute name="action">CommonQuit</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">EditMenu</attribute>
+      <attribute name="label" translatable="yes">_Edit</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonUndo</attribute>
+          <attribute name="label" translatable="yes">_Undo</attribute>
+          <attribute name="accel">&lt;Primary&gt;z</attribute>
           <attribute name="action">CommonUndo</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonRedo</attribute>
+          <attribute name="label" translatable="yes">_Redo</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;z</attribute>
           <attribute name="action">CommonRedo</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonFind</attribute>
+          <attribute name="label" translatable="yes">_Find</attribute>
           <attribute name="action">CommonFind</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonNewSearch</attribute>
+          <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
+          <attribute name="accel">&lt;Primary&gt;s</attribute>
           <attribute name="action">CommonNewSearch</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonSelectAll</attribute>
+          <attribute name="label" translatable="yes">Select _All</attribute>
+          <attribute name="accel">&lt;Primary&gt;a</attribute>
           <attribute name="action">CommonSelectAll</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonPreferences</attribute>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
           <attribute name="action">CommonPreferences</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">ViewMenu</attribute>
+      <attribute name="label" translatable="yes">_View</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplayBasicProperties</attribute>
+          <attribute name="label" translatable="yes">_Basic Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
           <attribute name="action">CommonDisplayBasicProperties</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplayExtendedProperties</attribute>
+          <attribute name="label" translatable="yes">E_xtended Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
           <attribute name="action">CommonDisplayExtendedProperties</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplaySearchbar</attribute>
+          <attribute name="label" translatable="yes">_Search Bar</attribute>
+          <attribute name="accel">F8</attribute>
           <attribute name="action">CommonDisplaySearchbar</attribute>
         </item>
         <item>
@@ -87,13 +96,14 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">ViewComment</attribute>
+          <attribute name="label" translatable="yes">_Comments</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;c</attribute>
           <attribute name="action">ViewComment</attribute>
         </item>
       </section>
       <section>
         <submenu>
-          <attribute name="label" translatable="yes">CommonSortEvents</attribute>
+          <attribute name="label" translatable="yes">Sort _Events</attribute>
           <section>
             <item>
               <attribute name="label" translatable="yes">CommonSortEventsAscending</attribute>
@@ -108,47 +118,50 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonFullscreen</attribute>
+          <attribute name="label" translatable="yes">Fulls_creen</attribute>
+          <attribute name="accel">F11</attribute>
           <attribute name="action">CommonFullscreen</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">EventsMenu</attribute>
+      <attribute name="label" translatable="yes">Even_ts</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">Merge</attribute>
+          <attribute name="label" translatable="yes">_Merge Events</attribute>
           <attribute name="action">Merge</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">Rename</attribute>
+          <attribute name="label" translatable="yes">Re_name Event…</attribute>
+          <attribute name="accel">F2</attribute>
           <attribute name="action">Rename</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">EditComment</attribute>
+          <attribute name="label" translatable="yes">Edit _Comment…</attribute>
           <attribute name="action">EditComment</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">HelpMenu</attribute>
+      <attribute name="label" translatable="yes">_Help</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpContents</attribute>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
           <attribute name="action">CommonHelpContents</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpFAQ</attribute>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
           <attribute name="action">CommonHelpFAQ</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpReportProblem</attribute>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
           <attribute name="action">CommonHelpReportProblem</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonAbout</attribute>
+          <attribute name="label" translatable="yes">_About</attribute>
           <attribute name="action">CommonAbout</attribute>
         </item>
       </section>
diff --git a/ui/import.ui b/ui/import.ui
index 0f0c2c9..52ec86f 100644
--- a/ui/import.ui
+++ b/ui/import.ui
@@ -2,82 +2,90 @@
 <interface domain="shotwell">
   <menu id="MenuBar">
     <submenu>
-      <attribute name="label" translatable="yes">FileMenu</attribute>
+      <attribute name="label" translatable="yes">_File</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonFileImport</attribute>
+          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="accel">&lt;Primary&gt;i</attribute>
           <attribute name="action">CommonFileImport</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">ImportSelected</attribute>
+          <attribute name="label" translatable="yes">Import _Selected</attribute>
           <attribute name="action">ImportSelected</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">ImportAll</attribute>
+          <attribute name="label" translatable="yes">Import _All</attribute>
           <attribute name="action">ImportAll</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">ExternalLibraryImport</attribute>
+          <attribute name="label" translatable="yes">Import From _Application…</attribute>
           <attribute name="action">ExternalLibraryImport</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonEmptyTrash</attribute>
+          <attribute name="label" translatable="yes">Empty T_rash</attribute>
           <attribute name="action">CommonEmptyTrash</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonQuit</attribute>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
           <attribute name="action">CommonQuit</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">EditMenu</attribute>
+      <attribute name="label" translatable="yes">_Edit</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonUndo</attribute>
+          <attribute name="label" translatable="yes">_Undo</attribute>
+          <attribute name="accel">&lt;Primary&gt;z</attribute>
           <attribute name="action">CommonUndo</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonRedo</attribute>
+          <attribute name="label" translatable="yes">_Redo</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;z</attribute>
           <attribute name="action">CommonRedo</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonFind</attribute>
+          <attribute name="label" translatable="yes">_Find</attribute>
           <attribute name="action">CommonFind</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonSelectAll</attribute>
+          <attribute name="label" translatable="yes">Select _All</attribute>
+          <attribute name="accel">&lt;Primary&gt;a</attribute>
           <attribute name="action">CommonSelectAll</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonPreferences</attribute>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
           <attribute name="action">CommonPreferences</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">ViewMenu</attribute>
+      <attribute name="label" translatable="yes">_View</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplayBasicProperties</attribute>
+          <attribute name="label" translatable="yes">_Basic Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
           <attribute name="action">CommonDisplayBasicProperties</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplayExtendedProperties</attribute>
+          <attribute name="label" translatable="yes">E_xtended Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
           <attribute name="action">CommonDisplayExtendedProperties</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplaySearchbar</attribute>
+          <attribute name="label" translatable="yes">_Search Bar</attribute>
+          <attribute name="accel">F8</attribute>
           <attribute name="action">CommonDisplaySearchbar</attribute>
         </item>
         <item>
@@ -91,13 +99,14 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">ViewTitle</attribute>
+          <attribute name="label" translatable="yes">_Titles</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;t</attribute>
           <attribute name="action">ViewTitle</attribute>
         </item>
       </section>
       <section>
         <submenu>
-          <attribute name="label" translatable="yes">CommonFilterPhotos</attribute>
+          <attribute name="label" translatable="yes">_Filter Photos</attribute>
           <section>
             <item>
               <attribute name="label" translatable="yes">CommonDisplayFiveOrHigher</attribute>
@@ -136,7 +145,7 @@
       </section>
       <section>
         <submenu>
-          <attribute name="label" translatable="yes">CommonSortEvents</attribute>
+          <attribute name="label" translatable="yes">Sort _Events</attribute>
           <section>
             <item>
               <attribute name="label" translatable="yes">CommonSortEventsAscending</attribute>
@@ -151,24 +160,25 @@
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">HelpMenu</attribute>
+      <attribute name="label" translatable="yes">_Help</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpContents</attribute>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
           <attribute name="action">CommonHelpContents</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpFAQ</attribute>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
           <attribute name="action">CommonHelpFAQ</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpReportProblem</attribute>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
           <attribute name="action">CommonHelpReportProblem</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonAbout</attribute>
+          <attribute name="label" translatable="yes">_About</attribute>
           <attribute name="action">CommonAbout</attribute>
         </item>
       </section>
diff --git a/ui/import_queue.ui b/ui/import_queue.ui
index 92ba9c1..e12f262 100644
--- a/ui/import_queue.ui
+++ b/ui/import_queue.ui
@@ -2,7 +2,7 @@
 <interface domain="shotwell">
   <menu id="MenuBar">
     <submenu>
-      <attribute name="label" translatable="yes">FileMenu</attribute>
+      <attribute name="label" translatable="yes">_File</attribute>
       <section>
         <item>
           <attribute name="label" translatable="yes">Stop</attribute>
@@ -11,38 +11,41 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonFileImport</attribute>
+          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="accel">&lt;Primary&gt;i</attribute>
           <attribute name="action">CommonFileImport</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">ExternalLibraryImport</attribute>
+          <attribute name="label" translatable="yes">Import From _Application…</attribute>
           <attribute name="action">ExternalLibraryImport</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonEmptyTrash</attribute>
+          <attribute name="label" translatable="yes">Empty T_rash</attribute>
           <attribute name="action">CommonEmptyTrash</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonQuit</attribute>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
           <attribute name="action">CommonQuit</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">ViewMenu</attribute>
+      <attribute name="label" translatable="yes">_View</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplayBasicProperties</attribute>
+          <attribute name="label" translatable="yes">_Basic Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
           <attribute name="action">CommonDisplayBasicProperties</attribute>
         </item>
       </section>
       <section>
         <submenu>
-          <attribute name="label" translatable="yes">CommonSortEvents</attribute>
+          <attribute name="label" translatable="yes">Sort _Events</attribute>
           <section>
             <item>
               <attribute name="label" translatable="yes">CommonSortEventsAscending</attribute>
@@ -57,24 +60,25 @@
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">HelpMenu</attribute>
+      <attribute name="label" translatable="yes">_Help</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpContents</attribute>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
           <attribute name="action">CommonHelpContents</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpFAQ</attribute>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
           <attribute name="action">CommonHelpFAQ</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpReportProblem</attribute>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
           <attribute name="action">CommonHelpReportProblem</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonAbout</attribute>
+          <attribute name="label" translatable="yes">_About</attribute>
           <attribute name="action">CommonAbout</attribute>
         </item>
       </section>
diff --git a/ui/media.ui b/ui/media.ui
index 3981003..bc8766d 100644
--- a/ui/media.ui
+++ b/ui/media.ui
@@ -2,14 +2,15 @@
 <interface domain="shotwell">
   <menu id="MenuBar">
     <submenu>
-      <attribute name="label" translatable="yes">FileMenu</attribute>
+      <attribute name="label" translatable="yes">_File</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonFileImport</attribute>
+          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="accel">&lt;Primary&gt;i</attribute>
           <attribute name="action">CommonFileImport</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">ExternalLibraryImport</attribute>
+          <attribute name="label" translatable="yes">Import From _Application…</attribute>
           <attribute name="action">ExternalLibraryImport</attribute>
         </item>
         <item>
@@ -28,36 +29,40 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonEmptyTrash</attribute>
+          <attribute name="label" translatable="yes">Empty T_rash</attribute>
           <attribute name="action">CommonEmptyTrash</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonQuit</attribute>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
           <attribute name="action">CommonQuit</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">EditMenu</attribute>
+      <attribute name="label" translatable="yes">_Edit</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonUndo</attribute>
+          <attribute name="label" translatable="yes">_Undo</attribute>
+          <attribute name="accel">&lt;Primary&gt;z</attribute>
           <attribute name="action">CommonUndo</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonRedo</attribute>
+          <attribute name="label" translatable="yes">_Redo</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;z</attribute>
           <attribute name="action">CommonRedo</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonFind</attribute>
+          <attribute name="label" translatable="yes">_Find</attribute>
           <attribute name="action">CommonFind</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonNewSearch</attribute>
+          <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
+          <attribute name="accel">&lt;Primary&gt;s</attribute>
           <attribute name="action">CommonNewSearch</attribute>
         </item>
       </section>
@@ -74,30 +79,34 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonSelectAll</attribute>
+          <attribute name="label" translatable="yes">Select _All</attribute>
+          <attribute name="accel">&lt;Primary&gt;a</attribute>
           <attribute name="action">CommonSelectAll</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonPreferences</attribute>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
           <attribute name="action">CommonPreferences</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">ViewMenu</attribute>
+      <attribute name="label" translatable="yes">_View</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplayBasicProperties</attribute>
+          <attribute name="label" translatable="yes">_Basic Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
           <attribute name="action">CommonDisplayBasicProperties</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplayExtendedProperties</attribute>
+          <attribute name="label" translatable="yes">E_xtended Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
           <attribute name="action">CommonDisplayExtendedProperties</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplaySearchbar</attribute>
+          <attribute name="label" translatable="yes">_Search Bar</attribute>
+          <attribute name="accel">F8</attribute>
           <attribute name="action">CommonDisplaySearchbar</attribute>
         </item>
         <item>
@@ -111,11 +120,13 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">ViewTitle</attribute>
+          <attribute name="label" translatable="yes">_Titles</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;t</attribute>
           <attribute name="action">ViewTitle</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">ViewComment</attribute>
+          <attribute name="label" translatable="yes">_Comments</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;c</attribute>
           <attribute name="action">ViewComment</attribute>
         </item>
         <item>
@@ -129,7 +140,7 @@
       </section>
       <section>
         <submenu>
-          <attribute name="label" translatable="yes">CommonFilterPhotos</attribute>
+          <attribute name="label" translatable="yes">_Filter Photos</attribute>
           <section>
             <item>
               <attribute name="label" translatable="yes">CommonDisplayFiveOrHigher</attribute>
@@ -199,7 +210,7 @@
           </section>
         </submenu>
         <submenu>
-          <attribute name="label" translatable="yes">CommonSortEvents</attribute>
+          <attribute name="label" translatable="yes">Sort _Events</attribute>
           <section>
             <item>
               <attribute name="label" translatable="yes">CommonSortEventsAscending</attribute>
@@ -214,11 +225,13 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">IncreaseSize</attribute>
+          <attribute name="label" translatable="yes">Zoom _In</attribute>
+          <attribute name="accel">&lt;Primary&gt;plus</attribute>
           <attribute name="action">IncreaseSize</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">DecreaseSize</attribute>
+          <attribute name="label" translatable="yes">Zoom _Out</attribute>
+          <attribute name="accel">&lt;Primary&gt;minus</attribute>
           <attribute name="action">DecreaseSize</attribute>
         </item>
       </section>
@@ -227,7 +240,7 @@
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">PhotosMenu</attribute>
+      <attribute name="label" translatable="yes">_Photos</attribute>
       <section>
       <attribute name="id">PhotosExtrasEditsPlaceholder</attribute>
       </section>
@@ -286,7 +299,7 @@
           <attribute name="action">EditTitle</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">EditComment</attribute>
+          <attribute name="label" translatable="yes">Edit _Comment…</attribute>
           <attribute name="action">EditComment</attribute>
         </item>
       <attribute name="id">PhotosExtrasDateTimePlaceholder</attribute>
@@ -311,20 +324,21 @@
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">EventsMenu</attribute>
+      <attribute name="label" translatable="yes">Even_ts</attribute>
       <section>
         <item>
           <attribute name="label" translatable="yes">NewEvent</attribute>
           <attribute name="action">NewEvent</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonJumpToEvent</attribute>
+          <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;q</attribute>
           <attribute name="action">CommonJumpToEvent</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">TagsMenu</attribute>
+      <attribute name="label" translatable="yes">Ta_gs</attribute>
       <section>
         <item>
           <attribute name="label" translatable="yes">AddTags</attribute>
@@ -337,24 +351,25 @@
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">HelpMenu</attribute>
+      <attribute name="label" translatable="yes">_Help</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpContents</attribute>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
           <attribute name="action">CommonHelpContents</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpFAQ</attribute>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
           <attribute name="action">CommonHelpFAQ</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpReportProblem</attribute>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
           <attribute name="action">CommonHelpReportProblem</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonAbout</attribute>
+          <attribute name="label" translatable="yes">_About</attribute>
           <attribute name="action">CommonAbout</attribute>
         </item>
       </section>
diff --git a/ui/offline.ui b/ui/offline.ui
index ef9c160..4968344 100644
--- a/ui/offline.ui
+++ b/ui/offline.ui
@@ -2,49 +2,54 @@
 <interface domain="shotwell">
   <menu id="MenuBar">
     <submenu>
-      <attribute name="label" translatable="yes">FileMenu</attribute>
+      <attribute name="label" translatable="yes">_File</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonFileImport</attribute>
+          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="accel">&lt;Primary&gt;i</attribute>
           <attribute name="action">CommonFileImport</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">ExternalLibraryImport</attribute>
+          <attribute name="label" translatable="yes">Import From _Application…</attribute>
           <attribute name="action">ExternalLibraryImport</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonEmptyTrash</attribute>
+          <attribute name="label" translatable="yes">Empty T_rash</attribute>
           <attribute name="action">CommonEmptyTrash</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonQuit</attribute>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
           <attribute name="action">CommonQuit</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">EditMenu</attribute>
+      <attribute name="label" translatable="yes">_Edit</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonUndo</attribute>
+          <attribute name="label" translatable="yes">_Undo</attribute>
+          <attribute name="accel">&lt;Primary&gt;z</attribute>
           <attribute name="action">CommonUndo</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonRedo</attribute>
+          <attribute name="label" translatable="yes">_Redo</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;z</attribute>
           <attribute name="action">CommonRedo</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonFind</attribute>
+          <attribute name="label" translatable="yes">_Find</attribute>
           <attribute name="action">CommonFind</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonNewSearch</attribute>
+          <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
+          <attribute name="accel">&lt;Primary&gt;s</attribute>
           <attribute name="action">CommonNewSearch</attribute>
         </item>
       </section>
@@ -56,30 +61,34 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonSelectAll</attribute>
+          <attribute name="label" translatable="yes">Select _All</attribute>
+          <attribute name="accel">&lt;Primary&gt;a</attribute>
           <attribute name="action">CommonSelectAll</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonPreferences</attribute>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
           <attribute name="action">CommonPreferences</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">ViewMenu</attribute>
+      <attribute name="label" translatable="yes">_View</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplayBasicProperties</attribute>
+          <attribute name="label" translatable="yes">_Basic Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
           <attribute name="action">CommonDisplayBasicProperties</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplayExtendedProperties</attribute>
+          <attribute name="label" translatable="yes">E_xtended Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
           <attribute name="action">CommonDisplayExtendedProperties</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplaySearchbar</attribute>
+          <attribute name="label" translatable="yes">_Search Bar</attribute>
+          <attribute name="accel">F8</attribute>
           <attribute name="action">CommonDisplaySearchbar</attribute>
         </item>
         <item>
@@ -93,7 +102,7 @@
       </section>
       <section>
         <submenu>
-          <attribute name="label" translatable="yes">CommonFilterPhotos</attribute>
+          <attribute name="label" translatable="yes">_Filter Photos</attribute>
           <section>
             <item>
               <attribute name="label" translatable="yes">CommonDisplayFiveOrHigher</attribute>
@@ -132,7 +141,7 @@
       </section>
       <section>
         <submenu>
-          <attribute name="label" translatable="yes">CommonSortEvents</attribute>
+          <attribute name="label" translatable="yes">Sort _Events</attribute>
           <section>
             <item>
               <attribute name="label" translatable="yes">CommonSortEventsAscending</attribute>
@@ -147,24 +156,25 @@
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">HelpMenu</attribute>
+      <attribute name="label" translatable="yes">_Help</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpContents</attribute>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
           <attribute name="action">CommonHelpContents</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpFAQ</attribute>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
           <attribute name="action">CommonHelpFAQ</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpReportProblem</attribute>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
           <attribute name="action">CommonHelpReportProblem</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonAbout</attribute>
+          <attribute name="label" translatable="yes">_About</attribute>
           <attribute name="action">CommonAbout</attribute>
         </item>
       </section>
diff --git a/ui/photo.ui b/ui/photo.ui
index 50df0a2..598df1c 100644
--- a/ui/photo.ui
+++ b/ui/photo.ui
@@ -2,14 +2,15 @@
 <interface domain="shotwell">
   <menu id="MenuBar">
     <submenu>
-      <attribute name="label" translatable="yes">FileMenu</attribute>
+      <attribute name="label" translatable="yes">_File</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonFileImport</attribute>
+          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="accel">&lt;Primary&gt;i</attribute>
           <attribute name="action">CommonFileImport</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">ExternalLibraryImport</attribute>
+          <attribute name="label" translatable="yes">Import From _Application…</attribute>
           <attribute name="action">ExternalLibraryImport</attribute>
         </item>
         <item>
@@ -23,45 +24,50 @@
       <section>
       <attribute name="id">PublishPlaceholder</attribute>
         <item>
-          <attribute name="label" translatable="yes">SendTo</attribute>
+          <attribute name="label" translatable="yes">Send _To…</attribute>
           <attribute name="action">SendTo</attribute>
         </item>
       <attribute name="id">SetBackgroundPlaceholder</attribute>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonJumpToFile</attribute>
+          <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;q</attribute>
           <attribute name="action">CommonJumpToFile</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonEmptyTrash</attribute>
+          <attribute name="label" translatable="yes">Empty T_rash</attribute>
           <attribute name="action">CommonEmptyTrash</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonQuit</attribute>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
           <attribute name="action">CommonQuit</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">EditMenu</attribute>
+      <attribute name="label" translatable="yes">_Edit</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonUndo</attribute>
+          <attribute name="label" translatable="yes">_Undo</attribute>
+          <attribute name="accel">&lt;Primary&gt;z</attribute>
           <attribute name="action">CommonUndo</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonRedo</attribute>
+          <attribute name="label" translatable="yes">_Redo</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;z</attribute>
           <attribute name="action">CommonRedo</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonNewSearch</attribute>
+          <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
+          <attribute name="accel">&lt;Primary&gt;s</attribute>
           <attribute name="action">CommonNewSearch</attribute>
         </item>
       </section>
@@ -77,20 +83,22 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonPreferences</attribute>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
           <attribute name="action">CommonPreferences</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">ViewMenu</attribute>
+      <attribute name="label" translatable="yes">_View</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplayBasicProperties</attribute>
+          <attribute name="label" translatable="yes">_Basic Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
           <attribute name="action">CommonDisplayBasicProperties</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplayExtendedProperties</attribute>
+          <attribute name="label" translatable="yes">E_xtended Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
           <attribute name="action">CommonDisplayExtendedProperties</attribute>
         </item>
         <item>
@@ -110,7 +118,7 @@
       </section>
       <section>
         <submenu>
-          <attribute name="label" translatable="yes">CommonSortEvents</attribute>
+          <attribute name="label" translatable="yes">Sort _Events</attribute>
           <section>
             <item>
               <attribute name="label" translatable="yes">CommonSortEventsAscending</attribute>
@@ -125,56 +133,64 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">IncreaseSize</attribute>
+          <attribute name="label" translatable="yes">Zoom _In</attribute>
+          <attribute name="accel">&lt;Primary&gt;plus</attribute>
           <attribute name="action">IncreaseSize</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">DecreaseSize</attribute>
+          <attribute name="label" translatable="yes">Zoom _Out</attribute>
+          <attribute name="accel">&lt;Primary&gt;minus</attribute>
           <attribute name="action">DecreaseSize</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">ZoomFit</attribute>
+          <attribute name="label" translatable="yes">Fit to _Page</attribute>
+          <attribute name="accel">&lt;Primary&gt;0</attribute>
           <attribute name="action">ZoomFit</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">Zoom100</attribute>
+          <attribute name="label" translatable="yes">Zoom _100%</attribute>
+          <attribute name="accel">&lt;Primary&gt;1</attribute>
           <attribute name="action">Zoom100</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">Zoom200</attribute>
+          <attribute name="label" translatable="yes">Zoom _200%</attribute>
+          <attribute name="accel">&lt;Primary&gt;2</attribute>
           <attribute name="action">Zoom200</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonFullscreen</attribute>
+          <attribute name="label" translatable="yes">Fulls_creen</attribute>
+          <attribute name="accel">F11</attribute>
           <attribute name="action">CommonFullscreen</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">Slideshow</attribute>
+          <attribute name="label" translatable="yes">S_lideshow</attribute>
+          <attribute name="accel">F5</attribute>
           <attribute name="action">Slideshow</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">PhotoMenu</attribute>
+      <attribute name="label" translatable="yes">_Photo</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">PrevPhoto</attribute>
+          <attribute name="label" translatable="yes">_Previous Photo</attribute>
           <attribute name="action">PrevPhoto</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">NextPhoto</attribute>
+          <attribute name="label" translatable="yes">_Next Photo</attribute>
           <attribute name="action">NextPhoto</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">RotateClockwise</attribute>
+          <attribute name="label" translatable="yes">Rotate _Right</attribute>
+          <attribute name="accel">&lt;Primary&gt;r</attribute>
           <attribute name="action">RotateClockwise</attribute>
         </item>
         <item>
@@ -182,52 +198,59 @@
           <attribute name="action">RotateCounterclockwise</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">FlipHorizontally</attribute>
+          <attribute name="label" translatable="yes">Flip Hori_zontally</attribute>
           <attribute name="action">FlipHorizontally</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">FlipVertically</attribute>
+          <attribute name="label" translatable="yes">Flip Verti_cally</attribute>
           <attribute name="action">FlipVertically</attribute>
         </item>
       </section>
       <section>
         <submenu>
-          <attribute name="label" translatable="yes">Tools</attribute>
+          <attribute name="label" translatable="yes">T_ools</attribute>
           <section>
             <item>
-              <attribute name="label" translatable="yes">Enhance</attribute>
+              <attribute name="label" translatable="yes">_Enhance</attribute>
+              <attribute name="accel">&lt;Primary&gt;e</attribute>
               <attribute name="action">Enhance</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">Crop</attribute>
+              <attribute name="label" translatable="yes">_Crop</attribute>
+              <attribute name="accel">&lt;Primary&gt;o</attribute>
               <attribute name="action">Crop</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">Straighten</attribute>
+              <attribute name="label" translatable="yes">_Straighten</attribute>
+              <attribute name="accel">&lt;Primary&gt;a</attribute>
               <attribute name="action">Straighten</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RedEye</attribute>
+              <attribute name="label" translatable="yes">_Red-eye</attribute>
+              <attribute name="accel">&lt;Primary&gt;y</attribute>
               <attribute name="action">RedEye</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">Adjust</attribute>
+              <attribute name="label" translatable="yes">_Adjust</attribute>
+              <attribute name="accel">&lt;Primary&gt;d</attribute>
               <attribute name="action">Adjust</attribute>
             </item>
           </section>
         </submenu>
         <item>
-          <attribute name="label" translatable="yes">Revert</attribute>
+          <attribute name="label" translatable="yes">Re_vert to Original</attribute>
           <attribute name="action">Revert</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CopyColorAdjustments</attribute>
+          <attribute name="label" translatable="yes">_Copy Color Adjustments</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;c</attribute>
           <attribute name="action">CopyColorAdjustments</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">PasteColorAdjustments</attribute>
+          <attribute name="label" translatable="yes">_Paste Color Adjustments</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;v</attribute>
           <attribute name="action">PasteColorAdjustments</attribute>
         </item>
       </section>
@@ -286,11 +309,11 @@
           <attribute name="action">EditTitle</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">EditComment</attribute>
+          <attribute name="label" translatable="yes">Edit _Comment…</attribute>
           <attribute name="action">EditComment</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">AdjustDateTime</attribute>
+          <attribute name="label" translatable="yes">_Adjust Date and Time…</attribute>
           <attribute name="action">AdjustDateTime</attribute>
         </item>
       </section>
@@ -311,17 +334,18 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">ExternalEdit</attribute>
+          <attribute name="label" translatable="yes">Open with E_xternal Editor</attribute>
+          <attribute name="accel">&lt;Primary&gt;Return</attribute>
           <attribute name="action">ExternalEdit</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">ExternalEditRAW</attribute>
+          <attribute name="label" translatable="yes">Open With RA_W Editor</attribute>
           <attribute name="action">ExternalEditRAW</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">TagsMenu</attribute>
+      <attribute name="label" translatable="yes">Ta_gs</attribute>
       <section>
         <item>
           <attribute name="label" translatable="yes">AddTags</attribute>
@@ -334,24 +358,25 @@
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">HelpMenu</attribute>
+      <attribute name="label" translatable="yes">_Help</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpContents</attribute>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
           <attribute name="action">CommonHelpContents</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpFAQ</attribute>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
           <attribute name="action">CommonHelpFAQ</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpReportProblem</attribute>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
           <attribute name="action">CommonHelpReportProblem</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonAbout</attribute>
+          <attribute name="label" translatable="yes">_About</attribute>
           <attribute name="action">CommonAbout</attribute>
         </item>
       </section>
diff --git a/ui/photo_context.ui b/ui/photo_context.ui
index bc48330..b859aca 100644
--- a/ui/photo_context.ui
+++ b/ui/photo_context.ui
@@ -5,11 +5,12 @@
       <attribute name="label" translatable="yes">PhotoContextMenu</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">Enhance</attribute>
+          <attribute name="label" translatable="yes">_Enhance</attribute>
+          <attribute name="accel">&lt;Primary&gt;e</attribute>
           <attribute name="action">Enhance</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">Revert</attribute>
+          <attribute name="label" translatable="yes">Re_vert to Original</attribute>
           <attribute name="action">Revert</attribute>
         </item>
       </section>
@@ -92,15 +93,16 @@
           <attribute name="action">EditTitle</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">EditComment</attribute>
+          <attribute name="label" translatable="yes">Edit _Comment…</attribute>
           <attribute name="action">EditComment</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">ExternalEdit</attribute>
+          <attribute name="label" translatable="yes">Open with E_xternal Editor</attribute>
+          <attribute name="accel">&lt;Primary&gt;Return</attribute>
           <attribute name="action">ExternalEdit</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">ExternalEditRAW</attribute>
+          <attribute name="label" translatable="yes">Open With RA_W Editor</attribute>
           <attribute name="action">ExternalEditRAW</attribute>
         </item>
       </section>
diff --git a/ui/savedsearch.ui b/ui/savedsearch.ui
index 5faca0e..e1236c1 100644
--- a/ui/savedsearch.ui
+++ b/ui/savedsearch.ui
@@ -5,15 +5,15 @@
       <attribute name="label" translatable="yes">SearchContextMenu</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">RenameSearch</attribute>
+          <attribute name="label" translatable="yes">Re_name…</attribute>
           <attribute name="action">RenameSearch</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">EditSearch</attribute>
+          <attribute name="label" translatable="yes">_Edit…</attribute>
           <attribute name="action">EditSearch</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">DeleteSearch</attribute>
+          <attribute name="label" translatable="yes">_Delete</attribute>
           <attribute name="action">DeleteSearch</attribute>
         </item>
       </section>
diff --git a/ui/tags.ui b/ui/tags.ui
index 7a744a0..574102f 100644
--- a/ui/tags.ui
+++ b/ui/tags.ui
@@ -2,7 +2,7 @@
 <interface domain="shotwell">
   <menu id="MenuBar">
     <submenu>
-      <attribute name="label" translatable="yes">TagsMenu</attribute>
+      <attribute name="label" translatable="yes">Ta_gs</attribute>
       <section>
         <item>
           <attribute name="label" translatable="yes">RemoveTagFromPhotos</attribute>
diff --git a/ui/top.ui b/ui/top.ui
index 0b1c7ad..683a2fa 100644
--- a/ui/top.ui
+++ b/ui/top.ui
@@ -2,42 +2,42 @@
 <interface domain="shotwell">
   <menu id="MenuBar">
     <submenu>
-      <attribute name="label" translatable="yes">FileMenu</attribute>
+      <attribute name="label" translatable="yes">_File</attribute>
       <section>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">EditMenu</attribute>
+      <attribute name="label" translatable="yes">_Edit</attribute>
       <section>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">ViewMenu</attribute>
+      <attribute name="label" translatable="yes">_View</attribute>
       <section>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">PhotoMenu</attribute>
+      <attribute name="label" translatable="yes">_Photo</attribute>
       <section>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">PhotosMenu</attribute>
+      <attribute name="label" translatable="yes">_Photos</attribute>
       <section>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">EventsMenu</attribute>
+      <attribute name="label" translatable="yes">Even_ts</attribute>
       <section>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">TagsMenu</attribute>
+      <attribute name="label" translatable="yes">Ta_gs</attribute>
       <section>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">HelpMenu</attribute>
+      <attribute name="label" translatable="yes">_Help</attribute>
       <section>
       </section>
     </submenu>
diff --git a/ui/trash.ui b/ui/trash.ui
index b7e1c4d..6fc84ad 100644
--- a/ui/trash.ui
+++ b/ui/trash.ui
@@ -2,53 +2,59 @@
 <interface domain="shotwell">
   <menu id="MenuBar">
     <submenu>
-      <attribute name="label" translatable="yes">FileMenu</attribute>
+      <attribute name="label" translatable="yes">_File</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonFileImport</attribute>
+          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="accel">&lt;Primary&gt;i</attribute>
           <attribute name="action">CommonFileImport</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">ExternalLibraryImport</attribute>
+          <attribute name="label" translatable="yes">Import From _Application…</attribute>
           <attribute name="action">ExternalLibraryImport</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonJumpToFile</attribute>
+          <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;q</attribute>
           <attribute name="action">CommonJumpToFile</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonEmptyTrash</attribute>
+          <attribute name="label" translatable="yes">Empty T_rash</attribute>
           <attribute name="action">CommonEmptyTrash</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonQuit</attribute>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
           <attribute name="action">CommonQuit</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">EditMenu</attribute>
+      <attribute name="label" translatable="yes">_Edit</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonUndo</attribute>
+          <attribute name="label" translatable="yes">_Undo</attribute>
+          <attribute name="accel">&lt;Primary&gt;z</attribute>
           <attribute name="action">CommonUndo</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonRedo</attribute>
+          <attribute name="label" translatable="yes">_Redo</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;z</attribute>
           <attribute name="action">CommonRedo</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonFind</attribute>
+          <attribute name="label" translatable="yes">_Find</attribute>
           <attribute name="action">CommonFind</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonNewSearch</attribute>
+          <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
+          <attribute name="accel">&lt;Primary&gt;s</attribute>
           <attribute name="action">CommonNewSearch</attribute>
         </item>
       </section>
@@ -64,34 +70,39 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonSelectAll</attribute>
+          <attribute name="label" translatable="yes">Select _All</attribute>
+          <attribute name="accel">&lt;Primary&gt;a</attribute>
           <attribute name="action">CommonSelectAll</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonPreferences</attribute>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
           <attribute name="action">CommonPreferences</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">ViewMenu</attribute>
+      <attribute name="label" translatable="yes">_View</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplayBasicProperties</attribute>
+          <attribute name="label" translatable="yes">_Basic Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
           <attribute name="action">CommonDisplayBasicProperties</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplayExtendedProperties</attribute>
+          <attribute name="label" translatable="yes">E_xtended Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
           <attribute name="action">CommonDisplayExtendedProperties</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplaySearchbar</attribute>
+          <attribute name="label" translatable="yes">_Search Bar</attribute>
+          <attribute name="accel">F8</attribute>
           <attribute name="action">CommonDisplaySearchbar</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplaySidebar</attribute>
+          <attribute name="label" translatable="yes">S_idebar</attribute>
+          <attribute name="accel">F9</attribute>
           <attribute name="action">CommonDisplaySidebar</attribute>
         </item>
         <item>
@@ -101,7 +112,7 @@
       </section>
       <section>
         <submenu>
-          <attribute name="label" translatable="yes">CommonFilterPhotos</attribute>
+          <attribute name="label" translatable="yes">_Filter Photos</attribute>
           <section>
             <item>
               <attribute name="label" translatable="yes">CommonDisplayFiveOrHigher</attribute>
@@ -140,7 +151,7 @@
       </section>
       <section>
         <submenu>
-          <attribute name="label" translatable="yes">CommonSortEvents</attribute>
+          <attribute name="label" translatable="yes">Sort _Events</attribute>
           <section>
             <item>
               <attribute name="label" translatable="yes">CommonSortEventsAscending</attribute>
@@ -155,24 +166,25 @@
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">HelpMenu</attribute>
+      <attribute name="label" translatable="yes">_Help</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpContents</attribute>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
           <attribute name="action">CommonHelpContents</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpFAQ</attribute>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
           <attribute name="action">CommonHelpFAQ</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonHelpReportProblem</attribute>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
           <attribute name="action">CommonHelpReportProblem</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">CommonAbout</attribute>
+          <attribute name="label" translatable="yes">_About</attribute>
           <attribute name="action">CommonAbout</attribute>
         </item>
       </section>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]