From fc43098f317f47b8324de319f35fdeec29539bf8 Mon Sep 17 00:00:00 2001
From: "ben%netscape.com"
 <ben%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 23 May 2001 05:43:17 +0000
Subject: [PATCH] Back out fix for 79639 and make sidebar toggle consistently
 accessible in all apps. sr=alecf

git-svn-id: svn://10.0.0.236/trunk@95807 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/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/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd b/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
index 680b1c3b07a..f5a240b1fa6 100644
--- a/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
+++ b/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
@@ -40,8 +40,8 @@
 <!ENTITY viewMenu.label "View">
 <!ENTITY viewMenu.accesskey "v">
 
-<!ENTITY toolbarsCmd.label "Show/Hide">
-<!ENTITY toolbarsCmd.accesskey "w">
+<!ENTITY toolbarsCmd.label "Toolbars">
+<!ENTITY toolbarsCmd.accesskey "t">
 <!ENTITY navbarCmd.label "Navigation Toolbar">
 <!ENTITY navbarCmd.accesskey "n">
 <!ENTITY personalbarCmd.label "Personal Toolbar">
diff --git a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul
index 23b8e84dae5..53585009911 100644
--- a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul
+++ b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul
@@ -163,14 +163,14 @@
       onclick="SidebarCleanUpExpandCollapse();"/>
   </splitter>
 
-  <!-- View | Show | Sidebar toggle -->
-  <menupopup id="view_toolbars_popup">
+  <!-- View->Sidebar toggle -->
+  <menupopup id="menu_View_Popup">
     <menuitem id="sidebar-menu" type="checkbox"
       label="&sidebarCmd.label;"
       accesskey="&sidebarCmd.accesskey;"
       command="toggleSidebar"
       key="showHideSidebar"
-      position="4"/>
+      position="2"/>
   </menupopup>
 
   <!-- Scripts go last, because they peek at state to tweak menus -->