[gedit] menus: Use Gnome >= 3.32 menus guidelines.

[Sébastien Lafargue <slafargue src gnome org>]

commit 3ec741dfe4bcab6bbed7282f3ee1c5bbe786dc55
Author: Corey Daley <cdaley redhat com>
Date:   Thu Nov 1 19:20:58 2018 -0400

    menus: Use Gnome >= 3.32 menus guidelines.
    
    https://gitlab.gnome.org/GNOME/Initiatives/wikis/App-Menu-Retirement
    
    Fixes #76

 gedit/resources/gtk/menus-common.ui      |  2 +-
 gedit/resources/gtk/menus-traditional.ui |  2 +-
 gedit/resources/gtk/menus.ui             | 60 +++++++++++---------------------
 3 files changed, 22 insertions(+), 42 deletions(-)
---
diff --git a/gedit/resources/gtk/menus-common.ui b/gedit/resources/gtk/menus-common.ui
index ef533b76d..2a2fec1a1 100644
--- a/gedit/resources/gtk/menus-common.ui
+++ b/gedit/resources/gtk/menus-common.ui
@@ -391,7 +391,7 @@
         </section>
         <section>
           <item>
-            <attribute name="label" translatable="yes">_About</attribute>
+            <attribute name="label" translatable="yes">_About Text Editor</attribute>
             <attribute name="hidden-when">macos-menubar</attribute>
             <attribute name="action">app.about</attribute>
           </item>
diff --git a/gedit/resources/gtk/menus-traditional.ui b/gedit/resources/gtk/menus-traditional.ui
index c4451c9cc..e2cb4dc68 100644
--- a/gedit/resources/gtk/menus-traditional.ui
+++ b/gedit/resources/gtk/menus-traditional.ui
@@ -117,7 +117,7 @@
         <attribute name="action">app.help</attribute>
       </item>
       <item>
-        <attribute name="label" translatable="yes">_About</attribute>
+        <attribute name="label" translatable="yes">_About Text Editor</attribute>
         <attribute name="action">app.about</attribute>
       </item>
     </section>
diff --git a/gedit/resources/gtk/menus.ui b/gedit/resources/gtk/menus.ui
index 1a46d5f2d..b9f4e85b0 100644
--- a/gedit/resources/gtk/menus.ui
+++ b/gedit/resources/gtk/menus.ui
@@ -1,41 +1,6 @@
 <?xml version="1.0"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <menu id="app-menu">
-    <section>
-      <attribute name="id">app-commands-section</attribute>
-      <item>
-        <attribute name="label" translatable="yes">_New Window</attribute>
-        <attribute name="action">app.new-window</attribute>
-      </item>
-    </section>
-    <section>
-      <attribute name="id">preferences-section</attribute>
-      <item>
-        <attribute name="label" translatable="yes">_Preferences</attribute>
-        <attribute name="action">app.preferences</attribute>
-      </item>
-    </section>
-    <section>
-      <attribute name="id">help-section</attribute>
-      <item>
-        <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
-        <attribute name="action">app.shortcuts</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Help</attribute>
-        <attribute name="action">app.help</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_About</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Quit</attribute>
-        <attribute name="action">app.quit</attribute>
-      </item>
-    </section>
-  </menu>
   <menu id="hamburger-menu">
     <section>
       <attribute name="id">juntion-section</attribute>
@@ -56,6 +21,13 @@
         <attribute name="verb-icon">view-fullscreen-symbolic</attribute>
       </item>
     </section>
+    <section>
+      <attribute name="id">new-window-section</attribute>
+      <item>
+        <attribute name="label" translatable="yes">_New Window</attribute>
+        <attribute name="action">app.new-window</attribute>
+      </item>
+    </section>
     <section>
       <attribute name="id">file-section</attribute>
     </section>
@@ -135,14 +107,22 @@
       </submenu>
     </section>
     <section>
-      <attribute name="id">close-section</attribute>
+      <attribute name="id">app-section</attribute>
       <item>
-        <attribute name="label" translatable="yes">_Close All</attribute>
-        <attribute name="action">win.close-all</attribute>
+        <attribute name="label" translatable="yes">_Preferences</attribute>
+        <attribute name="action">app.preferences</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
+        <attribute name="action">app.shortcuts</attribute>
       </item>
       <item>
-        <attribute name="label" translatable="yes">_Close</attribute>
-        <attribute name="action">win.close</attribute>
+        <attribute name="label" translatable="yes">_Help</attribute>
+        <attribute name="action">app.help</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_About Text Editor</attribute>
+        <attribute name="action">app.about</attribute>
       </item>
     </section>
   </menu>