Bug 658987 - Update of en-GB locale for suite pref r=moz_en-gb
authorIan Neal <iann_cvs@blueyonder.co.uk>
Fri, 20 May 2011 14:46:50 +0100
changeset 113 942f1ab44e43d22ef272c646c04a2fdab29db326
parent 112 59abb0d5ed3dd0afe4cf4b471b8b05da642d5a02
child 114 282e90fd259bf418d7beadde14552d709d24161a
push id55
push useriann_cvs@blueyonder.co.uk
push dateMon, 30 May 2011 22:17:06 +0000
reviewersmoz_en-gb
bugs658987
Bug 658987 - Update of en-GB locale for suite pref r=moz_en-gb
suite/chrome/common/pref/pref-applications.dtd
suite/chrome/common/pref/pref-cache.dtd
suite/chrome/common/pref/pref-content.dtd
suite/chrome/common/pref/pref-download.dtd
suite/chrome/common/pref/pref-findasyoutype.dtd
suite/chrome/common/pref/pref-history.dtd
suite/chrome/common/pref/pref-http.dtd
suite/chrome/common/pref/pref-images.dtd
suite/chrome/common/pref/pref-keynav.dtd
suite/chrome/common/pref/pref-links.dtd
suite/chrome/common/pref/pref-navigator.dtd
suite/chrome/common/pref/pref-offline.dtd
suite/chrome/common/pref/pref-policies.dtd
suite/chrome/common/pref/pref-popups.dtd
suite/chrome/common/pref/pref-proxies-advanced.dtd
suite/chrome/common/pref/pref-search.dtd
suite/chrome/common/pref/pref-security.dtd
suite/chrome/common/pref/pref-smartupdate.dtd
suite/chrome/common/pref/pref-sync.dtd
suite/chrome/common/pref/pref-tabs.dtd
suite/chrome/common/pref/preferences.dtd
suite/chrome/common/pref/prefutilities.properties
--- a/suite/chrome/common/pref/pref-applications.dtd
+++ b/suite/chrome/common/pref/pref-applications.dtd
@@ -2,9 +2,9 @@
 <!ENTITY pref.applications.title "Helper Applications">
 
 <!ENTITY typeColumn.label        "Content Type">
 <!ENTITY typeColumn.accesskey    "T">
 
 <!ENTITY actionColumn2.label     "Action">
 <!ENTITY actionColumn2.accesskey "A">
 
-<!ENTITY search.emptytext        "Search Types and Actions">
+<!ENTITY search.placeholder      "Search Types and Actions">
--- a/suite/chrome/common/pref/pref-cache.dtd
+++ b/suite/chrome/common/pref/pref-cache.dtd
@@ -1,28 +1,27 @@
 <!-- extracted from content/pref-cache.xul -->
 
 <!--LOCALIZATION NOTE : FILE Cache prefs dialog -->
 <!ENTITY pref.cache.title                "Cache">
 <!ENTITY pref.cache.caption              "Set Cache Options">
 <!ENTITY cachePara                       "The cache keeps copies of frequently visited web pages on your hard disc. (Clicking Reload always shows you the latest version of a page.)">
-<!ENTITY diskCache.label                 "Size:">
-<!ENTITY diskCache.accesskey             "S">
-<!ENTITY mbytes                          "MB">
+<!ENTITY cacheCheck.label                "Let &brandShortName; manage the size of my cache">
+<!ENTITY cacheCheck.accesskey            "L">
+<!ENTITY diskCacheUpTo.label             "Use up to">
+<!ENTITY diskCacheUpTo.accesskey         "U">
+<!ENTITY spaceMbytes                     "MB of disc space for the cache">
 <!ENTITY diskCacheFolder.label           "Cache Folder Location:">
 <!ENTITY clearDiskCache.label            "Clear Cache">
 <!ENTITY clearDiskCache.accesskey        "C">
 <!ENTITY chooseDiskCacheFolder.label     "Choose Folder…">
 <!ENTITY chooseDiskCacheFolder.accesskey "F">
 <!ENTITY diskCacheFolderExplanation      "Cache files will be stored in a subfolder named &quot;Cache&quot; of the directory you specify. Restart &brandShortName; for changes to take effect.">
-<!ENTITY docCache                        "Compare the page in the cache to the page on the network:">
-<!ENTITY oncePsessionRadio.label         "Once per session">
-<!ENTITY oncePsessionRadio.accesskey     "O">
-<!ENTITY everyTimeRadio.label            "Every time I view the page">
-<!ENTITY everyTimeRadio.accesskey        "E">
-<!ENTITY neverRadio.label                "Never">
-<!ENTITY neverRadio.accesskey            "N">
-<!ENTITY autoRadio.label                 "When the page is out of date">
-<!ENTITY autoRadio.accesskey             "W">
+<!ENTITY docCache.label                  "Compare the page in the cache to the page on the network:">
+<!ENTITY docCache.accesskey              "m">
+<!ENTITY checkOncePerSession.label       "Once per session">
+<!ENTITY checkEveryTime.label            "Every time I view the page">
+<!ENTITY checkNever.label                "Never">
+<!ENTITY checkAutomatically.label        "When the page is out of date">
 
 <!ENTITY prefetchTitle.label             "Link Prefetching">
 <!ENTITY enablePrefetch.label            "Prefetch web pages when idle, so that links in web pages designed for prefetching can load more quickly">
 <!ENTITY enablePrefetch.accesskey        "P">
--- a/suite/chrome/common/pref/pref-content.dtd
+++ b/suite/chrome/common/pref/pref-content.dtd
@@ -2,21 +2,18 @@
 
 <!ENTITY pref.content.title                     "Content">
 <!ENTITY pref.content.description               "These settings influence how web site and message content appears in &brandShortName;.">
 <!ENTITY siteIcons.label                        "Web site icons">
 <!ENTITY useSiteIcons.label                     "Show web site icons">
 <!ENTITY useSiteIcons.accesskey                 "S">
 <!ENTITY useFavIcons.label                      "Aggressively look for web site icons when the page does not define one">
 <!ENTITY useFavIcons.accesskey                  "A">
-<!ENTITY tbIconsDescription.label               "Display web site icons in bookmarks menu and toolbar:">
-<!ENTITY tbIconsNever.label                     "Never show icons for bookmarks">
-<!ENTITY tbIconsNever.accesskey                 "N">
-<!ENTITY tbIconsCache.label                     "Only when web site was loaded recently">
-<!ENTITY tbIconsCache.accesskey                 "O">
-<!ENTITY tbIconsAlways.label                    "Always load web site icons for bookmarks">
-<!ENTITY tbIconsAlways.accesskey                "w">
 <!ENTITY enableAutomaticImageResizing.label     "Resize large images to fit in the browser window">
 <!ENTITY enableAutomaticImageResizing.accesskey "R">
 <!ENTITY useSmoothScroll.label                  "Use smooth scrolling">
 <!ENTITY useSmoothScroll.accesskey              "U">
+<!ENTITY allowHWAccel.label                     "Use hardware acceleration when available">
+<!ENTITY allowHWAccel.accesskey                 "e">
 <!ENTITY textZoomOnly.label                     "Zoom only text instead of full pages">
 <!ENTITY textZoomOnly.accesskey                 "Z">
+<!ENTITY blockAutoRefresh.label                 "Warn me when web sites try to redirect or reload the page">
+<!ENTITY blockAutoRefresh.accesskey             "W">
--- a/suite/chrome/common/pref/pref-download.dtd
+++ b/suite/chrome/common/pref/pref-download.dtd
@@ -13,24 +13,24 @@
 <!ENTITY downloadLocation.label         "When saving a file">
 <!ENTITY saveTo.label                   "Save files to">
 <!ENTITY saveTo.accesskey               "v">
 <!ENTITY chooseDownloadFolder.label     "Choose Folder…">
 <!ENTITY chooseDownloadFolder.accesskey "C">
 <!ENTITY alwaysAsk.label                "Always ask me where to save files">
 <!ENTITY alwaysAsk.accesskey            "A">
 
-<!ENTITY downloadRetention.label        "Download retention">
-<!ENTITY removeDownloads.label          "Remove downloads">
-<!ENTITY removeDownloads.accesskey      "R">
+<!ENTITY downloadHistory.label          "Download history">
+<!ENTITY removeEntries.label            "Remove download entries">
+<!ENTITY removeEntries.accesskey        "R">
 <!ENTITY whenCompleted.label            "When they have completed">
 <!ENTITY whenQuittingApp.label          "When quitting &brandShortName;">
 <!ENTITY neverRemove.label              "Never">
 
 <!ENTITY finishedBehavior.label         "When a download completes">
 <!ENTITY playSound.label                "Play a sound">
 <!ENTITY playSound.accesskey            "P">
 <!ENTITY showAlert.label                "Show an alert">
 <!ENTITY showAlert.accesskey            "S">
 <!ENTITY browse.label                   "Browse…">
 <!ENTITY browse.accesskey               "B">
-<!ENTITY preview.label                  "Preview">
-<!ENTITY preview.accesskey              "e">
+<!ENTITY playButton.label               "Play">
+<!ENTITY playButton.accesskey           "l">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/pref/pref-findasyoutype.dtd
@@ -0,0 +1,17 @@
+<!ENTITY pref.findAsYouType.title "Find As You Type">
+<!ENTITY findAsYouTypeBehavior.label "Find As You Type">
+<!ENTITY findAsYouTypeTip.label "Tip: To manually start Find As You Type, type / to find text or ' to find links, followed by the text you want to find.">
+<!ENTITY findAsYouTypeTimeout.label "Clear the current search after a few seconds of inactivity">
+<!ENTITY findAsYouTypeTimeout.accesskey "C">
+<!ENTITY findAsYouTypeSound.label "Play a sound when typed text isn't found">
+<!ENTITY findAsYouTypeSound.accesskey "P">
+<!ENTITY findAsYouTypeEnableAuto.label "Find automatically when typing within a web page:">
+<!ENTITY findAsYouTypeEnableAuto.accesskey "F">
+<!ENTITY findAsYouTypeAutoText.label "Any text in the page">
+<!ENTITY findAsYouTypeAutoText.accesskey "A">
+<!ENTITY findAsYouTypeAutoLinks.label "Links only">
+<!ENTITY findAsYouTypeAutoLinks.accesskey "L">
+
+<!ENTITY findAsYouTypeFindbarEnable.label "Show the find toolbar during find as you type">
+<!ENTITY findAsYouTypeFindbarEnable.accesskey "S">
+<!ENTITY findAsYouTypeFindbarEnableTip.label "Note: Find as you type without showing the findbar does not allow international text entry.">
--- a/suite/chrome/common/pref/pref-history.dtd
+++ b/suite/chrome/common/pref/pref-history.dtd
@@ -1,21 +1,14 @@
 <!ENTITY  pref.history.title                "History">
 
 <!ENTITY  pref.history.caption              "Browsing History">
 <!ENTITY  historyPages.label                "History is a list of previously visited pages.">
-<!ENTITY  expireDaysMin1.label              "Always remember visited pages for at least">
-<!ENTITY  expireDaysMin1.accesskey          "R">
-<!ENTITY  expireDaysMin2.label              "days">
-<!ENTITY  expireDays1.label                 "Remember visited pages for up to">
-<!ENTITY  expireDays1.accesskey             "e">
-<!ENTITY  expireDays2.label                 "days">
-<!ENTITY  expireSites1.label                "Remember up to">
-<!ENTITY  expireSites1.accesskey            "m">
-<!ENTITY  expireSites2.label                "visited pages">
+<!ENTITY  enableHistory.label               "Remember visited pages">
+<!ENTITY  enableHistory.accesskey           "R">
 <!ENTITY  clearHistory.label                "Clear History">
 <!ENTITY  clearHistory.accesskey            "s">
 
 <!ENTITY  locationBarHistory.caption        "Location Bar History">
 <!ENTITY  clearLocationBar.label            "Clear the list of sites stored in the location bar menu.">
 <!ENTITY  clearLocationBarButton.label      "Clear Location Bar">
 <!ENTITY  clearLocationBarButton.accesskey  "L">
 <!ENTITY  formfillHistory.caption           "Form and Search History">
--- a/suite/chrome/common/pref/pref-http.dtd
+++ b/suite/chrome/common/pref/pref-http.dtd
@@ -12,8 +12,11 @@
 <!ENTITY prefEnableKeepAlive.label           "Enable Keep-Alive">
 <!ENTITY prefEnableKeepAlive.accesskey       "K">
 <!ENTITY prefEnableKeepAliveProxy.accesskey  "A">
 <!ENTITY prefEnablePipelining.label          "Enable Pipelining">
 <!ENTITY prefEnablePipelining.accesskey      "P">
 <!ENTITY prefEnablePipeliningProxy.accesskey "N">
 <!ENTITY prefPara                            "HTTP connections may be fine-tuned using these options to enhance either performance or compatibility. Some proxy servers, for example, are known to require HTTP/1.0 (see the release notes for details).">
 <!ENTITY prefPipeWarning                     "WARNING: pipelining is an experimental feature, designed to improve page-load performance, that is unfortunately not well supported by some web servers and proxies.">
+<!ENTITY prefUseragent.label                 "User Agent String">
+<!ENTITY prefFirefoxCompat.label             "Advertise Firefox compatibility">
+<!ENTITY prefFirefoxCompat.accesskey         "F">
--- a/suite/chrome/common/pref/pref-images.dtd
+++ b/suite/chrome/common/pref/pref-images.dtd
@@ -3,23 +3,23 @@
 <!ENTITY imageBlocking.label            "Image Acceptance Policy">
 
 <!--LOCALIZATION NOTE (onStartLegend.label): Don't translate "&brandShortName;".
     Place "&brandShortName;" in the phrase where the name of the application should
 	 appear
 -->
 <!ENTITY imageDetails                   "Specify how &brandShortName; handles images.">
 
-<!ENTITY accAllImagesRadio.label        "Accept all images">
-<!ENTITY accAllImagesRadio.accesskey    "A">
-<!ENTITY accOrgImagesRadio.label        "Accept images that come from the originating server only">
-<!ENTITY accOrgImagesRadio.accesskey    "r">
-<!ENTITY disableImages.label            "Do not load any images">
-<!ENTITY disableImages.accesskey        "n">
-<!ENTITY viewImages.label               "Manage Image Permissions">
-<!ENTITY viewImages.accesskey           "P">
+<!ENTITY loadAllImagesRadio.label       "Load all images">
+<!ENTITY loadAllImagesRadio.accesskey   "L">
+<!ENTITY loadOrgImagesRadio.label       "Only load images that come from the originating server">
+<!ENTITY loadOrgImagesRadio.accesskey   "n">
+<!ENTITY loadNoImagesRadio.label        "Do not load any images">
+<!ENTITY loadNoImagesRadio.accesskey    "D">
+<!ENTITY viewPermissions.label          "Manage Permissions">
+<!ENTITY viewPermissions.accesskey      "P">
 <!ENTITY animLoopingTitle.label         "Animated images should loop">
 <!ENTITY animLoopAsSpecified.label      "As many times as the image specifies">
 <!ENTITY animLoopAsSpecified.accesskey  "m">
 <!ENTITY animLoopOnce.label             "Once">
 <!ENTITY animLoopOnce.accesskey         "O">
 <!ENTITY animLoopNever.label            "Never">
 <!ENTITY animLoopNever.accesskey        "v">
--- a/suite/chrome/common/pref/pref-keynav.dtd
+++ b/suite/chrome/common/pref/pref-keynav.dtd
@@ -1,21 +1,16 @@
 <!ENTITY pref.keyNav.title "Keyboard Navigation">
 <!ENTITY tabNavigationBehavior.label "Tab Key Navigation">
 <!ENTITY tabNavigationLinks.label "Links">
 <!ENTITY tabNavigationLinks.accesskey "L">
 <!ENTITY tabNavigationForms.label "Buttons, radio buttons, tickboxes, and selection lists">
 <!ENTITY tabNavigationForms.accesskey "B">
 <!ENTITY tabNavigationTextboxes.label "Note: text boxes and scrollable regions are always part of the tabbing order.">
 <!ENTITY tabNavigationDesc.label "When Tab or Shift+Tab is pressed, move between:">
-<!ENTITY findAsYouTypeBehavior.label "Find As You Type">
-<!ENTITY findAsYouTypeTip.label "Tip: To manually start Find As You Type, type / to find text or ' to find links, followed by the text you want to find.">
-<!ENTITY findAsYouTypeTimeout.label "Clear the current search after a few seconds of inactivity">
-<!ENTITY findAsYouTypeTimeout.accesskey "C">
-<!ENTITY findAsYouTypeSound.label "Play a sound when typed text isn't found">
-<!ENTITY findAsYouTypeSound.accesskey "P">
-<!ENTITY findAsYouTypeEnableAuto.label "Find automatically when typing within a web page:">
-<!ENTITY findAsYouTypeEnableAuto.accesskey "F">
-<!ENTITY findAsYouTypeAutoText.label "Any text in the page">
-<!ENTITY findAsYouTypeAutoText.accesskey "A">
-<!ENTITY findAsYouTypeAutoLinks.label "Links only">
-<!ENTITY findAsYouTypeAutoLinks.accesskey "o">
-
+<!ENTITY accessibilityBrowseWithCaret.label "Browse With Caret">
+<!ENTITY browseWithCaretDesc.label "Caret browsing enables you to navigate and select within pages using the cursor keys to move a visible caret.">
+<!ENTITY browseWithCaretUse.label "Use caret browsing">
+<!ENTITY browseWithCaretUse.accesskey "U">
+<!ENTITY browseWithCaretShortCut.label "Use the F7 shortcut to toggle caret browsing">
+<!ENTITY browseWithCaretShortCut.accesskey "F">
+<!ENTITY browseWithCaretWarn.label "Warn me before turning on caret browsing">
+<!ENTITY browseWithCaretWarn.accesskey "W">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/pref/pref-links.dtd
@@ -0,0 +1,25 @@
+<!ENTITY linksHeader.label "Link Behaviour">
+<!ENTITY newWindow.label "Link open behaviour">
+<!ENTITY newWindowDescription.label "Open links meant to open a new window in:">
+<!ENTITY newWindowRestriction.label "When scripts want to open a new window:">
+<!ENTITY external.label "Links from other applications">
+<!ENTITY externalDescription.label "Open links passed from other applications in:">
+
+<!ENTITY openCurrent.label "The current tab/window">
+<!ENTITY newWindowGroupCurrent.accesskey "c">
+<!ENTITY externalGroupCurrent.accesskey "u">
+
+<!ENTITY openTab.label "A new tab in the current window">
+<!ENTITY newWindowGroupTab.accesskey "t">
+<!ENTITY externalGroupTab.accesskey "a">
+
+<!ENTITY openWindow.label "A new window">
+<!ENTITY newWindowGroupWindow.accesskey "w">
+<!ENTITY externalGroupWindow.accesskey "o">
+
+<!ENTITY divertAll.label "Always divert windows into tabs">
+<!ENTITY divertAll.accesskey "d">
+<!ENTITY divertNoFeatures.label "Don't divert custom windows into tabs">
+<!ENTITY divertNoFeatures.accesskey "s">
+<!ENTITY dontDivert.label "Always open new windows">
+<!ENTITY dontDivert.accesskey "n">
--- a/suite/chrome/common/pref/pref-navigator.dtd
+++ b/suite/chrome/common/pref/pref-navigator.dtd
@@ -21,22 +21,14 @@
 <!ENTITY useCurrent.accesskey           "U">
 <!ENTITY useCurrentGroup.label          "Use Current Group">
 <!ENTITY useCurrentGroup.accesskey      "G">
 <!ENTITY browseFile.label               "Choose File…">
 <!ENTITY browseFile.accesskey           "C">
 <!ENTITY useDefault.label               "Restore Default">
 <!ENTITY useDefault.accesskey           "R">
 
-<!ENTITY toolbarIntro.label             "Select the buttons you want to see in the toolbars:">
-
-<!ENTITY navToolbarIntro.label          "Navigation Toolbar">
-<!ENTITY goButton.label                 "Go">
-<!ENTITY goButton.accesskey             "o">
-<!ENTITY searchButton.label             "Search">
-<!ENTITY searchButton.accesskey         "S">
-
 <!ENTITY defaultBrowserGroup.label      "Default Browser">
 <!ENTITY defaultBrowserButton.label     "Set Default Browser">
 <!ENTITY defaultBrowserButton.accesskey "D">
 <!ENTITY alreadyDefaultText             "&brandShortName; is already your default browser.">
 <!ENTITY defaultPendingText             "&brandShortName; will be set as your default browser when you click OK.">
 <!ENTITY makeDefaultText                "Set &brandShortName; as your default browser.">
deleted file mode 100644
--- a/suite/chrome/common/pref/pref-offline.dtd
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- extracted from content/pref-offline.xul -->
-
-<!--LOCALIZATION NOTE : FILE The 'Offline' preferences dialog -->
-<!ENTITY window.title  "Offline">
-<!ENTITY boxHeader  "Offline">
-<!ENTITY rHeader  "Offline">
-<!--LOCALIZATION NOTE (textStart): Don't translate "&brandShortName;".
-    Place "&brandShortName;" in the phrase where the name of the application should
-	 appear
--->
-<!ENTITY textStart   "When starting &brandShortName;:">
-<!ENTITY radioAskMode  "Ask me if I want online or offline mode">
-<!ENTITY radioUsePrev  "Use my previous online/offline state"> 
--- a/suite/chrome/common/pref/pref-policies.dtd
+++ b/suite/chrome/common/pref/pref-policies.dtd
@@ -1,16 +1,16 @@
 
 <!ENTITY  pref.policies.title "Security Policies">
 
 <!ENTITY  zoneIntro.label     "&brandShortName; allows you to create policies that determine what access certain web sites have to various functionality, including aspects of scripting and Java.">
 
 <!ENTITY  policies.label      "Policies:">
 <!ENTITY  default.label       "Default Policy">
-<!ENTITY  allWebsites.label   "All Websites">
+<!ENTITY  allWebsites.label   "All Web Sites">
 <!ENTITY  trusted.label       "Trusted Sites">
 <!ENTITY  annoyances.label    "Common Annoyances">
 <!ENTITY  restricted.label    "Restricted Sites">
 
 <!ENTITY  addSite.label       "Add Site…">
 <!ENTITY  addSite.accesskey   "a">
 <!ENTITY  settings.label      "Settings for ">
 <!ENTITY  settings.accesskey  "s">
--- a/suite/chrome/common/pref/pref-popups.dtd
+++ b/suite/chrome/common/pref/pref-popups.dtd
@@ -1,30 +1,30 @@
 <!ENTITY pref.popups.title              "Popup Windows">
 
 <!ENTITY pref.popups.caption            "Popup Windows">
 
 <!ENTITY popupBlock.label               "Block unrequested popup windows">
 <!ENTITY popupBlock.accesskey           "B">
 
-<!ENTITY popupExceptions.label          "Allowed Sites…">
-<!ENTITY popupExceptions.accesskey      "A">
+<!ENTITY viewPermissions.label          "Manage Permissions">
+<!ENTITY viewPermissions.accesskey      "M">
 
 <!ENTITY whenBlock.description          "When a popup window has been blocked:">
 <!ENTITY playSound.label                "Play a sound:">
 <!ENTITY playSound.accesskey            "P">
 <!ENTITY systemSound.label              "System beep">
 <!ENTITY systemSound.accesskey          "S">
 <!ENTITY customSound.label              "Custom sound file">
 <!ENTITY customSound.accesskey          "C">
 
 <!ENTITY selectSound.label              "Browse…">
 <!ENTITY selectSound.accesskey          "o">
-<!ENTITY previewSound.label             "Preview">
-<!ENTITY previewSound.accesskey         "v">
+<!ENTITY playSoundButton.label          "Play">
+<!ENTITY playSoundButton.accesskey      "l">
 <!ENTITY selectSound.title              "Select Popup Block Sound">
 <!ENTITY selectSound.filter             "Sounds">
 
 <!ENTITY displayIcon.label              "Display an icon in the browser status bar">
 <!ENTITY displayIcon.accesskey          "D">
 
 <!ENTITY displayNotification.label      "Display a notification bar at the top of the content area">
 <!ENTITY displayNotification.accesskey  "N">
--- a/suite/chrome/common/pref/pref-proxies-advanced.dtd
+++ b/suite/chrome/common/pref/pref-proxies-advanced.dtd
@@ -3,25 +3,22 @@
 <!ENTITY  protocols.caption           "Protocol-Specific Proxies">
 <!ENTITY  protocols.description       "Normally the same proxy can handle all protocols listed here.">
 <!ENTITY  http.label                  "HTTP Proxy:">
 <!ENTITY  http.accesskey              "x">
 <!ENTITY  ssl.label                   "SSL Proxy:">
 <!ENTITY  ssl.accesskey               "L">
 <!ENTITY  ftp.label                   "FTP Proxy:">
 <!ENTITY  ftp.accesskey               "F">
-<!ENTITY  gopher.label                "Gopher Proxy:">
-<!ENTITY  gopher.accesskey            "G">
 <!ENTITY  reuseProxy.label            "Use HTTP Proxy settings for all protocols">
 <!ENTITY  reuseProxy.accesskey        "U">
 <!ENTITY  port.label                  "Port:">
 <!ENTITY  HTTPPort.accesskey          "P">
 <!ENTITY  SSLPort.accesskey           "o">
 <!ENTITY  FTPPort.accesskey           "r">
-<!ENTITY  gopherPort.accesskey        "">
 
 <!ENTITY  socks.caption               "Generic Proxy">
 <!ENTITY  socks.description           "A SOCKS proxy is a generic proxy sometimes used in corporate or similar environments.">
 <!ENTITY  socks.label                 "SOCKS Proxy:">
 <!ENTITY  socks.accesskey             "S">
 <!ENTITY  socks4.label                "SOCKS v4">
 <!ENTITY  socks4.accesskey            "C">
 <!ENTITY  socks5.label                "SOCKS v5">
--- a/suite/chrome/common/pref/pref-search.dtd
+++ b/suite/chrome/common/pref/pref-search.dtd
@@ -2,22 +2,18 @@
 
 <!-- LOCALIZATION NOTE : FILE The Search prefs dialog -->
 
 <!ENTITY pref.search.title                "Internet Search">
 <!ENTITY legendHeader                     "Default Search Engine">
 <!ENTITY defaultSearchEngine.label        "Search using:">
 <!ENTITY defaultSearchEngine.accesskey    "S">
 
-<!ENTITY openSidebarSearchPanel.label     "Open the Search tab in the Sidebar when a search is invoked">
-<!ENTITY openSidebarSearchPanel.accesskey "O">
-
-<!ENTITY openContextSearchTab.label       "Open a tab instead of a window for a context menu web search">
-<!ENTITY openContextSearchTab.accesskey   "t">
+<!ENTITY engineManager.label              "Manage Search Engines…">
 
 <!ENTITY searchResults.label              "Search Results">
 
-<!ENTITY sidebarSearchTabPref.label       "Sidebar Search Tab Preference">
-<!ENTITY searchModeBasic.label            "Basic">
-<!ENTITY searchModeBasic.accesskey        "B">
-<!ENTITY searchModeAdvanced.label         "Advanced">
-<!ENTITY searchModeAdvanced.accesskey     "A">
-
+<!ENTITY openInTab.label                  "Open new tabs for sidebar search results">
+<!ENTITY openInTab.accesskey              "n">
+<!ENTITY openContextSearchTab.label       "Open a tab instead of a window for a context menu web search">
+<!ENTITY openContextSearchTab.accesskey   "t">
+<!ENTITY openSidebarSearchPanel.label     "Open the Search tab in the Sidebar when a search is invoked">
+<!ENTITY openSidebarSearchPanel.accesskey "O">
--- a/suite/chrome/common/pref/pref-security.dtd
+++ b/suite/chrome/common/pref/pref-security.dtd
@@ -32,16 +32,21 @@
    - 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 ***** -->
 
 <!--LOCALIZATION NOTE : FILE 'Privacy and Security' prefs settings -->
 <!ENTITY pref.security.title              "Privacy &amp; Security">
+
+<!ENTITY tracking.label                   "User Tracking">
+<!ENTITY doNotTrack.label                 "Tell web sites I do not want to be tracked">
+<!ENTITY doNotTrack.accesskey             "T">
+
 <!ENTITY privateData.label                "Private Data">
 
 <!ENTITY alwaysClear.label                "Always clear my private data when I close &brandShortName;">
 <!ENTITY alwaysClear.accesskey            "w">
 
 <!ENTITY askBeforeClear.label             "Ask me before clearing private data">
 <!ENTITY askBeforeClear.accesskey         "A">
 
--- a/suite/chrome/common/pref/pref-smartupdate.dtd
+++ b/suite/chrome/common/pref/pref-smartupdate.dtd
@@ -1,22 +1,29 @@
 <!--LOCALIZATION NOTE : FILE UI for Software Updates prefs -->
 <!ENTITY pref.smartUpdate.title               "Software Installation">
-<!ENTITY smartTitle.label                     "Manage Software Installations and Updates">
-<!ENTITY enableSU.label                       "Allow web sites to install extensions and updates">
-<!ENTITY enableSU.accesskey                   "e">
-<!ENTITY allowedSites.label                   "Allowed Sites">
-<!ENTITY allowedSites.accesskey               "A">
+<!ENTITY addOnsTitle.label                    "Add-ons">
+<!ENTITY addOnsAllow.label                    "Allow web sites to install add-ons and updates">
+<!ENTITY addOnsAllow.accesskey                "b">
+<!ENTITY allowedSitesLink.label               "Allowed Web Sites">
+<!ENTITY autoAddOnsUpdates.label              "Automatically check for updates">
+<!ENTITY autoAddOnsUpdates.accesskey          "o">
+<!ENTITY daily.label                          "daily">
+<!ENTITY addOnsDaily.accesskey                "d">
+<!ENTITY weekly.label                         "weekly">
+<!ENTITY addOnsWeekly.accesskey               "k">
+<!ENTITY addOnsModeAutomatic.label            "Automatically download and install the updates">
+<!ENTITY addOnsModeAutomatic.accesskey        "m">
+<!ENTITY enablePersonalized.label             "Personalise add-on recommendations">
+<!ENTITY enablePersonalized.accesskey         "P">
+<!ENTITY addonManagerLink.label               "Manage Add-ons">
 
-<!ENTITY verifyUpdates.caption                "Updates">
-<!ENTITY autoUpdates.label                    "Automatically check for updates to:">
-<!ENTITY appUpdates.label                     "&brandShortName;">
-<!ENTITY appUpdates.accesskey                 "S">
-<!ENTITY daily.label                          "daily">
-<!ENTITY appDaily.accesskey                   "d">
-<!ENTITY weekly.label                         "weekly">
-<!ENTITY appWeekly.accesskey                  "w">
-<!ENTITY extensionsUpdates.label              "Installed Add-ons">
-<!ENTITY extensionsUpdates.accesskey          "n">
-<!ENTITY extensionsDaily.accesskey            "i">
-<!ENTITY extensionsWeekly.accesskey           "k">
-<!ENTITY addonManagerButton.label             "Add-on Manager">
-<!ENTITY addonManagerButton.accesskey         "M">
+<!ENTITY appUpdates.caption                   "&brandShortName;">
+<!ENTITY autoAppUpdates.label                 "Automatically check for updates">
+<!ENTITY autoAppUpdates.accesskey             "t">
+<!ENTITY appDaily.accesskey                   "a">
+<!ENTITY appWeekly.accesskey                  "e">
+<!ENTITY appModeAutomatic.label               "Automatically download and install the update">
+<!ENTITY appModeAutomatic.accesskey           "u">
+<!ENTITY appModeAutoAddonWarn.label           "Warn me if this will disable any of my add-ons">
+<!ENTITY appModeAutoAddonWarn.accesskey       "n">
+<!ENTITY updateHistoryButton.label            "Show Update History…">
+<!ENTITY updateHistoryButton.accesskey        "S">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/pref/pref-sync.dtd
@@ -0,0 +1,50 @@
+<!-- The page shown when not logged in... -->
+<!ENTITY setupButton.label          "Set Up &syncBrand.fullName.label;">
+<!ENTITY setupButton.accesskey      "S">
+<!ENTITY weaveDesc.label            "&syncBrand.fullName.label; lets you access your history, bookmarks, passwords and open tabs across all your devices.">
+
+<!-- The page shown when logged in... -->
+<!ENTITY accountGroupboxCaption.label "&syncBrand.fullName.label; Account">
+<!ENTITY accountName.label            "Account Name:">
+
+<!-- Login error feedback -->
+<!ENTITY updatePass.label             "Update">
+<!ENTITY updatePass.accesskey         "U">
+<!ENTITY resetPass.label              "Reset">
+<!ENTITY resetPass.accesskey          "R">
+
+<!-- Manage Account -->
+<!ENTITY manageAccount.label          "Manage Account">
+<!ENTITY manageAccount.accesskey      "A">
+<!ENTITY viewQuota.label              "View Quota">
+<!ENTITY viewQuota.accesskey          "V">
+<!ENTITY changePassword.label         "Change Password">
+<!ENTITY changePassword.accesskey     "C">
+<!ENTITY mySyncKey.label              "My Sync Key">
+<!ENTITY mySyncKey.accesskey          "M">
+<!ENTITY resetSync.label              "Reset Sync">
+<!ENTITY resetSync.accesskey          "R">
+<!ENTITY deactivateDevice.label       "Deactivate This Device">
+<!ENTITY deactivateDevice.accesskey   "D">
+<!ENTITY addDevice.label              "Add a Device">
+<!ENTITY addDevice.accesskey          "A">
+
+<!-- Sync Settings -->
+<!ENTITY syncComputerName.label       "Computer Name:">
+<!ENTITY syncComputerName.accesskey   "N">
+
+<!ENTITY syncMy2.label              "Synchronise My:">
+<!ENTITY engine.bookmarks.label     "Bookmarks">
+<!ENTITY engine.bookmarks.accesskey "B">
+<!ENTITY engine.tabs.label          "Tabs">
+<!ENTITY engine.tabs.accesskey      "T">
+<!ENTITY engine.history.label       "History">
+<!ENTITY engine.history.accesskey   "r">
+<!ENTITY engine.passwords.label     "Passwords">
+<!ENTITY engine.passwords.accesskey "w">
+<!ENTITY engine.prefs.label         "Preferences">
+<!ENTITY engine.prefs.accesskey     "P">
+
+<!-- Footer stuff -->
+<!ENTITY prefs.tosLink.label        "Terms of Service">
+<!ENTITY prefs.ppLink.label         "Privacy Policy">
--- a/suite/chrome/common/pref/pref-tabs.dtd
+++ b/suite/chrome/common/pref/pref-tabs.dtd
@@ -1,28 +1,16 @@
 <!ENTITY tabHeader.label "Tabbed Browsing">
 <!ENTITY tabDisplay.label "Tab Display">
 <!ENTITY autoHide.label "Hide the tab bar when only one tab is open">
 <!ENTITY autoHide.accesskey "d">
 <!ENTITY background.label "Switch to new tabs opened from links">
 <!ENTITY background.accesskey "S">
 <!ENTITY warnOnClose.label "Warn me when closing a window with multiple tabs">
 <!ENTITY warnOnClose.accesskey "n">
+<!ENTITY relatedAfterCurrent.label "Open related tabs after current tab">
+<!ENTITY relatedAfterCurrent.accesskey "O">
 <!ENTITY loadGroup.label "When opening a bookmark group">
 <!ENTITY loadGroupAppend.label "Add tabs">
 <!ENTITY loadGroupAppend.accesskey "A">
 <!ENTITY loadGroupReplace.label "Replace existing tabs">
 <!ENTITY loadGroupReplace.accesskey "R">
 <!ENTITY openTabs.label "Open tabs instead of windows for">
-
-<!ENTITY newWindow.label "Link open behaviour">
-<!ENTITY newWindowDescription.label "Open links meant to open a new window in">
-<!ENTITY external.label "Links from other applications">
-<!ENTITY externalDescription.label "Open links passed from other applications in">
-<!ENTITY openCurrent.label "The current tab/window">
-<!ENTITY newWindowGroupCurrent.accesskey "c">
-<!ENTITY externalGroupCurrent.accesskey "u">
-<!ENTITY openTab.label "A new tab in the current window">
-<!ENTITY newWindowGroupTab.accesskey "n">
-<!ENTITY externalGroupTab.accesskey "e">
-<!ENTITY openWindow.label "A new window">
-<!ENTITY newWindowGroupWindow.accesskey "w">
-<!ENTITY externalGroupWindow.accesskey "o">
--- a/suite/chrome/common/pref/preferences.dtd
+++ b/suite/chrome/common/pref/preferences.dtd
@@ -6,32 +6,35 @@
 <!ENTITY fonts.label "Fonts">
 <!ENTITY colors.label "Colours">
 <!ENTITY navigator.label "Browser">
 <!ENTITY history.label "History">
 <!ENTITY languages.label "Languages">
 <!ENTITY applications.label "Helper Applications">
 <!ENTITY locationBar.label "Location Bar">
 <!ENTITY tabWindows.label "Tabbed Browsing">
+<!ENTITY links.label "Link Behaviour">
 <!ENTITY offline.label "Offline">
 <!ENTITY security.label "Privacy &amp; Security">
 <!ENTITY cookies.label "Cookies">
 <!ENTITY images.label "Images">
 <!ENTITY popups.label "Popup Windows">
 <!ENTITY passwords.label "Passwords">
 <!ENTITY masterpass.label "Master Passwords">
 <!ENTITY ssl.label "SSL">
 <!ENTITY certs.label "Certificates">
 <!ENTITY validation.label "Validation">
+<!ENTITY sync.label "Sync">
 <!ENTITY advance.label "Advanced">
 <!ENTITY down.label "Download">
 <!ENTITY cache.label "Cache">
 <!ENTITY proxies.label "Proxies">
 <!ENTITY httpnetworking.label "HTTP Networking">
 <!ENTITY smart.label "Software Installation">
 <!ENTITY download.label "Downloads">
 <!ENTITY keynav.label "Keyboard Navigation">
+<!ENTITY findAsYouType.label "Find As You Type">
 <!ENTITY search.label "Internet Search">
 <!ENTITY policies.label "Security Policies">
 <!ENTITY mousewheel.label "Mouse Wheel">
 <!ENTITY scriptsAndWindows.label "Scripts &amp; Plugins">
 
 <!ENTITY focusSearch.key "f">
--- a/suite/chrome/common/pref/prefutilities.properties
+++ b/suite/chrome/common/pref/prefutilities.properties
@@ -1,10 +1,18 @@
 cachefolder=Choose Cache Folder
+#LOCALIZATION NOTE (%1$S) is the size and (%2$S) is the unit of disc space.
+cacheSizeInfo=Your cache is currently using %1$S %2$S of disc space.
 choosehomepage=Choose Home Page
 downloadfolder=Choose a Download Folder
 desktopFolderName=Desktop
 downloadsFolderName=Downloads
 choosesound=Choose a sound
 
 SoundFiles=Sounds
 
 labelDefaultFont=Default (%font_family%)
+
+stopUsingAccount.title=Do you want to stop using this account?
+differentAccount.label=This will reset all of your Sync account information and preferences.
+differentAccountConfirm.label=Reset All Information
+
+preferencesAccount=Preferences for %S profile