diff --git a/mozilla/extensions/content-packs/resources/content/pref-contentpacks.xul b/mozilla/extensions/content-packs/resources/content/pref-contentpacks.xul
index 1e5c4e47265..02278e1ec79 100644
--- a/mozilla/extensions/content-packs/resources/content/pref-contentpacks.xul
+++ b/mozilla/extensions/content-packs/resources/content/pref-contentpacks.xul
@@ -51,7 +51,7 @@
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://content-packs/content/pref-contentpacks.xul'); "
-      headertitle="&lHeader;">
+      headertitle="&pref.contentpacks.title;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -186,7 +186,7 @@
   ]]>
   </script>
 
-  <hbox class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&pref.contentpacks.title;"/>
 
   <!-- Language pack listbox -->
   <description>&languageIntro.label;</description>
diff --git a/mozilla/extensions/content-packs/resources/locale/en-US/pref-contentpacks.dtd b/mozilla/extensions/content-packs/resources/locale/en-US/pref-contentpacks.dtd
index 8852e595f8d..d2c041924ce 100644
--- a/mozilla/extensions/content-packs/resources/locale/en-US/pref-contentpacks.dtd
+++ b/mozilla/extensions/content-packs/resources/locale/en-US/pref-contentpacks.dtd
@@ -1,5 +1,5 @@
 
-<!ENTITY lHeader                        "Language and Content Packs">
+<!ENTITY pref.contentpacks.title        "Language and Content Packs">
 <!ENTITY contentIntro.label             "Selecting a new content pack changes items in the Sidebar, and changes the default home page, certain bookmarks, and other items. You will not lose bookmarks and other items that you have customized when you switch content packs.">
 <!ENTITY languageIntro.label            "Selecting a new language pack changes the language for text that appears in dialog boxes, menus, toolbars and button labels.">
 <!ENTITY restartOnLangChange.label      "Changes to content or language packs take effect when you restart &brandShortName;.">
diff --git a/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul b/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul
index 3af2302bf6b..60f2687df45 100644
--- a/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul
+++ b/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul
@@ -6,7 +6,7 @@
 
 <page id="winPref"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      headertitle="&Inspector.label;">
+      headertitle="&pref.inspector.title;">
 
   <stringbundle id="inspector-bundle" src="chrome://inspector/locale/inspector.properties"/>
 
@@ -54,10 +54,10 @@
 
   <vbox id="bxGeneralPrefs">
     <groupbox id="tbxBlink" flex="1">
-      <caption label="&elementBlinking.label;"/>
+      <caption label="&elementBlinking.caption;"/>
       <vbox>
-        <checkbox id="cbElOn" label="&blinkSelectedElement.label;" oncommand="enableBlinkPrefs(this.checked)"
-            preftype="bool" prefstring="inspector.blink.on" prefattribute="checked"/>
+        <checkbox id="cbElOn" label="&blinkSelectedElement.label;" accesskey="&blinkSelectedElement.accesskey;"
+          oncommand="enableBlinkPrefs(this.checked)" preftype="bool" prefstring="inspector.blink.on" prefattribute="checked"/>
         <grid>
           <columns>
             <column/>
@@ -98,20 +98,20 @@
           </rows>
         </grid>
         <vbox align="start">
-          <checkbox id="cbElInvert" label="&invertColors.label;"
-                    preftype="bool" prefstring="inspector.blink.invert" prefattribute="checked"/>
+          <checkbox id="cbElInvert" label="&invertColors.label;" accesskey="&invertColors.accesskey;"
+            preftype="bool" prefstring="inspector.blink.invert" prefattribute="checked"/>
         </vbox>
       </vbox>
     </groupbox>
     
     <groupbox id="tbxSidebar" flex="1">
-      <caption label="&Sidebar.label;"/>
+      <caption label="&Sidebar.caption;"/>
       <vbox flex="1">
         <vbox id="bxSidebarInstall" flex="1">
           <hbox>
             <description id="txSidebarMsg" flex="1">&installHowTo.label;</description>
           </hbox>
-          <button id="btnSidebarInstall" label="&install.label;" oncommand="sidebarPref.installSidebar()"/>
+          <button id="btnSidebarInstall" label="&install.label;" accesskey="&install.accesskey;" oncommand="sidebarPref.installSidebar()"/>
         </vbox>
       </vbox>
     </groupbox>
diff --git a/mozilla/extensions/inspector/resources/locale/en-US/prefs.dtd b/mozilla/extensions/inspector/resources/locale/en-US/prefs.dtd
index 1aad4de1bfc..2819a050288 100644
--- a/mozilla/extensions/inspector/resources/locale/en-US/prefs.dtd
+++ b/mozilla/extensions/inspector/resources/locale/en-US/prefs.dtd
@@ -1,7 +1,8 @@
-<!ENTITY Inspector.label "DOM Inspector">
-<!ENTITY Sidebar.label "Sidebar">
-<!ENTITY elementBlinking.label "Element Blinking">
+<!ENTITY pref.inspector.title "DOM Inspector">
+<!ENTITY Sidebar.caption "Sidebar">
+<!ENTITY elementBlinking.caption "Element Blinking">
 <!ENTITY blinkSelectedElement.label "Blink Selected Element">
+<!ENTITY blinkSelectedElement.accesskey "B">
 <!ENTITY borderColor.label "Border Color">
 <!ENTITY borderWidth.label "Border Width">
 <!ENTITY px.label "(px)">
@@ -9,6 +10,8 @@
 <!ENTITY ms.label "(ms)">
 <!ENTITY blinkSpeed.label "Blink Speed">
 <!ENTITY invertColors.label "Invert Colors">
+<!ENTITY invertColors.accesskey "C">
 <!ENTITY installHowTo.label "The DOM Inspector Sidebar is not currently installed.  Click the 'Install' button to add it to your Sidebar.">
 <!ENTITY install.label "Install">
+<!ENTITY install.accesskey "n">
 <!ENTITY addNavigatorHooks.label "Add contextual menus to Navigator">
diff --git a/mozilla/extensions/wallet/resources/content/pref-passwords.xul b/mozilla/extensions/wallet/resources/content/pref-passwords.xul
index 70062bdde4f..1db5115411b 100644
--- a/mozilla/extensions/wallet/resources/content/pref-passwords.xul
+++ b/mozilla/extensions/wallet/resources/content/pref-passwords.xul
@@ -46,7 +46,7 @@
 ]>
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://wallet/content/pref-passwords.xul');"
-      headertitle="&lHeader;">
+      headertitle="&pref.passwords.title;">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -81,7 +81,7 @@
   </script>
         
   <groupbox>
-    <caption label="&signonHeader.label;"/>
+    <caption label="&signonHeader.caption;"/>
     <description flex="1">&signonDescription.label;</description>
     <hbox align="start">
       <checkbox id="signonRememberSignons" label="&signonEnabled.label;" accesskey="&signonEnabled.accesskey;"
@@ -96,7 +96,7 @@
   </groupbox>
 
   <groupbox>
-    <caption label="&encryptHeader.label;"/>
+    <caption label="&encryptHeader.caption;"/>
     <description flex="1">&encryptDescription.label;</description>
     <vbox align="start">
       <checkbox id="encryptEnabled" label="&encryptEnabled.label;" accesskey="&encryptEnabled.accesskey;"
diff --git a/mozilla/extensions/wallet/resources/content/pref-wallet.xul b/mozilla/extensions/wallet/resources/content/pref-wallet.xul
index 719a6b5e2e8..def170e48e2 100644
--- a/mozilla/extensions/wallet/resources/content/pref-wallet.xul
+++ b/mozilla/extensions/wallet/resources/content/pref-wallet.xul
@@ -46,7 +46,7 @@
 ]>
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://wallet/content/pref-wallet.xul');"
-      headertitle="&lHeader;">
+      headertitle="&pref.wallet.title;">
 
   <script type="application/x-javascript" src="chrome://wallet/content/walletOverlay.js"/>
 
@@ -69,7 +69,7 @@
   </script>
         
   <groupbox>
-    <caption label="&walletHeader.label;"/>
+    <caption label="&walletHeader.caption;"/>
     <description>&walletDescription.label;</description>
     <hbox align="center">
       <checkbox id="walletCaptureForms"
diff --git a/mozilla/extensions/wallet/resources/locale/en-US/pref-passwords.dtd b/mozilla/extensions/wallet/resources/locale/en-US/pref-passwords.dtd
index f7554fd58df..36a26c3b237 100644
--- a/mozilla/extensions/wallet/resources/locale/en-US/pref-passwords.dtd
+++ b/mozilla/extensions/wallet/resources/locale/en-US/pref-passwords.dtd
@@ -1,17 +1,15 @@
-<!ENTITY  lHeader                     "Passwords">
-<!ENTITY  rHeader                     "Manage passwords">
+<!ENTITY  pref.passwords.title        "Passwords">
 
-<!ENTITY  signonHeader.label          "Password Manager">
+<!ENTITY  signonHeader.caption        "Password Manager">
 <!ENTITY  signonDescription.label     "Password Manager stores your login information for password-protected web sites, mail servers, and news servers, and enters the information automatically when needed.">
 
 <!ENTITY  signonEnabled.label         "Remember passwords">
-<!ENTITY  signonEnabled.accesskey     "r">
+<!ENTITY  signonEnabled.accesskey     "R">
 <!ENTITY  viewSignons.label           "Manage Stored Passwords">
-<!ENTITY  viewSignons.accesskey       "e">
+<!ENTITY  viewSignons.accesskey       "M">
 
-<!ENTITY  encryptHeader.label         "Encrypting versus Obscuring">
+<!ENTITY  encryptHeader.caption       "Encrypting versus Obscuring">
 <!ENTITY  encryptDescription.label    "Sensitive data that is stored on your hard disk can be encrypted to prevent the data from being read by an intruder.  A password is used to access the data.">
 <!ENTITY  encryptEnabled.label        "Use encryption when storing sensitive data.">
-<!ENTITY  encryptEnabled.accesskey    "n">
-<!ENTITY  encryptExpire.label         "Expire master password after each use.">
-<!ENTITY  encryptExpire.accesskey     "x">
+<!ENTITY  encryptEnabled.accesskey    "U">
+
diff --git a/mozilla/extensions/wallet/resources/locale/en-US/pref-wallet.dtd b/mozilla/extensions/wallet/resources/locale/en-US/pref-wallet.dtd
index 07c2479e4bc..3d1008a1e4e 100644
--- a/mozilla/extensions/wallet/resources/locale/en-US/pref-wallet.dtd
+++ b/mozilla/extensions/wallet/resources/locale/en-US/pref-wallet.dtd
@@ -1,7 +1,6 @@
-<!ENTITY  lHeader                     "Forms">
-<!ENTITY  rHeader                     "Manage personal information">
+<!ENTITY  pref.wallet.title           "Forms">
 
-<!ENTITY  walletHeader.label          "Form Manager">
+<!ENTITY  walletHeader.caption        "Form Manager">
 <!ENTITY  walletDescription.label     "Form Manager can remember information about you so that filling out forms on web pages is faster.">
 <!ENTITY  walletEnabled.label         "Save form data from web pages when completing forms.">
 <!ENTITY  walletEnabled.accesskey     "f">