Bug 498889 - "Check for Updates" label and its variations need separate accesskeys, r=philor

mail/base/content/baseMenuOverlay.xul

@@ -76,7 +76,7 @@
       <menuseparator id="menu_HelpAboutSeparator"/>
       <menuitem id="checkForUpdates" class="menuitem-iconic"
 #ifdef MOZ_UPDATER
-                label="&updateCmd.label;" accesskey="&updateCmd.accesskey;"
+                label="&updateCmd.label;"
                 oncommand="checkForUpdates();"/>
 #else
                 hidden="true"/>

mail/base/content/utilityOverlay.js

@@ -252,25 +252,33 @@ function buildHelpMenu()
     return strings.getString(key + "Fallback");
   }
 
-  // By default, show "Check for Updates..."
+  // By default, show "Check for Updates..." from updatesItem_default or
+  // updatesItem_defaultFallback
   var key = "default";
   if (activeUpdate) {
     switch (activeUpdate.state) {
     case "downloading":
       // If we're downloading an update at present, show the text:
-      // "Downloading Thunderbird x.x..." otherwise we're paused, and show
-      // "Resume Downloading Thunderbird x.x..."
+      // "Downloading Thunderbird x.x..." from updatesItem_downloading or
+      // updatesItem_downloadingFallback, otherwise we're paused, and show
+      // "Resume Downloading Thunderbird x.x..." from updatesItem_resume or
+      // updatesItem_resumeFallback
       key = updates.isDownloading ? "downloading" : "resume";
       break;
     case "pending":
       // If we're waiting for the user to restart, show: "Apply Downloaded
-      // Updates Now..."
+      // Updates Now..." from updatesItem_pending or
+      // updatesItem_pendingFallback
       key = "pending";
       break;
     }
   }
 
   checkForUpdates.label = getStringWithUpdateName("updatesItem_" + key);
+  // updatesItem_default.accesskey, updatesItem_downloading.accesskey,
+  // updatesItem_resume.accesskey or updatesItem_pending.accesskey
+  checkForUpdates.accessKey = strings.getString("updatesItem_" + key +
+                                                ".accesskey");
   if (um.activeUpdate && updates.isDownloading)
     checkForUpdates.setAttribute("loading", "true");
   else

mail/locales/en-US/chrome/messenger/baseMenuOverlay.dtd

@@ -15,6 +15,5 @@
 <!ENTITY openHelpMac2.modifiers    "accel">
 
 <!ENTITY updateCmd.label "Check for Updates…">
-<!ENTITY updateCmd.accesskey "o">
 <!ENTITY aboutCmd.label "About &brandFullName;">
 <!ENTITY aboutCmd.accesskey "A">

mail/locales/en-US/chrome/messenger/messenger.properties

@@ -423,14 +423,20 @@ confirmPhishingTitle=Email Scam Alert
 confirmPhishingUrl=%1$S thinks this message is a scam. The links in the message may be trying to impersonate web pages you want to visit. Are you sure you want to visit %2$S?
 
 # Check for Updates
+# LOCALIZATION NOTE (updatesItem_*): these are alternative labels for Check for Update item in Help menu.
+# Which one is used depends on Update process state.
 updatesItem_default=Check for Updates…
 updatesItem_defaultFallback=Check for Updates…
+updatesItem_default.accesskey=C
 updatesItem_downloading=Downloading %S…
 updatesItem_downloadingFallback=Downloading Update…
+updatesItem_downloading.accesskey=D
 updatesItem_resume=Resume Downloading %S…
 updatesItem_resumeFallback=Resume Downloading Update…
+updatesItem_resume.accesskey=D
 updatesItem_pending=Apply Downloaded Update Now…
 updatesItem_pendingFallback=Apply Downloaded Update Now…
+updatesItem_pending.accesskey=D
 
 # Folder Pane Header Title Strings
 folderPaneHeader_all=All Folders