Bug 453256 - Reallocate accesskeys in prefpanes with tabs now that they're independent, r=philor & wladow
authorSimon Paquet <bugzilla@babylonsounds.com>
Wed, 25 Feb 2009 23:28:47 +0100
changeset 2077 497ca78a30f5
parent 2076 674f6c68cb1a
child 2078 60054b5b6bda
push id1677
push userbugzilla@babylonsounds.com
push date2009-02-25 22:29 +0000
treeherdercomm-central@497ca78a30f5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilor
bugs453256
Bug 453256 - Reallocate accesskeys in prefpanes with tabs now that they're independent, r=philor & wladow
mail/components/preferences/compose.xul
mail/locales/en-US/chrome/messenger/preferences/advanced.dtd
mail/locales/en-US/chrome/messenger/preferences/compose.dtd
mail/locales/en-US/chrome/messenger/preferences/display.dtd
mail/locales/en-US/chrome/messenger/preferences/privacy.dtd
--- a/mail/components/preferences/compose.xul
+++ b/mail/components/preferences/compose.xul
@@ -90,18 +90,18 @@
 
       <tabpanels flex="1">
         <tabpanel orient="vertical">
           <groupbox>
             <hbox align="center">
               <label value="&forwardMsg.label;" accesskey="&forwardMsg.accesskey;" control="forwardMessageMode"/>
               <menulist id="forwardMessageMode" preference="mail.forward_message_mode">
                 <menupopup>
-                  <menuitem value="2" label="&inline.label;" accesskey="&inline.accesskey;"/>
-                  <menuitem value="0" label="&asAttachment.label;" accesskey="&asAttachment.accesskey;"/>
+                  <menuitem value="2" label="&inline.label;"/>
+                  <menuitem value="0" label="&asAttachment.label;"/>
                 </menupopup>
               </menulist>
               <checkbox id="addExtension" label="&addExtension.label;" preference="mail.forward_add_extension"
                         accesskey="&addExtension.accesskey;"/>
             </hbox>
 
             <hbox align="center" pack="start">
               <checkbox id="autoSave" label="&autoSave.label;" preference="mail.compose.autosave"
--- a/mail/locales/en-US/chrome/messenger/preferences/advanced.dtd
+++ b/mail/locales/en-US/chrome/messenger/preferences/advanced.dtd
@@ -2,95 +2,95 @@
 <!ENTITY itemDisplay.label       "Reading &amp; Display">
 <!ENTITY itemUpdate.label        "Update">
 <!ENTITY itemNetworking.label    "Network &amp; Disk Space">
 <!ENTITY itemCertificates.label  "Certificates">
 
 <!-- General Settings -->
 
 <!ENTITY enableGlodaSearch.label       "Enable Global Search and Indexer">
-<!ENTITY enableGlodaSearch.accesskey   "i">
+<!ENTITY enableGlodaSearch.accesskey   "E">
 <!ENTITY systemDefaults.label          "System Defaults">
 <!ENTITY alwaysCheckDefault.label      "Always check to see if &brandShortName; is the default mail client on startup">
-<!ENTITY alwaysCheckDefault.accesskey  "l">
+<!ENTITY alwaysCheckDefault.accesskey  "A">
 <!ENTITY checkNow.label                "Check Now">
 <!ENTITY checkNow.accesskey            "N">
 <!ENTITY configEditDesc.label          "Advanced Configuration">
 <!ENTITY configEdit.label              "Config Editor…">
-<!ENTITY configEdit.accesskey          "g">
+<!ENTITY configEdit.accesskey          "C">
 <!ENTITY returnReceiptsInfo.label      "Determine how &brandShortName; handles return receipts">
 <!ENTITY showReturnReceipts.label      "Return Receipts…">
 <!ENTITY showReturnReceipts.accesskey  "R">
 
 <!-- Display and Reading Settings -->
 <!ENTITY reading.caption               "Reading">
 <!ENTITY display.caption               "Display">
 <!ENTITY showCondensedAddresses.label  "Show only display name for people in my address book">
-<!ENTITY showCondensedAddresses.accesskey "p">
+<!ENTITY showCondensedAddresses.accesskey "S">
 
 <!ENTITY autoMarkAsRead.label          "Automatically mark messages as read">
 <!ENTITY autoMarkAsRead.accesskey      "A">
 <!ENTITY markAsReadNoDelay.label       "Immediately on display">
-<!ENTITY markAsReadNoDelay.accesskey   "d">
+<!ENTITY markAsReadNoDelay.accesskey   "o">
 <!-- LOCALIZATION NOTE (markAsReadDelay.label): This will concatenate to
      "After displaying for [___] seconds",
      using (markAsReadDelay.label) and a number (secondsLabel.label). -->
 <!ENTITY markAsReadDelay.label         "After displaying for">
-<!ENTITY markAsReadDelay.accesskey     "e">
+<!ENTITY markAsReadDelay.accesskey     "d">
 <!ENTITY secondsLabel.label            "seconds">
 <!ENTITY openMsgIn.label               "Open messages in:">
 <!ENTITY reuseExpRadio0.label          "A new message window">
-<!ENTITY reuseExpRadio0.accesskey      "i">
+<!ENTITY reuseExpRadio0.accesskey      "n">
 <!ENTITY reuseExpRadio1.label          "An existing message window">
-<!ENTITY reuseExpRadio1.accesskey      "x">
+<!ENTITY reuseExpRadio1.accesskey      "e">
 
 <!-- Update -->
 <!ENTITY autoCheck.label                "Automatically check for updates to:">
 <!ENTITY enableAppUpdate.label          "&brandShortName;">
 <!ENTITY enableAppUpdate.accesskey      "h">
 <!ENTITY enableAddonsUpdate.label       "Installed Add-ons">
-<!ENTITY enableAddonsUpdate.accesskey   "t">
+<!ENTITY enableAddonsUpdate.accesskey   "A">
 <!ENTITY whenUpdatesFound.label         "When updates to &brandShortName; are found,">
 <!ENTITY modeAskMe.label                "Ask me what I want to do">
-<!ENTITY modeAskMe.accesskey            "k">
+<!ENTITY modeAskMe.accesskey            "m">
 <!ENTITY modeAutomatic.label            "Automatically download and install the update">
-<!ENTITY modeAutomatic.accesskey        "m">
+<!ENTITY modeAutomatic.accesskey        "d">
 <!ENTITY modeAutoAddonWarn.label        "Warn me if this will disable any of my add-ons">
-<!ENTITY modeAutoAddonWarn.accesskey    "-">
+<!ENTITY modeAutoAddonWarn.accesskey    "W">
 <!ENTITY showUpdates.label              "Show Update History">
-<!ENTITY showUpdates.accesskey          "y">
+<!ENTITY showUpdates.accesskey          "S">
 
 <!-- Networking and Disk Space -->
 <!ENTITY showSettings.label            "Settings…">
-<!ENTITY showSettings.accesskey        "n">
+<!ENTITY showSettings.accesskey        "S">
 <!ENTITY proxiesConfigure.label        "Configure how &brandShortName; connects to the Internet">
 <!ENTITY connectionsInfo.caption       "Connection">
 <!ENTITY offlineInfo.caption           "Offline">
 <!ENTITY offlineInfo.label             "Configure offline settings">
 <!ENTITY showOffline.label             "Offline…">
 <!ENTITY showOffline.accesskey         "O">
 
 <!ENTITY Diskspace "Disk Space">
 <!ENTITY offlineCompact.label "Compact folders when it will save over">
-<!ENTITY offlineCompact.accesskey "v">
+<!ENTITY offlineCompact.accesskey "a">
 <!ENTITY kb.label "KB">
 
 <!-- LOCALIZATION NOTE:
   The entities useCacheBefore.label and useCacheAfter.label appear on a single
   line in preferences as follows:
 
   &useCacheBefore.label  [ textbox for cache size in MB ]   &useCacheAfter.label;
 -->
 <!ENTITY useCacheBefore.label            "Use up to">
 <!ENTITY useCacheBefore.accesskey        "U">
 <!ENTITY useCacheAfter.label             "MB of space for the cache">
 <!ENTITY clearCacheNow.label             "Clear Now">
 <!ENTITY clearCacheNow.accesskey         "C">
 
 <!-- Certificates -->
 <!ENTITY viewCertificates.label         "View Certificates">
-<!ENTITY viewCertificates.accesskey     "a">
+<!ENTITY viewCertificates.accesskey     "C">
 <!ENTITY viewCRLs.label                 "Revocation Lists">
-<!ENTITY viewCRLs.accesskey             "e">
+<!ENTITY viewCRLs.accesskey             "R">
 <!ENTITY validation.label               "Validation">
-<!ENTITY validation.accesskey           "d">
+<!ENTITY validation.accesskey           "V">
 <!ENTITY viewSecurityDevices.label      "Security Devices">
-<!ENTITY viewSecurityDevices.accesskey  "u">
+<!ENTITY viewSecurityDevices.accesskey  "S">
--- a/mail/locales/en-US/chrome/messenger/preferences/compose.dtd
+++ b/mail/locales/en-US/chrome/messenger/preferences/compose.dtd
@@ -1,53 +1,51 @@
 <!ENTITY itemGeneral.label                   "General">
 <!ENTITY itemAutoComplete.label              "Addressing">
 <!ENTITY itemSpellCheck.label                "Spelling">
 
 <!ENTITY forwardMsg.label                     "Forward messages:">
-<!ENTITY forwardMsg.accesskey                 "w">
+<!ENTITY forwardMsg.accesskey                 "F">
 <!ENTITY inline.label                         "Inline">
-<!ENTITY inline.accesskey                     "I">
 <!ENTITY asAttachment.label                   "As Attachment">
-<!ENTITY asAttachment.accesskey               "A">
 <!ENTITY addExtension.label                   "add extension to file name">
-<!ENTITY addExtension.accesskey               "f">
+<!ENTITY addExtension.accesskey               "e">
 
 <!ENTITY htmlComposeHeader.label              "HTML">
 <!ENTITY font.label                           "Font:">
 <!ENTITY font.accesskey                       "n">
 <!ENTITY size.label                           "Size:">
 <!ENTITY size.accesskey                       "z">
 <!ENTITY fontColor.label                      "Text Color:">
-<!ENTITY fontColor.accesskey                  "x">
+<!ENTITY fontColor.accesskey                  "T">
 <!ENTITY bgColor.label                        "Background Color:">
 <!ENTITY bgColor.accesskey                    "B">
 <!ENTITY restoreHTMLDefaults.label            "Restore Defaults">
 <!ENTITY restoreHTMLDefaults.accesskey        "R">
 
 <!ENTITY spellCheck.label                     "Check spelling before sending">
 <!ENTITY spellCheck.accesskey                 "C">
 <!ENTITY spellCheckInline.label               "Enable spell check as you type">
-<!ENTITY spellCheckInline1.accesskey           "k">
+<!ENTITY spellCheckInline1.accesskey          "E">
 <!ENTITY languagePopup.label                  "Language:">
-<!ENTITY languagePopup.accessKey              "g">
+<!ENTITY languagePopup.accessKey              "L">
 <!ENTITY downloadDictionaries.label           "Download More Dictionaries">
 
 <!ENTITY warnOnSendAccelKey.label             "Confirm when using keyboard shortcut to send message">
-<!ENTITY warnOnSendAccelKey.accesskey         "i">
+<!ENTITY warnOnSendAccelKey.accesskey         "C">
 <!ENTITY autoSave.label                       "Auto Save every">
-<!ENTITY autoSave.accesskey                   "u">
+<!ENTITY autoSave.accesskey                   "A">
 <!ENTITY autoSaveEnd.label                    "minutes">
 
 <!ENTITY emailCollectionPicker.label           "Automatically add outgoing e-mail addresses to my:">
-<!ENTITY emailCollectionPicker.accesskey       "t">
+<!ENTITY emailCollectionPicker.accesskey       "A">
 <!ENTITY addressingTitle.label                 "Address Autocompletion">
 <!ENTITY autocompleteText.label                "When addressing messages, look for matching entries in:">
 <!ENTITY addressingEnable.label                "Local Address Books">
-<!ENTITY addressingEnable.accesskey            "A">
+<!ENTITY addressingEnable.accesskey            "L">
 <!ENTITY directories.label                     "Directory Server:">
 <!ENTITY directories.accesskey                 "D">
 <!ENTITY directoriesNone.label                 "None">
 <!ENTITY editDirectories.label                 "Edit Directories…">
 <!ENTITY editDirectories.accesskey             "E">
 
 <!ENTITY sendOptionsDescription.label          "Configure text format behavior">
 <!ENTITY sendOptions.label                     "Send Options…">
--- a/mail/locales/en-US/chrome/messenger/preferences/display.dtd
+++ b/mail/locales/en-US/chrome/messenger/preferences/display.dtd
@@ -28,21 +28,21 @@
 <!ENTITY backgroundColor.label            "Background Color:">
 <!ENTITY backgroundColor.accesskey        "b">
 
 <!-- LOCALIZATION NOTE : (emoticonsAndStructs.label) 'Emoticons' are also known as 'Smileys', e.g. :-)   -->
 <!ENTITY convertEmoticons.label        "Display emoticons as graphics">
 <!ENTITY convertEmoticons.accesskey    "D">
 
 <!-- labels -->
-<!ENTITY displayTagsText.label    "Tags can be used to categorize and prioritize your messages.">
-<!ENTITY addTagButton.label       "Add">
-<!ENTITY addTagButton.accesskey   "A">
-<!ENTITY editTagButton.label      "Edit">
+<!ENTITY displayTagsText.label     "Tags can be used to categorize and prioritize your messages.">
+<!ENTITY addTagButton.label        "Add">
+<!ENTITY addTagButton.accesskey    "A">
+<!ENTITY editTagButton.label       "Edit">
 <!ENTITY editTagButton.accesskey   "E">
-<!ENTITY removeTagButton.label    "Delete">
-<!ENTITY removeTagButton.accesskey "l">
+<!ENTITY removeTagButton.label     "Delete">
+<!ENTITY removeTagButton.accesskey "D">
 
 <!-- Fonts -->
 <!ENTITY fontAndEncodingsDescription.label  "Configure the fonts and encodings used by &brandShortName;">
 <!ENTITY fontsAndEncodingsCaption.label      "Fonts &amp; Encodings">
 <!ENTITY fontOptions.accesskey   "F">
 <!ENTITY fontOptions.label       "Fonts…">
--- a/mail/locales/en-US/chrome/messenger/preferences/privacy.dtd
+++ b/mail/locales/en-US/chrome/messenger/preferences/privacy.dtd
@@ -5,39 +5,39 @@
 
 <!-- Junk Mail Controls -->
 <!ENTITY junkMail.intro "Set your default junk mail settings. Account-specific junk mail settings can be configured in Account Settings.">
 <!ENTITY manualMark.label "When I mark messages as junk:">
 <!ENTITY manualMark.accesskey "W">
 <!ENTITY manualMarkModeMove.label "Move them to the account's &quot;Junk&quot; folder">
 <!ENTITY manualMarkModeMove.accesskey "o">
 <!ENTITY manualMarkModeDelete.label "Delete them">
-<!ENTITY manualMarkModeDelete.accesskey "t">
+<!ENTITY manualMarkModeDelete.accesskey "D">
 <!ENTITY markAsReadOnSpam.label "Mark messages determined to be Junk as read">
-<!ENTITY markAsReadOnSpam.accesskey "k">
+<!ENTITY markAsReadOnSpam.accesskey "M">
 <!ENTITY enableJunkLogging.label "Enable junk filter logging">
-<!ENTITY enableJunkLogging.accesskey "g">
+<!ENTITY enableJunkLogging.accesskey "E">
 <!ENTITY openJunkLog.label "Show log">
-<!ENTITY openJunkLog.accesskey "h">
+<!ENTITY openJunkLog.accesskey "S">
 <!ENTITY resetTrainingData.label "Reset Training Data">
-<!ENTITY resetTrainingData.accesskey "D">
+<!ENTITY resetTrainingData.accesskey "R">
 
 <!-- Phishing Detector -->
 <!ENTITY phishingDetector1.intro  "&brandShortName; can analyze messages for suspected email scams by looking for common techniques used to deceive you.">
 <!ENTITY enablePhishingDetector1.label    "Tell me if the message I'm reading is a suspected email scam">
-<!ENTITY enablePhishingDetector1.accesskey  "e">
+<!ENTITY enablePhishingDetector1.accesskey  "T">
 <!ENTITY useDownloadedList.label "Use a downloaded list of suspected email scams">
 <!ENTITY useDownloadedList.accesskey "U">
 
 <!-- Passwords -->
 <!ENTITY savedPasswords.intro           "&brandShortName; can remember passwords for all of your accounts.">
 <!ENTITY useMasterPassword.label        "Use a master password">
-<!ENTITY useMasterPassword.accesskey    "m">
+<!ENTITY useMasterPassword.accesskey    "U">
 <!ENTITY masterPassword.intro           "A Master Password protects all your passwords, but you must enter it once per session.">
 <!ENTITY changeMasterPassword.label     "Change Master Password…">
 <!ENTITY changeMasterPassword.accesskey "C">
 <!ENTITY savedPasswords.label           "Saved Passwords…">
 <!ENTITY savedPasswords.accesskey       "S">
 
 <!-- Anti Virus -->
 <!ENTITY antiVirus.intro      "&brandShortName; can make it easy for anti-virus software to analyze incoming mail messages for viruses before they are stored locally.">
 <!ENTITY antiVirus.label      "Allow anti-virus clients to quarantine individual incoming messages">
-<!ENTITY antiVirus.accesskey  "l">
+<!ENTITY antiVirus.accesskey  "A">