bug 79639 - move sidebar toffle into toolbars menu, and rename toolbars

submenu to "show"
patch by gerv, r=hwaara, sr=alecf

xpfe/browser/resources/locale/en-US/navigator.dtd

@@ -40,8 +40,8 @@
 <!ENTITY viewMenu.label "View">
 <!ENTITY viewMenu.accesskey "v">
 
-<!ENTITY toolbarsCmd.label "Toolbars">
-<!ENTITY toolbarsCmd.accesskey "t">
+<!ENTITY toolbarsCmd.label "Show">
+<!ENTITY toolbarsCmd.accesskey "w">
 <!ENTITY navbarCmd.label "Navigation Toolbar">
 <!ENTITY navbarCmd.accesskey "n">
 <!ENTITY personalbarCmd.label "Personal Toolbar">

xpfe/components/sidebar/resources/sidebarOverlay.xul

@@ -163,14 +163,14 @@
       onclick="SidebarCleanUpExpandCollapse();"/>
   </splitter>
 
-  <!-- View->Sidebar toggle -->
-  <menupopup id="menu_View_Popup">
+  <!-- View | Show | Sidebar toggle -->
+  <menupopup id="view_toolbars_popup">
     <menuitem id="sidebar-menu" type="checkbox"
       label="&sidebarCmd.label;"
       accesskey="&sidebarCmd.accesskey;"
       command="toggleSidebar"
       key="showHideSidebar"
-      position="2"/>
+      position="4"/>
   </menupopup>
 
   <!-- Scripts go last, because they peek at state to tweak menus -->