Bug 191642 : Lots of missing keyboard accelerators in Options window, patch by Bryan <BoxerBoi76@hotmail.com> and me, r+a=mconnor

browser/base/content/downloadManagerOverlayMac.xul

@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla.org code.
+#
+# The Initial Developer of the Original Code is Asaf Romano
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Asaf Romano <mozilla.mano@sent.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+<overlay id="downloadManagerOverlay"
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
+
+<window id="downloadManager">
+
+#include browserMountPoints.inc
+
+</window>
+
+</overlay>

browser/base/content/sanitize.xul

@@ -138,22 +138,29 @@
     <groupbox orient="vertical" align="start">
       <caption label="&sanitizeItems.label;"/>
       
-      <checkbox label="&itemHistory.label;"   preference="privacy.item.history"
+      <checkbox label="&itemHistory.label;" accesskey="&itemHistory.accesskey;"
+                preference="privacy.item.history"
                 onsyncfrompreference="return gSanitizePromptDialog.onReadGeneric();"/>
-      <checkbox label="&itemFormData.label;"  preference="privacy.item.formdata"
+      <checkbox label="&itemFormData.label;" accesskey="&itemFormData.accesskey;"
+                preference="privacy.item.formdata"
                 onsyncfrompreference="return gSanitizePromptDialog.onReadGeneric();"/>
-      <checkbox label="&itemPasswords.label;" preference="privacy.item.passwords"
+      <checkbox label="&itemPasswords.label;" accesskey="&itemPasswords.accesskey;"
+                preference="privacy.item.passwords"
                 onsyncfrompreference="return gSanitizePromptDialog.onReadSanitizePasswords();"/>
-      <checkbox label="&itemDownloads.label;" preference="privacy.item.downloads"
+      <checkbox label="&itemDownloads.label;" accesskey="&itemDownloads.accesskey;"
+                preference="privacy.item.downloads"
                 onsyncfrompreference="return gSanitizePromptDialog.onReadGeneric();"/>
-      <checkbox label="&itemCookies.label;"   preference="privacy.item.cookies"
+      <checkbox label="&itemCookies.label;" accesskey="&itemCookies.accesskey;"
+                preference="privacy.item.cookies"
                 onsyncfrompreference="return gSanitizePromptDialog.onReadGeneric();"/>
-      <checkbox label="&itemCache.label;"     preference="privacy.item.cache"
+      <checkbox label="&itemCache.label;" accesskey="&itemCache.accesskey;"
+                preference="privacy.item.cache"
                 onsyncfrompreference="return gSanitizePromptDialog.onReadGeneric();"/>
     </groupbox>
     
     <groupbox orient="vertical" align="start">
       <checkbox id="promptOnSanitize" label="&promptOnSanitize.label;"
+                accesskey="&promptOnSanitize.accesskey;"
                 preference="privacy.sanitize.promptOnSanitize"/>
     </groupbox>
   </prefpane>

browser/components/preferences/content.xul

@@ -86,8 +86,9 @@
                         onsyncfrompreference="return gContentPane.updateButtons('popupPolicyButton', 
                                                                             'dom.disable_open_during_load');"/>
             </vbox>
-            <button id="popupPolicyButton" label="&allowedSites.label;"
-                    oncommand="gContentPane.showExceptions('popup');"/>
+            <button id="popupPolicyButton" label="&allowedSitesPopup.label;"
+                    oncommand="gContentPane.showExceptions('popup');"
+                    accesskey="&allowedSitesPopup.accesskey;"/>
           </row>
           <row id="enableSoftwareInstallRow">
             <vbox align="start">
@@ -96,8 +97,9 @@
                         onsyncfrompreference="return gContentPane.updateButtons('enableSoftwareInstallButton', 
                                                                             'xpinstall.enabled');"/>
             </vbox>
-            <button id="enableSoftwareInstallButton" label="&allowedSites.label;"
-                    oncommand="gContentPane.showExceptions('install');"/>
+            <button id="enableSoftwareInstallButton" label="&allowedSitesSoftware.label;"
+                    oncommand="gContentPane.showExceptions('install');"
+                    accesskey="&allowedSitesSoftware.accesskey;"/>
           </row>
           <row id="enableImagesRow">
             <vbox align="start">
@@ -116,6 +118,7 @@
             </vbox>
             <vbox>
               <button id="manageImages" label="&exceptions.label;"
+                      accesskey="&exceptions.accesskey;"
                       oncommand="gContentPane.showExceptions('image');"
                       preference="pref.advanced.images.disable_button.view_image"/>
             </vbox>

browser/components/preferences/downloads.xul

@@ -76,9 +76,11 @@
       <radiogroup id="askOnSave" flex="1"
                   preference="browser.download.useDownloadDir"
                   onsyncfrompreference="return gDownloadsPane.onReadUseDownloadDir();">
-        <radio id="alwaysAsk" label="&alwaysAsk.label;" value="false"/>
+        <radio id="alwaysAsk" label="&alwaysAsk.label;"
+               accesskey="&alwaysAsk.accesskey;" value="false"/>
         <vbox flex="1">
-          <radio id="neverAsk" label="&neverAsk.label;" value="true"/>
+          <radio id="neverAsk" label="&neverAsk.label;"
+                 accesskey="&neverAsk.accesskey;" value="true"/>
           <hbox class="indent" align="center">
             <filefield id="downloadFolder" flex="1"
                        preference="browser.download.folderList"
@@ -89,8 +91,10 @@
                     preference="browser.download.folderList"
                     onsynctopreference="return gDownloadsPane.writeFolderList()"
 #ifdef XP_MACSOX
+                    accesskey="&chooseFolderMac.accesskey;"
                     label="&chooseFolderMac.label;"/>
 #else
+                    accesskey="&chooseFolderWin.accesskey;"
                     label="&chooseFolderWin.label;"/>
 #endif
           </hbox>
@@ -101,10 +105,12 @@
     <groupbox align="start">
       <caption label="&downloadManagerWindow.label;"/>
       
-      <checkbox id="showWhenStarting" label="&showWhenStarting.label;" 
+      <checkbox id="showWhenStarting" label="&showWhenStarting.label;"
+                accesskey="&showWhenStarting.accesskey;"
                 preference="browser.download.manager.showWhenStarting"
                 onsyncfrompreference="return gDownloadsPane.readShowWhenStartingPref();"/>
-      <checkbox id="closeWhenDone" label="&closeWhenDone.label;" class="indent"
+      <checkbox id="closeWhenDone" label="&closeWhenDone.label;"
+                accesskey="&closeWhenDone.accesskey;" class="indent"
                 preference="browser.download.manager.closeWhenDone"/>
     </groupbox>
     

browser/components/preferences/fonts.xul

@@ -133,7 +133,9 @@
               </menupopup>
             </menulist>
             <hbox align="center" pack="end">
-              <label>&sizes.label;</label>
+              <label value="&size.label;"
+                     accesskey="&size.accesskey1;"
+                     control="sizeVar"/>
             </hbox>  
             <menulist id="sizeVar" class="small-margin">
               <menupopup>
@@ -188,7 +190,9 @@
             <menulist id="monospace" flex="1" style="width: 0px;" crop="right"
                       onsyncfrompreference="return gFontsDialog.readFontSelection(document.getElementById('monospace'));"/>
             <hbox align="center" pack="end">
-              <label>&sizes.label;</label>
+              <label value="&size.label;"
+                     accesskey="&size.accesskey2;"
+                     control="sizeMono"/>
             </hbox>  
             <menulist id="sizeMono">
               <menupopup>

browser/components/preferences/permissions.xul

@@ -69,12 +69,13 @@
       <textbox id="url" flex="1" 
                oninput="gPermissionManager.onHostInput(event.target);"
                onkeypress="gPermissionManager.onHostKeyPress(event);"/>
-    </hbox>
-    <hbox pack="end">
      <button id="btnBlock" disabled="true" label="&block.label;" 
+    </hbox>
+    <hbox pack="end">
+      <button id="btnBlock" disabled="true" label="&block.label;" accesskey="&block.accesskey;"
               oncommand="gPermissionManager.addPermission(nsIPermissionManager.DENY_ACTION);"/>
-      <button id="btnSession" disabled="true" label="&session.label;" 
+      <button id="btnSession" disabled="true" label="&session.label;" accesskey="&session.accesskey;"
               oncommand="gPermissionManager.addPermission(nsICookiePermission.ACCESS_SESSION);"/>
-      <button id="btnAllow" disabled="true" label="&allow.label;" default="true"
+      <button id="btnAllow" disabled="true" label="&allow.label;" default="true" accesskey="&allow.accesskey;"
               oncommand="gPermissionManager.addPermission(nsIPermissionManager.ALLOW_ACTION);"/>
     </hbox>
     <separator class="thin"/>
@@ -95,10 +96,12 @@
   <hbox align="end">
     <hbox class="actionButtons" flex="1">
       <button id="removePermission" disabled="true"
-              icon="remove" label="&removepermission.label;" 
+              accesskey="&removepermission.accesskey;"
+              icon="remove" label="&removepermission.label;"
               oncommand="gPermissionManager.onPermissionDeleted();"/>
       <button id="removeAllPermissions"
-              icon="clear" label="&removeallpermissions.label;" 
+              icon="clear" label="&removeallpermissions.label;"
+              accesskey="&removeallpermissions.accesskey;" 
               oncommand="gPermissionManager.onAllPermissionsDeleted();"/>
       <spacer flex="1"/>
 #ifndef XP_MACOSX

browser/components/preferences/sanitize.xul

@@ -71,20 +71,22 @@
       <caption label="&items.label;"/>
       
       <label>&sanitizeItems.label;</label>
-      <checkbox label="&itemHistory.label;"   preference="privacy.item.history"/>
-      <checkbox label="&itemFormData.label;"  preference="privacy.item.formdata"/>
-      <checkbox label="&itemPasswords.label;" preference="privacy.item.passwords"
+      <checkbox label="&itemHistory.label;" accesskey="&itemHistory.accesskey;" preference="privacy.item.history"/>
+      <checkbox label="&itemFormData.label;" accesskey="&itemFormData.accesskey;" preference="privacy.item.formdata"/>
+      <checkbox label="&itemPasswords.label;" accesskey="&itemPasswords.accesskey;" preference="privacy.item.passwords"
                 onsyncfrompreference="return gSanitizeDialog.onReadSanitizePasswords();"/>
-      <checkbox label="&itemDownloads.label;" preference="privacy.item.downloads"/>
-      <checkbox label="&itemCookies.label;"   preference="privacy.item.cookies"/>
-      <checkbox label="&itemCache.label;"     preference="privacy.item.cache"/>
+      <checkbox label="&itemDownloads.label;" accesskey="&itemDownloads.accesskey;" preference="privacy.item.downloads"/>
+      <checkbox label="&itemCookies.label;" accesskey="&itemCookies.accesskey;" preference="privacy.item.cookies"/>
+      <checkbox label="&itemCache.label;" accesskey="&itemCache.accesskey;" preference="privacy.item.cache"/>
     </groupbox>
     
     <groupbox orient="vertical" align="start">
       <caption label="&settings.label;"/>
       <checkbox label="&sanitizeOnShutDown.label;"
+                accesskey="&sanitizeOnShutDown.accesskey;"
                 preference="privacy.sanitize.sanitizeOnShutdown"/>
       <checkbox id="promptOnSanitize" label="&promptOnSanitize.label;"
+                accesskey="&promptOnSanitize.accesskey;"
                 preference="privacy.sanitize.promptOnSanitize"/>
     </groupbox>
   </prefpane>

browser/components/preferences/tabs.xul

@@ -61,13 +61,14 @@
       <caption label="&openExternalLinksIn.label;"/>
       <radiogroup id="tabbedExternalLinks"
                   preference="browser.link.open_external">
-        <radio label="&newWindow.label;" value="2"/>
-        <radio label="&newTabInRecentWindow.label;" value="3"/>
-        <radio label="&recentWindowOrTab.label;" value="1"/>
+        <radio label="&newWindow.label;" accesskey="&newWindow.accesskey;" value="2"/>
+        <radio label="&newTabInRecentWindow.label;" accesskey="&newTabInRecentWindow.accesskey;" value="3"/>
+        <radio label="&recentWindowOrTab.label;" accesskey="&recentWindowOrTab.accesskey;" value="1"/>
       </radiogroup>
     </groupbox>
     <vbox align="start">
       <checkbox id="tabbedOpenForce" label="&forceNewWindowLinks.label;"
+                accesskey="&forceNewWindowLinks.accesskey;"
                 preference="browser.link.open_newwindow"
                 onsynctopreference="return gTabsPane.writeWindowLinksBehavior();"
                 onsyncfrompreference="return gTabsPane.readForceLinks();"/>
@@ -75,14 +76,17 @@
                   preference="browser.link.open_newwindow"
                   onsynctopreference="return gTabsPane.writeWindowLinksBehavior();"
                   onsyncfrompreference="return gTabsPane.readForceLinksMode();">
-        <radio label="&sameTabOrWindow.label;" value="1"/>
-        <radio label="&newTab.label;" value="3"/>
+        <radio label="&sameTabOrWindow.label;" accesskey="sameTabOrWindow.accesskey;" value="1"/>
+        <radio label="&newTab.label;" accesskey="&newTab.accesskey;" value="3"/>
       </radiogroup>
       <checkbox id="hideTabBar" label="&hideTabBar.label;"
+                accesskey="&hideTabBar.accesskey;"
                 preference="browser.tabs.autoHide"/>
       <checkbox id="loadInBackground" label="&loadInBackground.label;"
+                accesskey="&loadBookmarksInBackground.accesskey;"
                 preference="browser.tabs.loadInBackground"/>
       <checkbox id="warnOnClose" label="&warnOnClose.label;"
+                accesskey="&warnOnClose.accesskey;"
                 preference="browser.tabs.warnOnClose"/>
     </vbox>
   </prefpane>

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

@@ -2,9 +2,9 @@
 <!ENTITY generalTab.label               "General">
 <!ENTITY accessibility.label            "Accessibility">
 <!ENTITY moveSystemCaret.label          "Allow text to be selected with the keyboard">
-<!ENTITY moveSystemCaret.accesskey      "k">
+<!ENTITY moveSystemCaret.accesskey      "b">
 <!ENTITY useTypeAheadFind.label         "Begin finding when you begin typing">
-<!ENTITY useTypeAheadFind.accesskey     "f">
+<!ENTITY useTypeAheadFind.accesskey     "g">
 <!ENTITY browsing.label                 "Browsing">
 <!ENTITY enableAutoImageResizing.label  "Resize large images to fit in the browser window">
 <!ENTITY enableAutoImageResizing.accesskey "z">
@@ -25,8 +25,8 @@
 <!ENTITY enableExtensionUpdate.label    "My Extensions and Themes">
 <!ENTITY enableExtensionUpdate.accesskey "x">
 <!ENTITY checkNow.label                 "Check Now...">
-<!ENTITY appCheckNow.accesskey          "C">
-<!ENTITY extensionsCheckNow.accesskey   "h">
+<!ENTITY appCheckNow.accesskey          "N">
+<!ENTITY extensionsCheckNow.accesskey   "w">
 <!ENTITY showUpdates.label              "Show Update History">
 <!ENTITY showUpdates.accesskey          "U">
 
@@ -51,7 +51,7 @@
 <!ENTITY viewOCSP.label                 "Verification">
 <!ENTITY viewOCSP.accesskey             "V">
 <!ENTITY viewSecurityDevices.label      "Security Devices">
-<!ENTITY viewSecurityDevices.accesskey  "S">
+<!ENTITY viewSecurityDevices.accesskey  "y">
 
 <!ENTITY languages.caption                  "Languages">
 <!ENTITY languagesInfo.label                "Choose Languages web pages are displayed in.">

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

@@ -2,7 +2,7 @@
 <!ENTITY window.width                     "38em">
 
 <!ENTITY  allowPagesToUse.label           "Allow pages to choose their own colors, instead of my selections above">
-<!ENTITY  allowPagesToUse.accesskey       "h">
+<!ENTITY  allowPagesToUse.accesskey       "A">
 
 <!ENTITY  color                           "Text and Background">
 <!ENTITY  textColor.label                 "Text:">

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

@@ -14,23 +14,23 @@
 <!ENTITY  configAutoconfigText.label    "Configuration location (URL):">
 <!ENTITY  configAutoconfigText.accesskey "u">
 <!ENTITY  reload.label                  "Reload">
-<!ENTITY  reload.accesskey              "l">
+<!ENTITY  reload.accesskey              "e">
 <!ENTITY  ftp.label                     "FTP Proxy:">
-<!ENTITY  ftp.accesskey                 "f">
+<!ENTITY  ftp.accesskey                 "F">
 <!ENTITY  gopher.label                  "Gopher Proxy:">
-<!ENTITY  gopher.accesskey              "g">
+<!ENTITY  gopher.accesskey              "G">
 <!ENTITY  http.label                    "HTTP Proxy:">
-<!ENTITY  http.accesskey                "h">
+<!ENTITY  http.accesskey                "y">
 <!ENTITY  ssl.label                     "SSL Proxy:">
-<!ENTITY  ssl.accesskey                 "s">
+<!ENTITY  ssl.accesskey                 "S">
 <!ENTITY  socks.label                   "SOCKS Host:">
-<!ENTITY  socks.accesskey               "c">
+<!ENTITY  socks.accesskey               "C">
 <!ENTITY  socks4.label                  "SOCKS v4">
-<!ENTITY  socks4.accesskey              "k">
+<!ENTITY  socks4.accesskey              "K">
 <!ENTITY  socks5.label                  "SOCKS v5">
 <!ENTITY  socks5.accesskey              "v">
 <!ENTITY  port.label                    "Port:">
-<!ENTITY  HTTPport.accesskey            "p">
+<!ENTITY  HTTPport.accesskey            "P">
 <!ENTITY  SSLport.accesskey             "o">
 <!ENTITY  FTPport.accesskey             "r">
 <!-- No accesskey for gopher (':' doesn't go well) - mpt's going to redesign the window -->

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

@@ -15,10 +15,14 @@
 <!ENTITY  popupReject.label                 "Block Popup Windows">
 <!ENTITY  popupReject.accesskey             "B">
 <!ENTITY  enableXPInstall.label             "Allow web sites to install software">
-<!ENTITY  enableXPInstall.accesskey         "i">
+<!ENTITY  enableXPInstall.accesskey         "A">
 
-<!ENTITY  allowedSites.label                "Allowed Sites">
+<!ENTITY  allowedSitesPopup.label           "Allowed Sites">
+<!ENTITY  allowedSitesPopup.accesskey       "l">
+<!ENTITY  allowedSitesSoftware.label        "Allowed Sites">
+<!ENTITY  allowedSitesSoftware.accesskey    "o">
 <!ENTITY  exceptions.label                  "Exceptions">
+<!ENTITY  exceptions.accesskey              "E">
 
 <!ENTITY  fonts.caption                     "Fonts &amp; Colors">
 <!ENTITY  advancedFonts.label               "Advanced...">

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

@@ -28,5 +28,5 @@
 <!ENTITY  clear.accesskey                     "l">
 
 <!ENTITY  button.close.label                  "Close">
-<!ENTITY  button.close.accesskey              "C">
+<!ENTITY  button.close.accesskey              "o">
 

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

@@ -1,14 +1,20 @@
 <!ENTITY askOnSave.label              "Download Folder">
 <!ENTITY alwaysAsk.label              "Ask me where to save every file">
+<!ENTITY alwaysAsk.accesskey          "A">
 <!ENTITY neverAsk.label               "Save all files to this folder:">
+<!ENTITY neverAsk.accesskey           "S">
 <!ENTITY desktop.label                "Desktop">
 <!ENTITY downloads.label              "My Downloads">
 <!ENTITY chooseFolderWin.label        "Browse...">
+<!ENTITY chooseFolderWin.accesskey    "B">
 <!ENTITY chooseFolderMac.label        "Choose...">
+<!ENTITY chooseFolderMac.accesskey    "h">
 
 <!ENTITY downloadManagerWindow.label  "Download Manager">
 <!ENTITY showWhenStarting.label       "Show Download Manager when a download begins">
+<!ENTITY showWhenStarting.accesskey   "o">
 <!ENTITY closeWhenDone.label          "Close the Download Manager when all downloads are complete">
+<!ENTITY closeWhenDone.accesskey      "C">
 
 <!ENTITY fileTypes.label              "Download Actions">
 <!ENTITY configureActions.label       "View &amp; Edit Actions...">

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

@@ -3,9 +3,11 @@
 <!ENTITY  window.macWidth                         "43em">
 
 <!ENTITY  language.label                          "Fonts for:">
-<!ENTITY  language.accesskey                      "t">
+<!ENTITY  language.accesskey                      "F">
 
-<!ENTITY  sizes.label                             "Size:">
+<!ENTITY  size.label                              "Size:">
+<!ENTITY  size.accesskey1                         "z">
+<!ENTITY  size.accesskey2                         "e">
 
 <!ENTITY  proportional.label                      "Proportional:">
 <!ENTITY  proportional.accesskey                  "P">
@@ -53,7 +55,7 @@
 <!ENTITY  font.langGroup.malayalam                "Malayalam">
 <!-- Minimum font size -->
 <!ENTITY minSize.label                            "Minimum font size:">
-<!ENTITY minSize.accesskey                        "z">
+<!ENTITY minSize.accesskey                        "o">
 <!ENTITY minSize.none                             "None">
 
 <!-- default font type -->
@@ -61,12 +63,12 @@
 <!ENTITY  useDefaultFontSansSerif.label           "Sans Serif">
 
 <!ENTITY  resolution.label                        "Display resolution:">
-<!ENTITY  resolution.accesskey                    "r">
+<!ENTITY  resolution.accesskey                    "D">
 <!ENTITY  resolution.system.label                 "System setting">
 <!ENTITY  resolution.other                        "Other...">
 
 <!ENTITY  allowPagesToUse.label                   "Allow pages to choose their own fonts, instead of my selections above">
-<!ENTITY  allowPagesToUse.accesskey               "h">
+<!ENTITY  allowPagesToUse.accesskey               "A">
 
 <!ENTITY languages.customize.Charset.grouplabel         "Character Encoding">
 <!ENTITY languages.customize.DefaultCharset.label       "Default Character Encoding:">

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

@@ -5,11 +5,16 @@
 <!ENTITY treehead.status.label        "Status">
 <!ENTITY addpermission.label          "New Site">
 <!ENTITY removepermission.label       "Remove Site">
+<!ENTITY removepermission.accesskey   "R">
 <!ENTITY removeallpermissions.label   "Remove All Sites">
+<!ENTITY removeallpermissions.accesskey "e">
 <!ENTITY address.label                "Address of web site:">
 <!ENTITY block.label                  "Block">
+<!ENTITY block.accesskey              "B">
 <!ENTITY session.label                "Allow for Session">
+<!ENTITY session.accesskey            "S">
 <!ENTITY allow.label                  "Allow">
+<!ENTITY allow.accesskey              "A">
 <!ENTITY windowClose.key              "w">
 
 <!ENTITY button.close.label           "Close">

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

@@ -7,7 +7,7 @@
 
 <!ENTITY  itemHistory.label           "History">
 <!ENTITY  rememberPages.label         "Remember visited pages for the last">
-<!ENTITY  rememberPages.accesskey     "R">
+<!ENTITY  rememberPages.accesskey     "d">
 <!ENTITY  rememberDays.label          "days.">
 <!ENTITY  clearHistory.label          "Clear Browsing History Now">
 <!ENTITY  clearHistory.accesskey      "C">
@@ -22,7 +22,7 @@
 <!ENTITY  itemPasswords.label         "Passwords">
 <!ENTITY  savedPasswords.intro        "&brandShortName; can remember login information for web pages so that you do not need to re-enter your login details every time you visit.">
 <!ENTITY  enablePasswords.label       "Remember Passwords">
-<!ENTITY  enablePasswords.accesskey   "P">
+<!ENTITY  enablePasswords.accesskey   "b">
 <!ENTITY  masterPassword.intro        "When set, the Master Password protects all your passwords - but you must enter it once per session.">
 <!ENTITY  setMasterPassword.label     "Master Password">
 <!ENTITY  setMasterPassword.accesskey "M">
@@ -77,7 +77,7 @@
 <!ENTITY  cacheUseUpTo.accesskey      "p">
 <!ENTITY  cacheSize.label             "MB of disk space for the cache.">
 <!ENTITY  clearCache.label            "Clear Cache Now">
-<!ENTITY  clearCache.accesskey        "h">
+<!ENTITY  clearCache.accesskey        "N">
 
 <!ENTITY  sanitizeSettings.label      "Sanitize Settings...">
 <!ENTITY  sanitizeSettings.accesskey  "z">

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

@@ -4,13 +4,21 @@
 <!ENTITY items.label                  "Sanitize Items">
 <!ENTITY sanitizeItems.label          "Clear the following items when Sanitizing &brandShortName;:">
 <!ENTITY itemHistory.label            "Browsing History">
+<!ENTITY itemHistory.accesskey        "B">
 <!ENTITY itemFormData.label           "Saved Form Information">
+<!ENTITY itemFormData.accesskey       "F">
 <!ENTITY itemPasswords.label          "Saved Passwords">
+<!ENTITY itemPasswords.accesskey      "P">
 <!ENTITY itemCookies.label            "Cookies">
+<!ENTITY itemCookies.accesskey        "C">
 <!ENTITY itemCache.label              "Cache">
+<!ENTITY itemCache.accesskey          "a">
 <!ENTITY itemDownloads.label          "Download History">
+<!ENTITY itemDownloads.accesskey      "D">
 
 <!ENTITY settings.label               "Sanitize Settings">
 <!ENTITY sanitizeOnShutDown.label     "Sanitize &brandShortName; on shutdown">
+<!ENTITY sanitizeOnShutDown.accesskey "S">
 <!ENTITY promptOnSanitize.label       "Ask me before Sanitizing &brandShortName;">
+<!ENTITY promptOnSanitize.accesskey   "k">
 

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

@@ -1,14 +1,23 @@
 
-<!ENTITY tabsTab.label                  "Tabs">
-<!ENTITY openExternalLinksIn.label      "Open links from other applications in:">
-<!ENTITY newWindow.label                "a new window">
-<!ENTITY newTabInRecentWindow.label     "a new tab in the most recent window">
-<!ENTITY recentWindowOrTab.label        "the most recent tab/window">
-<!ENTITY forceNewWindowLinks.label      "Force links that open new windows to open in:">
-<!ENTITY sameTabOrWindow.label          "the same tab/window as the link">
-<!ENTITY newTab.label                   "a new tab">
-<!ENTITY hideTabBar.label               "Hide the tab bar when only one web site is open">
-<!ENTITY loadInBackground.label         "Select new tabs opened from links">
-<!ENTITY loadBookmarksInBackground.label  "Select new tabs opened from bookmarks or history">
-<!ENTITY warnOnClose.label              "Warn when closing multiple tabs">
-
+<!ENTITY tabsTab.label                       "Tabs">
+<!ENTITY openExternalLinksIn.label           "Open links from other applications in:">
+<!ENTITY newWindow.label                     "a new window">
+<!ENTITY newWindow.accesskey                 "w">
+<!ENTITY newTabInRecentWindow.label          "a new tab in the most recent window">
+<!ENTITY newTabInRecentWindow.accesskey      "t">
+<!ENTITY recentWindowOrTab.label             "the most recent tab/window">
+<!ENTITY recentWindowOrTab.accesskey         "r">
+<!ENTITY forceNewWindowLinks.label           "Force links that open new windows to open in:">
+<!ENTITY forceNewWindowLinks.accesskey       "F">
+<!ENTITY sameTabOrWindow.label               "the same tab/window as the link">
+<!ENTITY sameTabOrWindow.accesskey           "s">
+<!ENTITY newTab.label                        "a new tab">
+<!ENTITY newTab.accesskey                    "n">
+<!ENTITY hideTabBar.label                    "Hide the tab bar when only one web site is open">
+<!ENTITY hideTabBar.accesskey                "d">
+<!ENTITY loadInBackground.label              "Select new tabs opened from links">
+<!ENTITY loadInBackground.accesskey          "l">
+<!ENTITY loadBookmarksInBackground.label     "Select new tabs opened from bookmarks or history">
+<!ENTITY loadBookmarksInBackground.accesskey "b">
+<!ENTITY warnOnClose.label                   "Warn when closing multiple tabs">
+<!ENTITY warnOnClose.accesskey               "m">

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

@@ -2,10 +2,17 @@
 
 <!ENTITY sanitizeItems.label          "Clear the following items now:">
 <!ENTITY itemHistory.label            "Browsing History">
+<!ENTITY itemHistory.accesskey        "B">
 <!ENTITY itemFormData.label           "Saved Form Information">
+<!ENTITY itemFormData.accesskey       "F">
 <!ENTITY itemPasswords.label          "Saved Passwords">
+<!ENTITY itemPasswords.accesskey      "P">
 <!ENTITY itemCookies.label            "Cookies">
+<!ENTITY itemCookies.accesskey        "C">
 <!ENTITY itemCache.label              "Cache">
+<!ENTITY itemCache.accesskey          "a">
 <!ENTITY itemDownloads.label          "Download History">
+<!ENTITY itemDownloads.accesskey      "D">
 
 <!ENTITY promptOnSanitize.label       "Ask me before Sanitizing &brandShortName;">
+<!ENTITY promptOnSanitize.accesskey   "k">

toolkit/components/passwordmgr/resources/content/passwordManager.xul

@@ -84,9 +84,10 @@
             <separator class="thin"/>
             <hbox>
               <button id="removeSignon" disabled="true" icon="remove"
-                      label="&remove.label;" oncommand="DeleteSignon();"/>
+                      label="&remove.label;" accesskey="&remove.accesskey;"
+                      oncommand="DeleteSignon();"/>
               <button id="removeAllSignons" icon="clear"
-                      label="&removeall.label;"
+                      label="&removeall.label;" accesskey="&removeall.accesskey;"
                       oncommand="DeleteAllSignons();"/>
               <spacer flex="1"/>
               <button id="togglePasswords"
@@ -109,8 +110,10 @@
             <separator class="thin"/>
             <hbox>
               <button id="removeReject" disabled="true" icon="remove"
+                      accesskey="&remove.accesskey;"
                       label="&remove.label;" oncommand="DeleteReject();"/>
               <button id="removeAllRejects"
+                      accesskey="&removeall.accesskey;"
                       icon="clear" label="&removeall.label;"
                       oncommand="DeleteAllRejects();"/>
             </hbox>

toolkit/locales/en-US/chrome/passwordmgr/passwordManager.dtd

@@ -48,4 +48,6 @@
 <!ENTITY      treehead.username.label         "Username">
 <!ENTITY      treehead.password.label         "Password">
 <!ENTITY      remove.label                    "Remove">
+<!ENTITY      remove.accesskey                "R">
 <!ENTITY      removeall.label                 "Remove All">
+<!ENTITY      removeall.accesskey             "A">