From e28ca375608e57a0460b8a86e586d1c94dfaa29f Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com"
 <blakeross%telocity.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 7 Apr 2002 01:52:42 +0000
Subject: [PATCH] more crap removal.

git-svn-id: svn://10.0.0.236/trunk@118419 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../browser/base/resources/content/browser.js | 39 --------------
 .../base/resources/content/browser.xul        |  2 +-
 .../base/resources/locale/navigator.dtd       | 52 ++++++++-----------
 3 files changed, 24 insertions(+), 69 deletions(-)

diff --git a/mozilla/browser/base/resources/content/browser.js b/mozilla/browser/base/resources/content/browser.js
index 59a897f1b0f..bcbbb111724 100644
--- a/mozilla/browser/base/resources/content/browser.js
+++ b/mozilla/browser/base/resources/content/browser.js
@@ -49,7 +49,6 @@ var gSearchService = null;
 var gNavigatorBundle;
 var gNavigatorRegionBundle;
 var gLastValidURLStr = "";
-var gLastValidURL = null;
 var gHaveUpdatedToolbarState = false;
 var gClickSelectsAll = -1;
 
@@ -85,13 +84,6 @@ const gButtonPrefListener =
       button.setAttribute("hidden","false");
     else
       button.setAttribute("hidden", "true");
-
-    // If all buttons before the separator are hidden, also hide the separator
-    if (allLeftButtonsAreHidden())
-      document.getElementById("home-bm-separator").setAttribute("hidden", "true");
-    else
-      document.getElementById("home-bm-separator").removeAttribute("hidden");
-  }
 };
 
 const gTabStripPrefListener =
@@ -422,21 +414,6 @@ function UpdateBackForwardButtons()
   }
 }
 
-// Function allLeftButtonsAreHidden
-// Returns true if all the buttons left of the separator in the personal
-// toolbar are hidden, false otherwise.
-// Used by nsButtonPrefListener to hide the separator if needed
-function allLeftButtonsAreHidden()
-{
-  var buttonNode = document.getElementById("PersonalToolbar").firstChild;
-  while(buttonNode.tagName != "toolbarseparator") {
-    if(!buttonNode.hasAttribute("hidden") || buttonNode.getAttribute("hidden") == "false")
-      return false;
-    buttonNode = buttonNode.nextSibling;
-  }
-  return true;
-}
-
 function Startup()
 {
   // init globals
@@ -679,20 +656,6 @@ function Shutdown()
     appCore.close();
 }
 
-function Translate()
-{
-  var service = pref.getCharPref("browser.translation.service");
-  var serviceDomain = pref.getCharPref("browser.translation.serviceDomain");
-  var targetURI = getWebNavigation().currentURI.spec;
-
-  // if we're already viewing a translated page, then just reload
-  if (targetURI.indexOf(serviceDomain) >= 0)
-    BrowserReload();
-  else {
-    loadURI(service + escape(targetURI));
-  }
-}
-
 function gotoHistoryIndex(aEvent)
 {
   var index = aEvent.target.getAttribute("index");
@@ -2083,5 +2046,3 @@ function FillInHTMLTooltip(tipElement)
 
   return retVal;
 }
-
-
diff --git a/mozilla/browser/base/resources/content/browser.xul b/mozilla/browser/base/resources/content/browser.xul
index e24123da4c9..101418c40a8 100644
--- a/mozilla/browser/base/resources/content/browser.xul
+++ b/mozilla/browser/base/resources/content/browser.xul
@@ -494,7 +494,7 @@ Contributor(s): ______________________________________. -->
             <menuseparator/>
             <menuitem accesskey="&pageSourceCmd.accesskey;" label="&pageSourceCmd.label;" key="key_viewSource" command="View:PageSource"/>
             <menuitem accesskey="&pageInfoCmd.accesskey;"   label="&pageInfoCmd.label;"   key="key_viewInfo"   command="View:PageInfo"/>
-            <menuseparator />
+            <menuseparator/>
             <menu id="menu_textZoom" accesskey="&textZoomMenu.accesskey;" observes="isImage">
               <menupopup id="menu_textZoomPopup" onpopupshowing="updateTextZoomMenu();">
                 <menuitem key="key_textZoomReduce"  label="&textZoomReduceCmd.label;"  accesskey="&textZoomReduceCmd.accesskey;" command="cmd_textZoomReduce"/>
diff --git a/mozilla/browser/base/resources/locale/navigator.dtd b/mozilla/browser/base/resources/locale/navigator.dtd
index 80655d827af..50a900e2585 100644
--- a/mozilla/browser/base/resources/locale/navigator.dtd
+++ b/mozilla/browser/base/resources/locale/navigator.dtd
@@ -1,5 +1,3 @@
-<!-- extracted from content/navigator.xul -->
-
 <!-- LOCALIZATION NOTE : FILE This file contains the browser main menu items --> 
 <!-- LOCALIZATION NOTE : FILE Do not translate accesskey and commandkey --> 
 
@@ -19,7 +17,7 @@
 <!ENTITY tabCmd.commandkey "t">
 <!ENTITY openCmd.commandkey "l">
 <!ENTITY openFileCmd.label "Open File...">
-<!ENTITY openFileCmd.accesskey "o">
+<!ENTITY openFileCmd.accesskey "O">
 <!ENTITY openFileCmd.commandkey "o">
 
 <!ENTITY printSetupCmd.label "Page Setup...">
@@ -27,18 +25,18 @@
 <!ENTITY printPreviewCmd.label "Print Preview">
 <!ENTITY printPreviewCmd.accesskey "v">
 <!ENTITY printCmd.label "Print...">
-<!ENTITY printCmd.accesskey "p">
+<!ENTITY printCmd.accesskey "P">
 <!ENTITY printCmd.commandkey "p">
 
 <!ENTITY viewMenu.label "View">
-<!ENTITY viewMenu.accesskey "v">
+<!ENTITY viewMenu.accesskey "V">
 
 <!ENTITY toolbarsCmd.label "Show/Hide">
 <!ENTITY toolbarsCmd.accesskey "w">
 <!ENTITY navbarCmd.label "Navigation Toolbar">
 <!ENTITY navbarCmd.accesskey "N">
 <!ENTITY personalbarCmd.label "Personal Toolbar">
-<!ENTITY personalbarCmd.accesskey "p">
+<!ENTITY personalbarCmd.accesskey "P">
 <!ENTITY taskbarCmd.label "Status Bar">
 <!ENTITY taskbarCmd.accesskey "S">
 <!ENTITY locationbarCmd.label "Location Bar">
@@ -95,7 +93,6 @@
 
 <!ENTITY  homeButton.label            "Home">
 
-<!-- Statusbar -->
 <!ENTITY  statusText.label            "Document: Done">
 
 <!ENTITY textZoomEnlargeCmd.label       "Larger">
@@ -113,7 +110,6 @@
 <!ENTITY textZoomMenu.accesskey         "z">
 <!ENTITY textZoomOtherCmd.accesskey     "o">
 
-<!-- extracted from charsetOverlay.xul -->
 <!ENTITY charsetMenu.label        "Encoding">
 <!ENTITY charsetMenu.accesskey        "E">
 <!ENTITY charsetMenuAutodet.label     "Auto-Detect">
@@ -140,51 +136,49 @@
 <!-- LOCALIZATION NOTE : FILE This file contains the global menu items --> 
 
 <!ENTITY fileMenu.label         "File"> 
-<!ENTITY fileMenu.accesskey       "f">
+<!ENTITY fileMenu.accesskey       "F">
 <!ENTITY newMenu.label            "New">
 <!ENTITY newMenu.accesskey          "N">
 
 <!ENTITY editMenu.label         "Edit"> 
-<!ENTITY editMenu.accesskey       "e"> 
+<!ENTITY editMenu.accesskey       "E"> 
 <!ENTITY undoCmd.label            "Undo">  
-<!ENTITY undoCmd.key            "Z">  
-<!ENTITY undoCmd.accesskey          "u"> 
+<!ENTITY undoCmd.key            "z">  
+<!ENTITY undoCmd.accesskey          "U"> 
 <!ENTITY redoCmd.label            "Redo">  
-<!ENTITY redoCmd.key            "Y">  
-<!ENTITY redoCmd.accesskey          "r"> 
+<!ENTITY redoCmd.key            "y">  
+<!ENTITY redoCmd.accesskey          "R"> 
 <!ENTITY cutCmd.label           "Cut">  
 <!ENTITY cutCmd.key             "X">  
 <!ENTITY cutCmd.accesskey         "t"> 
 <!ENTITY copyCmd.label            "Copy">  
-<!ENTITY copyCmd.key            "C">  
-<!ENTITY copyCmd.accesskey          "c"> 
+<!ENTITY copyCmd.key            "c">  
+<!ENTITY copyCmd.accesskey          "C"> 
 <!ENTITY pasteCmd.label           "Paste">  
-<!ENTITY pasteCmd.key           "V">  
-<!ENTITY pasteCmd.accesskey         "p"> 
+<!ENTITY pasteCmd.key           "v">  
+<!ENTITY pasteCmd.accesskey         "P"> 
 <!ENTITY deleteCmd.label          "Delete">  
-<!ENTITY deleteCmd.key            "D">  
-<!ENTITY deleteCmd.accesskey        "d"> 
+<!ENTITY deleteCmd.accesskey        "D"> 
 <!ENTITY selectAllCmd.label         "Select All">  
-<!ENTITY selectAllCmd.key         "A">  
-<!ENTITY selectAllCmd.accesskey       "a"> 
+<!ENTITY selectAllCmd.key         "a">  
+<!ENTITY selectAllCmd.accesskey       "A"> 
 <!ENTITY preferencesCmd.label       "Preferences...">
-<!ENTITY preferencesCmd.key         "E">  
 <!ENTITY preferencesCmd.accesskey     "e"> 
 
 <!ENTITY helpMenu.label         "Help"> 
-<!ENTITY helpMenu.accesskey       "h"> 
+<!ENTITY helpMenu.accesskey       "H"> 
 <!ENTITY helpContentCmd.label       "Help Contents">  
-<!ENTITY helpContentCmd.accesskey     "h">
+<!ENTITY helpContentCmd.accesskey     "H">
 
 <!ENTITY releaseCmd.label       "Release Notes">
-<!ENTITY releaseCmd.accesskey       "r">
+<!ENTITY releaseCmd.accesskey       "R">
 <!ENTITY aboutCmd.label         "About &brandShortName;">
 <!ENTITY aboutCmd.accesskey       "A">
 <!ENTITY aboutCommPluginsCmd.label      "About Plug-ins">
-<!ENTITY aboutCommPluginsCmd.accesskey      "p">
+<!ENTITY aboutCommPluginsCmd.accesskey      "P">
 
 <!ENTITY javaConsoleCmd.label         "Java Console">
-<!ENTITY javaConsoleCmd.accesskey       "j">
+<!ENTITY javaConsoleCmd.accesskey       "J">
 
 <!ENTITY javaScriptConsoleCmd.label                             "JavaScript Console">
 <!ENTITY javaScriptConsoleCmd.accesskey       "S">
@@ -197,7 +191,7 @@
 
 <!ENTITY historyCmd.label "History">
 <!ENTITY historyCmd.accesskey "H">
-<!ENTITY historyCmd.commandkey "H">
+<!ENTITY historyCmd.commandkey "h">
 
 <!ENTITY location.label "Location:">
 <!ENTITY location.accesskey "L">