Merge tag 'upstream/0.25.1'

Upstream version 0.25.1

1 files changed, 45 insertions, 12 deletions

diff --git a/ui/top.ui b/ui/top.ui
index 81d1006..683a2fa 100644
--- a/ui/top.ui
+++ b/ui/top.ui
@@ -1,12 +1,45 @@
-<ui>
-    <menubar name="MenuBar">
-        <menu name="FileMenu" action="FileMenu" />
-        <menu name="EditMenu" action="EditMenu" />  
-        <menu name="ViewMenu" action="ViewMenu" />
-        <menu name="PhotoMenu" action="PhotoMenu" />
-        <menu name="PhotosMenu" action="PhotosMenu" />
-        <menu name="EventsMenu" action="EventsMenu" />
-        <menu name="TagsMenu" action="TagsMenu" />
-        <menu name="HelpMenu" action="HelpMenu" />
-    </menubar>
-</ui>
+<?xml version="1.0"?>
+<interface domain="shotwell">
+  <menu id="MenuBar">
+    <submenu>
+      <attribute name="label" translatable="yes">_File</attribute>
+      <section>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Edit</attribute>
+      <section>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_View</attribute>
+      <section>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Photo</attribute>
+      <section>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Photos</attribute>
+      <section>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">Even_ts</attribute>
+      <section>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">Ta_gs</attribute>
+      <section>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+      </section>
+    </submenu>
+  </menu>
+</interface>