From d1f2414952a6e18433a5b9133c087038b2f17143 Mon Sep 17 00:00:00 2001
From: "bbaetz%cs.mcgill.ca" <bbaetz%cs.mcgill.ca>
Date: Sat, 12 May 2001 17:49:15 +0000
Subject: [PATCH] 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    | 4 ++--
 xpfe/components/sidebar/resources/sidebarOverlay.xul | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xpfe/browser/resources/locale/en-US/navigator.dtd b/xpfe/browser/resources/locale/en-US/navigator.dtd
index 099c2194273b..93e7e6ff6d3c 100644
--- a/xpfe/browser/resources/locale/en-US/navigator.dtd
+++ b/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">
diff --git a/xpfe/components/sidebar/resources/sidebarOverlay.xul b/xpfe/components/sidebar/resources/sidebarOverlay.xul
index fcec535c3b98..870dac7e645a 100644
--- a/xpfe/components/sidebar/resources/sidebarOverlay.xul
+++ b/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 -->