diff --git a/browser/components/preferences/colors.xul b/browser/components/preferences/colors.xul
index f2109aed7207..4d96d7da53f3 100644
--- a/browser/components/preferences/colors.xul
+++ b/browser/components/preferences/colors.xul
@@ -85,15 +85,15 @@
 #else
     <vbox>
 #endif
-      <label accesskey="&overridePageColors.accesskey;"
-             control="useDocumentColors">&overridePageColors.label;</label>
+      <label accesskey="&overrideDefaultPageColors.accesskey;"
+             control="useDocumentColors">&overrideDefaultPageColors.label;</label>
       <menulist id="useDocumentColors" preference="browser.display.document_color_use">
         <menupopup>
-          <menuitem label="&overridePageColors.always.label;"
+          <menuitem label="&overrideDefaultPageColors.always.label;"
                     value="2" id="documentColorAlways"/>
-          <menuitem label="&overridePageColors.auto.label;"
+          <menuitem label="&overrideDefaultPageColors.auto.label;"
                     value="0" id="documentColorAutomatic"/>
-          <menuitem label="&overridePageColors.never.label;"
+          <menuitem label="&overrideDefaultPageColors.never.label;"
                     value="1" id="documentColorNever"/>
         </menupopup>
       </menulist>
diff --git a/browser/components/preferences/fonts.xul b/browser/components/preferences/fonts.xul
index ed1d1ecc21b0..f87cf16a2a48 100644
--- a/browser/components/preferences/fonts.xul
+++ b/browser/components/preferences/fonts.xul
@@ -238,7 +238,7 @@
       <separator class="groove"/>
       <hbox>
         <checkbox id="useDocumentFonts" 
-                  label="&allowPagesToUse.label;" accesskey="&allowPagesToUse.accesskey;"
+                  label="&allowPagesToUseOwn.label;" accesskey="&allowPagesToUseOwn.accesskey;"
                   preference="browser.display.use_document_fonts"
                   onsyncfrompreference="return gFontsDialog.readUseDocumentFonts();"
                   onsynctopreference="return gFontsDialog.writeUseDocumentFonts();"/>
diff --git a/browser/components/preferences/in-content/advanced.xul b/browser/components/preferences/in-content/advanced.xul
index 19dea6e5f519..b2a56d4521d1 100644
--- a/browser/components/preferences/in-content/advanced.xul
+++ b/browser/components/preferences/in-content/advanced.xul
@@ -167,12 +167,12 @@
                   accesskey="&useCursorNavigation.accesskey;"
                   preference="accessibility.browsewithcaret"/>
         <checkbox id="searchStartTyping"
-                  label="&searchStartTyping.label;"
-                  accesskey="&searchStartTyping.accesskey;"
+                  label="&searchOnStartTyping.label;"
+                  accesskey="&searchOnStartTyping.accesskey;"
                   preference="accessibility.typeaheadfind"/>
         <checkbox id="blockAutoRefresh"
-                  label="&blockAutoRefresh.label;"
-                  accesskey="&blockAutoRefresh.accesskey;"
+                  label="&blockAutoReload.label;"
+                  accesskey="&blockAutoReload.accesskey;"
                   preference="accessibility.blockautorefresh"/>
       </groupbox>
       <!-- Browsing -->
@@ -192,8 +192,8 @@
                   accesskey="&allowHWAccel.accesskey;"
                   preference="layers.acceleration.disabled"/>
         <checkbox id="checkSpelling"
-                  label="&checkSpelling.label;"
-                  accesskey="&checkSpelling.accesskey;"
+                  label="&checkUserSpelling.label;"
+                  accesskey="&checkUserSpelling.accesskey;"
                   onsyncfrompreference="return gAdvancedPane.readCheckSpelling();"
                   onsynctopreference="return gAdvancedPane.writeCheckSpelling();"
                   preference="layout.spellcheckDefault"/>
@@ -301,13 +301,13 @@
         </hbox>
         <hbox align="center">
           <checkbox id="offlineNotify"
-                    label="&offlineNotify.label;" accesskey="&offlineNotify.accesskey;"
+                    label="&offlineStorageNotify.label;" accesskey="&offlineStorageNotify.accesskey;"
                     preference="browser.offline-apps.notify"
                     onsyncfrompreference="return gAdvancedPane.readOfflineNotify();"/>
           <spacer flex="1"/>
           <button id="offlineNotifyExceptions"
-                  label="&offlineNotifyExceptions.label;"
-                  accesskey="&offlineNotifyExceptions.accesskey;"/>
+                  label="&offlineStorageNotifyExceptions.label;"
+                  accesskey="&offlineStorageNotifyExceptions.accesskey;"/>
         </hbox>
         <hbox>
           <vbox flex="1">
@@ -354,8 +354,8 @@
                  label="&updateAuto1.label;"
                  accesskey="&updateAuto1.accesskey;"/>
           <radio value="checkOnly"
-                label="&updateCheck.label;"
-                accesskey="&updateCheck.accesskey;"/>
+                label="&updateCheckChoose.label;"
+                accesskey="&updateCheckChoose.accesskey;"/>
           <radio value="manual"
                 label="&updateManual.label;"
                 accesskey="&updateManual.accesskey;"/>
@@ -388,8 +388,8 @@
     <!-- Certificates -->
     <tabpanel id="encryptionPanel" orient="vertical">
       <groupbox id="certSelection" align="start">
-        <caption><label>&certSelection.label;</label></caption>
-        <description id="CertSelectionDesc" control="certSelection">&certSelection.description;</description>
+        <caption><label>&certPersonal.label;</label></caption>
+        <description id="CertSelectionDesc" control="certSelection">&certPersonal.description;</description>
 
         <!--
           The values on these radio buttons may look like l12y issues, but
@@ -400,11 +400,11 @@
                     preftype="string"
                     preference="security.default_personal_cert"
                     aria-labelledby="CertSelectionDesc">
-          <radio label="&certs.auto;"
-                 accesskey="&certs.auto.accesskey;"
+          <radio label="&selectCerts.auto;"
+                 accesskey="&selectCerts.auto.accesskey;"
                  value="Select Automatically"/>
-          <radio label="&certs.ask;"
-                 accesskey="&certs.ask.accesskey;"
+          <radio label="&selectCerts.ask;"
+                 accesskey="&selectCerts.ask.accesskey;"
                  value="Ask Every Time"/>
         </radiogroup>
       </groupbox>
diff --git a/browser/components/preferences/in-content/main.xul b/browser/components/preferences/in-content/main.xul
index 526bbc714f6b..f9e5a6dd8890 100644
--- a/browser/components/preferences/in-content/main.xul
+++ b/browser/components/preferences/in-content/main.xul
@@ -172,13 +172,13 @@
                   class="content-cell-item"
                   preference="browser.startup.page">
           <menupopup>
-          <menuitem label="&startupHomePage.label;"
+          <menuitem label="&startupUserHomePage.label;"
                     value="1"
                     id="browserStartupHomePage"/>
           <menuitem label="&startupBlankPage.label;"
                     value="0"
                     id="browserStartupBlank"/>
-          <menuitem label="&startupLastSession.label;"
+          <menuitem label="&startupPrevSession.label;"
                     value="3"
                     id="browserStartupLastSession"/>
           </menupopup>
@@ -260,8 +260,8 @@
     <hbox>
       <radio id="alwaysAsk"
              value="false"
-             label="&alwaysAsk.label;"
-             accesskey="&alwaysAsk.accesskey;"/>
+             label="&alwaysAskWhere.label;"
+             accesskey="&alwaysAskWhere.accesskey;"/>
     </hbox>
   </radiogroup>
 </groupbox>
@@ -281,16 +281,16 @@
               onsyncfrompreference="return gMainPane.readLinkTarget();"
               onsynctopreference="return gMainPane.writeLinkTarget();"/>
 
-    <checkbox id="warnCloseMultiple" label="&warnCloseMultipleTabs.label;"
-              accesskey="&warnCloseMultipleTabs.accesskey;"
+    <checkbox id="warnCloseMultiple" label="&warnOnCloseMultipleTabs.label;"
+              accesskey="&warnOnCloseMultipleTabs.accesskey;"
               preference="browser.tabs.warnOnClose"/>
 
-    <checkbox id="warnOpenMany" label="&warnOpenManyTabs.label;"
-              accesskey="&warnOpenManyTabs.accesskey;"
+    <checkbox id="warnOpenMany" label="&warnOnOpenManyTabs.label;"
+              accesskey="&warnOnOpenManyTabs.accesskey;"
               preference="browser.tabs.warnOnOpen"/>
 
-    <checkbox id="switchToNewTabs" label="&switchToNewTabs.label;"
-              accesskey="&switchToNewTabs.accesskey;"
+    <checkbox id="switchToNewTabs" label="&switchLinksToNewTabs.label;"
+              accesskey="&switchLinksToNewTabs.accesskey;"
               preference="browser.tabs.loadInBackground"/>
 
 #ifdef XP_WIN
diff --git a/browser/components/preferences/in-content/security.xul b/browser/components/preferences/in-content/security.xul
index a10576c25d7f..70084978f940 100644
--- a/browser/components/preferences/in-content/security.xul
+++ b/browser/components/preferences/in-content/security.xul
@@ -62,8 +62,8 @@
 
   <hbox id="addonInstallBox">
     <checkbox id="warnAddonInstall"
-              label="&warnAddonInstall.label;"
-              accesskey="&warnAddonInstall.accesskey;"
+              label="&warnOnAddonInstall.label;"
+              accesskey="&warnOnAddonInstall.accesskey;"
               preference="xpinstall.whitelist.required"
               onsyncfrompreference="return gSecurityPane.readWarnAddonInstall();"/>
     <spacer flex="1"/>
@@ -82,8 +82,8 @@
                 label="&blockDownloads.label;"
                 accesskey="&blockDownloads.accesskey;" />
       <checkbox id="blockUncommonUnwanted"
-                label="&blockUncommonUnwanted.label;"
-                accesskey="&blockUncommonUnwanted.accesskey;" />
+                label="&blockUncommonAndUnwanted.label;"
+                accesskey="&blockUncommonAndUnwanted.accesskey;" />
     </vbox>
   </vbox>
 </groupbox>
diff --git a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
index d744cd66361e..3c01e77444f9 100644
--- a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -10,10 +10,10 @@
 
 <!ENTITY useCursorNavigation.label       "Always use the cursor keys to navigate within pages">
 <!ENTITY useCursorNavigation.accesskey   "c">
-<!ENTITY searchStartTyping.label         "Search for text when I start typing">
-<!ENTITY searchStartTyping.accesskey     "x">
-<!ENTITY blockAutoRefresh.label          "Warn me when websites try to redirect or reload the page">
-<!ENTITY blockAutoRefresh.accesskey      "b">
+<!ENTITY searchOnStartTyping.label       "Search for text when you start typing">
+<!ENTITY searchOnStartTyping.accesskey   "x">
+<!ENTITY blockAutoReload.label           "Warn you when websites try to redirect or reload the page">
+<!ENTITY blockAutoReload.accesskey       "b">
 <!ENTITY useOnScreenKeyboard.label       "Show a touch keyboard when necessary">
 <!ENTITY useOnScreenKeyboard.accesskey   "k">
 
@@ -25,8 +25,8 @@
 <!ENTITY useSmoothScrolling.accesskey    "m">
 <!ENTITY allowHWAccel.label              "Use hardware acceleration when available">
 <!ENTITY allowHWAccel.accesskey          "r">
-<!ENTITY checkSpelling.label             "Check my spelling as I type">
-<!ENTITY checkSpelling.accesskey         "t">
+<!ENTITY checkUserSpelling.label         "Check your spelling as you type">
+<!ENTITY checkUserSpelling.accesskey     "t">
 
 <!ENTITY dataChoicesTab.label            "Data Choices">
 
@@ -85,8 +85,8 @@
 <!ENTITY updateApplication.label         "&brandShortName; updates">
 <!ENTITY updateAuto1.label               "Automatically install updates (recommended: improved security)">
 <!ENTITY updateAuto1.accesskey           "A">
-<!ENTITY updateCheck.label               "Check for updates, but let me choose whether to install them">
-<!ENTITY updateCheck.accesskey           "C">
+<!ENTITY updateCheckChoose.label         "Check for updates, but let you choose whether to install them">
+<!ENTITY updateCheckChoose.accesskey     "C">
 <!ENTITY updateManual.label              "Never check for updates (not recommended: security risk)">
 <!ENTITY updateManual.accesskey          "N">
 
@@ -100,10 +100,10 @@
 <!ENTITY enableSearchUpdate.label        "Search Engines">
 <!ENTITY enableSearchUpdate.accesskey    "E">
 
-<!ENTITY offlineNotify.label             "Tell me when a website asks to store data for offline use">
-<!ENTITY offlineNotify.accesskey         "T">
-<!ENTITY offlineNotifyExceptions.label   "Exceptions…">
-<!ENTITY offlineNotifyExceptions.accesskey "x">
+<!ENTITY offlineStorageNotify.label               "Tell you when a website asks to store data for offline use">
+<!ENTITY offlineStorageNotify.accesskey           "T">
+<!ENTITY offlineStorageNotifyExceptions.label     "Exceptions…">
+<!ENTITY offlineStorageNotifyExceptions.accesskey "x">
 
 <!ENTITY offlineAppsList2.label          "The following websites are allowed to store data for offline use:">
 <!ENTITY offlineAppsList.height          "7em">
@@ -112,12 +112,12 @@
 <!ENTITY offlineAppRemove.confirm        "Remove offline data">
 
 <!ENTITY certificateTab.label            "Certificates">
-<!ENTITY certSelection.label             "Requests">
-<!ENTITY certSelection.description       "When a server requests my personal certificate:">
-<!ENTITY certs.auto                      "Select one automatically">
-<!ENTITY certs.auto.accesskey            "S">
-<!ENTITY certs.ask                       "Ask me every time">
-<!ENTITY certs.ask.accesskey             "A">
+<!ENTITY certPersonal.label              "Requests">
+<!ENTITY certPersonal.description        "When a server requests your personal certificate:">
+<!ENTITY selectCerts.auto                "Select one automatically">
+<!ENTITY selectCerts.auto.accesskey      "S">
+<!ENTITY selectCerts.ask                 "Ask you every time">
+<!ENTITY selectCerts.ask.accesskey       "A">
 <!ENTITY enableOCSP.label                "Query OCSP responder servers to confirm the current validity of certificates">
 <!ENTITY enableOCSP.accesskey            "Q">
 <!ENTITY viewCerts.label                 "View Certificates">
diff --git a/browser/locales/en-US/chrome/browser/preferences/colors.dtd b/browser/locales/en-US/chrome/browser/preferences/colors.dtd
index 7456f48b5caa..153f68d7c90c 100644
--- a/browser/locales/en-US/chrome/browser/preferences/colors.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/colors.dtd
@@ -6,12 +6,12 @@
 <!ENTITY  window.width                    "38em">
 <!ENTITY  window.macWidth                 "41em">
 
-<!ENTITY  overridePageColors.label        "Override the colors specified by the page with my selections above:">
-<!ENTITY  overridePageColors.accesskey    "O">
+<!ENTITY  overrideDefaultPageColors.label        "Override the colors specified by the page with your selections above:">
+<!ENTITY  overrideDefaultPageColors.accesskey    "O">
 
-<!ENTITY  overridePageColors.always.label "Always">
-<!ENTITY  overridePageColors.auto.label   "Only with High Contrast themes">
-<!ENTITY  overridePageColors.never.label  "Never">
+<!ENTITY  overrideDefaultPageColors.always.label "Always">
+<!ENTITY  overrideDefaultPageColors.auto.label   "Only with High Contrast themes">
+<!ENTITY  overrideDefaultPageColors.never.label  "Never">
 
 <!ENTITY  color                           "Text and Background">
 <!ENTITY  textColor.label                 "Text:">
diff --git a/browser/locales/en-US/chrome/browser/preferences/fonts.dtd b/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
index 98d697d35bc1..cdf5c2ba786d 100644
--- a/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
@@ -61,8 +61,8 @@
 <!ENTITY  useDefaultFontSerif.label               "Serif">
 <!ENTITY  useDefaultFontSansSerif.label           "Sans Serif">
 
-<!ENTITY  allowPagesToUse.label                   "Allow pages to choose their own fonts, instead of my selections above">
-<!ENTITY  allowPagesToUse.accesskey               "A">
+<!ENTITY  allowPagesToUseOwn.label                "Allow pages to choose their own fonts, instead of your selections above">
+<!ENTITY  allowPagesToUseOwn.accesskey            "A">
 
 <!ENTITY languages.customize.Fallback2.grouplabel "Text Encoding for Legacy Content">
 <!ENTITY languages.customize.Fallback2.label      "Fallback Text Encoding:">
diff --git a/browser/locales/en-US/chrome/browser/preferences/main.dtd b/browser/locales/en-US/chrome/browser/preferences/main.dtd
index 6b56f34005b5..3085ffd0dead 100644
--- a/browser/locales/en-US/chrome/browser/preferences/main.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/main.dtd
@@ -6,9 +6,9 @@
 
 <!ENTITY startupPage.label         "When &brandShortName; starts:">
 <!ENTITY startupPage.accesskey     "s">
-<!ENTITY startupHomePage.label     "Show my home page">
+<!ENTITY startupUserHomePage.label "Show your home page">
 <!ENTITY startupBlankPage.label    "Show a blank page">
-<!ENTITY startupLastSession.label  "Show my windows and tabs from last time">
+<!ENTITY startupPrevSession.label  "Show your windows and tabs from last time">
 
 <!ENTITY homepage.label            "Home Page:">
 <!ENTITY homepage.accesskey        "P">
@@ -28,8 +28,8 @@
 <!ENTITY chooseFolderWin.accesskey    "o">
 <!ENTITY chooseFolderMac.label        "Choose…">
 <!ENTITY chooseFolderMac.accesskey    "e">
-<!ENTITY alwaysAsk.label "Always ask me where to save files">
-<!ENTITY alwaysAsk.accesskey "A">
+<!ENTITY alwaysAskWhere.label         "Always ask you where to save files">
+<!ENTITY alwaysAskWhere.accesskey     "A">
 
 <!ENTITY alwaysCheckDefault2.label        "Always check if &brandShortName; is your default browser">
 <!ENTITY alwaysCheckDefault2.accesskey    "y">
diff --git a/browser/locales/en-US/chrome/browser/preferences/security.dtd b/browser/locales/en-US/chrome/browser/preferences/security.dtd
index ca9420401e8d..cc067e40390d 100644
--- a/browser/locales/en-US/chrome/browser/preferences/security.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/security.dtd
@@ -4,8 +4,8 @@
 
 <!ENTITY  general.label                 "General">
 
-<!ENTITY  warnAddonInstall.label        "Warn me when sites try to install add-ons">
-<!ENTITY  warnAddonInstall.accesskey    "W">
+<!ENTITY  warnOnAddonInstall.label        "Warn you when sites try to install add-ons">
+<!ENTITY  warnOnAddonInstall.accesskey    "W">
 
 <!-- LOCALIZATION NOTE (enableSafeBrowsing.label, blockDownloads.label, blockUncommonUnwanted.label):
   It is important that wording follows the guidelines outlined on this page:
@@ -17,8 +17,8 @@
 <!ENTITY  blockDownloads.label            "Block dangerous downloads">
 <!ENTITY  blockDownloads.accesskey        "D">
 
-<!ENTITY  blockUncommonUnwanted.label     "Warn me about unwanted and uncommon software">
-<!ENTITY  blockUncommonUnwanted.accesskey "C">
+<!ENTITY  blockUncommonAndUnwanted.label     "Warn you about unwanted and uncommon software">
+<!ENTITY  blockUncommonAndUnwanted.accesskey "C">
 
 <!ENTITY  addonExceptions.label         "Exceptions…">
 <!ENTITY  addonExceptions.accesskey     "E">
diff --git a/browser/locales/en-US/chrome/browser/preferences/tabs.dtd b/browser/locales/en-US/chrome/browser/preferences/tabs.dtd
index 5df3e330dc83..5b3dcd621c77 100644
--- a/browser/locales/en-US/chrome/browser/preferences/tabs.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/tabs.dtd
@@ -8,14 +8,14 @@
 <!ENTITY newWindowsAsTabs.label       "Open new windows in a new tab instead">
 <!ENTITY newWindowsAsTabs.accesskey   "w">
 
-<!ENTITY warnCloseMultipleTabs.label  "Warn me when closing multiple tabs">
-<!ENTITY warnCloseMultipleTabs.accesskey  "m">
+<!ENTITY warnOnCloseMultipleTabs.label      "Warn you when closing multiple tabs">
+<!ENTITY warnOnCloseMultipleTabs.accesskey  "m">
 
-<!ENTITY warnOpenManyTabs.label       "Warn me when opening multiple tabs might slow down &brandShortName;">
-<!ENTITY warnOpenManyTabs.accesskey   "d">
+<!ENTITY warnOnOpenManyTabs.label       "Warn you when opening multiple tabs might slow down &brandShortName;">
+<!ENTITY warnOnOpenManyTabs.accesskey   "d">
 
-<!ENTITY switchToNewTabs.label        "When I open a link in a new tab, switch to it immediately">
-<!ENTITY switchToNewTabs.accesskey    "h">
+<!ENTITY switchLinksToNewTabs.label        "When you open a link in a new tab, switch to it immediately">
+<!ENTITY switchLinksToNewTabs.accesskey    "h">
 
 <!ENTITY showTabsInTaskbar.label          "Show tab previews in the Windows taskbar">
 <!ENTITY showTabsInTaskbar.accesskey      "k">