Sync with trunk
authorEduardo Trápani <eduardo@esperanto.org.uy>
Tue, 28 Sep 2010 12:59:22 -0300
changeset 85 6ed25c6f65cbe9b77026a532379bb3acd88df1d2
parent 84 6ade35e746a0e37e6e1cbcd93c70f726ed2e2152
child 86 1834aa43e7697d72082809c675c01299817fe129
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:46:40 +0000
Sync with trunk
browser/chrome/browser-region/region.properties
browser/chrome/browser/aboutDialog.dtd
browser/chrome/browser/aboutPrivateBrowsing.dtd
browser/chrome/browser/aboutSessionRestore.dtd
browser/chrome/browser/baseMenuOverlay.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/inspector.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/pageInfo.properties
browser/chrome/browser/pageReportFirstTime.dtd
browser/chrome/browser/preferences/advanced-scripts.dtd
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/main.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/privacy.dtd
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/sanitize.dtd
browser/chrome/browser/search.properties
browser/chrome/browser/syncGenericChange.properties
browser/chrome/browser/syncSetup.dtd
browser/chrome/browser/syncSetup.properties
browser/chrome/overrides/netError.dtd
browser/feedback/main.dtd
dom/chrome/dom/dom.properties
dom/chrome/layout/MediaDocument.properties
dom/chrome/netError.dtd
dom/chrome/security/caps.properties
dom/chrome/xslt/xslt.properties
other-licenses/branding/firefox/brand.dtd
security/manager/chrome/pipnss/nsserrors.properties
services/sync/errors.properties
services/sync/sync.properties
toolkit/chrome/global/aboutRights.dtd
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/commonDialogs.properties
toolkit/chrome/global/headsUpDisplay.properties
toolkit/chrome/global/xpinstall/xpinstall.properties
toolkit/chrome/mozapps/extensions/extensions.dtd
toolkit/chrome/mozapps/extensions/extensions.properties
toolkit/chrome/mozapps/update/updates.dtd
toolkit/chrome/mozapps/update/updates.properties
toolkit/chrome/passwordmgr/passwordmgr.properties
--- a/browser/chrome/browser-region/region.properties
+++ b/browser/chrome/browser-region/region.properties
@@ -4,17 +4,17 @@ browser.search.defaultenginename=Google
 # Search engine order (order displayed in the search bar dropdown)s
 browser.search.order.1=Google
 browser.search.order.2=Yahoo
 
 # This is the default set of web based feed handlers shown in the reader
 # selection UI
 browser.contentHandlers.types.0.title=Netvibes
 browser.contentHandlers.types.0.uri=http://www.netvibes.com/subscribe.php?url=%s
-browser.contentHandlers.types.1.title=Bloglines
+browser.contentHandlers.types.1.title=My Yahoo!
 browser.contentHandlers.types.1.uri=http://www.bloglines.com/login?r=/sub/%s
 browser.contentHandlers.types.2.title=My Yahoo
 browser.contentHandlers.types.2.uri=http://add.my.yahoo.com/rss?url=%s
 
 # URL for site-specific search engines
 # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
 # to be searched and the user's search query. Place them in the appropriate location
 # for your locale's URL but do not translate them.
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -1,11 +1,23 @@
 <!ENTITY aboutDialog.title          "Pri &brandFullName;">
-<!ENTITY copyright                  "Agnosko">
-<!ENTITY copyright.accesskey        "K">
-<!ENTITY copyrightGNOME.accesskey   "r">
-<!ENTITY aboutLink                  "&lt; Pri &brandFullName;">
-<!ENTITY aboutLink.accesskey        "A">
-<!ENTITY aboutVersion               "versio">
-<!ENTITY closeCmdGNOME.label        "Fermi">  
-<!ENTITY closeCmdGNOME.accesskey    "F">
-<!ENTITY licenseLinkText            "Permesila informo">
-<!ENTITY licenseLinkSuffix          ".">
+
+<!ENTITY community.start2           "&brandShortName; is designed by ">
+<!-- LOCALIZATION NOTE (community.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
+<!ENTITY community.mozillaLink      "&vendorShortName;">
+<!ENTITY community.middle2          ", a ">
+<!-- LOCALIZATION NOTE (community.creditsLink): This is a link title that links to about:credits. -->
+<!ENTITY community.creditsLink      "global community">
+<!ENTITY community.end2             " working together to make the Internet better. We believe that the Internet should be open, public, and accessible to everyone without any restrictions.">
+
+<!ENTITY contribute.start           "Sound interesting? ">
+<!-- LOCALIZATION NOTE (contribute.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
+<!ENTITY contribute.getInvolvedLink "Get involved!">
+<!ENTITY contribute.end             "">
+
+<!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
+<!ENTITY bottomLinks.license        "Licensing Information">
+
+<!-- LOCALIZATION NOTE (bottomLinks.rights): This is a link title that links to about:rights. -->
+<!ENTITY bottomLinks.rights         "End User Rights">
+
+<!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to http://www.mozilla.com/legal/privacy/. -->
+<!ENTITY bottomLinks.privacy        "Privacy Policy">
--- a/browser/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/browser/chrome/browser/aboutPrivateBrowsing.dtd
@@ -10,13 +10,15 @@
 <!-- LOCALIZATION NOTE (privatebrowsingpage.clearRecentHistoryAfter): include a starting space as needed -->
 <!ENTITY privatebrowsingpage.clearRecentHistoryBefore  "Vi eble volos komenci per ">
 <!ENTITY privatebrowsingpage.clearRecentHistoryInner   "forviŝado de via ĵusa historio">
 <!ENTITY privatebrowsingpage.clearRecentHistoryAfter   ".">
 
 <!ENTITY privatebrowsingpage.startPrivateBrowsing.label "Komenci privatan retesploradon">
 <!ENTITY privatebrowsingpage.startPrivateBrowsing.accesskey "P">
 
-<!ENTITY privatebrowsingpage.howToStop                 "Por haltigi privatan retesploradon, elektu &toolsMenu.label; &gt; &privateBrowsingCmd.stop.label;, aŭ finu &brandShortName;.">
-<!ENTITY privatebrowsingpage.howToStart                "Por komenci la privatan retesploradon, vi povas ankaŭ elekti &toolsMenu.label; &gt; &privateBrowsingCmd.start.label;.">
+<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStop2): please leave &basePBMenu.label; intact in the translation -->
+<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart2): please leave &basePBMenu.label; intact in the translation -->
+<!ENTITY privatebrowsingpage.howToStop2                "To stop Private Browsing, select &basePBMenu.label; &gt; &privateBrowsingCmd.stop.label;, or close &brandShortName;.">
+<!ENTITY privatebrowsingpage.howToStart2               "To start Private Browsing, you can also select &basePBMenu.label; &gt; &privateBrowsingCmd.start.label;.">
 
 <!ENTITY privatebrowsingpage.moreInfo                  "Eĉ se via komputilo ne registros la retesploradan historion, via retprovizanto aŭ vi dunginto povus daŭre scii kiujn paĝojn vi vizitas.">
 <!ENTITY privatebrowsingpage.learnMore                 "Plia informo">
--- a/browser/chrome/browser/aboutSessionRestore.dtd
+++ b/browser/chrome/browser/aboutSessionRestore.dtd
@@ -5,13 +5,15 @@
 <!ENTITY restorepage.errorTitle     "Nu, tio estas hontiga.">
 <!ENTITY restorepage.problemDesc    "&brandShortName; havas problemojn je la restaŭro de viaj fenestroj kaj folioj. Tion kaŭzas kutime antaŭ nelonge malfermita reta paĝo.">
 <!ENTITY restorepage.tryThis        "Vi povas klopodi:">
 <!ENTITY restorepage.restoreSome    "forigi unu aŭ plurajn foliojn kiujn vi suspektas ke kaŭzas la problemo">
 <!ENTITY restorepage.startNew       "komenci tute novan retesploran seancon">
 
 <!ENTITY restorepage.tryagainButton "Restaŭri">
 <!ENTITY restorepage.restore.access "R">
+<!ENTITY restorepage.cancelButton   "Start New Session">
+<!ENTITY restorepage.cancel.access  "S">
 
 <!ENTITY restorepage.restoreHeader  "Restaŭri">
 <!ENTITY restorepage.listHeader     "Fenestrojn kaj foliojn">
 <!-- LOCALIZATION NOTE: &#37;S will be replaced with a number. -->
 <!ENTITY restorepage.windowLabel    "Fenestro &#37;S">
--- a/browser/chrome/browser/baseMenuOverlay.dtd
+++ b/browser/chrome/browser/baseMenuOverlay.dtd
@@ -12,16 +12,18 @@
 <!ENTITY helpMenuWin.accesskey    "H">
 <!ENTITY aboutProduct.label       "About &brandShortName;">
 <!ENTITY aboutProduct.accesskey   "A">
 <!ENTITY productHelp.label        "Helpo por &brandShortName;">
 <!ENTITY productHelp.accesskey    "H">
 <!ENTITY helpForIEUsers.label     "Por uzantoj de Internet Explorer">
 <!ENTITY helpForIEUsers.accesskey "I">
 <!ENTITY helpMac.commandkey       "?">
+<!ENTITY helpSafeMode.label       "Restart with Add-ons Disabled…">
+<!ENTITY helpSafeMode.accesskey   "R">
 
 <!ENTITY helpReleaseNotes.label         "Liveraj notoj">
 <!ENTITY helpReleaseNotes.accesskey     "N">
 
 <!ENTITY helpTroubleshootingInfo.label      "Troubleshooting Information">
 <!ENTITY helpTroubleshootingInfo.accesskey  "T">
 
 <!ENTITY helpFeedbackPage.label      "Submit Feedback…">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -13,27 +13,31 @@
 
 <!-- Tab context menu -->
 <!ENTITY  reloadTab.label                    "Reload Tab">
 <!ENTITY  reloadTab.accesskey                "R">
 <!ENTITY  reloadAllTabs.label                "Reload All Tabs">
 <!ENTITY  reloadAllTabs.accesskey            "A">
 <!ENTITY  closeOtherTabs.label               "Close Other Tabs">
 <!ENTITY  closeOtherTabs.accesskey           "o">
-<!ENTITY  openTabInNewWindow.label           "Open in a New Window">
-<!ENTITY  openTabInNewWindow.accesskey       "W">
-<!ENTITY  pinTab.label                       "Make into App Tab">
-<!ENTITY  pinTab.accesskey                   "p">
-<!ENTITY  unpinTab.label                     "Make into Normal Tab">
-<!ENTITY  unpinTab.accesskey                 "k">
+
+<!-- LOCALIZATION NOTE (pinAppTab.label, unpinAppTab.label): "Pin" is being
+used as a metaphor for expressing the fact that these tabs are "pinned" to the
+left edge of the tabstrip. Really we just want the string to express the idea
+that this is a lightweight and reversible action that keeps your tab where you
+can reach it easily. -->
+<!ENTITY  pinAppTab.label                    "Pin as App Tab">
+<!ENTITY  pinAppTab.accesskey                "P">
+<!ENTITY  unpinAppTab.label                  "Unpin Tab">
+<!ENTITY  unpinAppTab.accesskey              "b">
 <!ENTITY  moveToGroup.label                  "Move to Group">
 <!ENTITY  moveToGroup.accesskey              "M">
 <!ENTITY  moveToNewGroup.label               "New Group">
-<!ENTITY  bookmarkThisTab.label              "Bookmark This Tab">
-<!ENTITY  bookmarkThisTab.accesskey          "B">
+<!ENTITY  moveToNewWindow.label              "Move to New Window">
+<!ENTITY  moveToNewWindow.accesskey          "W">
 <!ENTITY  bookmarkAllTabs.label              "Bookmark All Tabs…">
 <!ENTITY  bookmarkAllTabs.accesskey          "T">
 <!ENTITY  undoCloseTab.label                 "Undo Close Tab">
 <!ENTITY  undoCloseTab.accesskey             "U">
 <!ENTITY  closeTab.label                     "Fermi folion">
 <!ENTITY  closeTab.accesskey                 "c">
 
 <!ENTITY  listAllTabs.label      "List all tabs">
@@ -61,18 +65,18 @@
 
 <!ENTITY menubarCmd.label "Strio de menuo">
 <!ENTITY menubarCmd.accesskey "M">
 <!ENTITY navbarCmd.label "Ilaro de navigado">
 <!ENTITY navbarCmd.accesskey "N">
 <!ENTITY personalbarCmd.label "Ilaro de paĝosignoj">
 <!ENTITY personalbarCmd.accesskey "P">
 <!ENTITY bookmarksToolbarItem.label "Elementoj de ilaro de paĝosignoj">
-<!ENTITY taskbarCmd.label "Stata strio">
-<!ENTITY taskbarCmd.accesskey "S">
+<!ENTITY addonBarCmd.label "Add-on Bar">
+<!ENTITY addonBarCmd.accesskey "B">
 
 <!ENTITY pageSourceCmd.label "Fonto de paĝo">
 <!ENTITY pageSourceCmd.accesskey "p">
 <!ENTITY pageSourceCmd.commandkey "u">
 <!ENTITY pageInfoCmd.label "Informo de paĝo">
 <!ENTITY pageInfoCmd.accesskey "I">
 <!ENTITY pageInfoCmd.commandkey "i">
 <!ENTITY fullScreenCmd.label "Plenekrane">
@@ -94,17 +98,17 @@
 
 <!ENTITY bookmarksMenu.label "Paĝosignoj">
 <!ENTITY bookmarksMenu.accesskey "P">
 <!ENTITY bookmarkThisPageCmd.label "Aldoni paĝosignon por tiu ĉi paĝo">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
 <!ENTITY subscribeToPageMenupopup.label "Aboni tiun ĉi paĝon">
 <!ENTITY subscribeToPageMenuitem.label "Aboni tiun ĉi paĝon…">
 <!ENTITY addCurPagesCmd.label "Aldoni paĝosignon por ĉiuj folioj…">
-<!ENTITY organizeBookmarks.label "Organizi paĝosignojn…">
+<!ENTITY showAllBookmarks.label "Show All Bookmarks…">
 <!ENTITY bookmarkAllCmd.label "Aldoni paĝosignon por ĉiuj folioj…">
 <!ENTITY bookmarksToolbarChevron.tooltip "Montri pliajn paĝosignojn">
 
 <!ENTITY backCmd.label                "Malantaŭen">
 <!ENTITY backCmd.accesskey            "M">
 <!ENTITY backButton.tooltip           "Go back one page">
 <!ENTITY forwardCmd.label             "Antaŭen">
 <!ENTITY forwardCmd.accesskey         "A">
@@ -113,30 +117,35 @@
 <!ENTITY reloadCmd.label              "Reŝargi">
 <!ENTITY reloadCmd.accesskey          "R">
 <!ENTITY reloadButton.tooltip         "Reŝargi nunan paĝon">
 <!ENTITY stopCmd.label                "Halti">
 <!ENTITY stopCmd.accesskey            "H">
 <!ENTITY stopCmd.macCommandKey        ".">
 <!ENTITY stopButton.tooltip           "Haltigi la ŝargadon de ĉiu tiu paĝo">
 <!ENTITY goEndCap.tooltip             "Iri al la adreso en la retadresa strio">
-<!ENTITY feedButton.tooltip           "Aboni ĉi tiun paĝon…">
 <!ENTITY printButton.label            "Presi">
 <!ENTITY printButton.tooltip          "Presi ĉi tiun paĝon">
 
 <!ENTITY backForwardItem.title        "Malantaŭen/antaŭen">
 <!ENTITY locationItem.title           "Retadreso">
 <!ENTITY searchItem.title             "Serĉi">
 <!ENTITY throbberItem.title           "Indikilo de aktiveco">
 <!ENTITY bookmarksItem.title          "Paĝosignoj">
 
 <!-- Toolbar items --> 
-<!ENTITY  homeButton.label            "Eka paĝo">
-<!ENTITY tabViewButton2.label         "Tab Groups">
-<!ENTITY tabViewButton2.tooltip       "Group Your Tabs">
+<!ENTITY appMenuButton.label          "Menu">
+<!ENTITY appMenuButton.tooltip        "Open &brandShortName; menu">
+<!ENTITY homeButton.label             "Eka paĝo">
+
+<!ENTITY tabGroupsButton.label        "Tab Groups">
+<!ENTITY tabGroupsButton.tooltip      "Group your tabs">
+
+<!ENTITY feedButton.label             "Subscribe">
+<!ENTITY feedButton.tooltip           "Aboni ĉi tiun paĝon…">
 
 <!ENTITY bookmarksButton.label          "Paĝosignoj">
 <!ENTITY bookmarksButton.tooltip        "Montri viajn paĝosignojn">
 <!ENTITY bookmarksButton.accesskey  "M">
 <!ENTITY bookmarksCmd.commandkey "b">
 
 <!ENTITY bookmarksMenuButton.label          "Bookmarks">
 <!ENTITY bookmarksMenuButton.tooltip        "Display your bookmarks">
@@ -163,16 +172,17 @@
 <!ENTITY search.accesskey             "S">
 <!ENTITY downloads.label              "Elŝutoj">
 <!ENTITY downloads.tooltip            "Montri la progreson de la aktivaj elŝutoj">
 <!ENTITY downloads.accesskey          "E">
 <!ENTITY downloads.commandkey         "j">
 <!ENTITY downloadsUnix.commandkey     "y">
 <!ENTITY addons.label                 "Aldonaĵoj">
 <!ENTITY addons.accesskey             "A">
+<!ENTITY addons.commandkey            "A">
 
 <!ENTITY errorConsoleCmd.label        "Konzolo de eraroj">
 <!ENTITY errorConsoleCmd.accesskey    "E">
 <!ENTITY errorConsoleCmd.commandkey   "j">
 
 <!ENTITY webConsoleCmd.label          "Web Console">
 <!ENTITY webConsoleCmd.accesskey      "W">
 <!ENTITY webConsoleCmd.commandkey     "k">
@@ -186,22 +196,22 @@
 <!ENTITY inspectButton.accesskey      "I">
 <!ENTITY inspectNextButton.label      "Next">
 <!ENTITY inspectNextButton.accesskey  "N">
 <!ENTITY inspectPreviousButton.label  "Previous">
 <!ENTITY inspectPreviousButton.accesskey "P">
 <!ENTITY inspectStyleButton.label     "Style">
 <!ENTITY inspectStyleButton.accesskey "S">
 <!ENTITY inspectStylePanelTitle.label  "Style">
-<!-- LOCALIZATION NOTE (inspectDOMButton.label): This button label
-  -  stands for Document Object Model and appears on the inspector's toolbar.
-  -  It is used to open and closed the DOM panel. There is also a DOM label in
-  -  inspector.properties for the panel titlebar. -->
-<!ENTITY inspectDOMButton.label       "DOM">
-<!ENTITY inspectDOMButton.accesskey       "D">
+<!-- LOCALIZATION NOTE (inspectObjectButton.label): This button label
+  -  appears on the Inspector's toolbar. It is used to open and close the Object
+  -  panel. There is also a label in inspector.properties for the panel
+  -  titlebar: object.objectPanelTitle. -->
+<!ENTITY inspectObjectButton.label       "Object">
+<!ENTITY inspectObjectButton.accesskey   "O">
 
 <!ENTITY fileMenu.label         "Dosiero"> 
 <!ENTITY fileMenu.accesskey       "o">
 <!ENTITY newNavigatorCmd.label        "Nova fenestro">
 <!ENTITY newNavigatorCmd.key        "N">
 <!ENTITY newNavigatorCmd.accesskey      "N">
 
 <!ENTITY editMenu.label         "Modifi"> 
@@ -239,45 +249,48 @@
 <!ENTITY privateBrowsingCmd.start.label         "Komenci privatan retesploradon">
 <!ENTITY privateBrowsingCmd.start.accesskey     "K">
 <!ENTITY privateBrowsingCmd.stop.label          "Haltigi privatan retesploradon">
 <!ENTITY privateBrowsingCmd.stop.accesskey      "H">
 <!ENTITY privateBrowsingCmd.commandkey          "P">
 
 <!ENTITY viewMenu.label         "Vidi"> 
 <!ENTITY viewMenu.accesskey       "V"> 
-<!ENTITY showTabView2.label     "Group Your Tabs…">
-<!ENTITY showTabView2.accesskey     "G">
+<!ENTITY viewTabGroups.label            "Tab Groups">
+<!ENTITY viewTabGroups.accesskey        "G">
 <!ENTITY viewToolbarsMenu.label       "Ilaraj strioj"> 
 <!ENTITY viewToolbarsMenu.accesskey     "I"> 
 <!ENTITY viewSidebarMenu.label "Flanka strio">
 <!ENTITY viewSidebarMenu.accesskey "n">
 <!ENTITY viewCustomizeToolbar.label       "Persone agordi…"> 
 <!ENTITY viewCustomizeToolbar.accesskey     "P">
 <!ENTITY viewTabsOnTop.label            "Tabs on Top">
 <!ENTITY viewTabsOnTop.accesskey        "T">
 
 <!ENTITY historyMenu.label "Historio">
 <!ENTITY historyMenu.accesskey "h">
 <!ENTITY historyUndoMenu.label "Antaŭ ne longe fermitaj folioj">
 <!-- LOCALIZATION NOTE (historyUndoWindowMenu): see bug 394759 -->
 <!ENTITY historyUndoWindowMenu.label "Antaŭ ne longe fermitaj folioj">
+<!ENTITY historyRestoreLastSession.label "Restore Previous Session">
 
 <!ENTITY historyHomeCmd.label "Eka paĝo">
 <!ENTITY showAllHistoryCmd2.label "Montri tutan historion">
 <!ENTITY showAllHistoryCmd.commandkey "H">
 
+<!ENTITY appMenuEdit.label "Edit">
 <!ENTITY appMenuCustomize.label "Customize">
 <!ENTITY appMenuToolbarLayout.label "Toolbar Layout…">
 <!ENTITY appMenuSidebars.label "Sidebars">
 <!ENTITY appMenuFind.label "Find…">
 <!ENTITY appMenuUnsorted.label "Unsorted Bookmarks">
+<!ENTITY appMenuWebDeveloper.label "Web Developer">
 <!ENTITY appMenuGettingStarted.label "Getting Started">
-
-<!ENTITY developerMenu.label "Developer">
+<!ENTITY appMenuSafeMode.label "Restart with Add-ons Disabled…">
+<!ENTITY appMenuSafeMode.accesskey "R">
 
 <!ENTITY openCmd.commandkey           "l">
 <!ENTITY urlbar.placeholder           "Go to a Web Site">
 <!ENTITY urlbar.accesskey             "d">
 <!ENTITY urlbar.switchToTab.label     "Switch to tab:">
 
 <!-- 
   Comment duplicated from browser-sets.inc:
@@ -438,18 +451,23 @@ you can use these alternative items. Oth
 
 <!ENTITY newTabButton.tooltip           "Malfermi novan folion">
 <!ENTITY newWindowButton.tooltip        "Malfermi novan fenestron">
 <!ENTITY sidebarCloseButton.tooltip     "Fermi flankan strion">
 
 <!ENTITY cutButton.tooltip              "Eltondi">
 <!ENTITY copyButton.tooltip             "Kopii">
 <!ENTITY pasteButton.tooltip            "Alglui">
+
 <!ENTITY fullScreenButton.tooltip       "Montri la fenestron plenekrane">
 
+<!ENTITY zoomOutButton.tooltip          "Zoom out">
+<!ENTITY zoomInButton.tooltip           "Zoom in">
+<!ENTITY zoomControls.label             "Zoom Controls">
+
 <!ENTITY quitApplicationCmdWin.label       "Eliri"> 
 <!ENTITY quitApplicationCmdWin.accesskey   "l">
 <!ENTITY goBackCmd.commandKey "[">
 <!ENTITY goForwardCmd.commandKey "]">
 <!ENTITY quitApplicationCmd.label       "Fini"> 
 <!ENTITY quitApplicationCmd.accesskey   "F">
 <!ENTITY quitApplicationCmdMac.label    "Fini &brandShortName;">
 <!ENTITY quitApplicationCmdMac.key      "Q">
@@ -472,17 +490,17 @@ you can use these alternative items. Oth
      on Linux and Mac OS X we use "Preferences" - carry that distinction
      over into this string, which is used in the "popup blocked" info bar . -->
 <!ENTITY editPopupSettingsUnix.label "Modifi la preferojn de la blokilo de ŝprucfenestroj…">
 <!ENTITY editPopupSettings.label "Modifi la opciojn de la blokilo de ŝprucfenestroj…">
 <!ENTITY editPopupSettings.accesskey "M">
 <!ENTITY dontShowMessage.accesskey "N">
 
 <!ENTITY bidiSwitchPageDirectionItem.label        "Ŝanĝi paĝodirekton">
-<!ENTITY bidiSwitchPageDirectionItem.accesskey    "n">
+<!ENTITY bidiSwitchPageDirectionItem.accesskey    "D">
 <!ENTITY bidiSwitchTextDirectionItem.label        "Ŝanĝi tekstodirekton">
 <!ENTITY bidiSwitchTextDirectionItem.accesskey    "a">
 <!ENTITY bidiSwitchTextDirectionItem.commandkey   "X">
 
 <!ENTITY findOnCmd.label     "Serĉi en tiu ĉi paĝo …">
 <!ENTITY findOnCmd.accesskey "S">
 <!ENTITY findOnCmd.commandkey "f">
 <!ENTITY findAgainCmd.label  "Serĉi denove">
@@ -523,22 +541,15 @@ just addresses the organization to follo
 <!ENTITY allTabs.filter.emptyText "Serĉi foliojn">
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
 <!ENTITY tabsToolbar.label "Browser tabs">
 
 <!-- LOCALIZATION NOTE (syncTabsMenu.label): This appears in the history menu -->
 <!ENTITY syncTabsMenu.label     "Tabs From Other Computers">
 
-<!ENTITY syncBrand.shortName.label  "Sync">
+<!ENTITY syncBrand.shortName.label    "Sync">
 
-<!ENTITY syncMenu.label               "&syncBrand.shortName.label;">
-<!-- LOCALIZATION NOTE (sync.menu.accesskey): This is part of the tools menu, so
-                                              don't use a conflicting access key -->
-<!ENTITY syncMenu.accesskey           "Y">
 <!ENTITY syncSetup.label              "Set Up &syncBrand.shortName.label;…">
 <!ENTITY syncSetup.accesskey          "Y">
-<!ENTITY syncLogInItem.label          "Connect">
-<!ENTITY syncLogInItem.accesskey      "C">
-<!ENTITY syncLogOutItem.label         "Disconnect">
-<!ENTITY syncLogOutItem.accesskey     "D">
 <!ENTITY syncSyncNowItem.label        "Sync Now">
 <!ENTITY syncSyncNowItem.accesskey    "S">
+<!ENTITY syncToolbarButton.label      "Sync">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -10,17 +10,17 @@ droponnewwindowbutton=Faligi ligilon aŭ dosieron por malfermi gin en nova fenestro
 droponhomebutton=Faligi ligon aŭ dosieron por ke ĝi estu via komenca paĝo
 droponhometitle=Difini la ekan paĝon
 droponhomemsg=Ĉu vi volas ke tiu ĉi dokumento iĝu via komenca paĝo?
 
 # context menu strings
 
 # LOCALIZATION NOTE (contextMenuSearchText): %1$S is the search engine,
 # %2$S is the selection string.
-contextMenuSearchText=En %S serĉi "%S"
+contextMenuSearchText=Search %1$S for "%2$S"
 contextMenuSearchText.accesskey=S
 
 # bookmark dialog strings
 
 bookmarkAllTabsDefault=[nomo de dosierujo]
 
 xpinstallPromptWarning=%S ne permesis al tiu ĉi retejo (%S) demandi al vi la rajton instali programon en via komputilo.
 xpinstallPromptAllowButton=Permesi
@@ -68,26 +68,31 @@ lwthemeInstallRequest.allowButton=Permes
 lwthemeInstallRequest.allowButton.accesskey=P
 
 lwthemePostInstallNotification.message=Nova etoso estis instalita.
 lwthemePostInstallNotification.undoButton=Malfari
 lwthemePostInstallNotification.undoButton.accesskey=M
 lwthemePostInstallNotification.manageButton=Administri etosojn…
 lwthemePostInstallNotification.manageButton.accesskey=e
 
+# LOCALIZATION NOTE (lwthemeNeedsRestart.message):
+# %S will be replaced with the new theme name.
+lwthemeNeedsRestart.message=%S will be installed after you restart.
+lwthemeNeedsRestart.button=Restart Now
+lwthemeNeedsRestart.accesskey=R
+
 popupWarning=%S evitis ke tiu ĉi retejo malfermu ŝprucfenestron.
 popupWarningMultiple=%S evitis ke tiu ĉi retejo malfermu %S ŝprucfenestrojn.
 popupWarningButton=Opcioj
 popupWarningButton.accesskey=O
 popupWarningButtonUnix=Preferoj
 popupWarningButtonUnix.accesskey=P
 popupAllow=Permesi ŝprucfenestrojn por %S
 popupBlock=Bloki ŝprucfenestrojn por %S
 popupWarningDontShowFromMessage=Ne montri ĉiun ĉi mesaĝon kiam ŝprucfenestroj estas blokataj
-popupWarningDontShowFromStatusbar=Ne montri informigan mesaĝon kiam ŝprucfenestroj estas blokataj
 popupShowPopupPrefix=Montri '%S'
 
 # missing plugin installer
 missingpluginsMessage.title=aldonaj kromprogramoj estas postulataj por montri ĉiujn komunikrimedojn en tiu ĉi paĝo.
 missingpluginsMessage.button.label=Instali mankantajn kromprogramojn…
 missingpluginsMessage.button.accesskey=I
 outdatedpluginsMessage.title=Kelkaj aldonaĵoj uzataj de tiu ĉi paĝo ne estas ĝisdatigitaj.
 outdatedpluginsMessage.updateButton.label=Ĝisdatigi aldonaĵojn…
@@ -130,16 +135,43 @@ updatesItem_downloadingFallback=Ĝisdatigo elŝutata…
 updatesItem_downloading.accesskey=e
 updatesItem_resume=Repreni elŝutadon de %S…
 updatesItem_resumeFallback=Repreni elŝutadon de ĝisdatigo…
 updatesItem_resume.accesskey=R
 updatesItem_pending=Apliki nun la elŝutitan ĝisdatigon…
 updatesItem_pendingFallback=Apliki nun la elŝutitan ĝisdatigon…
 updatesItem_pending.accesskey=A
 
+# Check for Updates in the About Dialog - button labels and accesskeys
+# LOCALIZATION NOTE - all of the following update buttons and labels will only
+# be displayed one at a time. So, if a button is displayed no other buttons or
+# labels will be displayed and if a label is displayed no other buttons or
+# labels will be displayed. They will be placed directly under the Firefox
+# version in the about dialog.
+update.checkButton.label=Check for Updates…
+update.checkButton.accesskey=C
+update.resumeButton.label=Resume Downloading %S…
+update.resumeButton.accesskey=D
+update.openUpdateUI.applyButton.label=Apply Update…
+update.openUpdateUI.applyButton.accesskey=A
+update.restart.applyButton.label=Apply Update
+update.restart.applyButton.accesskey=A
+update.openUpdateUI.upgradeButton.label=Upgrade Now…
+update.openUpdateUI.upgradeButton.accesskey=U
+update.restart.upgradeButton.label=Upgrade Now
+update.restart.upgradeButton.accesskey=U
+# Check for Updates in the About Dialog - status labels
+update.checkingForUpdate.label=Checking for updates…
+update.checkingAddonCompat.label=Checking add-on compatibility…
+update.noUpdateFound.label=This is the latest available version
+# LOCALIZATION NOTE (update.downloading) — is the "em dash" (long dash)
+# %S is the amount download
+# examples: Downloading update — 111 KB of 13 MB
+update.downloading=Downloading update — %S
+
 # RSS Pretty Print
 feedShowFeedNew=Aboni '%S'…
 
 menuOpenAllInTabs.label=Malfermi ĉiujn en folioj
 
 # History menu
 menuRestoreAllTabs.label=Restaŭri ĉiujn foliojn
 # LOCALIZATION NOTE (menuRestoreAllWindows, menuUndoCloseWindowLabel, menuUndoCloseWindowSingleTabLabel):
@@ -151,16 +183,19 @@ menuRestoreAllWindows.label=Restaŭri ĉiujn fenestrojn
 menuUndoCloseWindowLabel=#1 (kaj #2 alian folion);#1 (kaj #2 aliajn foliojn)
 menuUndoCloseWindowSingleTabLabel=#1
 
 # Unified Back-/Forward Popup
 tabHistory.current=Resti en tiu ĉi paĝo
 tabHistory.goBack=Iri reen al tiu paĝo
 tabHistory.goForward=Iri antaŭen al tiu paĝo
 
+# URL Bar
+pasteAndGo.label=Paste & Go
+
 # Block autorefresh
 refreshBlocked.goButton=Permesi
 refreshBlocked.goButton.accesskey=A
 refreshBlocked.refreshLabel=%S evitis ke tiu ĉi paĝo aŭtomate reŝargiĝu.
 refreshBlocked.redirectLabel=%S evitis ke tiu ĉi paĝo aŭtomate redirektiĝis al alia paĝo.
 
 # Star button
 starButtonOn.tooltip=Redakti tiun ĉi paĝosignon
@@ -174,18 +209,22 @@ offlineApps.never=Neniam por ĉi tiu retejo
 offlineApps.neverAccessKey=r
 offlineApps.notNow=Ne nun
 offlineApps.notNowAccessKey=N
 
 offlineApps.usage=La retejo (%S) konservas nun pli ol %SMO de datumoj en via komputilo por uzi malkonektite.
 offlineApps.manageUsage=Montri agordojn
 offlineApps.manageUsageAccessKey=S
 
+# LOCALIZATION NOTE (indexedDB.usage): %1$S is the website host name
+# %2$S a number of megabytes.
+indexedDB.usage=This website (%1$S) is attempting to store more than %2$S MB of data on your computer for offline use.
+
 identity.identified.verifier=Kontrolita de: %S
-identity.identified.verified_by_you=Vi aldonis sekurecan escepton por tiu ĉi retejo
+identity.identified.verified_by_you=You have added a security exception for this site.
 identity.identified.state_and_country=%S, %S
 
 identity.encrypted=Via konekto al tiu ĉi retejo estas ĉifrita por eviti preterlegado.
 identity.unencrypted=Via konekto al tiu ĉi retejo ne estas ĉifrita.
 identity.mixed_content=Via konekto al tiu ĉi retejo estas nur parte ĉifrita, kio ne evitas preterlegado.
 
 identity.unknown.tooltip=Tiu ĉi retejo ne provizis identecan informon.
 
@@ -205,17 +244,17 @@ editBookmarkPanel.pageBookmarkedDescription=%S ĉiam memoros tiun ĉi paĝon por vi.
 editBookmarkPanel.bookmarkedRemovedTitle=Paĝosigno forigita
 editBookmarkPanel.editBookmarkTitle=Modifi tiun ĉi paĝosignon
 
 # LOCALIZATION NOTE (editBookmark.removeBookmarks.label)
 # Semi-colon list of plural forms. Replacement for #1 is
 # the number of bookmarks to be removed.
 # If this causes problems with localization you can also do "Remove Bookmarks (#1)"
 # instead of "Remove #1 Bookmarks".
-editBookmark.removeBookmarks.label=Forigi paĝosignon;Forigi paĝosignojn (#1)
+editBookmark.removeBookmarks.label=Remove Bookmark;Remove #1 Bookmarks
 
 # Post Update Notifications
 pu.notifyButton.label=Details…
 pu.notifyButton.accesskey=D
 # LOCALIZATION NOTE %S will be replaced by the short name of the application.
 puNotifyText=%S has been updated
 puAlertTitle=%S Updated
 puAlertText=Click here for details
@@ -273,8 +312,23 @@ ctrlTab.showAll.label=;Montri ĉiujn #1 foliojn
 # Used as the bookmark name when saving a keyword for a search field.
 addKeywordTitleAutoFill=Serĉi %S
 
 # TabView
 tabView2.title=%S - Group Your Tabs
 
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Ĉefa
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=La ĉefa etoso.
+
+# safeModeRestart
+safeModeRestartPromptTitle=Restart with Add-ons Disabled
+safeModeRestartPromptMessage=Are you sure you want to disable all add-ons and restart?
+
+# LOCALIZATION NOTE (browser.menu.showCharacterEncoding): Set to the string
+# "true" (spelled and capitalized exactly that way) to show the "Character
+# Encoding" menu in the main Firefox button on Windows. Any other value will
+# hide it. Regardless of the value of this setting, the "Character Encoding"
+# menu will always be accessible via the "Web Developer" menu.
+# This is not a string to translate; it just controls whether the menu shows
+# up in the Firefox button. If users frequently use the "Character Encoding"
+# menu, set this to "true". Otherwise, you can leave it as "false".
+browser.menu.showCharacterEncoding=false
+
--- a/browser/chrome/browser/inspector.properties
+++ b/browser/chrome/browser/inspector.properties
@@ -5,13 +5,12 @@ style.selectorLabel=Selector
 # LOCALIZATION NOTE  (style.inheritedFrom): used in Style panel in
 #  inspector. Describes which tagname[#id] the properties are inherited from.
 style.inheritedFrom=Inherited from: #1
 
 # LOCALIZATION NOTE (style.styleItemLabel): used in Style panel in inspector.
 #  Used for construction of list items, #1 = label, #2 = content.
 style.styleItemLabel=#1: #2
 
-# LOCALIZATION NOTE (dom.domPanelTitle): used in DOM Panel in inspector.
-#  Stands for "Document Object Model". Also referenced in in browser.dtd
-#  and used as a button title.
-#  Unsure if this localizes well, but including just in case
-dom.domPanelTitle=DOM
+# LOCALIZATION NOTE (object.objectPanelTitle): used in the Object Panel in the
+#  Inspector tool. There's also inspectObjectButton in browser.dtd for the
+#  toolbar button which allows users to open/close the Object panel.
+object.objectPanelTitle=Object
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -94,31 +94,35 @@
 <!ENTITY  permBlock             "Bloki">
 <!ENTITY  permissionsFor        "Permesoj por:">
 <!ENTITY  permImage             "Ŝargi bildojn">
 <!ENTITY  permPopup             "Malfermi ŝprucfenestrojn">
 <!ENTITY  permCookie            "Difini kuketojn">
 <!ENTITY  permInstall           "Instali etendoprogramojn aŭ temojn">
 <!ENTITY  permGeo               "Diskonigi lokon">
 
+<!ENTITY  permIndexedDB              "Maintain Offline Storage">
+<!ENTITY  permClearStorage           "Clear Storage">
+<!ENTITY  permClearStorage.accesskey "C">
+
 <!ENTITY  securityTab           "Sekureco">
 <!ENTITY  securityTab.accesskey "S">
 <!ENTITY  securityHeader        "Sekureca informo de tiu ĉi paĝo">
 <!ENTITY  securityView.certView "Vidi atestilon">
 <!ENTITY  securityView.accesskey "V">
 <!ENTITY  securityView.unknown   "Nekonata">
 
 
 <!ENTITY  securityView.identity.header   "Identeco de retejo">
 <!ENTITY  securityView.identity.owner    "Posedanto:">
 <!ENTITY  securityView.identity.domain   "Retejo:">
 <!ENTITY  securityView.identity.verifier "Kontrolita de:">
 
 <!ENTITY  securityView.privacy.header                   "Privateco kaj historio">
-<!ENTITY  securityView.privacy.history                  "Ĉu mi vizitis tiun retejon antaŭ ol hodiaŭ?">
+<!ENTITY  securityView.privacy.history                  "Have I visited this web site prior to today?">
 <!ENTITY  securityView.privacy.cookies                  "Ĉu tiu ĉi retejo konservas datumon (kuketojn) en mia komputilo?">
 <!ENTITY  securityView.privacy.viewCookies              "Vidi kuketojn">
 <!ENTITY  securityView.privacy.viewCookies.accessKey    "k">
 <!ENTITY  securityView.privacy.passwords                "Ĉu mi konservis pasvortojn por tiu ĉi retejo?">
 <!ENTITY  securityView.privacy.viewPasswords            "Vidi konservitajn pasvortojn">
 <!ENTITY  securityView.privacy.viewPasswords.accessKey  "w">
 
 <!ENTITY  securityView.technical.header                 "Teĥnikaj detaloj">
--- a/browser/chrome/browser/pageInfo.properties
+++ b/browser/chrome/browser/pageInfo.properties
@@ -74,8 +74,15 @@ generalSiteIdentity=Tiun ĉi retejon posedas %S\nTion kontrolis %S
 
 feedRss=RSS
 feedAtom=Atom
 feedXML=XML
 
 securityNoOwner=Tiu ĉi retejo ne provizas informon pri sia posedanto.
 securityOneVisit=Jes, unu fojo
 securityNVisits=Jes, %S fojoj
+
+# LOCALIZATION NOTE: The next string is for the disk usage of the
+# database
+#   e.g. indexedDBUsage : "50.23 MB"
+#   %1$S = size (in bytes or megabytes, ...)
+#   %2$S = unit of measure (bytes, KB, MB, ...)
+indexedDBUsage=This web site is using %1$S %2$S
--- a/browser/chrome/browser/pageReportFirstTime.dtd
+++ b/browser/chrome/browser/pageReportFirstTime.dtd
@@ -1,7 +1,7 @@
-<!ENTITY startDescription.label            "Retejo klopodis malfermi ŝprucfenestron sen via permeso. &brandShortName; aŭtomate fermis tiun ŝprucfenestron.  Kiam &brandShortName; blokas tiujn ŝprucfenestrojn vi vidos bildsimbolon en la stata strio.">
+<!ENTITY startDescriptionText.label        "A web site has attempted to open a pop-up window without your permission. &brandShortName; has automatically closed the pop-up window.">
 
 <!ENTITY endDescription.label              "Vi povas alklaki tiun ĉi bildsimbolon por vidi kiujn retejojn &brandShortName; blokis kaj por permesi al tiuj retejoj malfermi ŝprucfenestrojn se ili estas postulataj por korekta funkciado de retejo.">
 
 <!ENTITY caption.label                     "About Pop-up Blocking">
 
 <!ENTITY done.label "Done">
--- a/browser/chrome/browser/preferences/advanced-scripts.dtd
+++ b/browser/chrome/browser/preferences/advanced-scripts.dtd
@@ -41,12 +41,8 @@
 <!ENTITY allowScripts.label             "Permesi al skizoj:">
 
 <!ENTITY moveResizeWindows.label        "Movi aŭ ŝanĝi la grandon de ekzistantaj fenestroj">
 <!ENTITY moveResizeWindows.accesskey    "M">
 <!ENTITY raiseLowerWindows.label        "Levi aŭ mallevi fenestrojn">
 <!ENTITY raiseLowerWindows.accesskey    "L">
 <!ENTITY disableContextMenus.label      "Malaktivigi aŭ anstataŭigi menuojn de kunteksto">
 <!ENTITY disableContextMenus.accesskey  "M">
-<!ENTITY hideStatusBar.label            "Kaŝi la statan strion">
-<!ENTITY hideStatusBar.accesskey        "K">
-<!ENTITY changeStatusBar.label          "Ŝanĝi tekston en la stata strio">
-<!ENTITY changeStatusBar.accesskey      "Ŝ">
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -12,16 +12,18 @@
 <!ENTITY blockAutoRefresh.accesskey      "r">
 
 <!ENTITY browsing.label                  "Retesplorado">
 
 <!ENTITY useAutoScroll.label             "Uzi aŭtomatan ŝovadon">
 <!ENTITY useAutoScroll.accesskey         "a">
 <!ENTITY useSmoothScrolling.label        "Uzi glatan ŝovadon">
 <!ENTITY useSmoothScrolling.accesskey    "g">
+<!ENTITY allowHWAccel.label              "Use hardware acceleration when available">
+<!ENTITY allowHWAccel.accesskey          "h">
 <!ENTITY checkSpelling.label             "Kontroli literumadon dum tajpado">
 <!ENTITY checkSpelling.accesskey         "t">
 
 <!ENTITY systemDefaults.label            "Difinitaj de la sistemo">
 <!ENTITY alwaysCheckDefault.label        "Ĉiam kontroli ĉe la eko ĉu &brandShortName; estas la ĉefa retumilo"><!--XXX-->
 <!ENTITY alwaysCheckDefault.accesskey    "k">
 <!ENTITY checkNow.label                  "Kontroli nun">
 <!ENTITY checkNow.accesskey              "K">
@@ -34,26 +36,28 @@
 
 <!ENTITY connectionDesc.label            "Agordi la manieron kiel &brandShortName; konektiĝas al la reto">
 <!ENTITY connectionSettings.label        "Agordoj…">
 <!ENTITY connectionSettings.accesskey    "g">
 
 <!ENTITY offlineStorage.label            "Deponejo por malkonektitaĵoj">
 
 <!-- LOCALIZATION NOTE:
-  The entities useCacheBefore.label and useCacheAfter.label appear on a single
+  The entities limitCacheSizeBefore.label and limitCacheSizeAfter.label appear on a single
   line in preferences as follows:
 
-  &useCacheBefore.label  [ textbox for cache size in MB ]   &useCacheAfter.label;
+  &limitCacheSizeBefore.label [textbox for cache size in MB] &limitCacheSizeAfter.label;
 -->
-<!ENTITY useCacheBefore.label            "Uzi ĝis">
-<!ENTITY useCacheBefore.accesskey        "U">
-<!ENTITY useCacheAfter.label             "MO da spaco por la staplo">
+<!ENTITY limitCacheSizeBefore.label      "Limit cache to">
+<!ENTITY limitCacheSizeBefore.accesskey  "L">
+<!ENTITY limitCacheSizeAfter.label       "MB of space">
 <!ENTITY clearCacheNow.label             "Forviŝi nun">
 <!ENTITY clearCacheNow.accesskey         "F">
+<!ENTITY overrideSmartCacheSize.label    "Override automatic cache management">
+<!ENTITY overrideSmartCacheSize.accesskey "O">
 
 <!ENTITY updateTab.label                 "Ĝisdatigi">
 
 <!ENTITY autoCheck.label                 "Aŭtomate kontroli ĉu estas ĝisdatigoj por:">
 <!ENTITY enableAppUpdate.label           "&brandShortName;">
 <!ENTITY enableAppUpdate.accesskey       "M">
 <!ENTITY enableAddonsUpdate2.label       "Aldonaĵoj">
 <!ENTITY enableAddonsUpdate2.accesskey   "n">
--- a/browser/chrome/browser/preferences/main.dtd
+++ b/browser/chrome/browser/preferences/main.dtd
@@ -1,17 +1,17 @@
 <!ENTITY startup.label             "Starto">
 
 <!ENTITY startupPage.label         "Kiam &brandShortName; ekfunkcias:">
 <!ENTITY startupPage.accesskey     "e">
 <!ENTITY startupHomePage.label     "Montri mian ekan paĝon">
 <!ENTITY startupBlankPage.label    "Montri malplenan paĝon">
 <!ENTITY startupLastSession.label  "Montri miajn lastajn fenestrojn kaj foliojn">
-<!ENTITY location.label            "Eka paĝo:">
-<!ENTITY location.accesskey        "E">
+<!ENTITY homepage.label            "Home Page:">
+<!ENTITY homepage.accesskey        "P">
 <!ENTITY useCurrentPage.label      "Uzi la nunan paĝon">
 <!ENTITY useCurrentPage.accesskey  "L">
 <!ENTITY useMultiple.label         "Uzi nunajn paĝojn">
 <!ENTITY useBookmark.label         "Uzi paĝosignon">
 <!ENTITY useBookmark.accesskey     "P">
 <!ENTITY restoreDefault.label      "Norma paĝo">
 <!ENTITY restoreDefault.accesskey  "N">
 
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -99,16 +99,22 @@ offlineAppRemoveConfirm=Forigi malkonektitaĵojn
 #   e.g. offlineAppUsage : "50.23 MB"
 #   %1$S = size (in bytes or megabytes, ...)
 #   %2$S = unit of measure (bytes, KB, MB, ...)
 offlineAppUsage=%1$S %2$S
 
 offlinepermissionstext=La jenaj retejoj ne rajtas konservi datumojn por uzi malkonektite:
 offlinepermissionstitle=Malkonektitaĵoj
 
+####Preferences::Advanced::Network
+#LOCALIZATION NOTE: The next string is for the disk usage of the http cache.
+#   e.g., "Your cache is currently using 200 MB"
+#   %1$S = size
+#   %2$S = unit (MB, KB, etc.)
+actualCacheSize=Your cache is currently using %1$S %2$S of disk space
 
 #### Syncing
 connect.label=Connect
 disconnect.label=Disconnect
 
-differentAccount.title=Use a Different Account?
+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
--- a/browser/chrome/browser/preferences/privacy.dtd
+++ b/browser/chrome/browser/preferences/privacy.dtd
@@ -7,20 +7,20 @@
 <!ENTITY  locbar.post.label             "">
 <!ENTITY  locbar.both.label             "Historio kaj paĝosignoj">
 <!ENTITY  locbar.history.label          "Historio">
 <!ENTITY  locbar.bookmarks.label        "Paĝosignoj">
 <!ENTITY  locbar.nothing.label          "Nenio">
 
 
 <!ENTITY  acceptCookies.label           "Akcepti kuketojn el retejoj">
-<!ENTITY  acceptCookies.accesskey       "e">
+<!ENTITY  acceptCookies.accesskey       "A">
 
 <!ENTITY  acceptThirdParty.label        "Akcepti nerektajn kuketojn">
-<!ENTITY  acceptThirdParty.accesskey    "e">
+<!ENTITY  acceptThirdParty.accesskey    "c">
 
 <!ENTITY  keepUntil.label               "Konservi ĝis:">
 <!ENTITY  keepUntil.accesskey           "K">
 
 <!ENTITY  expire.label                  "ili senvalidiĝas">
 <!ENTITY  close.label                   "mi finas &brandShortName;">
 <!ENTITY  askEachTime.label             "demandi al mi ĉiun fojon">
 
--- a/browser/chrome/browser/preferences/sync.dtd
+++ b/browser/chrome/browser/preferences/sync.dtd
@@ -1,44 +1,43 @@
 <!-- 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 currentUser.label            "Current User:">
+<!ENTITY currentAccount.label         "Current Account:">
 
 <!-- Login error feedback -->
 <!ENTITY updatePass.label             "Update">
 <!ENTITY resetPass.label              "Reset">
 
 <!-- Manage Account -->
 <!ENTITY manageAccount.label          "Manage Account">
 <!ENTITY manageAccount.accesskey      "A">
+<!ENTITY viewQuota.label              "View Quota">
 <!ENTITY changePassword.label         "Change Password">
-<!ENTITY changePassphrase.label       "Change Secret Phrase">
+<!ENTITY mySyncKey.label              "My Sync Key">
 <!ENTITY resetSync.label              "Reset Sync">
-<!ENTITY differentAccount.label       "Use a Different Account">
+<!ENTITY stopUsingAccount.label       "Stop Using This Account">
 
 <!-- Sync Settings -->
 <!ENTITY syncPrefsCaption.label       "Browser Sync">
 <!ENTITY syncComputerName.label       "Computer Name:">
 <!ENTITY syncComputerName.accesskey   "c">
-<!ENTITY syncModeSwitchDesc.label     "&brandShortName; will: ">
-<!ENTITY syncModeSwitchDesc.accesskey "w">
-<!ENTITY syncEverything.label         "Sync Everything">
-<!ENTITY customSync.label             "Use my custom settings">
-<!ENTITY syncEverythingDescription.label  "Your bookmarks, history, passwords, preferences, and tabs will be synced.">
-<!ENTITY syncItem.bookmarks.label     "Sync Bookmarks">
-<!ENTITY syncItem.bookmarks.accesskey "m">
-<!ENTITY syncItem.tabs.label          "Sync Tabs">
-<!ENTITY syncItem.tabs.accesskey      "T">
-<!ENTITY syncItem.history.label       "Sync History">
-<!ENTITY syncItem.history.accesskey   "r">
-<!ENTITY syncItem.passwords.label     "Sync Passwords">
-<!ENTITY syncItem.passwords.accesskey "P">
-<!ENTITY syncItem.prefs.label         "Sync Preferences">
-<!ENTITY syncItem.prefs.accesskey     "S">
+
+<!ENTITY syncMy.label               "Sync My">
+<!ENTITY engine.bookmarks.label     "Bookmarks">
+<!ENTITY engine.bookmarks.accesskey "m">
+<!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 "P">
+<!ENTITY engine.prefs.label         "Preferences">
+<!ENTITY engine.prefs.accesskey     "S">
+
 
 <!-- Footer stuff -->
 <!ENTITY prefs.tosLink.label        "Terms of Service">
 <!ENTITY prefs.ppLink.label         "Privacy Policy">
--- a/browser/chrome/browser/sanitize.dtd
+++ b/browser/chrome/browser/sanitize.dtd
@@ -53,10 +53,10 @@ that require it.  -->
 <!ENTITY itemSitePreferences.label         "Preferoj de retejoj">
 <!ENTITY itemSitePreferences.accesskey     "P">
 
 <!-- LOCALIZATION NOTE (sanitizeEverythingUndoWarning): Second warning paragraph
      that appears when "Time range to clear" is set to "Everything".  See UI
      mockup at bug 480169 -->
 <!ENTITY sanitizeEverythingUndoWarning     "Tiu ĉi ago ne estas malfarebla.">
 
-<!ENTITY dialog.width                 "32em">
+<!ENTITY dialog.width                 "28em">
 <!ENTITY column.width                 "14em">
--- a/browser/chrome/browser/search.properties
+++ b/browser/chrome/browser/search.properties
@@ -1,10 +1,14 @@
 searchtip=Serĉi per %S
 
+# LOCALIZATION NOTE (cmd_pasteAndSearch): "Search" is a verb, this is the
+# search bar equivalent to the url bar's "Paste & Go"
+cmd_pasteAndSearch=Paste & Search
+
 cmd_clearHistory=Forviŝi la serĉilan historion
-cmd_clearHistory_accesskey=K
+cmd_clearHistory_accesskey=H
 
 cmd_showSuggestions=Montri sugestojn
 cmd_showSuggestions_accesskey=S
 
 cmd_addFoundEngine=Aldoni "%S"
 
--- a/browser/chrome/browser/syncGenericChange.properties
+++ b/browser/chrome/browser/syncGenericChange.properties
@@ -1,37 +1,35 @@
 # LOCALIZATION NOTE (change.password.title): This (and associated change.password/passphrase) are used when the user elects to change their password.
 change.password.title = Change your Password
 change.password.acceptButton = Change Password
 change.password.status.active = Changing your password…
 change.password.status.success = Your password has been changed.
 change.password.status.error = There was an error changing your password.
 
-change.password.introText = Your password must be at least 8 characters long.  It cannot be the same as either your user name or your secret phrase.
+change.password2.introText = Your password must be at least 8 characters long.  It cannot be the same as either your user name or your Sync Key.
 change.password.warningText = Note: All of your other devices will be unable to connect to your account once you change this password.
 
-change.passphrase.title = Change your Secret Phrase
-change.passphrase.acceptButton = Change Secret Phrase
-change.passphrase.label = Changing secret phrase and uploading local data, please wait…
-change.passphrase.error = There was an error while changing your secret phrase!
-change.passphrase.success = Your secret phrase was successfully changed!
+change.synckey.title = Change your Sync Key
+change.synckey.acceptButton = Change Sync Key
+change.synckey.label = Changing Sync Key and uploading local data, please wait…
+change.synckey2.error = There was an error while changing your Sync Key!
+change.synckey2.success = Your Sync Key was successfully changed!
 
-# LOCALIZATION NOTE (change.passphrase.introText) "Sync" should match &syncBrand.shortName.label; from syncBrand.dtd
-change.passphrase.introText = Your secret phrase must be at least 12 characters long.  Sync uses this phrase as part of encrypting your data.
-# LOCALIZATION NOTE (change.passphrase.introText2) "Firefox Sync" should match syncBrand.fullName.label from syncBrand.dtd
-change.passphrase.introText2 = You may wish to write this down, as this is never sent over the Internet and is not backed up or synced by Firefox Sync for your security.
-# LOCALIZATION NOTE (change.passphrase.warningText) "Sync" should match &syncBrand.shortName.label; from syncBrand.dtd
-change.passphrase.warningText = Note: This will erase all data stored on the Sync server and upload new data secured by this phrase. Your other devices will not sync until the secret phrase is entered for that device.
+change.synckey.introText = Firefox Cares About Your Privacy
+change.synckey.introText2 = To ensure your total privacy, all of your data is encrypted prior to being uploaded. The key to decrypt your data is not uploaded.
+# LOCALIZATION NOTE (change.synckey2.warningText) "Sync" should match &syncBrand.shortName.label; from syncBrand.dtd
+change.synckey2.warningText = Note: Changing this will erase all data stored on the Sync server and upload new data secured by this Sync Key. Your other devices will not sync until the new Sync Key is entered for that device.
+
+new.synckey.label = Your Sync Key
 
 # LOCALIZATION NOTE (new.password.title): This (and associated new.password/passphrase) are used on a second computer when it detects that your password or passphrase has been changed on a different device.
 new.password.title            = Update Password
 new.password.introText        = Your password was rejected by the server, please update your password.
 new.password.label            = Enter your new password
 new.password.confirm          = Confirm your new password
 new.password.acceptButton     = Update Password
 new.password.status.incorrect = Password incorrect, please try again.
 
-new.passphrase.title            = Update Secret Phrase
-new.passphrase.introText        = Your secret phrase has changed, please enter your new secret phrase
-new.passphrase.label            = New secret phrase
-new.passphrase.confirm          = Confirm secret phrase
-new.passphrase.acceptButton     = Update Secret Phrase
-new.passphrase.status.incorrect = Secret phrase incorrect, please try again.
+new.synckey.title          = Update Sync Key
+new.synckey.introText        = Your Sync Key has changed, please enter your new Sync Key
+new.synckey.acceptButton     = Update Sync Key
+new.synckey.status.incorrect = Sync Key incorrect, please try again.
--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -1,98 +1,102 @@
 <!ENTITY accountSetupTitle.label    "&syncBrand.fullName.label; Setup">
 
 <!-- First page of the wizard -->
 
+<!ENTITY setup.pickSetupType.description "Welcome, if you've never used &syncBrand.fullName.label; before, you will need to create a new account.">
+<!ENTITY button.createNewAccount.label "Create a New Account">
+<!ENTITY button.haveAccount.label "I Have a &syncBrand.fullName.label; Account">
+
 <!ENTITY setup.choicePage.title.label     "Have you used &syncBrand.fullName.label; before?">
 <!ENTITY setup.choicePage.new.label       "I've never used &syncBrand.shortName.label; before">
 <!ENTITY setup.choicePage.existing.label  "I'm already using &syncBrand.shortName.label; on another computer">
 
 <!-- New Account AND Existing Account -->
-<!ENTITY connectTo.label            "Connect to">
+<!ENTITY server.label               "Server">
 <!ENTITY serverType.main.label      "&syncBrand.fullName.label; Server">
 <!ENTITY serverType.custom.label    "Use a custom server">
-<!ENTITY signIn.username.label      "User Name">
-<!ENTITY signIn.username.accesskey  "U">
+<!ENTITY signIn.account.label       "Email Address / User Name">
+<!ENTITY signIn.account.accesskey   "E">
 <!ENTITY signIn.password.label      "Password">
 <!ENTITY signIn.password.accesskey  "P">
 <!ENTITY signIn.serverURL.label     "Server URL">
 <!ENTITY signIn.serverURL.accesskey "L">
 
 <!-- New Account Page 1: Basic Account Info -->
-<!ENTITY setup.newAccountPage.title.label  "Create your &syncBrand.shortName.label; Account">
+<!ENTITY setup.newAccountDetailsPage.title.label "Account Details">
 <!ENTITY setup.confirmPassword.label  "Confirm Password">
 <!ENTITY setup.confirmPassword.accesskey  "m">
 <!ENTITY setup.emailAddress.label     "Email Address">
 <!ENTITY setup.emailAddress.accesskey "E">
 <!-- LOCALIZATION NOTE: tosAgree1, tosLink, tosAgree2, ppLink, tosAgree3 are
      joined with implicit white space, so spaces in the strings aren't necessary -->
 <!ENTITY setup.tosAgree1.label      "I agree to the">
 <!ENTITY setup.tosAgree1.accesskey  "a">
 <!ENTITY setup.tosLink.label        "Terms of Service">
 <!ENTITY setup.tosAgree2.label      "and the">
 <!ENTITY setup.ppLink.label         "Privacy Policy">
 <!ENTITY setup.tosAgree3.label      "">
 <!ENTITY setup.tosAgree2.accesskey  "">
 
-<!-- New Account Page 2: Passphrase Entry -->
-<!ENTITY setup.newPPPage.title.label       "Enter your Secret Phrase">
-<!ENTITY passphraseDesc.label         "Please enter a secret phrase. This will be used to encrypt all your data so only you can access it. It is never stored on the server, so don't lose this!">
-<!ENTITY passphraseDesc2.label        "This must be at least 12 characters long and cannot match your account password.">
-<!ENTITY passphraseEntry.label        "Secret Phrase">
-<!ENTITY passphraseEntry.accesskey    "S">
-<!ENTITY passphraseConfirm.label      "Confirm">
-<!ENTITY passphraseConfirm.accesskey  "m">
+<!-- New Account Page 2: Sync Key -->
+<!ENTITY setup.newSyncKeyPage.title.label "&brandShortName; Cares About Your Privacy">
+<!ENTITY setup.newSyncKeyPage.description.label "To ensure your total privacy, all of your data is encrypted prior to being uploaded. The Sync Key which is necessary to decrypt your data is not uploaded.">
+<!ENTITY syncKeyEntry.label        "Your Sync Key">
+<!ENTITY syncKeyEntry.accesskey    "K">
+<!ENTITY syncKeyGenerate.label     "Generate">
+<!ENTITY syncKeyBackup.description "Your Sync Key is required to access &syncBrand.fullName.label; on other machines. Please create a backup copy. We cannot help you recover your Sync Key.">
 
-<!-- New Account Page 3: Sync Type Options -->
-<!ENTITY setup.newAccountPrefs2.title.label "Browser Sync Preferences">
-<!ENTITY syncComputerName.label       "Computer Name:">
-<!ENTITY syncComputerName.accesskey   "c">
-<!ENTITY syncModeSwitchDesc.label     "&brandShortName; will: ">
-<!ENTITY syncModeSwitchDesc.accesskey "w">
-<!ENTITY syncEverything.label         "Sync Everything">
-<!ENTITY customSync.label             "Use my custom settings">
-<!ENTITY syncEverythingDescription.label  "Your bookmarks, history, passwords, preferences, and tabs will be synced.">
-<!ENTITY syncItem.bookmarks.label     "Sync Bookmarks">
-<!ENTITY syncItem.bookmarks.accesskey "m">
-<!ENTITY syncItem.tabs.label          "Sync Tabs">
-<!ENTITY syncItem.tabs.accesskey      "T">
-<!ENTITY syncItem.history.label       "Sync History">
-<!ENTITY syncItem.history.accesskey   "r">
-<!ENTITY syncItem.passwords.label     "Sync Passwords">
-<!ENTITY syncItem.passwords.accesskey "P">
-<!ENTITY syncItem.prefs.label         "Sync Preferences">
-<!ENTITY syncItem.prefs.accesskey     "S">
+<!ENTITY button.syncKeyBackup.print.label     "Print…">
+<!ENTITY button.syncKeyBackup.print.accesskey "P">
+<!ENTITY button.syncKeyBackup.save.label      "Save…">
+<!ENTITY button.syncKeyBackup.save.accesskey  "S">
 
-<!-- New Account Page 4: Captcha -->
-<!ENTITY setup.captchaPage.title.label     "Please confirm you're not a robot ;)">
+<!-- New Account Page 3: Captcha -->
+<!ENTITY setup.captchaPage2.title.label     "Please Confirm You're Not a Robot">
 
 <!-- Existing Account Page 1: Login -->
 <!ENTITY setup.existingAccount.title.label "Enter Account Information">
 <!ENTITY resetPassword.label          "Reset Password">
 <!ENTITY connecting.label             "Connecting…">
 
-<!-- Existing Account Page 2: Passphrase -->
-<!ENTITY passphraseGroupbox.label     "Enter Secret Phrase">
-<!ENTITY passphraseDesc3.label        "Please enter your secret phrase. This must be the same secret phrase that you used to encrypt your data.">
-<!ENTITY passphraseHelp.label         "Your secret phrase is at least 12 characters long and is not your password. You can find your saved secret phrase by going to your other computer and checking the Saved Passwords under Security. If you still cannot get the correct secret phrase, you can choose to reset it, but you will lose any data stored on the server.">
-<!ENTITY changePassphrase.label       "Change Secret Phrase">
+<!-- Existing Account Page 2: Sync Key -->
+<!ENTITY setup.existingSyncKeyPage.title "Please Enter Your Sync Key">
+<!ENTITY setup.existingSyncKeyPage.description "The Sync Key was generated for you, or you entered your own, when you first signed up for &syncBrand.fullName.label;. It is not the same as your password.">
+<!ENTITY existingSyncKeyHelp.description "You can find your saved Sync Key by going to your other computer and checking the Saved Passwords under Security. If you still cannot get the correct Sync Key, you can choose to reset it, but you will lose any data stored on the server.">
+<!ENTITY lostSyncKey.label            "I have lost my Sync Key">
 <!ENTITY verifying.label              "Verifying…">
 
-<!-- New & Existing Account: Merge Options -->
-<!ENTITY setup.mergeChoicePage.title.label "How do you want to start off?">
-<!ENTITY choice.merge.main.label      "Merge this computer's data with your &syncBrand.shortName.label; data">
-<!ENTITY choice.merge.recommend.label "This option is strongly recommended by Mozilla for all users.">
-<!ENTITY choice.client.main.label     "Replace all data on this computer with your &syncBrand.fullName.label; data">
-<!ENTITY choice.server.main.label     "Replace all other devices with your local data">
+<!-- Sync Options -->
+<!ENTITY setup.optionsPage.title      "Sync Options">
+<!ENTITY syncComputerName.label       "Computer Name:">
+<!ENTITY syncComputerName.accesskey   "c">
 
-<!-- New & Existing Account: Confirm Merge Options -->
-<!ENTITY confirm.caption.label        "Confirm your choice">
-<!ENTITY confirm.merge.label          "You have chosen to merge your data on this computer with the data on your other devices running &syncBrand.fullName.label;.">
+<!ENTITY syncMy.label               "Sync My">
+<!ENTITY engine.bookmarks.label     "Bookmarks">
+<!ENTITY engine.bookmarks.accesskey "m">
+<!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 "P">
+<!ENTITY engine.prefs.label         "Preferences">
+<!ENTITY engine.prefs.accesskey     "S">
+
+<!ENTITY choice2.merge.main.label      "Merge this computer's data with my &syncBrand.shortName.label; data">
+<!ENTITY choice2.merge.recommended.label "Recommended:">
+<!ENTITY choice2.client.main.label     "Replace all data on this computer with my &syncBrand.shortName.label; data">
+<!ENTITY choice2.server.main.label     "Replace all other devices with this computer's data">
+
+<!-- Confirm Merge Options -->
+<!ENTITY setup.optionsConfirmPage.title "Confirm">
+<!ENTITY confirm.merge.label    "You have chosen to merge your data on this computer with the data on your other devices running &syncBrand.fullName.label;.">
 <!ENTITY confirm.client.label         "All &brandShortName; data on this computer will be deleted, including the following:">
 <!ENTITY confirm.client.moreinfo.label "&brandShortName; will then copy your &syncBrand.fullName.label; data to this computer.">
 <!ENTITY confirm.client.warning.label "WARNING: This will result in all &brandShortName; data on this computer being replaced!">
 <!ENTITY confirm.server.label         "The following devices will be overwritten with your local data:">
 <!ENTITY confirm.server.warning.label "WARNING: Your local data will replace all &brandShortName; data on these devices!">
 
 <!-- New & Existing Account: Setup Complete -->
-<!ENTITY setup.successPage.title.label   "Setup Complete!">
-<!ENTITY setup.successPage.desc.label    "Congratulations! &brandShortName; is now set up to automatically sync your information. Don't forget to install &syncBrand.fullName.label; on all your devices. You can now continue using &brandShortName;.">
+<!ENTITY setup.successPage.title "Setup Complete">
+<!ENTITY changeOptions.label "You can change this preference by selecting Sync Options below.">
+<!ENTITY continueUsing.label "You may now continue using &brandShortName;.">
--- a/browser/chrome/browser/syncSetup.properties
+++ b/browser/chrome/browser/syncSetup.properties
@@ -1,16 +1,38 @@
-cancelSetup.label           = Cancel Setup
-errorCreatingAccount.title  = Error Creating Account
+button.syncOptions.label       = Sync Options
+button.syncOptionsDone.label   = Done
+button.syncOptionsCancel.label = Cancel
 
 invalidEmail.label          = Invalid email address
 serverInvalid.label         = Please enter a valid server URL
 usernameNotAvailable.label  = Already in use
 
-# LOCALIZATION NOTE (additionalClients.label, bookmarkCount.label, historyCount.label, passwordCount.label).
-# We'll fix the lack of PluralForms in bug 583661.
-additionalClients.label     = and %S additional devices
-bookmarkCount.label         = %S bookmarks
-historyCount.label          = %S days of history
-passwordCount.label         = %S passwords
+verifying.label = Verifying…
+
+# LOCALIZATION NOTE (additionalClientCount.label):
+# Semi-colon list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+additionalClientCount.label = and %S additional device;and %S additional devices
+# LOCALIZATION NOTE (bookmarksCount.label):
+# Semi-colon list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+bookmarksCount.label        = %S bookmark;%S bookmarks
+# LOCALIZATION NOTE (historyDaysCount.label):
+# Semi-colon list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+historyDaysCount.label      = %S day of history;%S days of history
+# LOCALIZATION NOTE (passwordsCount.label):
+# Semi-colon list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+passwordsCount.label        = %S password;%S passwords
+
+save.synckey.title = Save Sync Key
+
+newAccount.action.label = Firefox Sync is now set up to automatically sync all of your browser data.
+newAccount.change.label = You can choose exactly what to sync by selecting Sync Options below.
+resetClient.change.label = Firefox Sync will now merge all this computer's browser data into your Sync account.
+wipeClient.change.label = Firefox Sync will now replace all of the browser data on this computer with the data in your Sync account.
+wipeRemote.change.label = Firefox Sync will now replace all of the browser data in your Sync account with the data on this computer.
+existingAccount.change.label = You can change this preference by selecting Sync Options below.
 
 # Several other strings are used (via Weave.Status.login), but they come from
-#  /services/sync */
+#  /services/sync
--- a/browser/chrome/overrides/netError.dtd
+++ b/browser/chrome/overrides/netError.dtd
@@ -36,19 +36,26 @@ retperanto, certiĝu ke
 <li>TTTajn adresojn oni kutime skribas ĉi tiel <strong>http://www.example.com/</strong></li> 
 <li>Kontrolu ĉu vi tajpis la ĝustajn signojn (ekzemple <strong>/</strong>).</li> 
 </ul>">
 
 <!ENTITY netInterrupt.title "La konekto estis ĉesigita">
 <!ENTITY netInterrupt.longDesc "&sharedLongDesc;">
 
 <!ENTITY netOffline.title "Malkonektita reĝimo">
-<!ENTITY netOffline.longDesc "<ul> 
-<li>Malaktivigu &quot;Labori malkonektite&quot; en la menuo Dosiero kaj klopodu denove.</li> 
-</ul>">
+<!-- LOCALIZATION NOTE (netOffline.overrideLongDesc) - This string should
+     indicate that "Work Offline" is a menu item without being too specific,
+     since it could be in either the normal menu (Mac/Linux) or the Firefox button
+     menu (Windows).
+-->
+<!ENTITY netOffline.overrideLongDesc "
+<ul>
+  <li>Uncheck the &quot;Work Offline&quot; menu item, then try again.</li>
+</ul>
+">
 
 <!ENTITY contentEncodingError.title "Eraro de enkodigo de enhavo">
 <!ENTITY contentEncodingError.longDesc "<ul> 
 <li>Bonvolu kontakti la retejajn posedantojn por raporti al ili tiun ĉi problemon.</li> 
 </ul>">
 
 <!ENTITY unsafeContentType.title "Nesekura tipo de dosiero">
 <!ENTITY unsafeContentType.longDesc "<ul> 
--- a/browser/feedback/main.dtd
+++ b/browser/feedback/main.dtd
@@ -1,10 +1,9 @@
 <!ENTITY testpilot.brand.label                      "Test Pilot">
-<!-- browser window: menu and status bar -->
 <!ENTITY testpilot.settings.label                   "Settings">
 <!ENTITY testpilot.settings.dataSubmission.label    "Data Submission">
 <!ENTITY testpilot.settings.notifications.label     "Notifications">
 <!ENTITY testpilot.settings.notifyWhen.label        "Notify me when…">
 <!ENTITY testpilot.settings.readyToSubmit.label     "A study is ready to submit">
 <!ENTITY testpilot.settings.newStudy.label          "There's a new study">
 <!ENTITY testpilot.settings.hasNewResults.label     "A study has new results">
 <!ENTITY testpilot.settings.alwaysSubmitData.label  "Automatically submit my data (don't ask me)">
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -41,35 +41,39 @@ KillScriptMessage=A script on this page 
 KillScriptWithDebugMessage=A script on this page may be busy, or it may have stopped responding. You can stop the script now, open the script in the debugger, or let the script continue.
 KillScriptLocation=Script: %S
 StopScriptButton=Stop script
 DebugScriptButton=Debug script
 WaitForScriptButton=Daŭrigi
 DontAskAgain=&Don't ask me again
 JSURLLoadBlockedWarning=La klopodo ŝargi javascript-an URLon el iu servilo en la fenestro kiu montras enhavon de alia servilo estis blokita de la sekureca administranto.
 WindowCloseBlockedWarning=Scripts may not close windows that were not opened by script.
-OnBeforeUnloadPreMessage=Are you sure you want to navigate away from this page?
-OnBeforeUnloadPostMessage=Press OK to continue, or Cancel to stay on the current page.
+OnBeforeUnloadTitle=Are you sure?
+OnBeforeUnloadMessage=This page is asking you to confirm that you want to leave - data you have entered may not be saved.
+OnBeforeUnloadStayButton=Stay on Page
+OnBeforeUnloadLeaveButton=Leave Page
 DocumentAllUsed=Non-standard document.all property was used. Use W3C standard document.getElementById() instead.
 GlobalScopeElementReference=Element referenced by ID/NAME in the global scope. Use W3C standard document.getElementById() instead.
 UseOfCaptureEventsWarning=Use of captureEvents() is deprecated. To upgrade your code, use the DOM 2 addEventListener() method. For more help http://developer.mozilla.org/en/docs/DOM:element.addEventListener
 UseOfReleaseEventsWarning=Use of releaseEvents() is deprecated. To upgrade your code, use the DOM 2 removeEventListener() method. For more help http://developer.mozilla.org/en/docs/DOM:element.removeEventListener
 UseOfRouteEventWarning=Use of routeEvent() is deprecated. To upgrade your code, use the DOM 2 dispatchEvent() method. For more help http://developer.mozilla.org/en/docs/DOM:element.dispatchEvent
 UseOfPreventBubbleWarning=Event=%S, use of preventBubble() is deprecated. Use W3C standard stopPropagation() instead.
 UseOfPreventCaptureWarning=Event=%S, use of preventCapture() is deprecated. Use W3C standard stopPropagation() instead.
 UseOfDOM3LoadMethodWarning=Use of Document.load() is deprecated. To upgrade your code, use the DOM XMLHttpRequest object. For more help https://developer.mozilla.org/en/XMLHttpRequest
 UnexpectedCanvasVariantStyle=canvas: an attempt to set strokeStyle or fillStyle to a value that is neither a string, a CanvasGradient, or a CanvasPattern was ignored.
 EmptyGetElementByIdParam=Empty string passed to getElementById().
 LowMemoryTitle=Warning: Low memory
 LowMemoryMessage=A script on this page has been stopped due to a low memory condition.
 WrongEventPropertyAccessWarning=The '%S' property of a %S event should not be used. The value is meaningless.
 SpeculationFailed=An unbalanced tree was written using document.write() causing data from the network to be reparsed. For more information https://developer.mozilla.org/en/Optimizing_Your_Pages_for_Speculative_Parsing
 DocumentWriteIgnored=A call to document.write() from an asynchronously-loaded external script was ignored.
-ElementSuffersFromBeingTooLong=The text is too long. It is %S characters long and the limit is %S.
-TextElementSuffersFromBeingMissing=This field is mandatory, you have to fill it.
-CheckboxElementSuffersFromBeingMissing=This checkbox is mandatory, you have to check it.
-RadioElementSuffersFromBeingMissing=You have to select one of these options.
-FileElementSuffersFromBeingMissing=You have to select a file.
-ElementSuffersFromInvalidEmail=The entered email address is not valid.
-ElementSuffersFromInvalidURL=The entered URL is not valid.
-ElementSuffersFromPatternMismatch=The field value is not in the requested format.
-ElementSuffersFromPatternMismatchWithTitle=The field value is not in the requested format. %S
-
+FormValidationTextTooLong=Please shorten this text to %S characters or less (you are currently using %S characters).
+FormValidationValueMissing=Please fill out this field.
+FormValidationCheckboxMissing=Please check this box if you want to proceed.
+FormValidationRadioMissing=Please select one of these options.
+FormValidationFileMissing=Please select a file.
+FormValidationSelectMissing=Please select an item in the list.
+FormValidationInvalidEmail=Please enter an email address.
+FormValidationInvalidURL=Please enter a URL.
+FormValidationPatternMismatch=Please match the requested format.
+FormValidationPatternMismatchWithTitle=Please match the requested format: %S.
+UseOfDocumentWidthWarning=Non-standard document.width was used. Use standard document.body.clientWidth instead.
+UseOfDocumentHeightWarning=Non-standard document.height was used. Use standard document.body.clientHeight instead.
--- a/dom/chrome/layout/MediaDocument.properties
+++ b/dom/chrome/layout/MediaDocument.properties
@@ -45,12 +45,12 @@
 #LOCALIZATION NOTE (MediaTitleWithNoInfo): first %S is type
 ImageTitleWithDimensionsAndFile=%S (%S Bildo, %S x %S grafikaj punktoj)
 ImageTitleWithoutDimensions=%S (%S Bildo)
 ImageTitleWithDimensions=(%S Bildo, %Sx%S grafikaj punktoj)
 ImageTitleWithNeitherDimensionsNorFile=(%S Bildo)
 MediaTitleWithFile=%S (%S Object)
 MediaTitleWithNoInfo=(%S Object)
 
-InvalidImage=La bildo “%S” ne povas esti montrita ĉar ĝi enhavas erarojn.
+InvalidImage=The image \u201c%S\u201d cannot be displayed because it contains errors.
 ScaledImage=Scaled (%S%%)
 
 TitleWithStatus=%S - %S
--- a/dom/chrome/netError.dtd
+++ b/dom/chrome/netError.dtd
@@ -21,16 +21,17 @@
 <!ENTITY malformedURI.title "Invalid Address">
 <!ENTITY malformedURI.longDesc "<p>The provided address is not in a recognized format. Please check the location bar for mistakes and try again.</p>">
 
 <!ENTITY netInterrupt.title "Data Transfer Interrupted">
 <!ENTITY netInterrupt.longDesc "<p>The browser connected successfully, but the connection was interrupted while transferring information.  Please try again.</p><ul><li>Are you unable to browse other sites? Check the computer's network connection.</li><li>Still having trouble? Consult your network administrator or Internet provider for assistance.</li></ul>">
 
 <!ENTITY netOffline.title "Offline Mode">
 <!ENTITY netOffline.longDesc "<p>The browser is operating in its offline mode and cannot connect to the requested item.</p><ul><li>Is the computer connected to an active network?</li><li>Place the browser in online mode and try again.</li></ul>">
+<!ENTITY netOffline.overrideLongDesc "<p>The browser is operating in its offline mode and cannot connect to the requested item.</p><ul><li>Is the computer connected to an active network?</li><li>Place the browser in online mode and try again.</li></ul>">
 
 <!ENTITY contentEncodingError.title "Eraro de enkodigo de enhavo">
 <!ENTITY contentEncodingError.longDesc "<p>The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.</p><ul><li>Please contact the website owners to inform them of this problem.</li></ul>">
 
 <!ENTITY unsafeContentType.title "Nesekura tipo de dosiero">
 <!ENTITY unsafeContentType.longDesc "<ul> 
 <li>Bonvolu kontakti la retejajn posedantojn por raporti al ili tiun ĉi problemon.</li> 
 </ul>">
--- a/dom/chrome/security/caps.properties
+++ b/dom/chrome/security/caps.properties
@@ -44,17 +44,17 @@ EnableCapabilityDenied = A script from "
 CheckLoadURIError = Sekureca eraro: Enhavo ĉe %S ne povas ŝargi aŭ ligi al %S.
 CheckSameOriginError = Sekureca eraro: La enhavo ĉe %S ne povas ŝargi datumojn el %S.
 
 # LOCALIZATION NOTE (GetPropertyDeniedOrigins):
 # %1$S is the origin of the script which was denied access.
 # %2$S is the type of object it was.
 # %3$S is the property of that object that access was denied for.
 # %4$S is the origin of the object access was denied to.
-GetPropertyDeniedOrigins = Permission denied for <%S> to get property %S.%S from <%S>.
+GetPropertyDeniedOrigins = Permission denied for <%1$S> to get property %2$S.%3$S from <%4$S>.
 # LOCALIZATION NOTE (GetPropertyDeniedOriginsSubjectDomain):
 # %1$S is the origin of the script which was denied access.
 # %2$S is the type of object it was.
 # %3$S is the property of that object that access was denied for.
 # %4$S is the origin of the object access was denied to.
 # %5$S is the value of document.domain for the script which was denied access;
 #      don't translate "document.domain".
 GetPropertyDeniedOriginsSubjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to get property %2$S.%3$S from <%4$S> (document.domain has not been set).
@@ -77,17 +77,17 @@ GetPropertyDeniedOriginsObjectDomain = P
 #      don't translate "document.domain".
 GetPropertyDeniedOriginsSubjectDomainObjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to get property %2$S.%3$S from <%4$S> (document.domain=<%6$S>).
 
 # LOCALIZATION NOTE (SetPropertyDeniedOrigins):
 # %1$S is the origin of the script which was denied access.
 # %2$S is the type of object it was.
 # %3$S is the property of that object that access was denied for.
 # %4$S is the origin of the object access was denied to.
-SetPropertyDeniedOrigins = Permission denied for <%S> to set property %S.%S on <%S>.
+SetPropertyDeniedOrigins = Permission denied for <%1$S> to set property %2$S.%3$S on <%4$S>.
 # LOCALIZATION NOTE (SetPropertyDeniedOriginsSubjectDomain):
 # %1$S is the origin of the script which was denied access.
 # %2$S is the type of object it was.
 # %3$S is the property of that object that access was denied for.
 # %4$S is the origin of the object access was denied to.
 # %5$S is the value of document.domain for the script which was denied access;
 #      don't translate "document.domain".
 SetPropertyDeniedOriginsSubjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to set property %2$S.%3$S on <%4$S> (document.domain has not been set).
@@ -110,17 +110,17 @@ SetPropertyDeniedOriginsObjectDomain = P
 #      don't translate "document.domain".
 SetPropertyDeniedOriginsSubjectDomainObjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to set property %2$S.%3$S on <%4$S> (document.domain=<%6$S>).
 
 # LOCALIZATION NOTE (CallMethodDeniedOrigins):
 # %1$S is the origin of the script which was denied access.
 # %2$S is the type of object it was.
 # %3$S is the method of that object that access was denied for.
 # %4$S is the origin of the object access was denied to.
-CallMethodDeniedOrigins = Permission denied for <%S> to call method %S.%S on <%S>.
+CallMethodDeniedOrigins = Permission denied for <%1$S> to call method %2$S.%3$S on <%4$S>.
 # LOCALIZATION NOTE (CallMethodDeniedOriginsSubjectDomain):
 # %1$S is the origin of the script which was denied access.
 # %2$S is the type of object it was.
 # %3$S is the method of that object that access was denied for.
 # %4$S is the origin of the object access was denied to.
 # %5$S is the value of document.domain for the script which was denied access;
 #      don't translate "document.domain".
 CallMethodDeniedOriginsSubjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to call method %2$S.%3$S on <%4$S> (document.domain has not been set).
--- a/dom/chrome/xslt/xslt.properties
+++ b/dom/chrome/xslt/xslt.properties
@@ -39,17 +39,17 @@ 1  = Parsing a XSLT stylesheet failed.
 2  = Parsing a XPath expression failed.
 3  = 
 4  = XSLT transformation failed.
 5  = Invalid XSLT/XPath function.
 6  = XSLT Stylesheet (possibly) contains a recursion.
 7  = Nevalida atributa valoro en XSLT 1.0.
 8  = An XPath expression was expected to return a NodeSet.
 9  = XSLT transformation was terminated by <xsl:message>.
-10 = A network error occured loading a XSLT stylesheet:
+10 = A network error occurred loading an XSLT stylesheet:
 11 = XSLT-a stilfolio ne havas XML-an MIME-an tipon:
 12 = An XSLT stylesheet directly or indirectly imports or includes itself:
 13 = An XPath function was called with the wrong number of arguments.
 14 = An unknown XPath extension function was called.
 15 = XPath parse failure: ')' expected:
 16 = XPath parse failure: invalid axis:
 17 = XPath parse failure: Name or Nodetype test expected:
 18 = XPath parse failure: ']' expected:
--- a/other-licenses/branding/firefox/brand.dtd
+++ b/other-licenses/branding/firefox/brand.dtd
@@ -1,5 +1,5 @@
 <!ENTITY  brandShortName        "Firefox">
 <!ENTITY  brandFullName         "Mozilla Firefox">
 <!ENTITY  vendorShortName       "Mozilla">
-<!-- LOCALIZATION NOTE (trademarkInfo): note that there is no space between licenseLinkText (and its trailing licenseLinkSuffix entity) and this entity, so if your locale needs a space between sentences, you need to put it at the start of this entity. -->
-<!ENTITY  trademarkInfo         " Firefox and the Firefox logos are trademarks of the Mozilla Foundation. Some of the trademarks used under license from The Charlton Company.">
+<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part2   "Some of the trademarks used under license from The Charlton Company.">
--- a/security/manager/chrome/pipnss/nsserrors.properties
+++ b/security/manager/chrome/pipnss/nsserrors.properties
@@ -105,16 +105,17 @@ SSL_ERROR_UNRECOGNIZED_NAME_ALERT=SSL pe
 SSL_ERROR_BAD_CERT_STATUS_RESPONSE_ALERT=SSL peer was unable to get an OCSP response for its certificate.
 SSL_ERROR_BAD_CERT_HASH_VALUE_ALERT=SSL peer reported bad certificate hash value.
 SSL_ERROR_RX_UNEXPECTED_NEW_SESSION_TICKET=SSL received an unexpected New Session Ticket handshake message.
 SSL_ERROR_RX_MALFORMED_NEW_SESSION_TICKET=SSL received a malformed New Session Ticket handshake message.
 SSL_ERROR_DECOMPRESSION_FAILURE=SSL received a compressed record that could not be decompressed.
 SSL_ERROR_RENEGOTIATION_NOT_ALLOWED=Renegotiation is not allowed on this SSL socket.
 SSL_ERROR_UNSAFE_NEGOTIATION=Peer attempted old style (potentially vulnerable) handshake.
 SSL_ERROR_RX_UNEXPECTED_UNCOMPRESSED_RECORD=SSL received an unexpected uncompressed record.
+SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY=SSL received a weak ephemeral Diffie-Hellman key in Server Key Exchange handshake message.
 SEC_ERROR_IO=An I/O error occurred during security authorization.
 SEC_ERROR_LIBRARY_FAILURE=security library failure.
 SEC_ERROR_BAD_DATA=security library: received bad data.
 SEC_ERROR_OUTPUT_LEN=security library: output length error.
 SEC_ERROR_INPUT_LEN=security library has experienced an input length error.
 SEC_ERROR_INVALID_ARGS=security library: invalid arguments.
 SEC_ERROR_INVALID_ALGORITHM=security library: invalid algorithm.
 SEC_ERROR_INVALID_AVA=security library: invalid AVA.
--- a/services/sync/errors.properties
+++ b/services/sync/errors.properties
@@ -1,26 +1,29 @@
 error.login.reason.network    = Failed to connect to the server
-error.login.reason.passphrase = Wrong secret phrase
+error.login.reason.synckey    = Wrong Sync Key
+# error.login.reason.password is deprecated.
 error.login.reason.password   = Incorrect username or password
+error.login.reason.account    = Incorrect account name or password
 error.login.reason.no_password= No saved password to use
-error.login.reason.no_passphrase= No saved secret phrase to use
+error.login.reason.no_synckey = No saved Sync Key to use
 error.login.reason.server     = Server incorrectly configured
 
 error.sync.failed_partial     = One or more data types could not be synced
 
 invalid-captcha = Incorrect words, try again
 weak-password   = Use a stronger password
 
 # this is the fallback, if we hit an error we didn't bother to localize
 error.reason.unknown          = Unknown error
 
-change.passphrase.ppSameAsPassphrase = The secret phrase cannot be the same as your current secret phrase
-change.passphrase.ppSameAsPassword   = The secret phrase cannot be the same as your password
-change.passphrase.ppSameAsUsername   = The secret phrase cannot be the same as your user name
-change.passphrase.mismatch           = The phrases entered do not match
-change.passphrase.tooShort           = The secret phrase entered is too short
+change.synckey.sameAsSyncKey    = The new Sync Key cannot be the same as your Sync Key
+change.synckey.sameAsPassword   = The Sync Key cannot be the same as your password
+change.synckey.sameAsUsername   = The Sync Key cannot be the same as your user name
+change.synckey.sameAsEmail      = The Sync Key cannot be the same as your email address
+change.synckey.tooShort         = The Sync Key entered is too short
 
-change.password.pwSameAsPassphrase   = Password can't match secret phrase
+change.password.pwSameAsSyncKey      = Password can't match your Sync Key
 change.password.pwSameAsPassword     = Password can't match current password
 change.password.pwSameAsUsername     = Password can't match your user name
+change.password.pwSameAsEmail        = Password can't match your email address
 change.password.mismatch             = The passwords entered do not match
 change.password.tooShort             = The password entered is too short
--- a/services/sync/sync.properties
+++ b/services/sync/sync.properties
@@ -28,10 +28,16 @@ error.sync.title = Error While Syncing
 error.sync.description = Sync encountered an error while syncing: %1$S.  Sync will automatically retry this action.
 error.sync.no_node_found = The Sync server is a little busy right now, but you don't need to do anything about it.  We'll start syncing your data as soon as we can!
 error.sync.no_node_found.title = Sync Delay
 error.sync.needUpdate.description = You need to update Firefox Sync to continue syncing your data.
 error.sync.needUpdate.label = Update Firefox Sync
 error.sync.needUpdate.accesskey = U
 error.sync.tryAgainButton.label = Sync Now
 error.sync.tryAgainButton.accesskey = S
+warning.sync.quota.label = Approaching Server Quota
+warning.sync.quota.description = You are approaching the server quota. Please review which data to sync.
+error.sync.quota.label = Server Quota Exceeded
+error.sync.quota.description = Sync failed because it exceeded the server quota. Please review which data to sync.
+error.sync.viewQuotaButton.label = View Quota
+error.sync.viewQuotaButton.accesskey = V
 
 tabs.fromOtherComputers.label = Tabs From Other Computers
--- a/toolkit/chrome/global/aboutRights.dtd
+++ b/toolkit/chrome/global/aboutRights.dtd
@@ -15,51 +15,71 @@
 <!ENTITY rights.intro-point1a "&brandShortName; estas akirebla de vi laŭ la kondiĉoj de la permesilo ">
 <!ENTITY rights.intro-point1b "Mozilla Public License">
 <!ENTITY rights.intro-point1c ". This means you may use, copy and distribute &brandShortName; to others.  You are also welcome to modify the source code of &brandShortName; as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions.">
 
 <!ENTITY rights.intro-point2-a "You are not granted any trademark rights or licenses to the trademarks of the Mozilla Foundation or any party, including without limitation the Firefox name or logo. Additional information on trademarks may be found ">
 <!ENTITY rights.intro-point2-b "here">
 <!ENTITY rights.intro-point2-c ".">
 
+<!-- point 2.5 text for official branded builds -->
+<!ENTITY rights.intro-point2.5 "Some features in &brandShortName;, such as the Crash Reporter, give you the option to provide feedback to &vendorShortName;. By choosing to submit feedback, you give &vendorShortName; permission to use the feedback to improve its products, to publish the feedback on its websites, and to distribute the feedback.">
+
 <!-- point 3 text for official branded builds -->
-<!ENTITY rights.intro-point3a "Privacy policies for &vendorShortName;'s products may be found ">
-<!ENTITY rights.intro-point3b "here">
+<!ENTITY rights2.intro-point3a "How we use your personal information and feedback submitted to &vendorShortName; through &brandShortName; is described in the ">
+<!ENTITY rights2.intro-point3b "&brandShortName; Privacy Policy">
 <!ENTITY rights.intro-point3c ".">
 
 <!-- point 3 text for unbranded builds -->
 <!ENTITY rights.intro-point3-unbranded "Any applicable privacy policies for this product should be listed here.">
 
 <!-- point 4 text for official branded builds -->
-<!ENTITY rights.intro-point4a "&brandShortName; also offers optional web site information services, such as the SafeBrowsing service; however, we cannot guarantee they are 100&#37; accurate or error-free. More details, including information on how to disable the services, can be found in the ">
+<!ENTITY rights2.intro-point4a "Some &brandShortName; features make use of web-based information services, however, we cannot guarantee they are 100&#37; accurate or error-free. More details, including information on how to disable the features that use these services, can be found in the ">
 <!ENTITY rights.intro-point4b "service terms">
 <!ENTITY rights.intro-point4c ".">
 
 <!-- point 4 text for unbranded builds -->
 <!ENTITY rights.intro-point4a-unbranded "If this product incorporates web services, any applicable service terms for the service(s) should be linked to the ">
 <!ENTITY rights.intro-point4b-unbranded "Web Site Services">
 <!ENTITY rights.intro-point4c-unbranded " section.">
 
-<!ENTITY rights.webservices-header "&brandFullName; Web Site Services">
+<!ENTITY rights2.webservices-header "&brandFullName; Web-Based Information Services">
 
 <!-- Note that this paragraph references a couple of entities from
      preferences/security.dtd, so that we can refer to text the user sees in
      the UI, without this page being forgotten every time those strings are
      updated.  -->
 <!-- intro paragraph for branded builds -->
-<!ENTITY rights.webservices-a "&brandFullName; uses web site information services (&quot;Services&quot;), such as the SafeBrowsing service, that are available for your use with this binary version of &brandShortName; as described below. If you do not want to use the Services or the terms below are unacceptable, you may disable the SafeBrowsing service by opening the application preferences, selecting the ">
-<!ENTITY rights.webservices-b "Security">
-<!ENTITY rights.webservices-c " section, and unchecking the options for &quot;&blockAttackSites.label;&quot; and &quot;&blockWebForgeries.label;&quot;">
+<!ENTITY rights2.webservices-a "&brandFullName; uses web-based information services (&quot;Services&quot;) to provide some of the features provided for your use with this binary version of &brandShortName; under the terms described below. If you do not want to use one or more of the Services or the terms below are unacceptable, you may disable the feature or Service(s). Instructions on how to disable a particular feature or Service may be found ">
+<!ENTITY rights2.webservices-b "here">
+<!ENTITY rights2.webservices-c ".">
+
+<!-- safe browsing points for branded builds -->
+<!ENTITY rights.safebrowsing-a "SafeBrowsing: ">
+<!ENTITY rights.safebrowsing-b "Disabling the Safe Browsing feature is not recommended as it may result in you going to unsafe sites.  If you wish to disable the feature completely, follow these steps:">
+<!ENTITY rights.safebrowsing-term1 "Open the application preferences">
+<!ENTITY rights.safebrowsing-term2 "Select the Security selection">
+<!ENTITY rights.safebrowsing-term3 "Uncheck the options to &quot;&blockAttackSites.label;&quot; and &quot;&blockWebForgeries.label;&quot;">
+<!ENTITY rights.safebrowsing-term4 "Safe Browsing is now disabled">
+
+<!-- location aware browsing points for branded builds -->
+<!ENTITY rights.locationawarebrowsing-a "Location Aware Browsing: ">
+<!ENTITY rights.locationawarebrowsing-b "is always opt-in.  No location information is ever sent without your permission.  If you wish to disable the feature completely, follow these steps:">
+<!ENTITY rights.locationawarebrowsing-term1a "In the URL bar, type ">
+<!ENTITY rights.locationawarebrowsing-term1b "about:config">
+<!ENTITY rights.locationawarebrowsing-term2 "Type geo.enabled">
+<!ENTITY rights.locationawarebrowsing-term3 "Double click on the geo.enabled preference">
+<!ENTITY rights.locationawarebrowsing-term4 "Location-Aware Browsing is now disabled">
 
 <!-- intro paragraph for unbranded builds -->
 <!ENTITY rights.webservices-unbranded "An overview of the web site services the product incorporates, along with instructions on how to disable them, if applicable, should be included here.">
 
 <!-- point 1 text for unbranded builds -->
 <!ENTITY rights.webservices-term1-unbranded "Any applicable service terms for this product should be listed here.">
 
 <!-- points 1-7 text for branded builds -->
-<!ENTITY rights.webservices-term1 "&vendorShortName; and its contributors, licensors and partners work to provide the most accurate and up-to-date phishing and malware information. However, they cannot guarantee that this information is comprehensive and error-free: some risky sites may not be identified and some safe sites may be identified in error.">
+<!ENTITY rights2.webservices-term1 "&vendorShortName; and its contributors, licensors and partners work to provide the most accurate and up-to-date Services.  However, we cannot guarantee that this information is comprehensive and error-free.  For example, the Safe Browsing Service may not identify some risky sites and may identify some safe sites in error and the Location Aware Service all locations returned by our service providers are estimates only and neither we nor our service providers guarantee the accuracy of the locations provided.">
 <!ENTITY rights.webservices-term2 "&vendorShortName; may discontinue or change the Services at its discretion.">
-<!ENTITY rights.webservices-term3 "You are welcome to use these Services with the accompanying version of &brandShortName;, and you have all the rights necessary to do so.  &vendorShortName; and its licensors reserve all other rights in the Services.  These terms are not intended to limit any rights granted under open source licenses applicable to &brandShortName; and to corresponding source code versions of &brandShortName;.">
+<!ENTITY rights2.webservices-term3 "You are welcome to use these Services with the accompanying version of &brandShortName;, and &vendorShortName; grants you its rights to do so.  &vendorShortName; and its licensors reserve all other rights in the Services.  These terms are not intended to limit any rights granted under open source licenses applicable to &brandShortName; and to corresponding source code versions of &brandShortName;.">
 <!ENTITY rights.webservices-term4 "The Services are provided &quot;as-is.&quot;  &vendorShortName;, its contributors, licensors, and distributors, disclaim all warranties, whether express or implied, including without limitation, warranties that the Services are merchantable and fit for your particular purposes.  You bear the entire risk as to selecting the Services for your purposes and as to the quality and performance of the Services. Some jurisdictions do not allow the exclusion or limitation of implied warranties, so this disclaimer may not apply to you.">
 <!ENTITY rights.webservices-term5 "Except as required by law, &vendorShortName;, its contributors, licensors, and distributors will not be liable for any indirect, special, incidental, consequential, punitive, or exemplary damages arising out of or in any way relating to the use of &brandShortName; and the Services.  The collective liability under these terms will not exceed $500 (five hundred dollars). Some jurisdictions do not allow the exclusion or limitation of certain damages, so this exclusion and limitation may not apply to you.">
 <!ENTITY rights.webservices-term6 "&vendorShortName; may update these terms as necessary from time to time. These terms may not be modified or canceled without &vendorShortName;'s written agreement.">
 <!ENTITY rights.webservices-term7 "These terms are governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions. If any portion of these terms is held to be invalid or unenforceable, the remaining portions will remain in full force and effect. In the event of a conflict between a translated version of these terms and the English language version, the English language version shall control.">
--- a/toolkit/chrome/global/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -14,28 +14,27 @@
 <!ENTITY aboutSupport.extensionId "ID">
 
 <!ENTITY aboutSupport.appBasicsTitle "Application Basics">
 <!ENTITY aboutSupport.appBasicsName "Name">
 <!ENTITY aboutSupport.appBasicsVersion "Version">
 <!ENTITY aboutSupport.appBasicsProfileDir "Profile Directory">
 <!ENTITY aboutSupport.appBasicsEnabledPlugins "Enabled Plugins">
 <!ENTITY aboutSupport.appBasicsBuildConfig "Build Configuration">
+<!ENTITY aboutSupport.appBasicsUserAgent "User Agent">
 
 <!ENTITY aboutSupport.show.label "Open Containing Folder">
 
 <!-- LOCALIZATION NOTE (aboutSupport.showMac.label): This is the Mac-specific
 variant of aboutSupport.show.label.  This allows us to use the preferred
 "Finder" terminology on Mac. -->
 <!ENTITY aboutSupport.showMac.label "Show in Finder">
 
 <!ENTITY aboutSupport.modifiedPrefsTitle "Modified Preferences">
 <!ENTITY aboutSupport.modifiedPrefsName "Name">
 <!ENTITY aboutSupport.modifiedPrefsValue "Value">
 
 <!ENTITY aboutSupport.graphicsTitle "Graphics">
-<!-- LOCALIZATION NOTE In the following string, "Direct2D" is a proper noun and should not be translated -->
-<!ENTITY aboutSupport.graphicsDirect2DEnabled "Direct2D Enabled">
 
 <!ENTITY aboutSupport.installationHistoryTitle "Installation History">
 <!ENTITY aboutSupport.updateHistoryTitle "Update History">
 
 <!ENTITY aboutSupport.copyToClipboard.label "Copy all to clipboard">
--- a/toolkit/chrome/global/commonDialogs.properties
+++ b/toolkit/chrome/global/commonDialogs.properties
@@ -9,16 +9,18 @@ OK=Akcepti
 Cancel=Nuligi
 Yes=&Yes
 No=&No
 Save=&Konservi
 Revert=&Reveni
 DontSave=&Ne Konservi
 ScriptDlgGenericHeading=[JavaScript programo]
 ScriptDlgHeading=La paĝo ĉe %S diras:
+ScriptDialogLabel=Prevent this page from creating additional dialogs
+ScriptDialogPreventTitle=Confirm Dialog Preference
 # LOCALIZATION NOTE (EnterLoginForRealm, EnterLoginForProxy):
 # %1 is an untrusted string provided by a remote server. It could try to
 # take advantage of sentence structure in order to mislead the user (see
 # bug 244273). %1 should be integrated into the translated sentences as
 # little as possible. %2 is the url of the site being accessed.
 EnterLoginForRealm=A username and password are being requested by %2$S. The site says: "%1$S"
 EnterLoginForProxy=The proxy %2$S is requesting a username and password. The site says: "%1$S"
 EnterUserPasswordFor=Enter username and password for %1$S
--- a/toolkit/chrome/global/headsUpDisplay.properties
+++ b/toolkit/chrome/global/headsUpDisplay.properties
@@ -56,10 +56,56 @@ jsPropertyTitle=Object Inspector
 # The %S is replaced by the evaluated code the user clicked on in the console.
 #
 # Example: The user executed `window.document` in the WebConsole. The `document`
 # object is written to the output. If the user clicks on the `document` output
 # in the console, a PropertyPanel will show up. The title of the PropertyPanel
 # is set to `Inspect: window.document` because the clicked `document` object was
 # evaluated based on the `window.document` string.
 jsPropertyInspectTitle=Inspect: %S
+saveBodies.label=Log Request and Response Bodies
+saveBodies.accesskey=L
 copyCmd.label=Kopii
 copyCmd.accesskey=K
+selectAllCmd.label=Select All
+selectAllCmd.accesskey=A
+# LOCALIZATION NOTE (timestampFormat): %1$02S = hours (24-hour clock),
+# %2$02S = minutes, %3$02S = seconds, %4$03S = milliseconds.
+timestampFormat=%02S:%02S:%02S.%03S
+
+helperFuncUnsupportedTypeError=Can't call pprint on this type of object.
+# LOCALIZATION NOTE (networkUrlWithStatus):
+#
+# When the HTTP request is started only the URL of the request is printed to the
+# WebConsole. As the response status of the HTTP request arrives, the URL string
+# is replaced by this string (the response status can look like `HTTP/1.1 200 OK`).
+# The bracket is not closed to mark that this request is not done by now. As the
+# request is finished (the HTTP connection is closed) this string is replaced
+# by `networkUrlWithStatusAndDuration` which has a closing the braket.
+#
+# %1$S = URL of network request
+# %2$S = response status code from the server (e.g. `HTTP/1.1 200 OK`)
+networkUrlWithStatus=%1$S [%2$S
+# LOCALIZATION NOTE (networkUrlWithStatusAndDuration):
+#
+# When the HTTP request is finished (the HTTP connection is closed) this string
+# replaces the former `networkUrlWithStatus` string in the WebConsole.
+#
+# %1$S = URL of network request
+# %2$S = response status code from the server (e.g. `HTTP/1.1 200 OK`)
+# %3$S = duration for the complete network request in milliseconds
+networkUrlWithStatusAndDuration=%1$S [%2$S %3$Sms]
+NetworkPanel.label=Inspect Network Request
+# LOCALIZATION NOTE (NetworkPanel.deltaDurationMS):
+#
+# This string is used to show the duration between two network events (e.g
+# request and respones header or response header and response body).
+NetworkPanel.durationMS=%Sms
+# LOCALIZATION NOTE (NetworkPanel.imageSizeDeltaDurationMS):
+# This string is used to show the duration between the response header and the
+# response body event. It also shows the size of the received or cached image.
+#
+# The first %S is replace by the width of the inspected image.
+# The second %S is replaced by the height of the inspected image.
+# The third %S is replaced by the duration between the response header and the
+# response body event.
+NetworkPanel.imageSizeDeltaDurationMS=%Sx%Spx, Δ%Sms
+ConsoleAPIDisabled=The Web Console logging API (console.log, console.info, console.warn, console.error) has been disabled by a script on this page.
--- a/toolkit/chrome/global/xpinstall/xpinstall.properties
+++ b/toolkit/chrome/global/xpinstall/xpinstall.properties
@@ -101,23 +101,23 @@ ERROR=ERROR
 
 error0=Sukceso
 error999=Restartigu por kompletigi
 error-202=Aliro rifuzita
 error-203=Neatendita eraro dum instalado\nEkzamenu la taglibron de la konzolo de eraroj por pliaj detaloj.
 error-204=Instala skizo ne troveblas
 error-207=Nevalida instala pako
 error-208=Nevalida argumento
-error-210=Nuligita de uzanto
+error-210=User canceled
 error-214=Postulata dosiero ne ekzistas
 error-215=Nur Legebla
 error-218=AppleSingle ĉerpa eraro
 error-219=Nevalida vojo
 error-225=EXTRACTION_FAILED
-error-227=Nuligita
+error-227=Canceled
 error-228=Elŝuta Eraro
 error-229=Eraro en skizo
 error-230=Jam ekzistas
 error-235=Spaco elĉerpiĝis
 error-239=Eraro en registrado de chrome
 error-240=Nefinita instalado
 error-244=Pako ne subtenata
 error-260=La subskribado ne povis esti kontrolita.
--- a/toolkit/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/chrome/mozapps/extensions/extensions.dtd
@@ -2,124 +2,177 @@
 <!ENTITY search.placeholder                   "Search all add-ons">
 <!ENTITY loading.label                        "Loading…">
 <!ENTITY listEmpty.installed.label            "You don't have any add-ons of this type installed">
 <!ENTITY listEmpty.availableUpdates.label     "No updates found">
 <!ENTITY listEmpty.recentUpdates.label        "You haven't recently updated any add-ons">
 <!ENTITY listEmpty.findUpdates.label          "Check For Updates">
 <!ENTITY listEmpty.search.label               "Could not find any matching add-ons">
 <!ENTITY listEmpty.button.label               "Learn more about add-ons">
-<!ENTITY installFromFile.label                "Install from file…">
-<!ENTITY installFromFile.accesskey            "I">
+<!ENTITY installAddonFromFile.label           "Install Add-on From File…">
+<!ENTITY installAddonFromFile.accesskey       "I">
+<!ENTITY toolsMenu.tooltip                    "Tools for all add-ons">
+
+<!ENTITY cmd.back.tooltip                     "Go back one page">
+<!ENTITY cmd.forward.tooltip                  "Go forward one page">
+
+<!-- global warnings -->
+<!ENTITY warning.safemode.label                    "All add-ons have been disabled by safe mode.">
+<!ENTITY warning.checkcompatibility.label          "Add-on compatibility checking is disabled. You may have incompatible add-ons.">
+<!ENTITY warning.checkcompatibility.enable.label   "Enable">
+<!ENTITY warning.checkcompatibility.enable.tooltip "Enable add-on compatibility checking">
+<!ENTITY warning.updatesecurity.label              "Add-on update security checking is disabled. You may be compromised by updates.">
+<!ENTITY warning.updatesecurity.enable.label       "Enable">
+<!ENTITY warning.updatesecurity.enable.tooltip     "Enable add-on update security checking">
 
 <!-- categories / views -->
-<!-- LOCALIZATION NOTE: These should match the header-* entries in extensions.properties -->
 <!ENTITY view.search.label                    "Search">
 <!ENTITY view.discover.label                  "Get Add-ons">
 <!ENTITY view.locales.label                   "Languages">
 <!ENTITY view.searchengines.label             "Search Engines">
 <!ENTITY view.features.label                  "Etendoprogramoj">
-<!ENTITY view.appearance.label                "Themes">
+<!ENTITY view.appearance2.label               "Appearance">
 <!ENTITY view.plugins.label                   "Kromprogramoj">
 <!ENTITY view.recentUpdates.label             "Recent Updates">
 <!ENTITY view.availableUpdates.label          "Available Updates">
 
 <!-- addon updates -->
-<!ENTITY updates.updateAddonsNow.label        "Update Add-ons Now">
-<!ENTITY updates.updateAddonsNow.accesskey    "U">
+<!ENTITY updates.checkForUpdates.label        "Check for Updates">
+<!ENTITY updates.checkForUpdates.accesskey    "C">
 <!ENTITY updates.viewUpdates.label            "View Recent Updates">
 <!ENTITY updates.viewUpdates.accesskey        "V">
-<!ENTITY updates.backgroudUpdateCheck.label   "Check for Updates Automatically">
-<!ENTITY updates.backgroudUpdateCheck.accesskey "C">
+<!ENTITY updates.updateAddonsAutomatically.label     "Update Add-ons Automatically">
+<!ENTITY updates.updateAddonsAutomatically.accesskey "A">
+<!ENTITY updates.resetUpdatesToAutomatic.label       "Reset All Add-ons to Update Automatically">
+<!ENTITY updates.resetUpdatesToAutomatic.accesskey   "R">
+<!ENTITY updates.resetUpdatesToManual.label          "Reset All Add-ons to Update Manually">
+<!ENTITY updates.resetUpdatesToManual.accesskey      "R">
 <!ENTITY updates.updating.label               "Updating add-ons">
 <!ENTITY updates.installed.label              "Your add-ons have been updated.">
 <!ENTITY updates.downloaded.label             "Your add-on updates have been downloaded.">
 <!ENTITY updates.restart.label                "Restart now to complete installation">
 <!ENTITY updates.noneFound.label              "No updates found">
 <!ENTITY updates.manualUpdatesFound.label     "View Available Updates">
+<!ENTITY updates.updateSelected.label         "Install Updates">
+<!ENTITY updates.updateSelected.tooltip       "Install available updates in this list">
 
 <!-- addon actions -->
 <!ENTITY cmd.showDetails.label                "Show more information">
 <!ENTITY cmd.showDetails.accesskey            "S">
 <!ENTITY cmd.findUpdates.label                "Find updates">
 <!ENTITY cmd.findUpdates.accesskey            "F">
-<!ENTITY cmd.preferences.label                "Preferences">
-<!ENTITY cmd.preferences.accesskey            "P">
+<!ENTITY cmd.preferencesWin.label             "Options">
+<!ENTITY cmd.preferencesWin.accesskey         "O">
+<!ENTITY cmd.preferencesUnix.label            "Preferences">
+<!ENTITY cmd.preferencesUnix.accesskey        "P">
 <!ENTITY cmd.about.label                      "About">
 <!ENTITY cmd.about.accesskey                  "A">
 
 <!ENTITY cmd.enableAddon.label                "Aktivigi">
 <!ENTITY cmd.enableAddon.accesskey            "A">
 <!ENTITY cmd.disableAddon.label               "Malaktivigi">
 <!ENTITY cmd.disableAddon.accesskey           "M">
+<!ENTITY cmd.enableTheme.label                "Wear Theme">
+<!ENTITY cmd.enableTheme.accesskey            "W">
+<!ENTITY cmd.disableTheme.label               "Stop Wearing Theme">
+<!ENTITY cmd.disableTheme.accesskey           "W">
+<!ENTITY cmd.installAddon.label               "Install">
+<!ENTITY cmd.installAddon.accesskey           "I">
 <!ENTITY cmd.uninstallAddon.label             "Malinstali">
 <!ENTITY cmd.uninstallAddon.accesskey         "R">
-<!ENTITY cmd.showPreferences.label            "Preferences">
-<!ENTITY cmd.showPreferences.tooltip          "Change this add-on's preferences">
+<!ENTITY cmd.showPreferencesWin.label         "Options">
+<!ENTITY cmd.showPreferencesWin.tooltip       "Change this add-on's options">
+<!ENTITY cmd.showPreferencesUnix.label        "Preferences">
+<!ENTITY cmd.showPreferencesUnix.tooltip      "Change this add-on's preferences">
 <!ENTITY cmd.contribute.label                 "Contribute">
 <!ENTITY cmd.contribute.accesskey             "C">
 <!ENTITY cmd.contribute.tooltip               "Contribute to the development of this add-on">
 
 <!ENTITY cmd.showReleaseNotes.label           "Show Release Notes">
 <!ENTITY cmd.showReleaseNotes.tooltip         "Show the release notes for this update">
 <!ENTITY cmd.hideReleaseNotes.label           "Hide Release Notes">
 <!ENTITY cmd.hideReleaseNotes.tooltip         "Hide the release notes for this update">
 
 <!-- detail view -->
 <!ENTITY detail.version.label                 "Versio">
-<!ENTITY detail.updated.label                 "Updated">
+<!ENTITY detail.lastupdated.label             "Last Updated">
 <!ENTITY detail.creator.label                 "Developer">
 <!ENTITY detail.homepage.label                "Homepage">
 <!ENTITY detail.numberOfDownloads.label       "Elŝutoj">
 
-<!ENTITY detail.updateAutomatically.label     "Update automatically">
-<!ENTITY detail.updateAutomatically.accesskey "U">
-<!ENTITY detail.updateAutomatically.tooltip   "Update this add-on automatically whenever there is an update available">
+<!ENTITY detail.contributions.description     "The developer of this add-on asks that you help support its continued development by making a small contribution.">
+
+<!ENTITY detail.updateType                    "Automatic Updates">
+<!ENTITY detail.updateDefault.label           "Default">
+<!ENTITY detail.updateDefault.tooltip         "Automatically install updates only if that's the default">
+<!ENTITY detail.updateAutomatic.label         "On">
+<!ENTITY detail.updateAutomatic.tooltip       "Automatically install updates">
+<!ENTITY detail.updateManual.label            "Off">
+<!ENTITY detail.updateManual.tooltip          "Don't automatically install updates">
+<!ENTITY detail.home                          "Homepage">
+<!ENTITY detail.repository                    "Add-on Profile">
+<!ENTITY detail.size                          "Size">
+
 <!ENTITY detail.checkForUpdates.label         "Check for updates">
 <!ENTITY detail.checkForUpdates.accesskey     "F">
 <!ENTITY detail.checkForUpdates.tooltip       "Check for updates for this add-on">
-<!ENTITY detail.showPreferences.label         "Preferences">
-<!ENTITY detail.showPreferences.accesskey     "P">
-<!ENTITY detail.showPreferences.tooltip       "Change this add-on's preferences">
+<!ENTITY detail.showPreferencesWin.label      "Options">
+<!ENTITY detail.showPreferencesWin.accesskey  "O">
+<!ENTITY detail.showPreferencesWin.tooltip    "Change this add-on's options">
+<!ENTITY detail.showPreferencesUnix.label     "Preferences">
+<!ENTITY detail.showPreferencesUnix.accesskey "P">
+<!ENTITY detail.showPreferencesUnix.tooltip   "Change this add-on's preferences">
 
 
 <!-- ratings -->
-<!ENTITY rating.label                         "Rating:">
+<!ENTITY rating2.label                        "Rating">
 
 <!-- download/install progress -->
 <!ENTITY progress.pause.tooltip               "Pause">
 <!ENTITY progress.cancel.tooltip              "Cancel">
 
 
 <!-- list sorting -->
 <!ENTITY sort.name.label                      "Name">
 <!ENTITY sort.name.tooltip                    "Sort by name">
 <!ENTITY sort.dateUpdated.label               "Last Updated">
 <!ENTITY sort.dateUpdated.tooltip             "Sort by date updated">
-<!ENTITY sort.rating.label                    "Rating">
-<!ENTITY sort.rating.tooltip                  "Sort by average rating">
+<!ENTITY sort.relevance.label                 "Best match">
+<!ENTITY sort.relevance.tooltip               "Sort by relevance">
+<!ENTITY sort.price.label                     "Price">
+<!ENTITY sort.price.tooltip                   "Sort by price">
 
-<!ENTITY search.filter.label                  "Show:">
-<!ENTITY search.filter.installed.label        "Your installed add-ons">
-<!ENTITY search.filter.available.label        "Available add-ons">
+<!ENTITY search.filter2.label                 "Search:">
+<!ENTITY search.filter2.installed.label       "My Add-ons">
+<!ENTITY search.filter2.installed.tooltip     "Show installed add-ons">
+<!ENTITY search.filter2.available.label       "Available Add-ons">
+<!ENTITY search.filter2.available.tooltip     "Show add-ons available to install">
 
 <!ENTITY addon.homepage                       "Homepage">
 <!ENTITY addon.details.label                  "Pli">
 <!ENTITY addon.details.tooltip                "Show more details about this add-on">
 <!ENTITY addon.unknownDate                    "Unknown">
+<!-- LOCALIZATION NOTE (addon.disabled.postfix): This is used in a normal list
+     to signify that an add-on is disabled, in the form
+     "<Addon name> <1.0> (disabled)" -->
 <!ENTITY addon.disabled.postfix               "(disabled)">
-<!-- LOCALIZATION NOTE (addon.update.postfix): This is used to signify that an item is an update, in the form "Addon v1.0 Update" -->
+<!-- LOCALIZATION NOTE (addon.update.postfix): This is used in the available
+     updates list to signify that an item is an update, in the form
+     "<Addon name> <1.1> Update". It is fine to use constructs like brackets if
+     necessary -->
 <!ENTITY addon.update.postfix                 "Update">
-<!ENTITY addon.undo.label                     "Undo?">
-<!ENTITY addon.undo.tooltip                   "Undo this action">
-<!ENTITY addon.undoUninstall.label            "Undo?">
-<!ENTITY addon.undoUninstall.tooltip          "Keep this add-on installed">
+<!ENTITY addon.undoAction.label               "Undo">
+<!ENTITY addon.undoAction.tooltip             "Undo this action">
+<!ENTITY addon.undoRemove.label               "Undo">
+<!ENTITY addon.undoRemove.tooltip             "Keep this add-on installed">
 <!ENTITY addon.restartNow.label               "Restart now">
 <!ENTITY addon.install.label                  "Instali">
 <!ENTITY addon.install.tooltip                "Instali ĉi tiun aldonaĵon">
 <!ENTITY addon.updateNow.label                "Update Now">
 <!ENTITY addon.updateNow.tooltip              "Install the update for this add-on">
+<!ENTITY addon.includeUpdate.label            "Include in Update">
+<!ENTITY addon.updateAvailable.label          "An update is available">
 <!ENTITY addon.checkingForUpdates.label       "Checking for updates…">
 <!ENTITY addon.releaseNotes.label             "Release Notes:">
 <!ENTITY addon.loadingReleaseNotes.label      "Loading…">
 <!ENTITY addon.errorLoadingReleaseNotes.label "Sorry, but there was an error loading the release notes.">
 
 <!ENTITY addon.createdBy.label                "By ">
--- a/toolkit/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/chrome/mozapps/extensions/extensions.properties
@@ -1,30 +1,16 @@
 #LOCALIZATION NOTE (aboutWindowTitle) %S is the addon name
 aboutWindowTitle=Pri %S
 aboutWindowCloseButton=Fermi
 #LOCALIZATION NOTE (aboutWindowVersionString) %S is the addon version
 aboutWindowVersionString=versio %S
 #LOCALIZATION NOTE (aboutAddon) %S is the addon name
 aboutAddon=Pri %S
 
-#LOCALIZATION NOTE These should match the view.*.label entities in extensions.dtd
-header-search=Search Results
-header-discover=Get Add-ons
-header-locale=Languages
-header-searchengine=Search Engines
-header-extension=Etendoprogramoj
-header-theme=Themes
-header-plugin=Kromprogramoj
-header-recentUpdates=Recent Updates
-header-availableUpdates=Available Updates
-
-#LOCALIZATION NOTE (header-goBack) %S is the name of the pane to go back to
-header-goBack=Back to %S
-
 #LOCALIZATION NOTE (uninstallNotice) %S is the add-on name
 uninstallNotice=%S has been removed.
 
 #LOCALIZATION NOTE (numReviews) #1 is the number of reviews
 numReviews=#1 review;#1 reviews
 
 #LOCALIZATION NOTE (dateUpdated) %S is the date the addon was last updated
 dateUpdated=Updated %S
@@ -32,44 +18,86 @@ dateUpdated=Updated %S
 #LOCALIZATION NOTE (notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
 notification.incompatible=%1$S estas nekongrua kun %2$S %3$S.
 #LOCALIZATION NOTE (notification.blocked) %1$S is the add-on name
 notification.blocked=%1$S has been disabled due to security or stability issues.
 notification.blocked.link=More Information
 #LOCALIZATION NOTE (notification.softblocked) %1$S is the add-on name
 notification.softblocked=%1$S is known to cause security or stability issues.
 notification.softblocked.link=More Information
+#LOCALIZATION NOTE (notification.outdated) %1$S is the add-on name
+notification.outdated=An important update is available for %1$S.
+notification.outdated.link=Update Now
 #LOCALIZATION NOTE (notification.enable) %1$S is the add-on name, %2$S is brand name
 notification.enable=%1$S will be enabled after you restart %2$S.
 #LOCALIZATION NOTE (notification.disable) %1$S is the add-on name, %2$S is brand name
 notification.disable=%1$S will be disabled after you restart %2$S.
 #LOCALIZATION NOTE (notification.install) %1$S is the add-on name, %2$S is brand name
 notification.install=%1$S will be installed after you restart %2$S.
 #LOCALIZATION NOTE (notification.uninstall) %1$S is the add-on name, %2$S is brand name
 notification.uninstall=%1$S will be uninstalled after you restart %2$S.
 #LOCALIZATION NOTE (notification.upgrade) %1$S is the add-on name, %2$S is brand name
 notification.upgrade=%1$S will be updated after you restart %2$S.
+#LOCALIZATION NOTE (notification.downloadError) %1$S is the add-on name. Not yet implemented - see https://bug593535.bugzilla.mozilla.org/attachment.cgi?id=475403
+notification.downloadError=There was an error downloading %1$S.
+notification.downloadError.retry=Try again
+notification.downloadError.retry.tooltip=Try downloading this add-on again
+#LOCALIZATION NOTE (notification.installError) %1$S is the add-on name. Not yet implemented - see https://bug593535.bugzilla.mozilla.org/attachment.cgi?id=475403
+notification.installError=There was an error installing %1$S.
+notification.installError.retry=Try again
+notification.installError.retry.tooltip=Try downloading and installing this add-on again
+
+#LOCALIZATION NOTE (contributionAmount) %S is the currency amount recommended for contributions
+contributionAmount=Suggested Donation: %S
 
 installDownloading=Downloading
 installDownloaded=Downloaded
 installDownloadFailed=Error downloading
 installVerifying=Verifying
 installInstalling=Installing
 installEnablePending=Restart to enable
 installDisablePending=Restart to disable
 installFailed=Error installing
 installCancelled=Install cancelled
 
-#LOCALIZATION NOTE: %1$S is the addon name, %2$S is brand name
-restartToEnable2=%1$S will be enabled after you restart %2$S
-restartToDisable=%1$S will be disabled after you restart %2$S
-restartToUninstall=%1$S will be removed after you restart %2$S
-restartToUpgrade=%1$S will be updated after you restart %2$S
+#LOCALIZATION NOTE (details.notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
+details.notification.incompatible=%1$S is incompatible with %2$S %3$S.
+#LOCALIZATION NOTE (details.notification.blocked) %1$S is the add-on name
+details.notification.blocked=%1$S has been disabled due to security or stability issues.
+details.notification.blocked.link=More Information
+#LOCALIZATION NOTE (details.notification.softblocked) %1$S is the add-on name
+details.notification.softblocked=%1$S is known to cause security or stability issues.
+details.notification.softblocked.link=More Information
+#LOCALIZATION NOTE (details.notification.outdated) %1$S is the add-on name
+details.notification.outdated=An important update is available for %1$S.
+details.notification.outdated.link=Update Now
+#LOCALIZATION NOTE (details.notification.enable) %1$S is the add-on name, %2$S is brand name
+details.notification.enable=%1$S will be enabled after you restart %2$S.
+#LOCALIZATION NOTE (details.notification.disable) %1$S is the add-on name, %2$S is brand name
+details.notification.disable=%1$S will be disabled after you restart %2$S.
+#LOCALIZATION NOTE (details.notification.install) %1$S is the add-on name, %2$S is brand name
+details.notification.install=%1$S will be installed after you restart %2$S.
+#LOCALIZATION NOTE (details.notification.uninstall) %1$S is the add-on name, %2$S is brand name
+details.notification.uninstall=%1$S will be uninstalled after you restart %2$S.
+#LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name
+details.notification.upgrade=%1$S will be updated after you restart %2$S.
 
 installFromFile.dialogTitle=Select add-on to install
 installFromFile.filterName=Add-ons
 
 uninstallAddonTooltip=Malinstali ĉi tiun aldonaĵon
 uninstallAddonRestartRequiredTooltip=Uninstall this add-on (restart required)
 enableAddonTooltip=Aktivigi ĉi tiun aldonaĵon
 enableAddonRestartRequiredTooltip=Enable this add-on (restart required)
 disableAddonTooltip=Malaktivigi ĉi tiun aldonaĵon
 disableAddonRestartRequiredTooltip=Disable this add-on (restart required)
+
+#LOCALIZATION NOTE (showAllSearchResults) #1 is the total number of search results
+showAllSearchResults=See one result;See all #1 results
+
+#LOCALIZATION NOTE (addon.purchase.label) displayed on a button in the list
+# view, %S is the price of the add-on including currency symbol
+addon.purchase.label=Purchase for %S…
+addon.purchase.tooltip=Visit the add-ons gallery to purchase this add-on
+#LOCALIZATION NOTE (cmd.purchaseAddon.label) displayed on a button in the detail
+# view, %S is the price of the add-on including currency symbol
+cmd.purchaseAddon.label=Purchase for %S…
+cmd.purchaseAddon.accesskey=u
--- a/toolkit/chrome/mozapps/update/updates.dtd
+++ b/toolkit/chrome/mozapps/update/updates.dtd
@@ -42,26 +42,34 @@ por daŭrigi la instaladon de ĉi tiu ĝisdatigo.">
 <!ENTITY  verificationFailedText.label    "&brandShortName; ne povis kontroli la sanon de la 
 poioma ĝisdatigo kiun ĝi elŝutis kaj 
 do ĝi elŝutas nun la tutan ĝisdatigan pakon.">
 
 <!ENTITY  viewDetails.tooltip             "Vidi detalojn pri tiu ĉi ĝisdatigo">
 
 <!ENTITY  details.link                    "Detaloj">
 
+<!ENTITY  error.title                     "Update Failed">
+
 <!ENTITY  error.label                     "Estis problemoj dum la kontrolado, elŝutado aŭ instalado de tiu ĉi 
 ĝisdatigo. &brandShortName; ne povis esti ĝisdatigita ĉar:">
                                            
 <!ENTITY  errorManual.label               "Vi povas ĝisdatigi &brandShortName; mem. Vizitu tiun ĉi ligilon 
 kaj elŝutu la lastan version:">
                                            
-<!ENTITY  errorpatching.title             "Ĝisdatigo malsukcesa">
 <!ENTITY  errorpatching.intro             "La parta ĝisdatigo ne povis esti aplikita. 
 &brandShortName; klopodos denove per elŝutado de kompleta ĝisdatigo.">
 
+<!ENTITY  genericBackgroundError.label    "&brandShortName; is unable to determine if there is an update available. Please
+                                           make sure that you have the latest version of &brandShortName; from:">
+<!ENTITY  errorCertAttrNoUpdate2.label    "Something is preventing &brandShortName; from updating securely.
+                                           Please make sure that you have the latest version of &brandShortName; from:">
+<!ENTITY  errorCertAttrHasUpdate.label    "Something is trying to trick &brandShortName; into accepting an
+                                           insecure update. Please contact your network provider and seek help.">
+
 <!ENTITY  finishedPage.title              "Preta instali ĝisdatigon">
 <!ENTITY  finishedPage.text               "La ĝisdatigo estos instalita kiam &brandShortName; startos denove. Vi 
 povas restartigi &brandShortName; nun aŭ daŭrigi vian retesploradon kaj restartigi poste.">
 
 <!ENTITY  finishedBackgroundPage.text     "Sekureca kaj stabileca ĝisdatigo por &brandShortName; estis 
 elŝutita kaj ĝi pretas esti instalita.">
 <!ENTITY  finishedBackground.name         "Ĝisdatigo:">
 <!-- LOCALIZATION NOTE (finishedBackground.more): This string describes the button labels defined by restartNowButton and restartLaterButton in updates.properties. -->
--- a/toolkit/chrome/mozapps/update/updates.properties
+++ b/toolkit/chrome/mozapps/update/updates.properties
@@ -27,17 +27,16 @@ intro_minor=A security and stability upd
 # Example: 2.1.5
 addonLabel=%1$S %2$S
 
 updateType_major=Nova versio
 updateType_minor=Sekureca ĝisdatigo
 
 # LOCALIZATION NOTE: When present %S is brandShortName
 verificationError=%S ne povis konfirmi la sanon de la ĝisdatiga pako.
-errorsPageHeader=Malsukcesa ĝisdatigo
 licenseContentNotFound=La permesila dosiero por tiu ĉi versio ne povis esti trovita. Bonvolu viziti la ĉefan paĝon de %S por plia informo.
 updateMoreInfoContentNotFound=Aldonaj detaloj pri tiu ĉi versio ne povis esti trovitaj. Bonvolu viziti la ĉefan paĝon de %S por plia informo.
 resumePausedAfterCloseTitle=Ĝisdatigo de programo
 resumePausedAfterCloseMsg=Vi paŭzigis la elŝutadon de tiu ĉi ĝisdatigo. Ĉu vi volas elŝuti la ĝisdatigon fone dum vi daŭrigas la uzadon de %S?
 updaterIOErrorTitle=Programara ĝisdatigo malsukcesa
 updaterIOErrorMsg=La ĝisdatigo ne povis esti instalita. Bonvolu certiĝu ke ne estas aliaj kopioj de %S funkciantaj en via komputilo kaj poste restartigu %S por klopodi denove.
 okButton=Akcepti
 okButton.accesskey=O
--- a/toolkit/chrome/passwordmgr/passwordmgr.properties
+++ b/toolkit/chrome/passwordmgr/passwordmgr.properties
@@ -34,35 +34,39 @@
 # 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 *****
 
 rememberValue = Uzi Pasvortan Administranton por memori ĉi tiun valoron.
 rememberPassword = Uzi Pasvortan Administranton por konservi ĉi tiun pasvorton.
 savePasswordTitle = Konfirmi
-# 1st string is product name, 2nd is the username for the login, 3rd is the
-#   login's hostname. Note that long usernames may be truncated.
-saveLoginText = Ĉu vi volas ke %1$S memoru la pasvorton por "%2$S" en %3$S?
-# 1st string is product name, 2nd is the login's hostname
-saveLoginTextNoUsername = Ĉu vi volas ke %1$S memoru tiun ĉi pasvorton en %2$S?
+# LOCALIZATION NOTE (rememberPasswordText):
+# 1st string is the username for the login, 2nd is the login's hostname. 
+# Note that long usernames may be truncated.
+rememberPasswordText = Remember password for "%1$S" on %2$S?
+# LOCALIZATION NOTE (rememberPasswordTextNoUsername):
+# String is the login's hostname.
+rememberPasswordTextNoUsername = Remember password on %S?
 notNowButtonText = &Ne nun
 notifyBarNotNowButtonText = Ne nun
 notifyBarNotNowButtonAccessKey = N
 neverForSiteButtonText = Ne&niam por ĉi tiu retejo
-notifyBarNeverForSiteButtonText = Neniam por ĉi tiu retejo
-notifyBarNeverForSiteButtonAccessKey = e
+notifyBarNeverRememberButtonText = Never Remember Password for This Site
+notifyBarNeverRememberButtonAccessKey = e
 rememberButtonText = &Memori
-notifyBarRememberButtonText = Memori
-notifyBarRememberButtonAccessKey = R
+notifyBarRememberPasswordButtonText = Remember Password
+notifyBarRememberPasswordButtonAccessKey = R
 passwordChangeTitle = Konfirmi ŝanĝon de pasvorto
-passwordChangeText = Ĉu vi ŝatus ŝanĝi la konservitan pasvorton por %S?
-passwordChangeTextNoUser = Ĉu vi ŝatus ŝanĝi la konservitan pasvorton por tiu ĉi uzanto?
-notifyBarChangeButtonText = Ŝanĝi
-notifyBarChangeButtonAccessKey = K
+# LOCALIZATION NOTE (updatePasswordText):
+# String is the username for the login.
+updatePasswordText = Update saved password for "%S"?
+updatePasswordTextNoUser = Update saved password?
+notifyBarUpdateButtonText = Update Password
+notifyBarUpdateButtonAccessKey = U
 notifyBarDontChangeButtonText = Ne ŝanĝi
 notifyBarDontChangeButtonAccessKey = N
 userSelectText = Bonvolu konfirmi por kiu uzanto vi ŝanĝas la pasvorton
 hidePasswords=Kaŝi pasvortojn
 hidePasswordsAccessKey=P
 showPasswords=Montri pasvortojn
 showPasswordsAccessKey=P
 noMasterPasswordPrompt=Ĉu vi certas ke vi volas montri viajn pasvortojn?