Merge tag 'upstream/0.25.3'

Upstream version 0.25.3

1 files changed, 45 insertions, 8 deletions

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>