Bug 421609: avoid non-common entity names, a=mconnor

browser/base/content/browser-menubar.inc

@@ -368,7 +368,7 @@
                           oncommand="BrowserGoHome(event);"
                           onclick="checkForMiddleClick(this, event);"
                           key="goHome"/>
-                <menuitem label="&showAllHistoryCmd.label2;"
+                <menuitem label="&showAllHistoryCmd2.label;"
 #ifndef XP_MACOSX
                           key="showAllHistoryKb"
 #endif
@@ -411,7 +411,7 @@
       </menu>
       <menuitem label="&addCurPagesCmd.label;" 
                 command="Browser:BookmarkAllTabs" key="bookmarkAllTabsKb"/>
-      <menuitem label="&showAllBookmarksCmd.label2;" 
+      <menuitem label="&showAllBookmarksCmd2.label;" 
                 command="Browser:ShowAllBookmarks" key="manBookmarkKb"/>
       <menuseparator builder="start"/>
     </menupopup>

browser/locales/en-US/chrome/browser/browser.dtd

@@ -64,7 +64,7 @@
 <!ENTITY subscribeToPageMenupopup.label "Subscribe to This Page">
 <!ENTITY subscribeToPageMenuitem.label "Subscribe to This Page…">
 <!ENTITY addCurPagesCmd.label "Bookmark All Tabs…">
-<!ENTITY showAllBookmarksCmd.label2 "Organize Bookmarks">
+<!ENTITY showAllBookmarksCmd2.label "Organize Bookmarks">
 <!ENTITY bookmarkAllCmd.label "Bookmark All Tabs…">
 
 <!ENTITY backCmd.label                "Back">
@@ -176,7 +176,7 @@
 <!ENTITY historyUndoMenu.label "Recently Closed Tabs">
 
 <!ENTITY historyHomeCmd.label "Home">
-<!ENTITY showAllHistoryCmd.label2 "Show All History">
+<!ENTITY showAllHistoryCmd2.label "Show All History">
 <!ENTITY showAllHistoryCmd.commandkey "H">
 
 <!ENTITY openCmd.commandkey           "l">