Bug 954266 - Add accesskeys missed by fix for bug 954362, r=florian.

im/components/mintrayr/content/mintrayr.xul

@@ -25,6 +25,7 @@
   <menupopup id="fileMenuPopup">
     <menuitem id="MinTrayR_minimize"
               label="&mintrayr.minimize;"
+              accesskey="&mintrayr.minimize.accesskey;"
               tooltiptext="&mintrayr.minimize.tip;"
               oncommand="gMinTrayR.minimize();"
               key="MinTrayR_minimize_key"
@@ -35,16 +36,20 @@
     <menupopup id="MinTrayR_context">
       <menuitem id="MinTrayR_available"
                 label="&available;"
+                accesskey="&available.accesskey;"
                 oncommand="gMinTrayR.setStatus('available');"/>
       <menuitem id="MinTrayR_unavailable"
                 label="&unavailable;"
+                accesskey="&unavailable.accesskey;"
                 oncommand="gMinTrayR.setStatus('away');"/>
       <menuitem id="MinTrayR_offline"
                 label="&offline;"
+                accesskey="&offline.accesskey;"
                 oncommand="gMinTrayR.setStatus('offline');"/>
       <menuseparator id="MinTrayR_sep-top"/>
       <menuitem id="MinTrayR_restore"
                 label="&mintrayr.restore;"
+                accesskey="&mintrayr.restore.accesskey;"
                 oncommand="gMinTrayR.restore();"/>
       <menuseparator id="MinTrayR_sep-bottom"/>
     </menupopup>

im/content/blist.xul

@@ -128,12 +128,15 @@
                      onpopupshown="buddyList.onStatusTypePopupShown();"
                      oncommand="buddyList.editStatus(event);">
             <menuitem id="statusTypeAvailable" label="&available;"
-                      status="available" class="menuitem-iconic"/>
+                      status="available" class="menuitem-iconic"
+                      accesskey="&available.accesskey;"/>
             <menuitem id="statusTypeUnavailable" label="&unavailable;"
-                      status="unavailable" class="menuitem-iconic"/>
+                      status="unavailable" class="menuitem-iconic"
+                      accesskey="&unavailable.accesskey;"/>
             <menuseparator id="statusTypeOfflineSeparator"/>
             <menuitem id="statusTypeOffline" label="&offline;"
-                      status="offline" class="menuitem-iconic"/>
+                      status="offline" class="menuitem-iconic"
+                      accesskey="&offline.accesskey;"/>
           </menupopup>
         </button>
       </stack>

im/content/menus.xul

@@ -46,12 +46,12 @@
         <menuitem id="addBuddyMenuItem" label="&addBuddy;" command="cmd_addbuddy" key="addBuddykey" accesskey="&addBuddy.accesskey;"/>
         <menuitem id="joinChatMenuItem" label="&joinChat;" command="cmd_joinchat" key="joinChatkey" accesskey="&joinChat.accesskey;"/>
         <menuseparator/>
-        <menu id="setStatusTo" label="&setStatusTo;" oncommand="menus.setStatus(event);">
+        <menu id="setStatusTo" label="&setStatusTo;" oncommand="menus.setStatus(event);" accesskey="&setStatusTo.accesskey;" >
           <menupopup id="setStatusMenupopup"> <!-- has onpopupshowing on mac -->
-            <menuitem id="statusAvailable" status="available" label="&available;" class="menuitem-iconic"/>
-            <menuitem id="statusUnavailable" status="unavailable" label="&unavailable;" class="menuitem-iconic"/>
+            <menuitem id="statusAvailable" status="available" label="&available;" accesskey="&available.accesskey;" class="menuitem-iconic"/>
+            <menuitem id="statusUnavailable" status="unavailable" label="&unavailable;" accesskey="&unavailable.accesskey;" class="menuitem-iconic"/>
             <menuseparator id="statusOfflineSeparator"/>
-            <menuitem id="statusOffline" status="offline" label="&offline;" class="menuitem-iconic"/>
+            <menuitem id="statusOffline" status="offline" label="&offline;" accesskey="&offline.accesskey;" class="menuitem-iconic"/>
           </menupopup>
         </menu>
         <menuseparator id="menu_FileQuitSeparator"/>
@@ -86,7 +86,7 @@
 #else
       <menupopup id="helpMenuPopup">
 #endif
-        <menuitem id="aboutName" label="&about.menu;" oncommand="menus.about()"/>
+        <menuitem id="aboutName" label="&about.menu;" accesskey="&about.accesskey;" oncommand="menus.about()"/>
       </menupopup>
     </menu>
   </menubar>

im/locales/en-US/chrome/instantbird/instantbird.dtd

@@ -20,37 +20,43 @@
 <!ENTITY quitApplicationCmdMac.label    "Quit &brandShortName;">
 <!ENTITY quitApplicationCmdMac.key      "Q">
 
-<!ENTITY addBuddy            "Add Buddy…">
-<!ENTITY addBuddy.commandkey "b">
-<!ENTITY addBuddy.accesskey  "B">
-<!ENTITY joinChat            "Join Chat…">
-<!ENTITY joinChat.commandkey "j">
-<!ENTITY joinChat.accesskey  "J">
-<!ENTITY setStatusTo        "Set Status to…">
-<!ENTITY available          "Available">
-<!ENTITY unavailable        "Unavailable">
-<!ENTITY offline            "Offline">
-<!ENTITY tools.menu         "Tools">
-<!ENTITY tools.accesskey    "T">
-<!ENTITY accountManager     "Accounts">
-<!ENTITY account.commandkey "a">
-<!ENTITY account.accesskey  "A">
-<!ENTITY contacts.label     "Contacts">
-<!ENTITY contacts.accesskey "C">
-<!ENTITY contacts.commandkey "c">
-<!ENTITY addonManager       "Add-ons">
-<!ENTITY addonManager.accesskey       "d">
-<!ENTITY addonManager.commandkey      "d">
-<!ENTITY checkForUpdates    "Check for Updates">
-<!ENTITY help.menu          "Help">
-<!ENTITY help.accesskey     "H">
+<!ENTITY addBuddy              "Add Buddy…">
+<!ENTITY addBuddy.commandkey   "b">
+<!ENTITY addBuddy.accesskey    "B">
+<!ENTITY joinChat              "Join Chat…">
+<!ENTITY joinChat.commandkey   "j">
+<!ENTITY joinChat.accesskey    "J">
+<!ENTITY setStatusTo           "Set Status to…">
+<!ENTITY setStatusTo.accesskey "S">
+<!ENTITY available             "Available">
+<!ENTITY available.accesskey   "A">
+<!ENTITY unavailable           "Unavailable">
+<!ENTITY unavailable.accesskey "U">
+<!ENTITY offline               "Offline">
+<!ENTITY offline.accesskey     "O">
+<!ENTITY tools.menu            "Tools">
+<!ENTITY tools.accesskey       "T">
+<!ENTITY accountManager        "Accounts">
+<!ENTITY account.commandkey    "a">
+<!ENTITY account.accesskey     "A">
+<!ENTITY contacts.label        "Contacts">
+<!ENTITY contacts.accesskey    "C">
+<!ENTITY contacts.commandkey   "c">
+<!ENTITY addonManager          "Add-ons">
+<!ENTITY addonManager.accesskey "d">
+<!ENTITY addonManager.commandkey "d">
+<!ENTITY addonManager.key      "d">
+<!ENTITY checkForUpdates       "Check for Updates">
+<!ENTITY help.menu             "Help">
+<!ENTITY help.accesskey        "H">
 <!-- LOCALIZATION NOTE (helpWin.menu):
     Some localizations of Windows (e.g. French, German) use "?" for the help
     button in the menubar. -->
-<!ENTITY helpWin.menu       "Help">
-<!ENTITY helpWin.accesskey  "H">
-<!ENTITY about.menu         "About &brandShortName;">
-<!ENTITY about.accesskey    "A">
+<!ENTITY helpWin.menu          "Help">
+<!ENTITY helpWin.accesskey     "H">
+<!ENTITY about.menu            "About &brandShortName;">
+<!ENTITY about.accesskey       "A">
+
 <!ENTITY conversation.contextMenu.close "Close Tab">
 <!ENTITY chat.participants  "Participants:">
 

im/locales/en-US/chrome/instantbird/mintrayr.dtd

@@ -4,6 +4,8 @@
 
 <!ENTITY mintrayr.minimize "Minimize to Tray">
 <!ENTITY mintrayr.minimize.tip "Minimizes the current window to the system tray">
+<!ENTITY mintrayr.minimize.accesskey "M">
 <!ENTITY mintrayr.restore "Restore">
+<!ENTITY mintrayr.restore.accesskey "R">
 <!ENTITY mintrayr.keys.minimize.keycode "VK_F9">
 <!ENTITY mintrayr.keys.minimize.modifiers "">