Axe Go menu, Use stylesheet, Translate.

browser/base/resources/content/navigatorOverlay.xul

@@ -219,24 +219,11 @@
         <menuitem accesskey="&reloadCmd.accesskey;" key="key_reload" label="&reloadCmd.label;" oncommand="BrowserReload();"/>
         <menuitem label="&stopCmd.label;" accesskey="&stopCmd.accesskey;" id="menuitem-stop" disabled="true" oncommand="BrowserStop();" key="key_stop"/>
         <menuseparator/>
- 
-        <!-- overlayed from viewZoomOverlay.xul -->
-        <menu id="menu_textZoom" observes="isImage"/>
-
-        <menu label="&useStyleSheetMenu.label;" accesskey="&useStyleSheetMenu.accesskey;" disabled="false" observes="isImage">
-          <menupopup onpopupshowing="stylesheetFillPopup(this);"
-                     oncommand="stylesheetSwitchAll(window._content, event.target.getAttribute('data'));">
-            <menuitem label="&useStyleSheetPersistentOnly.label;" accesskey="&useStyleSheetPersistentOnly.accesskey;" type="radio"/>
-          </menupopup>
-        </menu>
-        <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 />
-        
-        <menuitem accesskey="&translateMenu.accesskey;" label="&translateMenu.label;" observes="isImage" oncommand="Translate();"/>      
+        <menu id="menu_textZoom" observes="isImage"/>
         <menu id="charsetMenu" observes="isImage"/>
-
         <menuseparator/>
         <menu label="&applyTheme.label;" accesskey="&applyTheme.accesskey;">
           <menupopup datasources="rdf:chrome" ref="urn:mozilla:skin:root" oncommand="applyTheme(event.target)">
@@ -251,15 +238,6 @@
       </menupopup>
     </menu>
 
-    <menu accesskey="&goMenu.accesskey;" label="&goMenu.label;" oncommand="gotoHistoryIndex(event);">
-      <menupopup onpopupshowing="updateGoMenu(event);">
-        <menuitem label="&goBackCmd.label;"    accesskey="&goBackCmd.accesskey;"    key="goBackKb"    command="Browser:Back"/>
-        <menuitem label="&goForwardCmd.label;" accesskey="&goForwardCmd.accesskey;" key="goForwardKb" command="Browser:Forward"/>
-        <menuitem label="&goHomeCmd.label;"    accesskey="&goHomeCmd.accesskey;"    command="Browser:Home" key="goHome"/>
-        <menuseparator hidden="true"/>
-      </menupopup>
-    </menu>
-    
     <menu id="BookmarksMenu" label="&bookmarksMenu.label;" accesskey="&bookmarksMenu.accesskey;" 
           datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch" 
           ref="NC:BookmarksRoot" flags="dont-test-empty" template="bookmarksMenuTemplate"

browser/base/resources/locale/navigator.dtd

@@ -105,12 +105,6 @@
 <!ENTITY findAgainCmd.label "Find Again">
 <!ENTITY findAgainCmd.accesskey "g">
 <!ENTITY findAgainCmd.commandkey "g">
-<!ENTITY goMenu.label "Go">
-<!ENTITY goMenu.accesskey "g">
-<!ENTITY goHomeCmd.label "Home">
-<!ENTITY goHomeCmd.accesskey "h">
-
-
 <!ENTITY bookmarksMenu.label "Bookmarks">
 <!ENTITY bookmarksMenu.accesskey "b">
 <!ENTITY addCurPageCmd.label "Add Bookmark">
@@ -173,3 +167,5 @@
 
 <!-- Statusbar -->
 <!ENTITY  statusText.label            "Document: Done">
+
+

browser/base/resources/locale/navigator.properties

@@ -59,8 +59,4 @@ showskinsdescription=true
 #   "Seach " + search_engine_name + " for " + user_input
 #   e.g. "Search Google for abc"
 # DO NOT change the %S order when translate, the first %S must be the search engine name.
-searchFor=Search %S for "%S"
-
-# XXX - this sucks and should only be temporary.                                
-switchskins=Theme changes will take effect when you restart %S.       
-switchskinstitle=Apply Theme
+searchFor=Search %S for "%S"