Merge tag 'upstream/0.25.3'

Upstream version 0.25.3

15 files changed, 377 insertions, 97 deletions

diff --git a/ui/Makefile.am b/ui/Makefile.am
index 7bcf37d..c13a172 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -23,7 +23,6 @@ dist_ui_DATA = \
 	trash.ui
 
 dist_noinst_DATA = \
-	appmenu.ui \
 	set_background_dialog.ui \
 	set_background_slideshow_dialog.ui
 
diff --git a/ui/Makefile.in b/ui/Makefile.in
index 2e3b7c5..dc60376 100644
--- a/ui/Makefile.in
+++ b/ui/Makefile.in
@@ -363,7 +363,6 @@ dist_ui_DATA = \
 	trash.ui
 
 dist_noinst_DATA = \
-	appmenu.ui \
 	set_background_dialog.ui \
 	set_background_slideshow_dialog.ui
 
diff --git a/ui/appmenu.ui b/ui/appmenu.ui
deleted file mode 100644
index 72e5424..0000000
--- a/ui/appmenu.ui
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
-<interface domain="shotwell">
-  <requires lib="gtk+" version="3.14"/>
-  <menu id="appmenu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Preferences</attribute>
-        <attribute name="action">win.CommonPreferences</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Help</attribute>
-        <attribute name="accel">F1</attribute>
-        <attribute name="action">win.CommonHelpContents</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
-        <attribute name="action">win.CommonHelpFAQ</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Report a Problem…</attribute>
-        <attribute name="action">win.CommonHelpReportProblem</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_About</attribute>
-        <attribute name="action">win.CommonAbout</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Quit</attribute>
-        <attribute name="accel">&lt;Primary&gt;q</attribute>
-        <attribute name="action">win.CommonQuit</attribute>
-      </item>
-    </section>
-  </menu>
-  <menu id="direct-appmenu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Help</attribute>
-        <attribute name="accel">F1</attribute>
-        <attribute name="action">win.CommonHelpContents</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
-        <attribute name="action">win.CommonHelpFAQ</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Report a Problem…</attribute>
-        <attribute name="action">win.CommonHelpReportProblem</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_About</attribute>
-        <attribute name="action">win.CommonAbout</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Quit</attribute>
-        <attribute name="accel">&lt;Primary&gt;q</attribute>
-        <attribute name="action">win.CommonQuit</attribute>
-      </item>
-    </section>
-  </menu>
-</interface>
diff --git a/ui/direct.ui b/ui/direct.ui
index 6053967..75acb0f 100644
--- a/ui/direct.ui
+++ b/ui/direct.ui
@@ -32,6 +32,13 @@
           <attribute name="action">win.CommonJumpToFile</attribute>
         </item>
       </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Edit</attribute>
@@ -162,5 +169,29 @@
         </item>
       </section>
     </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
   </menu>
 </interface>
diff --git a/ui/event.ui b/ui/event.ui
index c2bc6cb..11d9b74 100644
--- a/ui/event.ui
+++ b/ui/event.ui
@@ -88,6 +88,12 @@
           <attribute name="action">win.CommonSelectAll</attribute>
         </item>
       </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
+        </item>
+      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_View</attribute>
@@ -408,6 +414,30 @@
       </section>
     </submenu>
     <!-- Faces menu goes here FacesMenuPlaceholder -->
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
   </menu>
   <menu id="CollectionContextMenu">
     <section>
diff --git a/ui/events_directory.ui b/ui/events_directory.ui
index ad4135e..380da0a 100644
--- a/ui/events_directory.ui
+++ b/ui/events_directory.ui
@@ -20,6 +20,13 @@
           <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Edit</attribute>
@@ -53,6 +60,12 @@
           <attribute name="action">win.CommonSelectAll</attribute>
         </item>
       </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
+        </item>
+      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_View</attribute>
@@ -133,6 +146,30 @@
         </item>
       </section>
     </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
   </menu>
   <menu id="EventsDirectoryContextMenu">
     <section>
diff --git a/ui/import.ui b/ui/import.ui
index af733bc..73320d6 100644
--- a/ui/import.ui
+++ b/ui/import.ui
@@ -28,6 +28,13 @@
           <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Edit</attribute>
@@ -56,6 +63,12 @@
           <attribute name="action">win.CommonSelectAll</attribute>
         </item>
       </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
+        </item>
+      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_View</attribute>
@@ -99,49 +112,49 @@
           <section>
             <item>
               <attribute name="label" translatable="no">★★★★★</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">7</attribute>
               <attribute name="accel">&lt;Primary&gt;5</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★★★★</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">6</attribute>
               <attribute name="accel">&lt;Primary&gt;4</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★★★</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">5</attribute>
               <attribute name="accel">&lt;Primary&gt;3</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★★</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">4</attribute>
               <attribute name="accel">&lt;Primary&gt;2</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">3</attribute>
               <attribute name="accel">&lt;Primary&gt;1</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_All Photos</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">2</attribute>
               <attribute name="accel">&lt;Primary&gt;0</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">All + _Rejected</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">1</attribute>
               <attribute name="accel">&lt;Primary&gt;9</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">Rejected _Only</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">8</attribute>
               <attribute name="accel">&lt;Primary&gt;8</attribute>
             </item>
@@ -166,6 +179,30 @@
         </submenu>
       </section>
     </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
   </menu>
   <menu id="ImportContextMenu">
     <section>
diff --git a/ui/import_queue.ui b/ui/import_queue.ui
index a19c32b..9b07d9c 100644
--- a/ui/import_queue.ui
+++ b/ui/import_queue.ui
@@ -26,6 +26,13 @@
           <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_View</attribute>
@@ -71,6 +78,12 @@
           <attribute name="action">win.CommonHelpReportProblem</attribute>
         </item>
       </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
     </submenu>
   </menu>
 </interface>
diff --git a/ui/media.ui b/ui/media.ui
index 895855a..e3d8ba1 100644
--- a/ui/media.ui
+++ b/ui/media.ui
@@ -35,6 +35,13 @@
           <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Edit</attribute>
@@ -81,6 +88,12 @@
           <attribute name="action">win.CommonSelectAll</attribute>
         </item>
       </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
+        </item>
+      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_View</attribute>
@@ -384,5 +397,29 @@
       </section>
     </submenu>
     <!-- Faces menu goes here FacesMenuPlaceholder -->
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
   </menu>
 </interface>
diff --git a/ui/offline.ui b/ui/offline.ui
index 273ac73..d6608d6 100644
--- a/ui/offline.ui
+++ b/ui/offline.ui
@@ -20,6 +20,13 @@
           <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Edit</attribute>
@@ -60,6 +67,12 @@
           <attribute name="action">win.CommonSelectAll</attribute>
         </item>
       </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
+        </item>
+      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_View</attribute>
@@ -96,49 +109,49 @@
           <section>
             <item>
               <attribute name="label" translatable="no">★★★★★</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">7</attribute>
               <attribute name="accel">&lt;Primary&gt;5</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★★★★</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">6</attribute>
               <attribute name="accel">&lt;Primary&gt;4</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★★★</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">5</attribute>
               <attribute name="accel">&lt;Primary&gt;3</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★★</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">4</attribute>
               <attribute name="accel">&lt;Primary&gt;2</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">3</attribute>
               <attribute name="accel">&lt;Primary&gt;1</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_All Photos</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">2</attribute>
               <attribute name="accel">&lt;Primary&gt;0</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">All + _Rejected</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">1</attribute>
               <attribute name="accel">&lt;Primary&gt;9</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">Rejected _Only</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">8</attribute>
               <attribute name="accel">&lt;Primary&gt;8</attribute>
             </item>
@@ -163,6 +176,30 @@
         </submenu>
       </section>
     </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
   </menu>
   <menu id="OfflineContextMenu">
     <section>
diff --git a/ui/photo.ui b/ui/photo.ui
index cb39801..6b662a5 100644
--- a/ui/photo.ui
+++ b/ui/photo.ui
@@ -43,6 +43,13 @@
           <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Edit</attribute>
@@ -77,6 +84,12 @@
           <attribute name="action">win.MoveToTrash</attribute>
         </item>
       </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
+        </item>
+      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_View</attribute>
@@ -367,5 +380,29 @@
         </item>
       </section>
     </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
   </menu>
 </interface>
diff --git a/ui/sidebar_default_context.ui b/ui/sidebar_default_context.ui
index 644d8c7..bd3d63a 100644
--- a/ui/sidebar_default_context.ui
+++ b/ui/sidebar_default_context.ui
@@ -4,12 +4,12 @@
     <section>
       <item>
         <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
-        <attribute name="action">win.CommonNewSearch</attribute>
+        <attribute name="action">sidebar.search.new</attribute>
         <attribute name="accel">&lt;Primary&gt;s</attribute>
       </item>
       <item>
         <attribute name="label" translatable="yes">New _Tag…</attribute>
-        <attribute name="action">win.CommonNewTag</attribute>
+        <attribute name="action">sidebar.tag.new</attribute>
       </item>
     </section>
   </menu>
diff --git a/ui/tag_sidebar_context.ui b/ui/tag_sidebar_context.ui
index 96b0f1e..b810c28 100644
--- a/ui/tag_sidebar_context.ui
+++ b/ui/tag_sidebar_context.ui
@@ -4,7 +4,7 @@
     <section>
       <item>
         <attribute name="label" translatable="yes">New _Tag…</attribute>
-        <attribute name="action">win.CommonNewTag</attribute>
+        <attribute name="action">sidebar.tag.new</attribute>
       </item>
     </section>
   </menu>
diff --git a/ui/tags.ui b/ui/tags.ui
index e2cb3cf..334b24d 100644
--- a/ui/tags.ui
+++ b/ui/tags.ui
@@ -35,6 +35,13 @@
           <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Edit</attribute>
@@ -81,6 +88,12 @@
           <attribute name="action">win.CommonSelectAll</attribute>
         </item>
       </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
+        </item>
+      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_View</attribute>
@@ -345,7 +358,7 @@
             <item>
               <attribute name="label" translatable="yes">Camera</attribute>
               <attribute name="action">win.RawDeveloper</attribute>
-              <attribute name="action">Camera</attribute>
+              <attribute name="target">Camera</attribute>
             </item>
           </section>
         </submenu>
@@ -403,8 +416,48 @@
       </section>
     </submenu>
     <!-- Faces menu goes here FacesMenuPlaceholder -->
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
   </menu>
 
   <menu id="TagsContextMenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_New</attribute>
+        <attribute name="action">win.NewChildTagSidebar</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Rename…</attribute>
+        <attribute name="action">win.RenameTag</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Delete</attribute>
+        <attribute name="action">win.DeleteTag</attribute>
+      </item>
+    </section>
   </menu>
 </interface>
diff --git a/ui/trash.ui b/ui/trash.ui
index 0bd7a20..2fbb9a4 100644
--- a/ui/trash.ui
+++ b/ui/trash.ui
@@ -25,6 +25,13 @@
           <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Edit</attribute>
@@ -69,6 +76,12 @@
           <attribute name="action">win.CommonSelectAll</attribute>
         </item>
       </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
+        </item>
+      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_View</attribute>
@@ -105,49 +118,49 @@
           <section>
             <item>
               <attribute name="label" translatable="no">★★★★★</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">7</attribute>
               <attribute name="accel">&lt;Primary&gt;5</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★★★★</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">6</attribute>
               <attribute name="accel">&lt;Primary&gt;4</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★★★</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">5</attribute>
               <attribute name="accel">&lt;Primary&gt;3</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★★</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">4</attribute>
               <attribute name="accel">&lt;Primary&gt;2</attribute>
             </item>
             <item>
               <attribute name="label" translatable="no">★</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">3</attribute>
               <attribute name="accel">&lt;Primary&gt;1</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_All Photos</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">2</attribute>
               <attribute name="accel">&lt;Primary&gt;0</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">All + _Rejected</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">1</attribute>
               <attribute name="accel">&lt;Primary&gt;9</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">Rejected _Only</attribute>
-              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="action">win.display.rating</attribute>
               <attribute name="target">8</attribute>
               <attribute name="accel">&lt;Primary&gt;8</attribute>
             </item>
@@ -172,6 +185,30 @@
         </submenu>
       </section>
     </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
   </menu>
   <menu id="TrashContextMenu">
     <section>