But 471836 - Don't need to dynamically set Clear Recent History... menu item label; r=gavin

--HG--
extra : rebase_source : 9a78779af016a0b1e37fdca429fbd90b168fc404

browser/base/content/browser-menubar.inc

@@ -605,8 +605,8 @@
                         key="key_privatebrowsing"
                         command="Tools:PrivateBrowsing"/>
               <menuitem id="sanitizeItem"
-                        accesskey="&clearRecentHistoryCmd.accesskey;"
-                        label="&clearRecentHistoryCmd.label;"
+                        accesskey="&clearRecentHistory.accesskey;"
+                        label="&clearRecentHistory.label;"
                         key="key_sanitize"
                         command="Tools:Sanitize"/>
 #ifndef XP_UNIX

browser/base/content/browser.js

@@ -1536,10 +1536,6 @@ var gAutoHideTabbarPrefListener = {
 
 function initializeSanitizer()
 {
-  // Always use the label with ellipsis
-  var label = gNavigatorBundle.getString("sanitizeWithPromptLabel2");
-  document.getElementById("sanitizeItem").setAttribute("label", label);
-
   const kDidSanitizeDomain = "privacy.sanitize.didShutdownSanitize";
   if (gPrefService.prefHasUserValue(kDidSanitizeDomain)) {
     gPrefService.clearUserPref(kDidSanitizeDomain);

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

@@ -172,8 +172,8 @@
 <!ENTITY preferencesCmdUnix.label       "Preferences">
 <!ENTITY preferencesCmdUnix.accesskey     "n"> 
 
-<!ENTITY clearRecentHistoryCmd.label            "Clear Recent History">
-<!ENTITY clearRecentHistoryCmd.accesskey        "H">
+<!ENTITY clearRecentHistory.label               "Clear Recent History…">
+<!ENTITY clearRecentHistory.accesskey           "H">
 
 <!-- LOCALIZATION NOTE : These two strings can share an access key beause they never appear together on the menu -->
 <!ENTITY privateBrowsingCmd.start.label         "Start Private Browsing">

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

@@ -76,7 +76,6 @@ blockedpluginsMessage.searchButton.label=Update Plugins…
 blockedpluginsMessage.searchButton.accesskey=U
 
 # Sanitize
-sanitizeWithPromptLabel2=Clear Recent History…
 # LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
 # clear" is set to "Everything", the Clear Recent History dialog's title is
 # changed to this.  See UI mockup and comment 11 at bug 480169 -->