Merge lp:~png2378/elementaryos/order-epiphany-menu-actions into lp:~elementary-os/elementaryos/os-patch-epiphany-browser-xenial

[Maxim Taranov]

Change the order of menu actions for better consistency between apps

[Cody Garver (codygarver)]

Maybe About should get removed, let's ask Dan what he thinks.

[Danielle Foré (danrabbit)]

I'm indifferent. It doesn't have an elementary-style About dialog so it could go either way

Unmerged revisions

9. By Maxim Taranov on 2016-09-20

Change the order of menu actions

=== modified file 'debian/patches/99_menu_add_preferences.patch'
--- debian/patches/99_menu_add_preferences.patch	2016-06-10 20:53:01 +0000
+++ debian/patches/99_menu_add_preferences.patch	2016-09-20 15:38:02 +0000
@@ -8,11 +8,14 @@
                  <separator name="FileSep5"/>
                  <menuitem name="HistoryEditMenu" action="EditHistory"/>
  		<menu name="BookmarksMenu" action="Bookmarks">
-@@ -47,6 +46,7 @@
+@@ -44,6 +44,7 @@
+                 <menuitem name="ViewPageSourceMenu" action="ViewPageSource"/>
+                 <separator name="FileSep7"/>
+                 <menuitem name="HelpContentsMenu" action="HelpContents"/>
++                <menuitem name="EditPreferencesMenu" action="EditPreferences"/>
                  <menuitem name="HelpAboutMenu" action="HelpAbout"/>
                  <menuitem name="FileCloseWindowMenu" action="FileCloseTab"/>
                  <menuitem name="FileQuitMenu" action="FileQuit"/>
-+                <menuitem name="EditPreferencesMenu" action="EditPreferences"/>
  	</popup>
  
  	<accelerator name="AlwaysStopAccel" action="ViewAlwaysStop"/>