[gnome-maps] Shortcuts: Standardize help overlay shortcuts/menu

[Hashem Nasarat <hnasarat src gnome org>]

commit 6b1952ea866cf945d4b7748c867b6dfdecf39c91
Author: Hashem Nasarat <hashem riseup net>
Date:   Wed Feb 10 00:28:22 2016 -0500

    Shortcuts: Standardize help overlay shortcuts/menu
    
    * Use standard Ctrl+F1 to open the shortcuts help overlay: at some point
      we'll use F1 to open the normal help documentation.
    * Put the App Menu entry in the Help/About/Quit section
    
    https://bugzilla.gnome.org/show_bug.cgi?id=761805

 data/ui/app-menu.ui     |    9 ++++-----
 data/ui/help-overlay.ui |    4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/data/ui/app-menu.ui b/data/ui/app-menu.ui
index ef8a613..73d9c34 100644
--- a/data/ui/app-menu.ui
+++ b/data/ui/app-menu.ui
@@ -3,17 +3,16 @@
   <menu id="app-menu">
     <section>
       <item>
-        <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
-        <attribute name="action">win.show-help-overlay</attribute>
-        <attribute name="accel">F1</attribute>
-      </item>
-      <item>
         <attribute name="action">app.osm-account-setup</attribute>
         <attribute name="label" translatable="yes">Set up OpenStreetMap Account</attribute>
       </item>
     </section>
     <section>
       <item>
+        <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
+        <attribute name="action">win.show-help-overlay</attribute>
+      </item>
+      <item>
         <attribute name="action">win.about</attribute>
         <attribute name="label" translatable="yes">About</attribute>
       </item>
diff --git a/data/ui/help-overlay.ui b/data/ui/help-overlay.ui
index b5d2480..45c11d7 100644
--- a/data/ui/help-overlay.ui
+++ b/data/ui/help-overlay.ui
@@ -12,8 +12,8 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="title" translatable="yes" context="shortcut window">Show help</property>
-                <property name="accelerator">F1</property>
+                <property name="title" translatable="yes" context="shortcut window">Show Shortcuts</property>
+                <property name="accelerator">&lt;Primary&gt;F1 &lt;Primary&gt;question</property>
               </object>
             </child>
             <child>