diff --git a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
index a4cc8ced954c..02550568452a 100644
--- a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -1,59 +1,118 @@
-<!-- Note: due to bug 143065, the only remainaing accesskeys available to be
-     used in this file are: "j" and "q" -->
-<!ENTITY generalTab.label               "General">
-<!ENTITY accessibility.label            "Accessibility">
+<!-- Note: due to bug 143065, the only remaining accesskeys available to be used
+     in the Advanced pane are: "b", "i", "j", "q", "z" -->
+
+<!ENTITY generalTab.label                "General">
+
+<!ENTITY accessibility.label             "Accessibility">
+
+<!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     "S">
+
+<!ENTITY browsing.label                  "Browsing">
+
+<!ENTITY useAutoScroll.label             "Use autoscrolling">
+<!ENTITY useAutoScroll.accesskey         "a">
+<!ENTITY useSmoothScrolling.label        "Use smooth scrolling">
+<!ENTITY useSmoothScrolling.accesskey    "m">
+
+<!ENTITY languages.label                 "Languages">
+
+<!ENTITY chooseLanguage.label            "Choose your preferred language for displaying pages">
+<!ENTITY chooseButton.label              "Choose...">
+<!ENTITY chooseButton.accesskey          "o">
+
+
+<!ENTITY networkTab.label                "Network">
+
+<!ENTITY connection.label                "Connection">
+
+<!ENTITY connectionDesc.label            "Configure how &brandShortName; connects to the Internet">
+<!ENTITY connectionSettings.label        "Settings...">
+<!ENTITY connectionSettings.accesskey    "e">
+
+<!ENTITY cache.label "Cache">
+
+<!ENTITY useCacheBefore.label            "Use up to">
+<!ENTITY useCacheBefore.accesskey        "U">
+<!ENTITY useCacheAfter.label             "MB of space for the cache">
+
+
+<!ENTITY updateTab.label                 "Update">
+
+<!ENTITY autoCheck.label                 "Automatically check for updates to:">
+<!ENTITY enableAppUpdate.label           "&brandShortName;">
+<!ENTITY enableAppUpdate.accesskey       "F">
+<!ENTITY enableExtensionUpdate.label     "Installed Extensions and Themes">
+<!ENTITY enableExtensionUpdate.accesskey "x">
+<!ENTITY enableSearchUpdate.label        "Search Engines">
+<!ENTITY enableSearchUpdate.accesskey    "h">
+<!ENTITY checkNow.label                  "Check Now...">
+<!ENTITY appCheckNow.accesskey           "N">
+<!ENTITY whenUpdatesFound.label          "When updates to &brandShortName; are found:">
+<!ENTITY askMe.label                     "Ask me what I want to do">
+<!ENTITY askMe.accesskey                 "k">
+<!ENTITY modeAutomatic.label             "Automatically download and install the update">
+<!ENTITY modeAutomatic.accesskey         "d">
+<!ENTITY modeAutoWarn.label              "Warn me if this will disable extensions or themes">
+<!ENTITY modeAutoWarn.accesskey          "W">
+<!ENTITY updateHistory.label             "Show Update History">
+<!ENTITY updateHistory.accesskey         "p">
+
+
+<!ENTITY encryptionTab.label             "Encryption">
+
+<!ENTITY protocols.label                 "Protocols">
+<!ENTITY useSSL3.label                   "Use SSL 3.0">
+<!ENTITY useSSL3.accesskey               "3">
+<!ENTITY useTLS1.label                   "Use TLS 1.0">
+<!ENTITY useTLS1.accesskey               "1">
+<!ENTITY certificates.label              "Certificates">
+<!ENTITY certselect.description          "When a web site requires a certificate:">
+<!ENTITY certs.auto                      "Select one automatically">
+<!ENTITY certs.auto.accesskey            "l">
+<!ENTITY certs.ask                       "Ask me every time">
+<!ENTITY certs.ask.accesskey             "t">
+<!ENTITY viewCerts.label                 "View Certificates">
+<!ENTITY viewCerts.accesskey             "V">
+<!ENTITY viewCRLs.label                  "Revocation Lists">
+<!ENTITY viewCRLs.accesskey              "R">
+<!ENTITY verify.label                    "Verification">
+<!ENTITY verify.accesskey                "i">
+<!ENTITY viewSecurityDevices.label       "Security Devices">
+<!ENTITY viewSecurityDevices.accesskey   "y">
+
+
+<!-- LOCALIZATION NOTE:
+     The entities below are old entities which probably will not be in v2.0.
+     Spend your time on other entities before localizing these, because they
+     are unlikely to be used and may even be removed.
+-->
+
 <!ENTITY moveSystemCaret.label          "Allow text to be selected with the keyboard">
 <!ENTITY moveSystemCaret.accesskey      "b">
 <!ENTITY useTypeAheadFind.label         "Begin finding when you begin typing">
 <!ENTITY useTypeAheadFind.accesskey     "p">
-<!ENTITY browsing.label                 "Browsing">
 <!ENTITY enableAutoImageResizing.label  "Resize large images to fit in the browser window">
 <!ENTITY enableAutoImageResizing.accesskey "z">
 <!ENTITY useAutoScrolling.label         "Use autoscrolling">
 <!ENTITY useAutoScrolling.accesskey     "s">
-<!ENTITY useSmoothScrolling.label       "Use smooth scrolling">
-<!ENTITY useSmoothScrolling.accesskey   "m">
 
-<!ENTITY updateTab.label                "Update">
-<!ENTITY autoCheck.label                "Automatically check for updates to:">
-<!ENTITY enableAppUpdate.label          "&brandShortName;">
-<!ENTITY enableAppUpdate.accesskey      "F">
-<!ENTITY enableExtensionUpdate.label    "Installed Extensions and Themes">
-<!ENTITY enableExtensionUpdate.accesskey "x">
-<!ENTITY enableSearchUpdate.label       "Search Engines">
-<!ENTITY enableSearchUpdate.accesskey   "h">
-<!ENTITY checkNow.label                 "Check Now...">
-<!ENTITY appCheckNow.accesskey          "N">
-<!ENTITY whenUpdatesFound.label         "When updates to &brandShortName; are found:">
 <!ENTITY modeAskMe.label                "Ask me what I want to do">
 <!ENTITY modeAskMe.accesskey            "A">
-<!ENTITY modeAutomatic.label            "Automatically download and install the update">
-<!ENTITY modeAutomatic.accesskey        "d">
-<!ENTITY modeAutoWarn.label             "Warn me if this will disable extensions or themes">
-<!ENTITY modeAutoWarn.accesskey         "W">
 <!ENTITY showUpdates.label              "Show Update History">
 <!ENTITY showUpdates.accesskey          "U">
 
 <!ENTITY securityTab.label              "Security">
-<!ENTITY protocols.label                "Protocols">
-<!ENTITY useSSL3.label                  "Use SSL 3.0">
-<!ENTITY useSSL3.accesskey              "3">
-<!ENTITY useTLS1.label                  "Use TLS 1.0">
-<!ENTITY useTLS1.accesskey              "1">
-<!ENTITY certificates.label             "Certificates">
-<!ENTITY certselect.description         "When a web site requires a certificate:">
 <!ENTITY certselect.auto                "Select one automatically">
 <!ENTITY certselect.auto.accesskey      "e">
 <!ENTITY certselect.ask                 "Ask me every time">
 <!ENTITY certselect.ask.accesskey       "k">
 <!ENTITY viewCertificates.label         "View Certificates">
 <!ENTITY viewCertificates.accesskey     "C">
-<!ENTITY viewCRLs.label                 "Revocation Lists">
-<!ENTITY viewCRLs.accesskey             "R">
 <!ENTITY viewOCSP.label                 "Verification">
 <!ENTITY viewOCSP.accesskey             "V">
-<!ENTITY viewSecurityDevices.label      "Security Devices">
-<!ENTITY viewSecurityDevices.accesskey  "y">
 
 <!ENTITY securityWarnings.label            "Warnings">
 <!ENTITY securityWarnings.description      "Choose which security warnings should be displayed while browsing.">
diff --git a/browser/locales/en-US/chrome/browser/preferences/content.dtd b/browser/locales/en-US/chrome/browser/preferences/content.dtd
index 5ef317271748..3108d483c391 100644
--- a/browser/locales/en-US/chrome/browser/preferences/content.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/content.dtd
@@ -1,11 +1,60 @@
+<!ENTITY  blockPopups.label           "Block pop-up windows">
+<!ENTITY  blockPopups.accesskey       "B">
+<!ENTITY  popupExceptions.label       "Exceptions...">
+<!ENTITY  popupExceptions.accesskey   "E">
+
+<!ENTITY  loadImages.label            "Load images automatically">
+<!ENTITY  loadImages.accesskey        "I">
+<!ENTITY  imageExceptions.label       "Exceptions">
+<!ENTITY  imageExceptions.accesskey   "x">
+
+<!ENTITY  enableJavaScript.label      "Enable JavaScript">
+<!ENTITY  enableJavaScript.accesskey  "J">
+<!ENTITY  advancedJS.label            "Advanced...">
+<!ENTITY  advancedJS.accesskey        "v">
+
+<!ENTITY  font.label                  "Default font:">
+<!ENTITY  font.accesskey              "u">
+<!ENTITY  advancedFonts.label         "Advanced...">
+<!ENTITY  advancedFonts.accesskey     "d">
+
+<!ENTITY  defaultSize.label           "Default size:">
+<!ENTITY  defaultSize.accesskey       "s">
+<!ENTITY  colors.label                "Colors...">
+<!ENTITY  colors.accesskey            "C">
+
+
+<!ENTITY  feeds.label                 "Feeds">
+
+<!ENTITY  feedReader.label            "Feed Reader:">
+<!ENTITY  feedReader.accesskey        "F">
+
+<!ENTITY  feedClick.label             "When I click on a web feed:">
+<!ENTITY  ask.label                   "Ask me what to use">
+<!ENTITY  ask.accesskey               "A">
+<!ENTITY  subLiveBookmark.label       "Always subscribe with a Live Bookmark">
+<!ENTITY  subLiveBookmark.accesskey   "L">
+<!ENTITY  subReader.label             "Always subscribe using the Feed Reader">
+<!ENTITY  subReader.accesskey         "R">
+
+
+<!ENTITY fileTypes.label              "File Types">
+
+<!ENTITY configureFileTypes.label     "Configure how &brandShortName; handles certain types of files">
+<!ENTITY manage.label                 "Manage...">
+<!ENTITY manage.accesskey             "M">
+
+
+<!-- LOCALIZATION NOTE:
+     The entities below are old entities which probably will not be in v2.0.
+     Spend your time on other entities before localizing these, because they
+     are unlikely to be used and may even be removed.
+-->
+
 <!ENTITY  lHeader                           "Web Features">
 
 <!ENTITY  enbJavaCheck.label                "Enable Java">
 <!ENTITY  enbJavaCheck.accesskey            "J">
-<!ENTITY  enableJavaScript.label            "Enable JavaScript">
-<!ENTITY  enableJavaScript.accesskey        "S">
-<!ENTITY  advancedJS.label                  "Advanced...">
-<!ENTITY  advancedJS.accesskey              "v">
 
 <!ENTITY  enableImages.label                "Load Images">
 <!ENTITY  enableImages.accesskey            "I">
@@ -22,10 +71,6 @@
 <!ENTITY  exceptions.accesskey              "E">
 
 <!ENTITY  fonts.caption                     "Fonts &amp; Colors">
-<!ENTITY  advancedFonts.label               "Advanced...">
-<!ENTITY  advancedFonts.accesskey           "d">
-<!ENTITY  colors.label                      "Colors...">
-<!ENTITY  colors.accesskey                  "C">
 <!ENTITY  defaultFontSize.label             "Size:">
 <!ENTITY  defaultFontSize.accesskey         "z">
 <!ENTITY  defaultFont.label                 "Default Font:">
diff --git a/browser/locales/en-US/chrome/browser/preferences/main.dtd b/browser/locales/en-US/chrome/browser/preferences/main.dtd
new file mode 100644
index 000000000000..1e111591c96b
--- /dev/null
+++ b/browser/locales/en-US/chrome/browser/preferences/main.dtd
@@ -0,0 +1,36 @@
+<!ENTITY homePage.label            "Home Page">
+
+<!ENTITY useDefaultHome.label      "&brandShortName; Start">
+<!ENTITY useDefaultHome.accesskey  "S">
+<!ENTITY useABookmark.label        "Use a Bookmark">
+<!ENTITY useABookmark.accesskey    "B">
+<!ENTITY choose.label              "Choose...">
+<!ENTITY choose.accesskey          "h">
+<!ENTITY useOther.label            "Use this page">
+<!ENTITY useOther.accesskey        "p">
+<!ENTITY useCurrent.label          "Use Current">
+<!ENTITY useCurrent.accesskey      "C">
+
+
+<!ENTITY downloads.label     "Downloads">
+
+<!ENTITY showWhenDownloading.label     "Show the Downloads window when downloading a file">
+<!ENTITY showWhenDownloading.accesskey "D">
+<!ENTITY closeWhenDone.label "Close it when all downloads are finished">
+<!ENTITY closeWhenDone.accesskey "w">
+<!ENTITY saveTo.label "Save files to">
+<!ENTITY saveTo.accesskey "v">
+<!ENTITY chooseFolderWin.label        "Browse...">
+<!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 systemDefaults.label  "System Defaults">
+
+<!ENTITY alwaysCheckDefault.label      "Always check to see if &brandShortName; is the default browser on startup"><!--XXX-->
+<!ENTITY alwaysCheckDefault.accesskey  "y">
+<!ENTITY checkNow.label             "Check Now">
+<!ENTITY checkNow.accesskey         "N">
diff --git a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd b/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
index 1ac9e8324f5e..194c96a5d700 100644
--- a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
@@ -5,9 +5,19 @@
 <!ENTITY  prefWindow.styleMac     "width: 47em;">
 <!ENTITY  prefWindow.styleGNOME   "width: 42em; height: 38.5em;">
 
-<!ENTITY  paneGeneral.title       "General">
-<!ENTITY  panePrivacy.title       "Privacy">
-<!ENTITY  paneDownloads.title     "Downloads">
-<!ENTITY  paneAdvanced.title      "Advanced">
-<!ENTITY  paneContent.title       "Content">
+<!ENTITY  paneMain.title          "Main">
 <!ENTITY  paneTabs.title          "Tabs">
+<!ENTITY  paneContent.title       "Content">
+<!ENTITY  panePrivacy.title       "Privacy">
+<!ENTITY  paneSecurity.title      "Security">
+<!ENTITY  paneAdvanced.title      "Advanced">
+
+
+<!-- LOCALIZATION NOTE:
+     The entities below are old entities which probably will not be in v2.0.
+     Spend your time on other entities before localizing these, because they
+     are unlikely to be used and may even be removed.
+-->
+
+<!ENTITY  paneGeneral.title       "General">
+<!ENTITY  paneDownloads.title     "Downloads">
diff --git a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
index 479787d42dbc..4a5c54fe1865 100644
--- a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
@@ -1,3 +1,63 @@
+<!ENTITY  history.label "History">
+
+<!ENTITY  rememberBefore.label          "Remember visited pages for the last">
+<!ENTITY  rememberBefore.accesskey      "v">
+<!ENTITY  rememberAfter.label           "days.">
+
+<!ENTITY  rememberForms.label           "Remember what I enter in forms and the search bar">
+<!ENTITY  rememberForms.accesskey       "f">
+
+<!ENTITY  rememberDownloads.label       "Remember what I've downloaded">
+<!ENTITY  rememberDownloads.accesskey   "d">
+
+
+<!ENTITY  cookies.label                 "Cookies">
+
+<!ENTITY  acceptCookies.label           "Accept cookies from sites">
+<!ENTITY  acceptCookies.accesskey       "c">
+<!ENTITY  alwaysAsk.label               "Always ask before accepting a cookie">
+<!ENTITY  alwaysAsk.accesskey           "A">
+<!ENTITY  keepUntilClose.label          "Only keep the cookies until I close &brandShortName;">
+<!ENTITY  keepUntilClose.accesskey      "O">
+
+<!ENTITY  cookieExceptions.label        "Exceptions...">
+<!ENTITY  cookieExceptions.accesskey    "E">
+
+<!ENTITY  showCookies.label             "Show Cookies...">
+<!ENTITY  showCookies.accesskey         "S">
+
+
+<!ENTITY  passwords.label               "Passwords">
+
+<!ENTITY  rememberPasswords.label       "Remember passwords for sites">
+<!ENTITY  rememberPasswords.accesskey   "R">
+<!ENTITY  useMasterPassword.label       "Use a master password">
+<!ENTITY  useMasterPassword.accesskey   "U">
+
+<!ENTITY  passwordExceptions.label      "Exceptions...">
+<!ENTITY  passwordExceptions.accesskey  "x">
+
+<!ENTITY  masterPassword.label          "Set Master Password...">
+<!ENTITY  masterPassword.accesskey       "M">
+
+<!ENTITY  showPasswords.label            "Show Saved Passwords...">
+<!ENTITY  showPasswords.accesskey        "P">
+
+
+<!ENTITY  clearPrivateData.label         "Clear Private Data">
+
+<!ENTITY  alwaysClear.label              "Always clear my private data when I close &brandShortName;">
+<!ENTITY  alwaysClear.accesskey          "w">
+
+<!ENTITY  clearDataSettings.label        "Settings...">
+<!ENTITY  clearDataSettings.accesskey    "t">
+
+
+<!-- LOCALIZATION NOTE:
+     The entities below are old entities which probably will not be in v2.0.
+     Spend your time on other entities before localizing these, because they
+     are unlikely to be used and may even be removed.
+-->
 
 <!ENTITY  privacy.intro               "As you browse the web, &brandShortName; keeps information about where you have been, what you have done etc. in the following areas:">
 <!ENTITY  clear.label                 "Clear">
@@ -56,7 +116,6 @@
 <!ENTITY  enableCookies.label         "Allow sites to set Cookies">
 <!ENTITY  enableCookies.accesskey     "l">
 <!ENTITY  exceptions.label            "Exceptions">
-<!ENTITY  cookieExceptions.accesskey  "x">
 <!ENTITY  enableCookiesForOriginating.label 
                                       "for the originating site only">
 <!ENTITY  enableCookiesForOriginating.accesskey
diff --git a/browser/locales/en-US/chrome/browser/preferences/security.dtd b/browser/locales/en-US/chrome/browser/preferences/security.dtd
new file mode 100644
index 000000000000..d98cf06fa5ae
--- /dev/null
+++ b/browser/locales/en-US/chrome/browser/preferences/security.dtd
@@ -0,0 +1,20 @@
+<!ENTITY  warnAddonInstall.label        "Warn me when sites try to install add-ons">
+<!ENTITY  warnAddonInstall.accesskey    "W">
+<!ENTITY  checkPhish.label              "Check to see if the site I'm loading is a forgery">
+<!ENTITY  checkPhish.accesskey          "C">
+<!ENTITY  useCachedPhishList.label      "Use a list of known forgeries provided by">
+<!ENTITY  useCachedPhishList.accesskey  "U">
+<!ENTITY  checkPhishOnLoad.label        "Ask">
+<!ENTITY  checkPhishOnLoad.accesskey    "A">
+<!ENTITY  checkPhishOnLoadAfter.label   "to check every site I visit">
+
+<!ENTITY  addonExceptions.label         "Exceptions...">
+<!ENTITY  addonExceptions.accesskey     "E">
+
+
+<!ENTITY  warnings.label                "Warning Messages">
+
+<!ENTITY  chooseWarnings.label          "Choose which warning messages you want to see while browsing the web">
+
+<!ENTITY  warningSettings.label         "Settings...">
+<!ENTITY  warningSettings.accesskey     "S">
diff --git a/browser/locales/en-US/chrome/browser/preferences/tabs.dtd b/browser/locales/en-US/chrome/browser/preferences/tabs.dtd
index 9c1456a26ba2..7e4ad0f2fc7b 100644
--- a/browser/locales/en-US/chrome/browser/preferences/tabs.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/tabs.dtd
@@ -1,3 +1,27 @@
+<!ENTITY linksOpenIn.label            "When a link opens a new window, open it in:">
+<!ENTITY inNewWindow.label            "a new window">
+<!ENTITY inNewWindow.accesskey        "w">
+<!ENTITY inNewTab.label               "a new tab">
+<!ENTITY inNewTab.accesskey           "t">
+
+<!ENTITY warnCloseMultiple.label      "Warn me when I close a window with multiple tabs">
+<!ENTITY warnCloseMultiple.accesskey  "m">
+
+<!ENTITY warnOpenMany.label           "Warn me when I open lots of tabs at once">
+<!ENTITY warnOpenMany.accesskey       "o">
+
+<!ENTITY showTabBar.label             "Always show the tab bar">
+<!ENTITY showTabBar.accesskey         "b">
+
+<!ENTITY switchToNewTabs.label        "When I open a link in a new tab, switch to it immediately">
+<!ENTITY switchToNewTabs.accesskey    "s">
+
+
+<!-- LOCALIZATION NOTE:
+     The entities below are old entities which probably will not be in v2.0.
+     Spend your time on other entities before localizing these, because they
+     are unlikely to be used and may even be removed.
+-->
 
 <!ENTITY tabsTab.label                       "Tabs">
 <!ENTITY linkTargeting.label                 "Open links that would open new windows in:">