Merge aurora to central
authorFrancesco Lodolo (:flod) <flod@lodolo.net>
Mon, 28 Jul 2014 09:27:08 +0200
changeset 428 817bd403581f18ea58df82d076c332bb5989a0e9
parent 387 255b5ccf4b8fa423ccaba05057add83bad6dc7ec (current diff)
parent 427 e84018c2c4e5c405bd15a68315e2f7994e73aeab (diff)
child 429 7cdd8c503c11e5dfda9ff1a0f2f1ca91430fbf08
push id83
push userfrancesco.lodolo@mozillaitalia.org
push dateMon, 28 Jul 2014 07:27:19 +0000
Merge aurora to central
browser/chrome/browser-region/region.properties
browser/chrome/browser/aboutDialog.dtd
browser/chrome/browser/aboutHome.dtd
browser/chrome/browser/aboutPrivateBrowsing.dtd
browser/chrome/browser/baseMenuOverlay.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/charsetMenu.dtd
browser/chrome/browser/charsetMenu.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/layoutview.dtd
browser/chrome/browser/devtools/scratchpad.dtd
browser/chrome/browser/devtools/sourceeditor.properties
browser/chrome/browser/devtools/styleeditor.dtd
browser/chrome/browser/devtools/styleeditor.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/downloads/downloads.dtd
browser/chrome/browser/newTab.dtd
browser/chrome/browser/newTab.properties
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/aboutPermissions.dtd
browser/chrome/browser/preferences/content.dtd
browser/chrome/browser/preferences/fonts.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/syncSetup.dtd
browser/chrome/browser/syncSetup.properties
browser/chrome/overrides/appstrings.properties
browser/chrome/overrides/netError.dtd
browser/installer/custom.properties
browser/installer/nsisstrings.properties
browser/metro/chrome/aboutAddons.dtd
browser/metro/chrome/aboutCertError.dtd
browser/metro/chrome/aboutPanel.dtd
browser/metro/chrome/browser.dtd
browser/metro/chrome/browser.properties
browser/metro/chrome/checkbox.dtd
browser/metro/chrome/config.dtd
browser/metro/chrome/crashprompt.dtd
browser/metro/chrome/passwordmgr.properties
browser/metro/chrome/phishing.dtd
browser/metro/chrome/preferences.dtd
browser/metro/chrome/region.properties
browser/metro/chrome/searchPanel.dtd
browser/metro/chrome/sync.dtd
browser/metro/chrome/sync.properties
browser/pdfviewer/chrome.properties
browser/pdfviewer/viewer.properties
browser/searchplugins/chambers-en-GB.xml
calendar/chrome/calendar/calendar-alarms.properties
calendar/chrome/calendar/calendar-event-dialog.dtd
calendar/chrome/calendar/calendar-event-dialog.properties
calendar/chrome/calendar/calendar.dtd
calendar/chrome/calendar/calendar.properties
calendar/chrome/calendar/dialogs/calendar-event-dialog-reminder.dtd
calendar/chrome/calendar/global.dtd
calendar/chrome/calendar/menuOverlay.dtd
calendar/chrome/calendar/preferences/alarms.dtd
calendar/chrome/calendar/preferences/general.dtd
calendar/chrome/calendar/timezones.properties
calendar/chrome/lightning/lightning.dtd
calendar/chrome/lightning/lightning.properties
calendar/chrome/sunbird/aboutDialog.dtd
calendar/chrome/sunbird/menuOverlay.dtd
calendar/chrome/sunbird/sunbird.dtd
calendar/defines.inc
calendar/extra-jar.mn
calendar/installer/custom.properties
calendar/installer/mui.properties
calendar/installer/override.properties
calendar/sunbird-l10n.js
calendar/updater/updater.ini
chat/conversations.properties
chat/irc.properties
chat/status.properties
chat/twitter.properties
chat/xmpp.properties
dom/chrome/accessibility/AccessFu.properties
dom/chrome/appstrings.properties
dom/chrome/charsetTitles.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/css.properties
dom/chrome/layout/htmlparser.properties
dom/chrome/layout/printing.properties
dom/chrome/netError.dtd
dom/chrome/nsWebBrowserPersist.properties
dom/chrome/security/csp.properties
editor/ui/chrome/composer/editorOverlay.dtd
mail/chrome/messenger-newsblog/feed-subscriptions.dtd
mail/chrome/messenger/FilterListDialog.dtd
mail/chrome/messenger/SearchDialog.dtd
mail/chrome/messenger/aboutDialog.dtd
mail/chrome/messenger/addressbook/abMainWindow.dtd
mail/chrome/messenger/addressbook/addressBook.properties
mail/chrome/messenger/chat.properties
mail/chrome/messenger/cloudfile/UbuntuOne/management.dtd
mail/chrome/messenger/cloudfile/UbuntuOne/settings.dtd
mail/chrome/messenger/cloudfile/YouSendIt/fileExceeds2GB.dtd
mail/chrome/messenger/cloudfile/YouSendIt/fileExceedsLimit.dtd
mail/chrome/messenger/cloudfile/YouSendIt/fileExceedsQuota.dtd
mail/chrome/messenger/cloudfile/YouSendIt/management.dtd
mail/chrome/messenger/cloudfile/YouSendIt/settings.dtd
mail/chrome/messenger/imAccounts.dtd
mail/chrome/messenger/localMsgs.properties
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/msgFolderPickerOverlay.dtd
mail/chrome/messenger/preferences/advanced.dtd
mail/chrome/messenger/preferences/chat.dtd
mail/chrome/messenger/preferences/general.dtd
mail/chrome/messenger/preferences/preferences.dtd
mail/chrome/messenger/preferences/preferences.properties
mail/chrome/messenger/preferences/security.dtd
mail/chrome/messenger/quickFilterBar.dtd
mail/chrome/overrides/netError.dtd
mobile/android/base/android_strings.dtd
mobile/android/base/sync_strings.dtd
mobile/android/chrome/aboutApps.dtd
mobile/android/chrome/aboutDownloads.properties
mobile/android/chrome/aboutFeedback.dtd
mobile/android/chrome/browser.properties
mobile/android/chrome/pippki.properties
mobile/chrome/region.properties
security/manager/chrome/pipnss/pipnss.properties
services/sync/sync.properties
suite/chrome/browser/navigator.dtd
suite/chrome/browser/region.properties
suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
suite/chrome/common/help/customize_help.xhtml
suite/chrome/common/help/mailnews_account_settings.xhtml
suite/chrome/common/help/mailnews_preferences.xhtml
suite/chrome/common/help/ssl_help.xhtml
suite/chrome/common/notification.properties
suite/chrome/common/pref/pref-locationbar.dtd
suite/chrome/common/pref/pref-ssl.dtd
suite/chrome/common/utilityOverlay.dtd
suite/chrome/mailnews/FilterEditor.dtd
suite/chrome/mailnews/compose/composeMsgs.properties
suite/chrome/mailnews/compose/messengercompose.dtd
suite/chrome/mailnews/localMsgs.properties
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/msgFolderPickerOverlay.dtd
suite/chrome/mailnews/newsblog/feed-subscriptions.dtd
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/aboutTelemetry.dtd
toolkit/chrome/global/charsetOverlay.dtd
toolkit/chrome/global/customizeCharset.dtd
toolkit/chrome/global/notification.dtd
toolkit/chrome/global/videocontrols.dtd
toolkit/chrome/global/viewSource.dtd
toolkit/chrome/mozapps/downloads/unknownContentType.properties
toolkit/chrome/mozapps/extensions/extensions.dtd
toolkit/chrome/mozapps/extensions/extensions.properties
toolkit/chrome/places/places.properties
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/aboutAccounts.dtd
@@ -0,0 +1,10 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY aboutAccounts.welcome "Welcome to &syncBrand.shortName.label;">
+
+<!ENTITY aboutAccountsConfig.description "Sign in to synchronise your tabs, bookmarks, passwords &amp; more.">
+<!ENTITY aboutAccountsConfig.startButton.label "Get started">
+<!ENTITY aboutAccountsConfig.useOldSync.label "Using an older version of Sync?">
+<!ENTITY aboutAccountsConfig.manage.label "Manage">
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -1,13 +1,26 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.  -->
 <!ENTITY aboutDialog.title          "About &brandFullName;">
 
+<!-- LOCALIZATION NOTE (update.checkForUpdatesButton.*, update.updateButton.*, update.applyButtonBillboard.*):
+# Only one button is present at a time.
+# The button when displayed is located directly under the Firefox version in
+# the about dialog (see bug 596813 for screenshots).
+-->
+<!ENTITY update.checkForUpdatesButton.label       "Check for updates">
+<!ENTITY update.checkForUpdatesButton.accesskey   "C">
+<!ENTITY update.updateButton.label                "Restart to Update">
+<!ENTITY update.updateButton.accesskey            "R">
+<!ENTITY update.applyButtonBillboard.label        "Apply Update…">
+<!ENTITY update.applyButtonBillboard.accesskey    "A">
+
+
 <!-- LOCALIZATION NOTE (warningDesc.version): This is a warning about the experimental nature of Nightly and Aurora builds. It is only shown in those versions. -->
 <!ENTITY warningDesc.version        "&brandShortName; is experimental and may be unstable.">
 <!-- LOCALIZATION NOTE (warningDesc.telemetryDesc): This is a notification that Nightly/Aurora builds automatically send Telemetry data back to Mozilla. It is only shown in those versions. "It" refers to brandShortName. -->
 <!ENTITY warningDesc.telemetryDesc  "It automatically sends information about performance, hardware, usage and customisations back to &vendorShortName; to help make &brandShortName; better.">
 
 <!-- LOCALIZATION NOTE (community.exp.*) This paragraph is shown in "experimental" builds, i.e. Nightly and Aurora builds, instead of the other "community.*" strings below. -->
 <!ENTITY community.exp.start        "">
 <!-- LOCALIZATION NOTE (community.exp.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
@@ -36,18 +49,16 @@
 <!-- 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">
 
 <!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.checkingForUpdates  "Checking for updates…">
-<!-- LOCALIZATION NOTE (update.checkingAddonCompat): try to make the localized text short (see bug 596813 for screenshots). -->
-<!ENTITY update.checkingAddonCompat "Checking Add-on compatibility…">
 <!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.noUpdatesFound      "&brandShortName; is up to date">
 <!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.adminDisabled       "Updates disabled by your system administrator">
 <!-- LOCALIZATION NOTE (update.otherInstanceHandlingUpdates): try to make the localized text short -->
 <!ENTITY update.otherInstanceHandlingUpdates "&brandShortName; is being updated by another instance">
 
 <!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
--- a/browser/chrome/browser/aboutHome.dtd
+++ b/browser/chrome/browser/aboutHome.dtd
@@ -21,13 +21,18 @@
      text in <a/> will be linked to the featured add-ons on addons.mozilla.org
 -->
 <!ENTITY abouthome.defaultSnippet2.v1 "It's easy to customise your Firefox exactly the way you want it. <a>Choose from thousands of add-ons</a>.">
 <!-- LOCALIZATION NOTE (abouthome.rightsSnippet): text in <a/> will be linked to about:rights -->
 <!ENTITY abouthome.rightsSnippet "&brandFullName; is free and open source software from the non-profit Mozilla Foundation. <a>Know your rights…</a>">
 
 <!ENTITY abouthome.bookmarksButton.label "Bookmarks">
 <!ENTITY abouthome.historyButton.label   "History">
-<!ENTITY abouthome.settingsButton.label  "Settings">
+<!-- LOCALIZATION NOTE (abouthome.preferencesButtonWin.label): The label for the
+     preferences/options item on about:home on Windows -->
+<!ENTITY abouthome.preferencesButtonWin.label  "Options">
+<!-- LOCALIZATION NOTE (abouthome.preferencesButtonUnix.label): The label for the
+     preferences/options item on about:home on Linux and OS X -->
+<!ENTITY abouthome.preferencesButtonUnix.label  "Preferences">
 <!ENTITY abouthome.addonsButton.label    "Add-ons">
 <!ENTITY abouthome.appsButton.label      "Marketplace">
 <!ENTITY abouthome.downloadsButton.label "Downloads">
 <!ENTITY abouthome.syncButton.label      "&syncBrand.shortName.label;">
--- a/browser/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/browser/chrome/browser/aboutPrivateBrowsing.dtd
@@ -8,14 +8,19 @@
 <!ENTITY privatebrowsingpage.perwindow.issueDesc        "&brandShortName; won't remember any history for this window.">
 <!ENTITY privatebrowsingpage.perwindow.issueDesc.normal "You are not currently in a private window.">
 
 <!ENTITY privatebrowsingpage.perwindow.description     "In a Private Browsing window, &brandShortName; won't keep any browser history, search history, download history, web form history, cookies, or temporary internet files.  However, files you download and bookmarks you make will be kept.">
 
 <!ENTITY privatebrowsingpage.openPrivateWindow.label "Open a Private Window">
 <!ENTITY privatebrowsingpage.openPrivateWindow.accesskey "P">
 
-<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart3): please leave &basePBMenu.label; intact in the translation -->
-<!ENTITY privatebrowsingpage.howToStart3               "To start Private Browsing, you can also select &basePBMenu.label; &gt; &newPrivateWindow.label;.">
+<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart4): please leave &newPrivateWindow.label; intact in the translation -->
+<!ENTITY privatebrowsingpage.howToStart4               "To start Private Browsing, you can also select &newPrivateWindow.label; from the menu.">
 <!ENTITY privatebrowsingpage.howToStop3                "To stop Private Browsing, you can close this window.">
 
 <!ENTITY privatebrowsingpage.moreInfo                  "While this computer won't have a record of your browsing history, your internet service provider or employer can still track the pages you visit.">
 <!ENTITY privatebrowsingpage.learnMore                 "Learn More">
+
+
+<!-- TO BE REMOVED POST-AUSTRALIS -->
+<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart3): please leave &basePBMenu.label; intact in the translation -->
+<!ENTITY privatebrowsingpage.howToStart3               "To start Private Browsing, you can also select &basePBMenu.label; &gt; &newPrivateWindow.label;.">
--- a/browser/chrome/browser/baseMenuOverlay.dtd
+++ b/browser/chrome/browser/baseMenuOverlay.dtd
@@ -30,16 +30,19 @@
 <!ENTITY healthReport.accesskey   "e">
 
 <!ENTITY helpTroubleshootingInfo.label      "Troubleshooting Information">
 <!ENTITY helpTroubleshootingInfo.accesskey  "T">
 
 <!ENTITY helpFeedbackPage.label      "Submit Feedback…">
 <!ENTITY helpFeedbackPage.accesskey  "S">
 
+<!ENTITY helpShowTour.label             "&brandShortName; Tour">
+<!ENTITY helpShowTour.accesskey         "o">
+
 <!ENTITY preferencesCmdMac.label        "Preferences…">
 <!ENTITY preferencesCmdMac.commandkey   ",">
 
 <!ENTITY servicesMenuMac.label          "Services">
 
 <!ENTITY hideThisAppCmdMac.label        "Hide &brandShortName;">
 <!ENTITY hideThisAppCmdMac.commandkey   "H">
 
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -10,16 +10,19 @@
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifier "&brandFullName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifiermenuseparator " - ">
 <!-- LOCALIZATION NOTE (mainWindow.titlePrivateBrowsingSuffix): This will be appended to the window's title
                                                                 inside the private browsing mode -->
 <!ENTITY mainWindow.titlePrivateBrowsingSuffix "(Private Browsing)">
 
+<!ENTITY appmenu.tooltip                     "Open menu">
+<!ENTITY navbarOverflow.label                "More tools…">
+
 <!-- Tab context menu -->
 <!ENTITY  reloadTab.label                    "Reload Tab">
 <!ENTITY  reloadTab.accesskey                "R">
 <!ENTITY  reloadAllTabs.label                "Reload All Tabs">
 <!ENTITY  reloadAllTabs.accesskey            "A">
 <!-- LOCALIZATION NOTE (closeTabsToTheEnd.label): This should indicate the
 direction in which tabs are closed, i.e. locales that use RTL mode should say
 left instead of right. -->
@@ -49,18 +52,20 @@ can reach it easily. -->
 <!ENTITY  closeTab.label                     "Close Tab">
 <!ENTITY  closeTab.accesskey                 "C">
 
 <!ENTITY  listAllTabs.label      "List all tabs">
 
 <!ENTITY tabCmd.label "New Tab">
 <!ENTITY tabCmd.accesskey "T">
 <!ENTITY tabCmd.commandkey "t">
+<!-- LOCALIZATION NOTE (openLocationCmd.label): "Open Location" is only
+displayed on OS X, and only on windows that aren't main browser windows, or
+when there are no windows but Firefox is still running. -->
 <!ENTITY openLocationCmd.label "Open Location…">
-<!ENTITY openLocationCmd.accesskey "L">
 <!ENTITY openFileCmd.label "Open File…">
 <!ENTITY openFileCmd.accesskey "O">
 <!ENTITY openFileCmd.commandkey "o">
 <!ENTITY printSetupCmd.label "Page Setup…">
 <!ENTITY printSetupCmd.accesskey "u">
 <!ENTITY printPreviewCmd.label "Print Preview">
 <!ENTITY printPreviewCmd.accesskey "v">
 <!ENTITY printCmd.label "Print…">
@@ -90,16 +95,26 @@ These should match what Safari and other
 <!ENTITY exitFullScreenCmd.label "Exit Full Screen">
 <!ENTITY exitFullScreenCmd.accesskey "F">
 <!ENTITY fullScreenCmd.label "Full Screen">
 <!ENTITY fullScreenCmd.accesskey "F">
 <!ENTITY fullScreenCmd.macCommandKey "f">
 <!ENTITY showAllTabsCmd.label "Show All Tabs">
 <!ENTITY showAllTabsCmd.accesskey "A">
 
+<!ENTITY fxaSignIn.label "Sign in to &syncBrand.shortName.label;">
+<!ENTITY fxaSignInError.label "Reconnect to &syncBrand.shortName.label;">
+<!ENTITY syncStartPanel2.heading "&syncBrand.shortName.label; enabled">
+<!ENTITY syncStartPanel2.subTitle "&brandShortName; will begin synchronising momentarily.">
+<!ENTITY syncErrorPanel.heading "Cannot connect to &syncBrand.shortName.label;">
+<!ENTITY syncErrorPanel.subTitle "Please sign in to resume synchronising.">
+<!ENTITY syncErrorPanel.signInButton.label "Sign In">
+<!ENTITY syncErrorPanel.signInButton.accesskey "S">
+
+
 <!ENTITY fullScreenMinimize.tooltip "Minimise">
 <!ENTITY fullScreenRestore.tooltip "Restore">
 <!ENTITY fullScreenClose.tooltip "Close">
 <!ENTITY fullScreenAutohide.label "Hide Toolbars">
 <!ENTITY fullScreenAutohide.accesskey "H">
 <!ENTITY fullScreenExit.label "Exit Full Screen Mode">
 <!ENTITY fullScreenExit.accesskey "F">
 <!ENTITY fullscreenAllowButton.label "Allow">
@@ -110,73 +125,67 @@ These should match what Safari and other
 <!ENTITY leaveDOMFullScreen.accesskey "u">
 
 <!ENTITY closeWindow.label "Close Window">
 <!ENTITY closeWindow.accesskey "d">
 
 <!ENTITY bookmarksMenu.label "Bookmarks">
 <!ENTITY bookmarksMenu.accesskey "B">
 <!ENTITY bookmarkThisPageCmd.label "Bookmark This Page">
+<!ENTITY editThisBookmarkCmd.label "Edit This Bookmark">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
 <!ENTITY markPageCmd.commandkey "l">
 <!ENTITY sharePageCmd.label "Share This Page">
 <!ENTITY sharePageCmd.commandkey "S">
 <!ENTITY sharePageCmd.accesskey "S">
 <!ENTITY shareLinkCmd.label "Share This Link">
 <!ENTITY shareLinkCmd.accesskey "S">
 <!ENTITY shareImageCmd.label "Share This Image">
 <!ENTITY shareImageCmd.accesskey "S">
 <!ENTITY shareSelectCmd.label "Share Selection">
 <!ENTITY shareSelectCmd.accesskey "S">
 <!ENTITY shareVideoCmd.label "Share This Video">
 <!ENTITY shareVideoCmd.accesskey "S">
+<!ENTITY feedsMenu.label "Subscribe">
 <!ENTITY subscribeToPageMenupopup.label "Subscribe to This Page">
 <!ENTITY subscribeToPageMenuitem.label "Subscribe to This Page…">
 <!ENTITY addCurPagesCmd.label "Bookmark All Tabs…">
 <!ENTITY showAllBookmarks2.label "Show All Bookmarks">
 <!ENTITY unsortedBookmarksCmd.label "Unsorted Bookmarks">
 <!ENTITY bookmarksToolbarChevron.tooltip "Show more bookmarks">
 
-<!ENTITY backCmd.label                "Back">
-<!ENTITY backCmd.accesskey            "B">
-<!ENTITY backButton.tooltip           "Go back one page">
+<!ENTITY backCmd.label                "Backwards">
+<!ENTITY backButton.tooltip           "Go backwards one page">
 <!ENTITY forwardCmd.label             "Forwards">
-<!ENTITY forwardCmd.accesskey         "F">
 <!ENTITY forwardButton.tooltip        "Go forwards one page">
 <!ENTITY backForwardButtonMenu.tooltip "Right-click or pull down to show history">
 <!ENTITY backForwardButtonMenuMac.tooltip "Pull down to show history">
 <!ENTITY reloadCmd.label              "Reload">
-<!ENTITY reloadCmd.accesskey          "R">
 <!ENTITY reloadButton.tooltip         "Reload current page">
 <!ENTITY stopCmd.label                "Stop">
-<!ENTITY stopCmd.accesskey            "S">
 <!ENTITY stopCmd.macCommandKey        ".">
 <!ENTITY stopButton.tooltip           "Stop loading this page">
 <!ENTITY goEndCap.tooltip             "Go to the address in the Location Bar">
 <!ENTITY printButton.label            "Print">
 <!ENTITY printButton.tooltip          "Print this page">
 
-<!ENTITY backForwardItem.title        "Back/Forwards">
 <!ENTITY locationItem.title           "Location">
 <!ENTITY searchItem.title             "Search">
-<!ENTITY bookmarksItem.title          "Bookmarks">
 
 <!-- Toolbar items --> 
 <!ENTITY homeButton.label             "Home">
 
 <!ENTITY tabGroupsButton.label        "Tab Groups">
-<!ENTITY tabGroupsButton.tooltip      "Group your tabs">
 
 <!ENTITY bookmarksButton.label          "Bookmarks">
 <!ENTITY bookmarksCmd.commandkey        "b">
 
 <!ENTITY bookmarksMenuButton.label          "Bookmarks">
-<!ENTITY bookmarksMenuButton.tooltip        "Display your bookmarks">
 <!ENTITY bookmarksMenuButton.unsorted.label "Unsorted Bookmarks">
-<!ENTITY viewBookmarksSidebar.label         "Show in Sidebar">
+<!ENTITY viewBookmarksSidebar2.label        "View Bookmarks Sidebar">
 <!ENTITY viewBookmarksToolbar.label         "View Bookmarks Toolbar">
 
 <!-- LOCALIZATION NOTE (bookmarksSidebarGtkCmd.commandkey): This command
   -  key should not contain the letters A-F, since these are reserved
   -  shortcut keys on Linux. -->
 <!ENTITY bookmarksGtkCmd.commandkey     "o">
 <!ENTITY bookmarksWinCmd.commandkey     "i">
 
@@ -185,17 +194,16 @@ These should match what Safari and other
 
 <!ENTITY toolsMenu.label              "Tools">
 <!ENTITY toolsMenu.accesskey          "T"> 
 
 <!ENTITY keywordfield.label           "Add a Keyword for this Search…">
 <!ENTITY keywordfield.accesskey       "K">
 
 <!ENTITY downloads.label              "Downloads">
-<!ENTITY downloads.tooltip            "Display the progress of ongoing downloads">
 <!ENTITY downloads.accesskey          "D">
 <!ENTITY downloads.commandkey         "j">
 <!ENTITY downloadsUnix.commandkey     "y">
 <!ENTITY addons.label                 "Add-ons">
 <!ENTITY addons.accesskey             "A">
 <!ENTITY addons.commandkey            "A">
 
 <!ENTITY webDeveloperMenu.label       "Web Developer">
@@ -218,16 +226,19 @@ These should match what Safari and other
 
 <!ENTITY inspectContextMenu.label     "Inspect Element">
 <!ENTITY inspectContextMenu.accesskey "Q">
 
 <!ENTITY responsiveDesignTool.label   "Responsive Design View">
 <!ENTITY responsiveDesignTool.accesskey "R">
 <!ENTITY responsiveDesignTool.commandkey "M">
 
+<!ENTITY eyedropper.label   "Eyedropper">
+<!ENTITY eyedropper.accesskey "y">
+
 <!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
   -  in the Tools menu. See bug 653093.
   -  The Scratchpad is intended to provide a simple text editor for creating
   -  and evaluating bits of JavaScript code for the purposes of function
   -  prototyping, experimentation and convenient scripting.
   -
   -  It's quite possible that you won't have a good analogue for the word
   -  "Scratchpad" in your locale. You should feel free to find a close
@@ -317,16 +328,45 @@ These should match what Safari and other
 <!-- LOCALIZATION NOTE (historyUndoWindowMenu): see bug 394759 -->
 <!ENTITY historyUndoWindowMenu.label "Recently Closed Windows">
 <!ENTITY historyRestoreLastSession.label "Restore Previous Session">
 
 <!ENTITY showAllHistoryCmd2.label "Show All History">
 <!ENTITY showAllHistoryCmd.commandkey "H">
 
 <!ENTITY appMenuCustomize.label "Customise">
+<!ENTITY appMenuCustomize.tooltip "Customise the Menu and Toolbars">
+<!ENTITY appMenuCustomizeExit.label "Exit Customise">
+<!ENTITY appMenuCustomizeExit.tooltip "Finish Customising">
+<!ENTITY appMenuHistory.label "History">
+<!ENTITY appMenuHistory.showAll.label "Show All History">
+<!ENTITY appMenuHistory.clearRecent.label "Clear Recent History…">
+<!ENTITY appMenuHistory.restoreSession.label "Restore Previous Session">
+<!ENTITY appMenuHistory.viewSidebar.label "View History Sidebar">
+<!ENTITY appMenuHelp.tooltip "Open Help Menu">
+
+<!ENTITY customizeMenu.addToToolbar.label "Add to Toolbar">
+<!ENTITY customizeMenu.addToToolbar.accesskey "A">
+<!ENTITY customizeMenu.addToPanel.label "Add to Menu">
+<!ENTITY customizeMenu.addToPanel.accesskey "M">
+<!ENTITY customizeMenu.moveToToolbar.label "Move to Toolbar">
+<!ENTITY customizeMenu.moveToToolbar.accesskey "o">
+<!-- LOCALIZATION NOTE (customizeMenu.moveToPanel.accesskey) can appear on the
+     same context menu as menubarCmd and personalbarCmd, so they should have
+     different access keys. customizeMenu.moveToToolbar and 
+     customizeMenu.moveToPanel are mutually exclusive, so can share access
+     keys.  -->
+<!ENTITY customizeMenu.moveToPanel.label "Move to Menu">
+<!ENTITY customizeMenu.moveToPanel.accesskey "o">
+<!ENTITY customizeMenu.removeFromToolbar.label "Remove from Toolbar">
+<!ENTITY customizeMenu.removeFromToolbar.accesskey "R">
+<!ENTITY customizeMenu.removeFromMenu.label "Remove from Menu">
+<!ENTITY customizeMenu.removeFromMenu.accesskey "R">
+<!ENTITY customizeMenu.addMoreItems.label "Add More Items…">
+<!ENTITY customizeMenu.addMoreItems.accesskey "A">
 
 <!ENTITY openCmd.commandkey           "l">
 <!ENTITY urlbar.placeholder2          "Search or enter address">
 <!ENTITY urlbar.accesskey             "d">
 <!ENTITY urlbar.switchToTab.label     "Switch to tab:">
 
 <!-- 
   Comment duplicated from browser-sets.inc:
@@ -394,25 +434,22 @@ These should match what Safari and other
 <!ENTITY viewImageDescCmd.accesskey   "D">
 <!ENTITY viewVideoCmd.label           "View Video">
 <!ENTITY viewVideoCmd.accesskey       "I">
 <!ENTITY viewBGImageCmd.label         "View Background Image">
 <!ENTITY viewBGImageCmd.accesskey     "w">
 <!ENTITY setDesktopBackgroundCmd.label      "Set As Desktop Background…">
 <!ENTITY setDesktopBackgroundCmd.accesskey  "S">
 <!ENTITY bookmarkPageCmd2.label       "Bookmark This Page">
-<!ENTITY bookmarkPageCmd2.accesskey   "m">
 <!ENTITY bookmarkThisLinkCmd.label      "Bookmark This Link">
 <!ENTITY bookmarkThisLinkCmd.accesskey  "L">
 <!ENTITY bookmarkThisFrameCmd.label      "Bookmark This Frame">
 <!ENTITY bookmarkThisFrameCmd.accesskey  "m">
 <!ENTITY emailPageCmd.label           "Email Link…">
 <!ENTITY emailPageCmd.accesskey       "E">
-<!ENTITY switchToMetroCmd.label       "Relaunch in Windows 8 style &brandShortName;">
-<!ENTITY switchToMetroCmd2.label      "Relaunch in &brandShortName; for Windows 8 Touch">
 <!ENTITY savePageCmd.label            "Save Page As…">
 <!ENTITY savePageCmd.accesskey        "A">
 <!-- alternate for content area context menu -->
 <!ENTITY savePageCmd.accesskey2       "P">
 <!ENTITY savePageCmd.commandkey       "s">
 <!ENTITY saveFrameCmd.label           "Save Frame As…">
 <!ENTITY saveFrameCmd.accesskey       "F">
 <!ENTITY printFrameCmd.label          "Print Frame…">
@@ -519,24 +556,21 @@ you can use these alternative items. Oth
 <!ENTITY fullZoomResetCmd.commandkey    "0">
 <!ENTITY fullZoomResetCmd.commandkey2   "">
 
 <!ENTITY fullZoomToggleCmd.label        "Zoom Text Only">
 <!ENTITY fullZoomToggleCmd.accesskey    "T">
 <!ENTITY fullZoom.label                 "Zoom">
 <!ENTITY fullZoom.accesskey             "Z">
 
-<!ENTITY newTabButton.tooltip           "Open a new tab">
-<!ENTITY newWindowButton.tooltip        "Open a new window">
 <!ENTITY sidebarCloseButton.tooltip     "Close sidebar">
 
-<!ENTITY fullScreenButton.tooltip       "Display the window in full screen">
-
 <!ENTITY quitApplicationCmdWin.label       "Exit"> 
 <!ENTITY quitApplicationCmdWin.accesskey   "x">
+<!ENTITY quitApplicationCmdWin.tooltip     "Exit &brandShortName;">
 <!ENTITY goBackCmd.commandKey "[">
 <!ENTITY goForwardCmd.commandKey "]">
 <!ENTITY quitApplicationCmd.label       "Quit"> 
 <!ENTITY quitApplicationCmd.accesskey   "Q">
 <!ENTITY quitApplicationCmdMac.label    "Quit &brandShortName;">
 <!-- LOCALIZATION NOTE(quitApplicationCmdUnix.key): This keyboard shortcut is used by both Linux and OSX builds. -->
 <!ENTITY quitApplicationCmdUnix.key     "Q">
 
@@ -570,16 +604,17 @@ you can use these alternative items. Oth
 
 <!ENTITY findOnCmd.label     "Find in This Page…">
 <!ENTITY findOnCmd.accesskey "F">
 <!ENTITY findOnCmd.commandkey "f">
 <!ENTITY findAgainCmd.label  "Find Again">
 <!ENTITY findAgainCmd.accesskey "g">
 <!ENTITY findAgainCmd.commandkey "g">
 <!ENTITY findAgainCmd.commandkey2 "VK_F3">
+<!ENTITY findSelectionCmd.commandkey "e">
 
 <!ENTITY spellAddDictionaries.label "Add Dictionaries…">
 <!ENTITY spellAddDictionaries.accesskey "A">
 
 <!ENTITY editBookmark.done.label                     "Done">
 <!ENTITY editBookmark.cancel.label                   "Cancel">
 <!ENTITY editBookmark.removeBookmark.accessKey       "R">
 
@@ -606,29 +641,30 @@ just addresses the organization to follo
      localized title of this SUMO article
      https://support.mozilla.org/kb/how-do-i-tell-if-my-connection-is-secure -->
 <!ENTITY identity.help.tooltip "How do I tell if my connection to a web site is secure?">
 
 <!-- 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 -->
+<!-- LOCALIZATION NOTE (syncTabsMenu2.label): This appears in the history menu -->
 <!ENTITY syncTabsMenu2.label     "Tabs From Other Devices">
 
 <!ENTITY syncBrand.shortName.label    "Sync">
 
 <!ENTITY syncSetup.label              "Set Up &syncBrand.shortName.label;…">
 <!ENTITY syncSetup.accesskey          "Y">
 <!ENTITY syncSyncNowItem.label        "Synchronise Now">
 <!ENTITY syncSyncNowItem.accesskey    "S">
+<!ENTITY syncReAuthItem.label         "Reconnect to &syncBrand.shortName.label;…">
+<!ENTITY syncReAuthItem.accesskey     "R">
 <!ENTITY syncToolbarButton.label      "Sync">
 
 <!ENTITY socialToolbar.title        "Social Toolbar Button">
-<!ENTITY social.notLoggedIn.label   "Not logged in">
 
 <!ENTITY social.ok.label       "OK">
 <!ENTITY social.ok.accesskey   "O">
 
 <!ENTITY social.toggleSidebar.label "Show sidebar">
 <!ENTITY social.toggleSidebar.accesskey "s">
 
 <!ENTITY social.addons.label "Manage Services…">
@@ -638,16 +674,26 @@ just addresses the organization to follo
 
 <!ENTITY social.activated.description "Services from <label/> have been enabled. You can change your settings for services in the <label class='text-link'>Add-on Manager</label>.">
 <!ENTITY social.activated.undo.label "Oops, undo this!">
 <!ENTITY social.activated.undo.accesskey "U">
 <!ENTITY social.learnMore.label "Learn more…">
 <!ENTITY social.learnMore.accesskey "l">
 <!ENTITY social.closeNotificationItem.label "Not Now">
 
+
+
+<!ENTITY customizeMode.tabTitle "Customise &brandShortName;">
+<!ENTITY customizeMode.menuAndToolbars.header2 "Additional Tools and Features">
+<!ENTITY customizeMode.menuAndToolbars.empty "Want more tools?">
+<!ENTITY customizeMode.menuAndToolbars.emptyLink "Choose from thousands of add-ons">
+<!ENTITY customizeMode.restoreDefaults "Restore Defaults">
+<!ENTITY customizeMode.toolbars "Show / Hide Toolbars">
+<!ENTITY customizeMode.titlebar "Title Bar">
+
 <!ENTITY social.chatBar.commandkey "c">
 <!ENTITY social.chatBar.label "Focus chats">
 <!ENTITY social.chatBar.accesskey "c">
 
 <!ENTITY social.markpageMenu.accesskey "P">
 <!ENTITY social.markpageMenu.label "Save Page To…">
 <!ENTITY social.marklinkMenu.accesskey "L">
 <!ENTITY social.marklinkMenu.label "Save Link To…">
@@ -655,17 +701,16 @@ just addresses the organization to follo
 <!ENTITY getUserMedia.selectCamera.label "Camera to share:">
 <!ENTITY getUserMedia.selectCamera.accesskey "C">
 <!ENTITY getUserMedia.selectMicrophone.label "Microphone to share:">
 <!ENTITY getUserMedia.selectMicrophone.accesskey "M">
 
 <!ENTITY webrtcIndicatorButton.label "Camera / Microphone Access">
 <!ENTITY webrtcIndicatorButton.tooltip "Display sites you are currently sharing your camera or microphone with">
 
-<!ENTITY mixedContentBlocked.helplink "Learn more">
 <!ENTITY mixedContentBlocked.moreinfo "Most web sites will still work properly even when this content is blocked.">
 
 <!ENTITY pointerLock.notification.message "Press ESC at any time to show it again.">
 
 <!ENTITY pluginNotification.showAll.label "Show All">
 <!ENTITY pluginNotification.showAll.accesskey "S">
 
 <!-- LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.properties -->
@@ -680,43 +725,14 @@ just addresses the organization to follo
      a CSS length value. -->
 <!ENTITY pluginNotification.width "28em">
 
 <!ENTITY tabCrashed.header "Tab crashed">
 <!ENTITY tabCrashed.message "Well, this is embarrassing. We tried to display this Web page, but it's not responding.">
 <!ENTITY tabCrashed.checkSendReport "Tell &vendorShortName; about this crash so they can fix it.">
 <!ENTITY tabCrashed.tryAgain "Try Again">
 
-<!-- LOCALIZATION NOTE: the following strings are unused in Australis, they're
-     kept here to avoid warnings from l10n tools like compare-locales on
-     l10n-central. They will be definitely removed when Australis is ready
-     for mozilla-aurora. -->
+<!ENTITY uiTour.infoPanel.close "Close">
 
-<!ENTITY navbarCmd.accesskey           "N">
-<!ENTITY addonBarCmd.label             "Add-on Bar">
-<!ENTITY addonBarCmd.accesskey         "A">
-<!ENTITY throbberItem.title            "Activity Indicator">
-<!ENTITY appMenuButton.label           "Menu">
-<!ENTITY appMenuButton.tooltip         "Open &brandShortName; menu">
-<!ENTITY feedButton.label              "Subscribe">
-<!ENTITY feedButton.tooltip            "Subscribe to this page…">
-<!ENTITY bookmarksButton.tooltip       "Display your bookmarks">
-<!ENTITY historyButton.tooltip         "Display pages you've viewed recently">
-<!ENTITY viewTabsOnTop.label           "Tabs on Top">
-<!ENTITY viewTabsOnTop.accesskey       "T">
-<!ENTITY appMenuEdit.label             "Edit">
-<!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 appMenuSafeMode.label         "Restart with Add-ons Disabled…">
-<!ENTITY appMenuSafeMode.accesskey     "R">
-<!ENTITY cutButton.tooltip             "Cut">
-<!ENTITY copyButton.tooltip            "Copy">
-<!ENTITY pasteButton.tooltip           "Paste">
-<!ENTITY zoomOutButton.tooltip         "Zoom out">
-<!ENTITY zoomInButton.tooltip          "Zoom in">
-<!ENTITY zoomControls.label            "Zoom Controls">
-<!ENTITY addonBarCloseButton.tooltip   "Close Add-on Bar">
-<!ENTITY toggleAddonBarCmd.key         "/">
-<!-- end of strings to be removed post-Australis -->
+
+<!ENTITY switchToMetroCmd2.label       "Relaunch in &brandShortName; for Windows 8 Touch">
+
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -186,45 +186,37 @@ sanitizeButtonClearing=Clearing
 # "Time range to clear" is set to "Everything" in Clear Recent History dialog,
 # provided that the user has not modified the default set of history items to clear.
 sanitizeEverythingWarning2=All history will be cleared.
 # LOCALIZATION NOTE (sanitizeSelectedWarning): Warning that appears when
 # "Time range to clear" is set to "Everything" in Clear Recent History dialog,
 # provided that the user has modified the default set of history items to clear.
 sanitizeSelectedWarning=All selected items will be cleared.
 
-# Check for Updates in the About Dialog - button labels and accesskeys
-# LOCALIZATION NOTE - all of the following update buttons labels will only be
-# displayed one at a time. So, if a button is displayed nothing else will
-# be displayed alongside of the button. The button when displayed is located
-# directly under the Firefox version in the about dialog (see bug 596813 for
-# screenshots).
-update.checkInsideButton.label=Check for Updates
-update.checkInsideButton.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.updateButton.label=Restart to Update
-update.restart.updateButton.accesskey=R
-update.openUpdateUI.upgradeButton.label=Upgrade Now…
-update.openUpdateUI.upgradeButton.accesskey=U
-update.restart.upgradeButton.label=Upgrade Now
-update.restart.upgradeButton.accesskey=U
+# LOCALIZATION NOTE (downloadAndInstallButton.label): %S is replaced by the
+# version of the update: "Update to 28.0".
+update.downloadAndInstallButton.label=Update to %S
+update.downloadAndInstallButton.accesskey=U
 
 # RSS Pretty Print
 feedShowFeedNew=Subscribe to '%S'…
 
 menuOpenAllInTabs.label=Open All in Tabs
 
 # History menu
 menuRestoreAllTabs.label=Restore All Tabs
+# LOCALIZATION NOTE (menuRestoreAllTabsSubview.label): like menuRestoreAllTabs.label,
+# but used in the history subview in the panel UI, so needs to mention these are *closed* tabs.
+menuRestoreAllTabsSubview.label=Restore Closed Tabs
 # LOCALIZATION NOTE (menuRestoreAllWindows, menuUndoCloseWindowLabel, menuUndoCloseWindowSingleTabLabel):
 # see bug 394759
 menuRestoreAllWindows.label=Restore All Windows
+# LOCALIZATION NOTE (menuRestoreAllWindowsSubview.label): like menuRestoreAllWindows.label,
+# but used in the history subview in the panel UI, so needs to mention these are *closed* windows.
+menuRestoreAllWindowsSubview.label=Restore Closed Windows
 # LOCALIZATION NOTE (menuUndoCloseWindowLabel): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 Window Title, #2 Number of tabs
 menuUndoCloseWindowLabel=#1 (and #2 other tab);#1 (and #2 other tabs)
 menuUndoCloseWindowSingleTabLabel=#1
 
 # Unified Back-/Forward Popup
 tabHistory.current=Stay on this page
@@ -235,19 +227,47 @@ tabHistory.goForward=Go forward to this 
 pasteAndGo.label=Paste & Go
 
 # Block autorefresh
 refreshBlocked.goButton=Allow
 refreshBlocked.goButton.accesskey=A
 refreshBlocked.refreshLabel=%S prevented this page from automatically reloading.
 refreshBlocked.redirectLabel=%S prevented this page from automatically redirecting to another page.
 
+# General bookmarks button
+# LOCALIZATION NOTE (bookmarksMenuButton.tooltip):
+# %S is the keyboard shortcut for "Show All Bookmarks"
+bookmarksMenuButton.tooltip=Show your bookmarks (%S)
 # Star button
-starButtonOn.tooltip=Edit this bookmark
-starButtonOff.tooltip=Bookmark this page
+starButtonOn.tooltip2=Edit this bookmark (%S)
+starButtonOff.tooltip2=Bookmark this page (%S)
+starButtonOverflowed.label=Bookmark This Page
+starButtonOverflowedStarred.label=Edit This Bookmark
+
+# Downloads button tooltip
+# LOCALIZATION NOTE (downloads.tooltip):
+# %S is the keyboard shortcut for "Downloads"
+downloads.tooltip=Display the progress of ongoing downloads (%S)
+
+# Print button tooltip on OS X
+# LOCALIZATION NOTE (printButton.tooltip):
+# Use the unicode ellipsis char, \u2026,
+# or use "..." if \u2026 doesn't suit traditions in your locale.
+# %S is the keyboard shortcut for "Print"
+printButton.tooltip=Print this page… (%S)
+
+# New Window button tooltip
+# LOCALIZATION NOTE (newWindowButton.tooltip):
+# %S is the keyboard shortcut for "New Window"
+newWindowButton.tooltip=Open a new window (%S)
+
+# New Tab button tooltip
+# LOCALIZATION NOTE (newTabButton.tooltip):
+# %S is the keyboard shortcut for "New Tab"
+newTabButton.tooltip=Open a new tab (%S)
 
 # Offline web applications
 offlineApps.available=This web site (%S) is asking to store data on your computer for offline use.
 offlineApps.allow=Allow
 offlineApps.allowAccessKey=A
 offlineApps.never=Never for This Site
 offlineApps.neverAccessKey=e
 offlineApps.notNow=Not Now
@@ -305,19 +325,16 @@ puAlertText=Click here for details
 geolocation.shareLocation=Share Location
 geolocation.shareLocation.accesskey=a
 geolocation.alwaysShareLocation=Always Share Location
 geolocation.alwaysShareLocation.accesskey=A
 geolocation.neverShareLocation=Never Share Location
 geolocation.neverShareLocation.accesskey=N
 geolocation.shareWithSite=Would you like to share your location with %S?
 geolocation.shareWithFile=Would you like to share your location with the file %S?
-# LOCALIZATION NOTE (geolocation.learnMore): Use the unicode ellipsis char, \u2026,
-# or use "..." if \u2026 doesn't suit traditions in your locale.
-geolocation.learnMore=Learn More…
 
 webNotifications.showForSession=Show for this session
 webNotifications.showForSession.accesskey=s
 webNotifications.alwaysShow=Always Show Notifications
 webNotifications.alwaysShow.accesskey=A
 webNotifications.neverShow=Always Block Notifications
 webNotifications.neverShow.accesskey=N
 webNotifications.showFromSite=Would you like to show notifications from %S?
@@ -360,16 +377,19 @@ addKeywordTitleAutoFill=Search %S
 # LOCALIZATION NOTE (tabview.title): %S is the application name.
 tabview.title=%S - Group Your Tabs
 # LOCALIZATION NOTE (tabview.moveToUnnamedGroup.label): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the page title of the first tab in the unnamed group, 
 # #2 is the number of remaining tabs.
 tabview.moveToUnnamedGroup.label=#1 and 1 more;#1 and #2 more
 
+# LOCALIZATION NOTE (tabviewButton.tooltip): %S is the keyboard shortcut for tab groups
+tabviewButton.tooltip=Group your tabs (%S)
+
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Default
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=The default theme.
 
 # safeModeRestart
 safeModeRestartPromptTitle=Restart with Add-ons Disabled
 safeModeRestartPromptMessage=Are you sure you want to disable all add-ons and restart?
 safeModeRestartButton=Restart
 
@@ -416,33 +436,26 @@ webapps.requestInstall = Do you want to 
 webapps.install.success = Application Installed
 webapps.install.inprogress = Installation in progress
 
 # LOCALIZATION NOTE (fullscreen.entered): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.entered=%S is now fullscreen.
 # LOCALIZATION NOTE (fullscreen.rememberDecision): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.rememberDecision=Remember decision for %S
 
+# LOCALIZATION NOTE (fullscreenButton.tooltip): %S is the keyboard shortcut for full screen
+fullscreenButton.tooltip=Display the window in full screen (%S)
+
 service.toolbarbutton.label=Services
 service.toolbarbutton.tooltiptext=Services
 
 # LOCALIZATION NOTE (social.install.description): %1$S is the hostname of the social provider, %2$S is brandShortName (e.g. Firefox)
 service.install.description=Would you like to enable services from %1$S to display in your %2$S toolbar and sidebar?
 service.install.ok.label=Enable Services
 service.install.ok.accesskey=E
-service.install.learnmore=Learn More…
-
-# LOCALIZATION NOTE (social.turnOff.label): %S is the name of the social provider
-social.turnOff.label=Turn off %S
-social.turnOff.accesskey=T
-# LOCALIZATION NOTE (social.turnOn.label): %S is the name of the social provider
-social.turnOn.label=Turn on %S
-social.turnOn.accesskey=T
-social.turnOffAll.label=Turn off all Services
-social.turnOnAll.label=Turn on all Services
 
 # LOCALIZATION NOTE (social.markpageMenu.label): %S is the name of the social provider
 social.markpageMenu.label=Save Page to %S
 # LOCALIZATION NOTE (social.marklinkMenu.label): %S is the name of the social provider
 social.marklinkMenu.label=Save Link to %S
 
 # LOCALIZATION NOTE (social.error.message): %1$S is brandShortName (e.g. Firefox), %2$S is the name of the social provider
 social.error.message=%1$S is unable to connect with %2$S right now.
@@ -480,28 +493,44 @@ identity.loggedIn.signOut.accessKey = O
 # The number of devices can be either one or two.
 getUserMedia.shareCamera.message = Would you like to share your camera with %S?
 getUserMedia.shareMicrophone.message = Would you like to share your microphone with %S?
 getUserMedia.shareCameraAndMicrophone.message = Would you like to share your camera and microphone with %S?
 getUserMedia.noVideo.label = No Video
 getUserMedia.noAudio.label = No Audio
 getUserMedia.shareSelectedDevices.label = Share Selected Device;Share Selected Devices
 getUserMedia.shareSelectedDevices.accesskey = S
+getUserMedia.always.label = Always Share
+getUserMedia.always.accesskey = A
 getUserMedia.denyRequest.label = Don't Share
 getUserMedia.denyRequest.accesskey = D
+getUserMedia.never.label = Never Share
+getUserMedia.never.accesskey = N
 getUserMedia.sharingCamera.message2 = You are currently sharing your camera with this page.
 getUserMedia.sharingMicrophone.message2 = You are currently sharing your microphone with this page.
 getUserMedia.sharingCameraAndMicrophone.message2 = You are currently sharing your camera and microphone with this page.
+getUserMedia.continueSharing.label = Continue Sharing
+getUserMedia.continueSharing.accesskey = C
+getUserMedia.stopSharing.label = Stop Sharing
+getUserMedia.stopSharing.accesskey = S
 
 # Mixed Content Blocker Doorhanger Notification
 # LOCALIZATION NOTE - %S is brandShortName
 mixedContentBlocked.message = %S has blocked content that isn't secure.
 mixedContentBlocked.keepBlockingButton.label = Keep Blocking
 mixedContentBlocked.keepBlockingButton.accesskey = B
 mixedContentBlocked.unblock.label = Disable Protection on This Page
 mixedContentBlocked.unblock.accesskey = D
 
 # LOCALIZATION NOTE - %S is brandShortName
 slowStartup.message = %S seems slow… to… start.
 slowStartup.helpButton.label = Learn How to Speed It Up
 slowStartup.helpButton.accesskey = L
 slowStartup.disableNotificationButton.label = Don't Tell Me Again
 slowStartup.disableNotificationButton.accesskey = A
+
+
+# LOCALIZATION NOTE(customizeTips.tip0): %1$S will be replaced with the text defined
+# in customizeTips.tip0.hint, %2$S will be replaced with brandShortName, %3$S will
+# be replaced with a hyperlink containing the text defined in customizeTips.tip0.learnMore.
+customizeTips.tip0 = %1$S: You can customise %2$S to work the way you do. Simply drag any of the above to the menu or toolbar. %3$S about customising %2$S.
+customizeTips.tip0.hint = Hint
+customizeTips.tip0.learnMore = Learn more
deleted file mode 100644
--- a/browser/chrome/browser/charsetMenu.dtd
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY charsetMenu.label             "Character Encoding">
-<!ENTITY charsetMenu.accesskey         "C">
-<!ENTITY charsetMenuAutodet.label      "Auto-Detect">
-<!ENTITY charsetMenuAutodet.accesskey  "D"><!-- A reserved for Arabic -->
-
-<!ENTITY charsetMenuAutodet.off.label     "(off)">
-<!ENTITY charsetMenuAutodet.off.accesskey "o">
-<!ENTITY charsetMenuAutodet.ja.label      "Japanese">
-<!ENTITY charsetMenuAutodet.ja.accesskey  "J">
-<!ENTITY charsetMenuAutodet.ru.label      "Russian">
-<!ENTITY charsetMenuAutodet.ru.accesskey  "R">
-<!ENTITY charsetMenuAutodet.uk.label      "Ukranian">
-<!ENTITY charsetMenuAutodet.uk.accesskey  "U">
-
deleted file mode 100644
--- a/browser/chrome/browser/charsetMenu.properties
+++ /dev/null
@@ -1,103 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# LOCALIZATION NOTE: The property keys ending with ".key" are for access keys.
-# Localizations may add or delete properties where the property key ends with
-# ".key" as appropriate for the localization. The code that uses this data can
-# deal with the absence of an access key for an item.
-# 
-# Make sure the keys defined here don't collide with
-# charsetMenuAutodet.accesskey in charsetMenu.dtd.
-#
-# In the en-US version of this file, access keys are given to the following:
-# * UTF-8
-# * All encodings that are the fallback encoding for some locale in Firefox
-# * All encodings that are the fallback encoding for some locale in IE
-# * All Japanese encodings
-#
-# For the items whose property key does not end in ".key" and whose value
-# includes "(" U+0028 LEFT PARENTHESIS, the "(" character is significant for
-# processing by CharsetMenu.jsm. If your localization does not use ASCII
-# parentheses where en-US does in this file, please file a bug to make
-# CharsetMenu.jsm also recognize the delimiter your localization uses.
-# (When this code was developed, all localizations appeared to use
-# U+0028 LEFT PARENTHESIS for this purpose.)
-
-# Globally-relevant
-UTF-8.key        = U
-UTF-8            = Unicode
-windows-1252.key = W
-windows-1252     = Western
-
-# Arabic
-windows-1256.key = A
-windows-1256     = Arabic (Windows)
-ISO-8859-6       = Arabic (ISO)
-
-# Baltic
-windows-1257.key = B
-windows-1257     = Baltic (Windows)
-ISO-8859-4       = Baltic (ISO)
-
-# Central European
-windows-1250.key =         E
-windows-1250     = Central European (Windows)
-ISO-8859-2.key   =       l
-ISO-8859-2       = Central European (ISO)
-
-# Chinese, Simplified
-gbk.key          =          S
-gbk              = Chinese, Simplified (GBK)
-gb18030          = Chinese, Simplified (GB18030)
-
-# Chinese, Traditional
-Big5.key         =          T
-Big5             = Chinese, Traditional
-
-# Cyrillic
-windows-1251.key = C
-windows-1251     = Cyrillic (Windows)
-ISO-8859-5       = Cyrillic (ISO)
-KOI8-R           = Cyrillic (KOI8-R)
-KOI8-U           = Cyrillic (KOI8-U)
-IBM866           = Cyrillic (DOS)
-
-# Greek
-windows-1253.key = G
-windows-1253     = Greek (Windows)
-ISO-8859-7.key   =          O
-ISO-8859-7       = Greek (ISO)
-
-# Hebrew
-windows-1255.key = H
-windows-1255     = Hebrew
-# LOCALIZATION NOTE (ISO-8859-8): The value for this item should begin with
-# the same word for Hebrew as the value for windows-1255 so that this item 
-# sorts right after that one in the collation order for your locale.
-ISO-8859-8       = Hebrew, Visual
-
-# Japanese
-Shift_JIS.key    = J
-Shift_JIS        = Japanese (Shift_JIS)
-EUC-JP.key       =   p
-EUC-JP           = Japanese (EUC-JP)
-ISO-2022-JP.key  =     n
-ISO-2022-JP      = Japanese (ISO-2022-JP)
-
-# Korean
-EUC-KR.key       = K
-EUC-KR           = Korean
-
-# Thai
-windows-874.key  =    i
-windows-874      = Thai
-
-# Turkish
-windows-1254.key =   r
-windows-1254     = Turkish
-
-# Vietnamese
-windows-1258.key = V
-windows-1258     = Vietnamese
-
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/customizableui/customizableWidgets.properties
@@ -0,0 +1,98 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+history-panelmenu.label = History
+# LOCALIZATION NOTE(history-panelmenu.tooltiptext2): %S is the keyboard shortcut
+history-panelmenu.tooltiptext2 = Show your history (%S)
+
+privatebrowsing-button.label = New Private Window
+# LOCALIZATION NOTE(privatebrowsing-button.tooltiptext): %S is the keyboard shortcut
+privatebrowsing-button.tooltiptext = Open a new Private Browsing window (%S)
+
+save-page-button.label = Save Page
+# LOCALIZATION NOTE(save-page-button.tooltiptext3): %S is the keyboard shortcut
+save-page-button.tooltiptext3 = Save this page (%S)
+
+find-button.label = Find
+# LOCALIZATION NOTE(find-button.tooltiptext3): %S is the keyboard shortcut.
+find-button.tooltiptext3 = Find in this page (%S)
+
+open-file-button.label = Open File
+# LOCALIZATION NOTE (open-file-button.tooltiptext3): %S is the keyboard shortcut.
+open-file-button.tooltiptext3 = Open a file (%S)
+
+developer-button.label = Developer
+# LOCALIZATION NOTE(developer-button.tooltiptext): %S is the keyboard shortcut
+developer-button.tooltiptext2 = Open Web developer tools (%S)
+
+sidebar-button.label = Sidebars
+sidebar-button.tooltiptext2 = Show sidebars
+
+add-ons-button.label = Add-ons
+# LOCALIZATION NOTE(add-ons-button.tooltiptext3): %S is the keyboard shortcut
+add-ons-button.tooltiptext3 = Manage your add-ons (%S)
+
+switch-to-metro-button2.label = Windows 8 Touch
+# LOCALIZATION NOTE(switch-to-metro-button2.tooltiptext): %S is the brand short name
+switch-to-metro-button2.tooltiptext = Relaunch in %S for Windows 8 Touch
+
+preferences-button.label = Preferences
+preferences-button.tooltiptext2 = Open Preferences
+preferences-button.tooltiptext.withshortcut = Open Preferences (%S)
+# LOCALIZATION NOTE (preferences-button.labelWin): Windows-only label for Options
+preferences-button.labelWin = Options
+# LOCALIZATION NOTE (preferences-button.tooltipWin): Windows-only tooltip for Options
+preferences-button.tooltipWin2 = Open Options
+
+zoom-controls.label = Zoom Controls
+zoom-controls.tooltiptext2 = Zoom controls
+
+zoom-out-button.label = Zoom out
+# LOCALIZATION NOTE(zoom-out-button.tooltiptext2): %S is the keyboard shortcut.
+zoom-out-button.tooltiptext2 = Zoom out (%S)
+
+# LOCALIZATION NOTE(zoom-reset-button.label): %S is the current zoom level,
+# %% will be displayed as a single % character (% is commonly used to define
+# format specifiers, so it needs to be escaped).
+zoom-reset-button.label = %S%%
+# LOCALIZATION NOTE(zoom-reset-button.tooltiptext2): %S is the keyboard shortcut.
+zoom-reset-button.tooltiptext2 = Reset zoom level (%S)
+
+zoom-in-button.label = Zoom in
+# LOCALIZATION NOTE(zoom-in-button.tooltiptext2): %S is the keyboard shortcut.
+zoom-in-button.tooltiptext2 = Zoom in (%S)
+
+edit-controls.label = Edit Controls
+edit-controls.tooltiptext2 = Edit controls
+
+cut-button.label = Cut
+# LOCALIZATION NOTE(cut-button.tooltiptext2): %S is the keyboard shortcut.
+cut-button.tooltiptext2 = Cut (%S)
+
+copy-button.label = Copy
+# LOCALIZATION NOTE(copy-button.tooltiptext2): %S is the keyboard shortcut.
+copy-button.tooltiptext2 = Copy (%S)
+
+paste-button.label = Paste
+# LOCALIZATION NOTE(paste-button.tooltiptext2): %S is the keyboard shortcut.
+paste-button.tooltiptext2 = Paste (%S)
+
+feed-button.label = Subscribe
+feed-button.tooltiptext2 = Subscribe to this page
+
+# LOCALIZATION NOTE (characterencoding-button.label): The \u00ad character at the beginning
+# of the string is used to disable auto hyphenation on the button text when it is displayed
+# in the menu panel.
+characterencoding-button.label = \u00adCharacter Encoding
+characterencoding-button.tooltiptext2 = Show character encoding options
+
+email-link-button.label = Email Link
+email-link-button.tooltiptext3 = Email a link to this page
+
+# LOCALIZATION NOTE(quit-button.tooltiptext.linux2): %1$S is the brand name (e.g. Firefox),
+# %2$S is the keyboard shortcut
+quit-button.tooltiptext.linux2 = Quit %1$S (%2$S)
+# LOCALIZATION NOTE(quit-button.tooltiptext.mac): %1$S is the brand name (e.g. Firefox),
+# %2$S is the keyboard shortcut
+quit-button.tooltiptext.mac = Quit %1$S (%2$S)
--- a/browser/chrome/browser/devtools/app-manager.dtd
+++ b/browser/chrome/browser/devtools/app-manager.dtd
@@ -2,92 +2,100 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY index.title "App Manager">
 <!ENTITY index.projects2 "Apps">
 <!ENTITY index.device2 "Device">
 <!ENTITY index.help "Help">
 
+<!ENTITY device.debugMainProcess "Debug main process">
+<!ENTITY device.debugMainProcessTooltip "Open the Developer Tools connected to the main process on the device">
 <!ENTITY device.screenshot "Screenshot">
-<!ENTITY device.screenshotTooltip "Open a screenshot of the current state of the device in a new tab.">
-<!ENTITY device.title "Device Control Center">
+<!ENTITY device.screenshotTooltip "Open a screenshot of the current state of the device in a new tab">
+<!ENTITY device.title "Device Control Centre">
 <!ENTITY device.notConnected "Not connected. Please connect your device below.">
 <!ENTITY device.startApp "Start">
-<!ENTITY device.startAppTooltip "Start this app on the device.">
+<!ENTITY device.startAppTooltip "Start this app on the device">
 <!ENTITY device.stopApp "Stop">
-<!ENTITY device.stopAppTooltip "Stop this app on the device.">
+<!ENTITY device.stopAppTooltip "Stop this app on the device">
 <!ENTITY device.debugApp "Debug">
-<!ENTITY device.debugAppTooltip "Open the Developer Tools connected to this app on the device.">
+<!ENTITY device.debugAppTooltip "Open the Developer Tools connected to this app on the device">
 <!ENTITY device.name "Name">
 <!ENTITY device.plain "Plain (default)">
 <!ENTITY device.privileged "Privileged">
 <!ENTITY device.certified "Certified">
 <!ENTITY device.allow "Allow">
-<!ENTITY device.allowTooltip "This permission is allowed for apps of this type.">
+<!ENTITY device.allowTooltip "This permission is allowed for apps of this type">
 <!ENTITY device.prompt "Prompt">
-<!ENTITY device.promptTooltip "This permission requires a user prompt for apps of this type.">
+<!ENTITY device.promptTooltip "This permission requires a user prompt for apps of this type">
 <!ENTITY device.deny "Deny">
-<!ENTITY device.denyTooltip "This permission is denied for apps of this type.">
+<!ENTITY device.denyTooltip "This permission is denied for apps of this type">
 <!ENTITY device.installedApps "Installed Apps">
 <!ENTITY device.installedAppsTooltip "View a list of apps installed on the device. Some apps, such as certified apps, may be excluded from this view.">
 <!ENTITY device.permissions "Permissions">
-<!ENTITY device.permissionsTooltip "View a table of the permissions accessible to the different types of apps.">
+<!ENTITY device.permissionsTooltip "View a table of the permissions accessible to the different types of apps">
 <!ENTITY device.permissionsHelpLink "https://developer.mozilla.org/docs/Web/Apps/App_permissions">
+<!ENTITY device.browserTabs "Browser Tabs">
+<!ENTITY device.browserTabsTooltip "View a list of tabs in the browser of the connected device">
+<!ENTITY device.debugBrowserTab "Debug">
+<!ENTITY device.debugBrowserTabTooltip "Open the Developer Tools connected to this browser tab on the device">
 <!ENTITY device.help "Help">
 
-<!ENTITY connection.connectTooltip "Connect to the device.">
+<!ENTITY connection.connectTooltip "Connect to the device">
 <!ENTITY connection.disconnect "Disconnect">
-<!ENTITY connection.disconnectTooltip "Disconnect from the current device or simulator.">
+<!ENTITY connection.disconnectTooltip "Disconnect from the current device or simulator">
 <!ENTITY connection.notConnected2 "Not Connected.">
 <!ENTITY connection.connectTo "Connect to:">
 <!ENTITY connection.noDeviceFound "No device found. Plug a device">
 <!ENTITY connection.changeHostAndPort "Change">
-<!ENTITY connection.changeHostAndPortTooltip "Change the host and port used to connect to the device. (Defaults to localhost:6000)">
+<!ENTITY connection.changeHostAndPortTooltip "Change the host and port used to connect to the device (defaults to localhost:6000)">
 <!ENTITY connection.startSimulator "Start Simulator">
-<!ENTITY connection.startSimulatorTooltip "Start an instance of the Simulator and connect to it.">
+<!ENTITY connection.startSimulatorTooltip "Start an instance of the Simulator and connect to it">
 <!ENTITY connection.saveConnectionInfo "Save">
-<!ENTITY connection.saveConnectionInfoTooltip "Save the host and port.">
+<!ENTITY connection.saveConnectionInfoTooltip "Save the host and port">
 <!ENTITY connection.connecting "Connecting…">
 <!ENTITY connection.disconnecting "Disconnecting…">
 <!ENTITY connection.cancel "Cancel">
-<!ENTITY connection.cancelConnectTooltip "Cancel the connection in progress.">
-<!ENTITY connection.cancelShowSimulatorTooltip "Exit the Simulator connection mode and return to the initial prompt.">
+<!ENTITY connection.cancelConnectTooltip "Cancel the connection in progress">
+<!ENTITY connection.cancelShowSimulatorTooltip "Exit the Simulator connection mode and return to the initial prompt">
 <!ENTITY connection.or "or">
 <!ENTITY connection.noSimulatorInstalled "No simulator installed.">
 <!ENTITY connection.installOneSimulator "Install Simulator">
-<!ENTITY connection.installOneSimulatorTooltip "Install a version of the Simulator by downloading the relevant add-on.">
+<!ENTITY connection.installOneSimulatorTooltip "Install a version of the Simulator by downloading the relevant add-on">
 <!ENTITY connection.installAnotherSimulator "Add">
-<!ENTITY connection.installAnotherSimulatorTooltip "Install an additional version of the Simulator by downloading the relevant add-on.">
+<!ENTITY connection.installAnotherSimulatorTooltip "Install an additional version of the Simulator by downloading the relevant add-on">
 <!ENTITY connection.startRegisteredSimulator "Start:">
 
 <!ENTITY projects.localApps "Local Apps">
 <!ENTITY projects.addApp "Add">
 <!ENTITY projects.addPackaged "Add Packaged App">
-<!ENTITY projects.addPackagedTooltip "Add a new packaged app (a directory) from your computer.">
+<!ENTITY projects.addPackagedTooltip "Add a new packaged app (a directory) from your computer">
 <!ENTITY projects.addHosted "Add Hosted App">
-<!ENTITY projects.addHostedTooltip "Add a new hosted app (link to a manifest.webapp file) from a remote web site.">
+<!ENTITY projects.addHostedTooltip "Add a new hosted app (link to a manifest.webapp file) from a remote web site">
 <!ENTITY projects.title "Local Apps">
 <!ENTITY projects.appDetails "App Details">
 <!ENTITY projects.removeAppFromList "Remove this app from the list of apps you are working on. This will not remove it from a device or a simulator.">
 <!ENTITY projects.updateApp "Update">
 <!ENTITY projects.updateAppTooltip "Execute validation checks and update the app to the connected device">
 <!ENTITY projects.debugApp "Debug">
 <!ENTITY projects.debugAppTooltip "Open Developer Tools connected to this app">
 <!ENTITY projects.saveManifest "Save">
-<!ENTITY projects.saveManifestTooltip "Save the contents of the Manifest Editor below.">
+<!ENTITY projects.saveManifestTooltip "Save the contents of the Manifest Editor below">
 <!ENTITY projects.hostedManifestPlaceHolder2 "http://example.com/app/manifest.webapp">
 <!ENTITY projects.noProjects "No projects. Add a new packaged app below (local directory) or a hosted app (link to a manifest file).">
 <!ENTITY projects.manifestEditor "Manifest Editor">
 <!ENTITY projects.manifestEditorTooltip "Edit your app's manifest in the panel below. The Update button will save your changes and update the app.">
 <!ENTITY projects.manifestViewer "Manifest Viewer">
-<!ENTITY projects.manifestViewerTooltip "Examine your app's manifest in the panel below.">
+<!ENTITY projects.manifestViewerTooltip "Examine your app's manifest in the panel below">
 <!ENTITY projects.valid "Valid">
 <!ENTITY projects.error "Error">
 <!ENTITY projects.warning "Warning">
+<!ENTITY projects.hosted "Hosted">
+<!ENTITY projects.packaged "Packaged">
 
 <!ENTITY help.title "App Manager">
 <!ENTITY help.close "Close">
 <!ENTITY help.intro "This tool will help you build and install web apps on compatible devices (i.e. Firefox OS). The <strong>Apps</strong> tab will assist you in the validation and installation process of your app. The <strong>Device</strong> tab will give you information about the connected device. Use the bottom toolbar to connect to a device or start the simulator.">
 <!ENTITY help.usefullLinks "Useful links:">
 <!ENTITY help.appMgrDoc "Documentation: Using the App Manager">
 <!ENTITY help.configuringDevice "How to setup your Firefox OS device">
 <!ENTITY help.troubleShooting "Troubleshooting">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/canvasdebugger.dtd
@@ -0,0 +1,45 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- LOCALIZATION NOTE : FILE This file contains the Debugger strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
+
+<!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
+  - keep it in English, or another language commonly spoken among web developers.
+  - You want to make that choice consistent across the developer tools.
+  - A good criteria is the language in which you'd find the best
+  - documentation on web development on the web. -->
+
+<!-- LOCALIZATION NOTE (canvasDebuggerUI.reloadNotice1): This is the label shown
+  -  on the button that triggers a page refresh. -->
+<!ENTITY canvasDebuggerUI.reloadNotice1   "Reload">
+
+<!-- LOCALIZATION NOTE (canvasDebuggerUI.reloadNotice2): This is the label shown
+  -  along with the button that triggers a page refresh. -->
+<!ENTITY canvasDebuggerUI.reloadNotice2   "the page to be able to debug &lt;canvas&gt; contexts.">
+
+<!-- LOCALIZATION NOTE (canvasDebuggerUI.emptyNotice1/2): This is the label shown
+  -  in the call list view when empty. -->
+<!ENTITY canvasDebuggerUI.emptyNotice1    "Click on the">
+<!ENTITY canvasDebuggerUI.emptyNotice2    "button to record an animation frame's call stack.">
+
+<!-- LOCALIZATION NOTE (canvasDebuggerUI.reloadNotice1): This is the label shown
+  -  in the call list view while loading a snapshot. -->
+<!ENTITY canvasDebuggerUI.importNotice    "Loading…">
+
+<!-- LOCALIZATION NOTE (canvasDebuggerUI.recordSnapshot): This string is displayed
+  -  on a button that starts a new snapshot. -->
+<!ENTITY canvasDebuggerUI.recordSnapshot.tooltip "Record the next frame in the animation loop.">
+
+<!-- LOCALIZATION NOTE (canvasDebuggerUI.importSnapshot): This string is displayed
+  -  on a button that opens a dialog to import a saved snapshot data file. -->
+<!ENTITY canvasDebuggerUI.importSnapshot "Import…">
+
+<!-- LOCALIZATION NOTE (canvasDebuggerUI.clearSnapshots): This string is displayed
+  -  on a button that remvoes all the snapshots. -->
+<!ENTITY canvasDebuggerUI.clearSnapshots "Clear">
+
+<!-- LOCALIZATION NOTE (canvasDebuggerUI.searchboxPlaceholder): This string is displayed
+  -  as a placeholder of the search box that filters the calls list. -->
+<!ENTITY canvasDebuggerUI.searchboxPlaceholder "Filter calls">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/canvasdebugger.properties
@@ -0,0 +1,74 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used inside the Canvas Debugger
+# which is available from the Web Developer sub-menu -> 'Canvas'.
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (ToolboxCanvasDebugger.label):
+# This string is displayed in the title of the tab when the Shader Editor is
+# displayed inside the developer tools window and in the Developer Tools Menu.
+ToolboxCanvasDebugger.label=Canvas
+
+# LOCALIZATION NOTE (ToolboxCanvasDebugger.tooltip):
+# This string is displayed in the tooltip of the tab when the Shader Editor is
+# displayed inside the developer tools window.
+ToolboxCanvasDebugger.tooltip=Tools to inspect and debug <canvas> contexts
+
+# LOCALIZATION NOTE (noSnapshotsText): The text to display in the snapshots menu
+# when there are no recorded snapshots yet.
+noSnapshotsText=There are no snapshots yet.
+
+# LOCALIZATION NOTE (snapshotsList.itemLabel):
+# This string is displayed in the snapshots list of the Canvas Debugger,
+# identifying a set of function calls of a recorded animation frame.
+snapshotsList.itemLabel=Snapshot #%S
+
+# LOCALIZATION NOTE (snapshotsList.loadingLabel):
+# This string is displayed in the snapshots list of the Canvas Debugger,
+# for an item that has not finished loading.
+snapshotsList.loadingLabel=Loading…
+
+# LOCALIZATION NOTE (snapshotsList.saveLabel):
+# This string is displayed in the snapshots list of the Canvas Debugger,
+# for saving an item to disk.
+snapshotsList.saveLabel=Save
+
+# LOCALIZATION NOTE (snapshotsList.savingLabel):
+# This string is displayed in the snapshots list of the Canvas Debugger,
+# while saving an item to disk.
+snapshotsList.savingLabel=Saving…
+
+# LOCALIZATION NOTE (snapshotsList.loadedLabel):
+# This string is displayed in the snapshots list of the Canvas Debugger,
+# for an item which was loaded from disk
+snapshotsList.loadedLabel=Loaded from disc
+
+# LOCALIZATION NOTE (snapshotsList.saveDialogTitle):
+# This string is displayed as a title for saving a snapshot to disk.
+snapshotsList.saveDialogTitle=Save animation frame snapshot…
+
+# LOCALIZATION NOTE (snapshotsList.saveDialogJSONFilter):
+# This string is displayed as a filter for saving a snapshot to disk.
+snapshotsList.saveDialogJSONFilter=JSON Files
+
+# LOCALIZATION NOTE (snapshotsList.saveDialogAllFilter):
+# This string is displayed as a filter for saving a snapshot to disk.
+snapshotsList.saveDialogAllFilter=All Files
+
+# LOCALIZATION NOTE (snapshotsList.drawCallsLabel):
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# This string is displayed in the snapshots list of the Canvas Debugger,
+# as a generic description about how many draw calls were made.
+snapshotsList.drawCallsLabel=#1 draw;#1 draws
+
+# LOCALIZATION NOTE (snapshotsList.functionCallsLabel):
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# This string is displayed in the snapshots list of the Canvas Debugger,
+# as a generic description about how many function calls were made in total.
+snapshotsList.functionCallsLabel=#1 call;#1 calls
--- a/browser/chrome/browser/devtools/connection-screen.dtd
+++ b/browser/chrome/browser/devtools/connection-screen.dtd
@@ -8,16 +8,17 @@
   - -->
 
 <!ENTITY title      "Connect">
 <!ENTITY header     "Connect to remote device">
 <!ENTITY host       "Host:">
 <!ENTITY port       "Port:">
 <!ENTITY connect    "Connect">
 <!ENTITY connecting "Connecting…">
+<!ENTITY availableAddons "Available remote add-ons:">
 <!ENTITY availableTabs "Available remote tabs:">
 <!ENTITY availableProcesses "Available remote processes:">
 <!ENTITY connectionError "Error:">
 <!ENTITY errorTimeout "Error: connection timeout.">
 <!ENTITY errorRefused "Error: connection refused.">
 <!ENTITY errorUnexpected "Unexpected error.">
 
 <!-- LOCALIZATION NOTE (remoteHelp, remoteDocumentation, remoteHelpSuffix):
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -36,125 +36,155 @@
 <!-- LOCALIZATION NOTE (debuggerUI.sources.blackBoxTooltip): This is the tooltip
   -  for the button that black boxes the selected source. -->
 <!ENTITY debuggerUI.sources.blackBoxTooltip "Toggle Black Boxing">
 
 <!-- LOCALIZATION NOTE (debuggerUI.sources.prettyPrint): This is the tooltip for the
   -  button that pretty prints the selected source. -->
 <!ENTITY debuggerUI.sources.prettyPrint "Prettify Source">
 
+<!-- LOCALIZATION NOTE (debuggerUI.autoPrettyPrint): This is the label for the
+  -  checkbox that toggles auto pretty print. -->
+<!ENTITY debuggerUI.autoPrettyPrint     "Auto Prettify Minified Sources">
+<!ENTITY debuggerUI.autoPrettyPrint.accesskey "P">
+
+<!-- LOCALIZATION NOTE (debuggerUI.sources.toggleBreakpoints): This is the tooltip for the
+  -  button that toggles all breakpoints for all sources. -->
+<!ENTITY debuggerUI.sources.toggleBreakpoints "Enable/disable all breakpoints">
+
+<!-- LOCALIZATION NOTE (debuggerUI.startTracing): This is the text displayed in
+  - the button to start execution tracing. -->
+<!ENTITY debuggerUI.startTracing "Start Tracing">
+
+<!-- LOCALIZATION NOTE (debuggerUI.clearButton): This is the label for
+  -  the button that clears the collected tracing data in the tracing tab. -->
+<!ENTITY debuggerUI.clearButton "Clear">
+
+<!-- LOCALIZATION NOTE (debuggerUI.clearButton.tooltip): This is the tooltip for
+  -  the button that clears the collected tracing data in the tracing tab. -->
+<!ENTITY debuggerUI.clearButton.tooltip "Clear the collected traces">
+
 <!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
   -  checkbox that toggles pausing on exceptions. -->
-<!ENTITY debuggerUI.pauseExceptions     "Pause on exceptions">
-<!ENTITY debuggerUI.pauseExceptions.key "E">
+<!ENTITY debuggerUI.pauseExceptions           "Pause on Exceptions">
+<!ENTITY debuggerUI.pauseExceptions.accesskey "E">
 
-<!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
+<!-- LOCALIZATION NOTE (debuggerUI.ignoreCaughtExceptions): This is the label for the
   -  checkbox that toggles ignoring caught exceptions. -->
-<!ENTITY debuggerUI.ignoreCaughtExceptions     "Ignore caught exceptions">
-<!ENTITY debuggerUI.ignoreCaughtExceptions.key "C">
+<!ENTITY debuggerUI.ignoreCaughtExceptions           "Ignore Caught Exceptions">
+<!ENTITY debuggerUI.ignoreCaughtExceptions.accesskey "C">
 
 <!-- LOCALIZATION NOTE (debuggerUI.showPanesOnInit): This is the label for the
   -  checkbox that toggles visibility of panes when opening the debugger. -->
-<!ENTITY debuggerUI.showPanesOnInit     "Show panes on startup">
-<!ENTITY debuggerUI.showPanesOnInit.key "S">
+<!ENTITY debuggerUI.showPanesOnInit           "Show Panes on Startup">
+<!ENTITY debuggerUI.showPanesOnInit.accesskey "S">
 
 <!-- LOCALIZATION NOTE (debuggerUI.showVarsFilter): This is the label for the
   -  checkbox that toggles visibility of a designated variables filter box. -->
-<!ENTITY debuggerUI.showVarsFilter      "Show variables filter box">
-<!ENTITY debuggerUI.showVarsFilter.key  "V">
+<!ENTITY debuggerUI.showVarsFilter           "Show Variables Filter Box">
+<!ENTITY debuggerUI.showVarsFilter.accesskey "V">
 
 <!-- LOCALIZATION NOTE (debuggerUI.showOnlyEnum): This is the label for the
   -  checkbox that toggles visibility of hidden (non-enumerable) variables and
   -  properties in stack views. The "enumerable" flag is a state of a property
   -  defined in JavaScript. When in doubt, leave untranslated. -->
-<!ENTITY debuggerUI.showOnlyEnum        "Show only enumerable properties">
-<!ENTITY debuggerUI.showOnlyEnum.key    "P">
+<!ENTITY debuggerUI.showOnlyEnum           "Show Only Enumerable Properties">
+<!ENTITY debuggerUI.showOnlyEnum.accesskey "P">
 
 <!-- LOCALIZATION NOTE (debuggerUI.showOriginalSource): This is the label for
        -  the checkbox that toggles the display of original or sourcemap-derived
   -  sources. -->
-<!ENTITY debuggerUI.showOriginalSource      "Show original sources">
-<!ENTITY debuggerUI.showOriginalSource.key  "O">
+<!ENTITY debuggerUI.showOriginalSource           "Show Original Sources">
+<!ENTITY debuggerUI.showOriginalSource.accesskey "O">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchPanelOperators): This is the text that
   -  appears in the filter panel popup as a header for the operators part. -->
 <!ENTITY debuggerUI.searchPanelOperators    "Operators:">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchFile): This is the text that appears
   -  in the source editor's context menu for the scripts search operation. -->
-<!ENTITY debuggerUI.searchFile          "Filter scripts">
-<!ENTITY debuggerUI.searchFile.key      "P">
-<!ENTITY debuggerUI.searchFile.altkey   "O">
+<!ENTITY debuggerUI.searchFile           "Filter Scripts">
+<!ENTITY debuggerUI.searchFile.key       "P">
+<!ENTITY debuggerUI.searchFile.altkey    "O">
+<!ENTITY debuggerUI.searchFile.accesskey "P">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchGlobal): This is the text that appears
   -  in the source editor's context menu for the global search operation. -->
-<!ENTITY debuggerUI.searchGlobal        "Search in all files">
-<!ENTITY debuggerUI.searchGlobal.key    "F">
+<!ENTITY debuggerUI.searchGlobal           "Search in All Files">
+<!ENTITY debuggerUI.searchGlobal.key       "F">
+<!ENTITY debuggerUI.searchGlobal.accesskey "F">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchFunction): This is the text that appears
   -  in the source editor's context menu for the function search operation. -->
-<!ENTITY debuggerUI.searchFunction      "Search for function definition">
-<!ENTITY debuggerUI.searchFunction.key  "D">
+<!ENTITY debuggerUI.searchFunction           "Search for Function Definition">
+<!ENTITY debuggerUI.searchFunction.key       "D">
+<!ENTITY debuggerUI.searchFunction.accesskey "D">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchToken): This is the text that appears
   -  in the source editor's context menu for the token search operation. -->
-<!ENTITY debuggerUI.searchToken         "Find">
-<!ENTITY debuggerUI.searchToken.key     "F">
+<!ENTITY debuggerUI.searchToken           "Find">
+<!ENTITY debuggerUI.searchToken.key       "F">
+<!ENTITY debuggerUI.searchToken.accesskey "F">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchLine): This is the text that appears
   -  in the source editor's context menu for the line search operation. -->
-<!ENTITY debuggerUI.searchGoToLine      "Go to line…">
-<!ENTITY debuggerUI.searchGoToLine.key  "L">
+<!ENTITY debuggerUI.searchGoToLine           "Go to Line…">
+<!ENTITY debuggerUI.searchGoToLine.key       "L">
+<!ENTITY debuggerUI.searchGoToLine.accesskey "L">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchVariable): This is the text that appears
   -  in the source editor's context menu for the variables search operation. -->
-<!ENTITY debuggerUI.searchVariable      "Filter variables">
-<!ENTITY debuggerUI.searchVariable.key  "V">
+<!ENTITY debuggerUI.searchVariable           "Filter Variables">
+<!ENTITY debuggerUI.searchVariable.key       "V">
+<!ENTITY debuggerUI.searchVariable.accesskey "V">
 
 <!-- LOCALIZATION NOTE (debuggerUI.focusVariables): This is the text that appears
   -  in the source editor's context menu for the variables focus operation. -->
-<!ENTITY debuggerUI.focusVariables      "Focus variables tree">
-<!ENTITY debuggerUI.focusVariables.key  "V">
+<!ENTITY debuggerUI.focusVariables           "Focus Variables Tree">
+<!ENTITY debuggerUI.focusVariables.key       "V">
+<!ENTITY debuggerUI.focusVariables.accesskey "V">
 
 <!-- LOCALIZATION NOTE (debuggerUI.condBreakPanelTitle): This is the text that
   -  appears in the conditional breakpoint panel popup as a description. -->
 <!ENTITY debuggerUI.condBreakPanelTitle "This breakpoint will stop execution only if the following expression is true">
 
 <!-- LOCALIZATION NOTE (debuggerUI.seMenuBreak): This is the text that
   -  appears in the source editor context menu for adding a breakpoint. -->
-<!ENTITY debuggerUI.seMenuBreak         "Add breakpoint">
-<!ENTITY debuggerUI.seMenuBreak.key     "B">
+<!ENTITY debuggerUI.seMenuBreak     "Add Breakpoint">
+<!ENTITY debuggerUI.seMenuBreak.key "B">
 
 <!-- LOCALIZATION NOTE (debuggerUI.seMenuCondBreak): This is the text that
   -  appears in the source editor context menu for adding a conditional
   -  breakpoint. -->
-<!ENTITY debuggerUI.seMenuCondBreak     "Add conditional breakpoint">
+<!ENTITY debuggerUI.seMenuCondBreak     "Add Conditional Breakpoint">
 <!ENTITY debuggerUI.seMenuCondBreak.key "B">
 
 <!-- LOCALIZATION NOTE (debuggerUI.instruments.*): This is the text that
   -  appears in the debugger's instruments pane tabs. -->
 <!ENTITY debuggerUI.tabs.sources        "Sources">
+<!ENTITY debuggerUI.tabs.traces         "Traces">
 <!ENTITY debuggerUI.tabs.callstack      "Call Stack">
 <!ENTITY debuggerUI.tabs.variables      "Variables">
 <!ENTITY debuggerUI.tabs.events         "Events">
 
 <!-- LOCALIZATION NOTE (debuggerUI.seMenuAddWatch): This is the text that
   -  appears in the source editor context menu for adding an expression. -->
-<!ENTITY debuggerUI.seMenuAddWatch      "Selection to watch expression">
+<!ENTITY debuggerUI.seMenuAddWatch      "Selection to Watch Expression">
 <!ENTITY debuggerUI.seMenuAddWatch.key  "E">
 
 <!-- LOCALIZATION NOTE (debuggerUI.addWatch): This is the text that
   -  appears in the watch expressions context menu for adding an expression. -->
-<!ENTITY debuggerUI.addWatch            "Add watch expression">
-<!ENTITY debuggerUI.addWatch.key        "E">
+<!ENTITY debuggerUI.addWatch            "Add Watch Expression">
+<!ENTITY debuggerUI.addWatch.accesskey  "E">
 
 <!-- LOCALIZATION NOTE (debuggerUI.removeWatch): This is the text that
   -  appears in the watch expressions context menu for removing all expressions. -->
-<!ENTITY debuggerUI.removeAllWatch      "Remove all watch expressions">
-<!ENTITY debuggerUI.removeAllWatch.key  "E">
+<!ENTITY debuggerUI.removeAllWatch           "Remove All Watch Expressions">
+<!ENTITY debuggerUI.removeAllWatch.key       "E">
+<!ENTITY debuggerUI.removeAllWatch.accesskey "E">
 
 <!-- LOCALIZATION NOTE (debuggerUI.stepping): These are the keycodes that
   -  control the stepping commands in the debugger (continue, step over,
   -  step in and step out). -->
 <!ENTITY debuggerUI.stepping.resume1    "VK_F8">
 <!ENTITY debuggerUI.stepping.resume2    "VK_SLASH">
 <!ENTITY debuggerUI.stepping.stepOver1  "VK_F10">
 <!ENTITY debuggerUI.stepping.stepOver2  "VK_QUOTE">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -44,16 +44,24 @@ expandPanes=Expand panes
 # LOCALIZATION NOTE (pauseLabel): The label that is displayed on the pause
 # button when the debugger is in a running state.
 pauseButtonTooltip=Click to pause (%S)
 
 # LOCALIZATION NOTE (resumeLabel): The label that is displayed on the pause
 # button when the debugger is in a paused state.
 resumeButtonTooltip=Click to resume (%S)
 
+# LOCALIZATION NOTE (startTracingTooltip): The label that is displayed on the trace
+# button when execution tracing is stopped.
+startTracingTooltip=Click to start tracing
+
+# LOCALIZATION NOTE (stopTracingTooltip): The label that is displayed on the trace
+# button when execution tracing is started.
+stopTracingTooltip=Click to stop tracing
+
 # LOCALIZATION NOTE (stepOverTooltip): The label that is displayed on the
 # button that steps over a function call.
 stepOverTooltip=Step Over (%S)
 
 # LOCALIZATION NOTE (stepInTooltip): The label that is displayed on the
 # button that steps into a function call.
 stepInTooltip=Step In (%S)
 
@@ -64,24 +72,36 @@ stepOutTooltip=Step Out (%S)
 # LOCALIZATION NOTE (emptyGlobalsText): The text to display in the menulist
 # when there are no chrome globals available.
 noGlobalsText=No globals
 
 # LOCALIZATION NOTE (noSourcesText): The text to display in the sources menu
 # when there are no scripts.
 noSourcesText=This page has no sources.
 
+# LOCALIZATION NOTE (loadingSourcesText): The text to display in the sources menu
+# when waiting for scripts to load.
+loadingSourcesText=Waiting for sources…
+
 # LOCALIZATION NOTE (noEventListenersText): The text to display in the events tab
 # when there are no events.
 noEventListenersText=No event listeners to display
 
 # LOCALIZATION NOTE (noStackFramesText): The text to display in the call stack tab
 # when there are no stack frames.
 noStackFramesText=No stack frames to display
 
+# LOCALIZATION NOTE (noStackFramesText): The text to display in the traces tab
+# when there are no function calls.
+noFunctionCallsText=No function calls to display
+
+# LOCALIZATION NOTE (tracingNotStartedText): The text to display in the traces tab
+# when when tracing hasn't started yet.
+tracingNotStartedText=Tracing has not started
+
 # LOCALIZATION NOTE (eventCheckboxTooltip): The tooltip text to display when
 # the user hovers over the checkbox used to toggle an event breakpoint.
 eventCheckboxTooltip=Toggle breaking on this event
 
 # LOCALIZATION NOTE (eventOnSelector): The text to display in the events tab
 # for every event item, between the event type and event selector.
 eventOnSelector=on
 
@@ -193,16 +213,20 @@ loadingText=Loading\u2026
 # LOCALIZATION NOTE (errorLoadingText): The text that is displayed in the debugger
 # viewer when there is an error loading a file
 errorLoadingText=Error loading source:\n
 
 # LOCALIZATION NOTE (emptyStackText): The text that is displayed in the watch
 # expressions list to add a new item.
 addWatchExpressionText=Add watch expression
 
+# LOCALIZATION NOTE (addWatchExpressionButton): The button that is displayed in the
+# variables view popup.
+addWatchExpressionButton=Watch
+
 # LOCALIZATION NOTE (emptyVariablesText): The text that is displayed in the
 # variables pane when there are no variables to display.
 emptyVariablesText=No variables to display.
 
 # LOCALIZATION NOTE (scopeLabel): The text that is displayed in the variables
 # pane as a header for each variable scope (e.g. "Global scope, "With scope",
 # etc.).
 scopeLabel=%S scope
@@ -212,32 +236,67 @@ scopeLabel=%S scope
 # the watch expressions scope.
 watchExpressionsScopeLabel=Watch expressions
 
 # LOCALIZATION NOTE (globalScopeLabel): The name of the global scope. This text
 # is added to scopeLabel and displayed in the variables pane as a header for
 # the global scope.
 globalScopeLabel=Global
 
+# LOCALIZATION NOTE (variablesViewErrorStacktrace): This is the text that is
+# shown before the stack trace in an error.
+variablesViewErrorStacktrace=Stack trace:
+
+# LOCALIZATION NOTE (variablesViewMoreObjects): the text that is displayed
+# when you have an object preview that does not show all of the elements. At the end of the list
+# you see "N more..." in the web console output.
+# This is a semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of remaining items in the object
+# example: 3 more…
+variablesViewMoreObjects=#1 more…;#1 more…
+
 # LOCALIZATION NOTE (variablesEditableNameTooltip): The text that is displayed
 # in the variables list on an item with an editable name.
 variablesEditableNameTooltip=Double click to edit
 
 # LOCALIZATION NOTE (variablesEditableValueTooltip): The text that is displayed
 # in the variables list on an item with an editable name.
 variablesEditableValueTooltip=Click to change value
 
 # LOCALIZATION NOTE (variablesCloseButtonTooltip): The text that is displayed
 # in the variables list on an item with which can be removed.
 variablesCloseButtonTooltip=Click to remove
 
 # LOCALIZATION NOTE (variablesEditButtonTooltip): The text that is displayed
 # in the variables list on a getter or setter which can be edited.
 variablesEditButtonTooltip=Click to set value
 
+# LOCALIZATION NOTE (variablesEditableValueTooltip): The text that is displayed
+# in a tooltip on the "open in inspector" button in the the variables list for a
+# DOMNode item.
+variablesDomNodeValueTooltip=Click to select the node in the inspector
+
+# LOCALIZATION NOTE (configurable|...|Tooltip): The text that is displayed
+# in the variables list on certain variables or properties as tooltips.
+# Expanations of what these represent can be found at the following links:
+# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty
+# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isExtensible
+# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isFrozen
+# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isSealed
+# It's probably best to keep these in English.
+configurableTooltip=configurable
+enumerableTooltip=enumerable
+writableTooltip=writable
+frozenTooltip=frozen
+sealedTooltip=sealed
+extensibleTooltip=extensible
+overriddenTooltip=overridden
+WebIDLTooltip=WebIDL
+
 # LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed
 # in the variables list as a separator between the name and value.
 variablesSeparatorLabel=:
 
 # LOCALIZATION NOTE (watchExpressionsSeparatorLabel): The text that is displayed
 # in the watch expressions list as a separator between the code and evaluation.
 watchExpressionsSeparatorLabel=\ →
 
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/eyedropper.properties
@@ -0,0 +1,14 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used in the Eyedropper color tool.
+# LOCALIZATION NOTE The correct localization of this file might be to keep it
+# in English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best documentation
+# on web development on the web.
+
+# LOCALIZATION NOTE  (colorValue.copied): This text is displayed when the user selects a
+# color with the eyedropper and it's copied to the clipboard.
+colorValue.copied=copied
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -48,16 +48,19 @@ cliUnusedArg=Too many arguments
 # LOCALIZATION NOTE: The title of the dialog which displays the options that
 # are available to the current command.
 cliOptions=Available Options
 
 # LOCALIZATION NOTE: The error message when the user types a command that
 # isn't registered
 cliUnknownCommand=Invalid Command
 
+# LOCALIZATION NOTE: A parameter should have a value, but doesn't
+cliIncompleteParam=Value required for '%1$S'.
+
 # LOCALIZATION NOTE: Error message given when a file argument points to a file
 # that does not exist, but should (e.g. for use with File->Open) %1$S is a
 # filename
 fileErrNotExists='%1$S' doesn't exist
 
 # LOCALIZATION NOTE: Error message given when a file argument points to a file
 # that exists, but should not (e.g. for use with File->Save As) %1$S is a
 # filename
@@ -72,29 +75,16 @@ fileErrIsNotFile='%1$S' is not a file
 # filename
 fileErrIsNotDirectory='%1$S' is not a directory
 
 # LOCALIZATION NOTE: Error message given when a file argument does not match
 # the specified regular expression %1$S is a filename %2$S is a regular
 # expression
 fileErrDoesntMatch='%1$S' does not match '%2$S'
 
-# LOCALIZATION NOTE: When a command has a parameter that has a number of
-# pre-defined options the user interface presents these in a drop-down menu,
-# where the first 'option' is an indicator that a selection should be made.
-# This string describes that first option.
-fieldSelectionSelect=Select a %S ...
-
-# LOCALIZATION NOTE (fieldArrayAdd, fieldArrayDel): When a command has a
-# parameter that can be repeated multiple times (e.g. like the 'cat a.txt
-# b.txt' command) the user interface presents buttons to add and remove
-# arguments. This string is used to add arguments.
-fieldArrayAdd=Add
-fieldArrayDel=Delete
-
 # LOCALIZATION NOTE: When the menu has displayed all the matches that it
 # should (i.e. about 10 items) then we display this to alert the user that
 # more matches are available.
 fieldMenuMore=More matches, keep typing
 
 # LOCALIZATION NOTE: The command line provides completion for JavaScript
 # commands, however there are times when the scope of what we're completing
 # against can't be used. This error message is displayed when this happens.
@@ -149,17 +139,16 @@ nodeParseNone=No matches
 helpDesc=Get help on the available commands
 helpManual=Provide help either on a specific command (if a search string is provided and an exact match is found) or on the available commands (if a search string is not provided, or if no exact match is found).
 helpSearchDesc=Search string
 helpSearchManual3=search string to use in narrowing down the displayed commands. Regular expressions not supported.
 
 # LOCALIZATION NOTE (helpManSynopsis, helpManDescription): These strings are
 # displayed in the help page for a command in the console.
 helpManSynopsis=Synopsis
-helpManDescription=Description
 
 # LOCALIZATION NOTE: This message is displayed in the help page if the command
 # has no parameters.
 helpManNone=None
 
 # LOCALIZATION NOTE: This message is displayed in response to the 'help'
 # command when used without a filter, just above the list of known commands.
 helpListAll=Available Commands:
@@ -174,25 +163,25 @@ helpListNone=No commands starting with '
 # LOCALIZATION NOTE (helpManRequired, helpManOptional, helpManDefault): When
 # the 'help x' command wants to show the manual for the 'x' command, it needs
 # to be able to describe the parameters as either required or optional, or if
 # they have a default value.
 helpManRequired=required
 helpManOptional=optional
 helpManDefault=optional, default=%1$S
 
+# LOCALIZATION NOTE (helpIntro): This forms part of the output from the 'help'
+# command. 'GCLI' is a project name and should be left untranslated.
+helpIntro=GCLI is an experiment to create a highly usable command line for web developers.
+
 # LOCALIZATION NOTE: Text shown as part of the output of the 'help' command
 # when the command in question has sub-commands, before a list of the matching
 # sub-commands.
 subCommands=Sub-Commands
 
-# LOCALIZATION NOTE: Text shown as part of the output of the 'help' command
-# when the command in question should have sub-commands but in fact has none.
-subCommandsNone=None
-
 # LOCALIZATION NOTE (contextDesc, contextManual, contextPrefixDesc): These
 # strings are used to describe the 'context' command and its 'prefix'
 # parameter. See localization comment for 'connect' for an explanation about
 # 'prefix'.
 contextDesc=Concentrate on a group of commands
 contextManual=Setup a default prefix to future commands. For example 'context git' would allow you to type 'commit' rather than 'git commit'.
 contextPrefixDesc=The command prefix
 
@@ -202,51 +191,59 @@ contextNotParentError=Can't use '%1$S' a
 
 # LOCALIZATION NOTE (contextReply, contextEmptyReply): These messages are
 # displayed during the processing of the 'context' command, to indicate
 # success or that there is no command prefix.
 contextReply=Using %1$S as a command prefix
 contextEmptyReply=Command prefix is unset
 
 # LOCALIZATION NOTE (connectDesc, connectManual, connectPrefixDesc,
-# connectPortDesc, connectHostDesc, connectDupReply): These strings describe
+# connectMethodDesc, connectUrlDesc, connectDupReply): These strings describe
 # the 'connect' command and all its available parameters. A 'prefix' is an 
 # alias for the remote server (think of it as a "connection name"), and it
 # allows to identify a specific server when connected to multiple remote
 # servers.
 connectDesc=Proxy commands to server
 connectManual=Connect to the server, creating local versions of the commands on the server. Remote commands initially have a prefix to distinguish them from local commands (but see the context command to get past this)
 connectPrefixDesc=Parent prefix for imported commands
-connectPortDesc=The TCP port to listen on
-connectHostDesc=The hostname to bind to
+connectMethodDesc=The method of connecting
+connectUrlDesc=The URL to connect to
 connectDupReply=Connection called %S already exists.
 
 # LOCALIZATION NOTE: The output of the 'connect' command, telling the user
 # what it has done. Parameters: %S is the prefix command. See localization
 # comment for 'connect' for an explanation about 'prefix'.
 connectReply=Added %S commands.
 
 # LOCALIZATION NOTE (disconnectDesc2, disconnectManual2, disconnectPrefixDesc,
 # disconnectForceDesc): These strings describe the 'disconnect' command and
 # all its available parameters. See localization comment for 'connect' for an
 # explanation about 'prefix'.
 disconnectDesc2=Disconnect from server
 disconnectManual2=Disconnect from a server currently connected for remote commands execution
 disconnectPrefixDesc=Parent prefix for imported commands
-disconnectForceDesc=Ignore outstanding requests
 
 # LOCALIZATION NOTE: This is the output of the 'disconnect' command,
 # explaining the user what has been done. Parameters: %S is the number of
 # commands removed.
 disconnectReply=Removed %S commands.
 
-# LOCALIZATION NOTE: This error message is displayed when the user attempts to
-# disconnect before all requests have completed. Parameters: %S is a list of
-# incomplete requests.
-disconnectOutstanding=Outstanding requests (%1$S)
+# LOCALIZATION NOTE (globalDesc, globalWindowDesc, globalOutput): These
+# strings describe the 'global' command and its parameters
+globalDesc=Change the JS global
+globalWindowDesc=The new window/global
+globalOutput=JS global is now %S
+
+# LOCALIZATION NOTE: These strings describe the 'clear' command
+clearDesc=Clear the output area
+
+# LOCALIZATION NOTE (langDesc, langOutput): These strings describe the 'lang'
+# command and its parameters
+langDesc=Enter commands in different languages
+langOutput=You are now using %S
 
 # LOCALIZATION NOTE (prefDesc, prefManual, prefListDesc, prefListManual,
 # prefListSearchDesc, prefListSearchManual, prefShowDesc, prefShowManual,
 # prefShowSettingDesc, prefShowSettingManual): These strings describe the
 # 'pref' command and all its available sub-commands and parameters.
 prefDesc=Commands to control settings
 prefManual=Commands to display and alter preferences both for GCLI and the surrounding environment
 prefListDesc=Display available settings
@@ -268,23 +265,16 @@ prefShowSettingValue=%1$S: %2$S
 # describe the 'pref set' command and all its parameters.
 prefSetDesc=Alter a setting
 prefSetManual=Alter preferences defined by the environment
 prefSetSettingDesc=Setting to alter
 prefSetSettingManual=The name of the setting to alter.
 prefSetValueDesc=New value for setting
 prefSetValueManual=The new value for the specified setting
 
-# LOCALIZATION NOTE (prefSetCheckHeading, prefSetCheckBody, prefSetCheckGo):
-# These strings are displayed to the user the first time they try to alter a
-# setting.
-prefSetCheckHeading=This might void your warranty!
-prefSetCheckBody=Changing these advanced settings can be harmful to the stability, security, and performance of this application. You should only continue if you are sure of what you are doing.
-prefSetCheckGo=I'll be careful, I promise!
-
 # LOCALIZATION NOTE (prefResetDesc, prefResetManual, prefResetSettingDesc,
 # prefResetSettingManual): These strings describe the 'pref reset' command and
 # all its parameters.
 prefResetDesc=Reset a setting
 prefResetManual=Reset the value of a setting to the system defaults
 prefResetSettingDesc=Setting to reset
 prefResetSettingManual=The name of the setting to reset to the system default value
 
@@ -299,35 +289,26 @@ prefOutputName=Name
 prefOutputValue=Value
 
 # LOCALIZATION NOTE (introDesc, introManual): These strings describe the
 # 'intro' command. The localization of 'Got it!' should be the same used in
 # introTextGo.
 introDesc=Show the opening message
 introManual=Redisplay the message that is shown to new users until they click the 'Got it!' button
 
-# LOCALIZATION NOTE (introTextOpening2, introTextCommands, introTextKeys2,
+# LOCALIZATION NOTE (introTextOpening3, introTextCommands, introTextKeys2,
 # introTextF1Escape, introTextGo): These strings are displayed when the user
 # first opens the developer toolbar to explain the command line, and is shown
 # each time it is opened until the user clicks the 'Got it!' button.
-introTextOpening2=This command line is designed for developers. It focuses on speed of input over JavaScript syntax and a rich display over monospace output.
+introTextOpening3=GCLI is an experiment to create a highly usable command line for web developers.
 introTextCommands=For a list of commands type
 introTextKeys2=, or to show/hide command hints press
 introTextF1Escape=F1/Escape
 introTextGo=Got it!
 
 # LOCALIZATION NOTE: This is a short description of the 'hideIntro' setting.
 hideIntroDesc=Show the initial welcome message
 
 # LOCALIZATION NOTE: This is a description of the 'eagerHelper' setting. It's
 # displayed when the user asks for help on the settings. eagerHelper allows
 # users to select between showing no tooltips, permanent tooltips, and only
 # important tooltips.
 eagerHelperDesc=How eager are the tooltips
-
-# LOCALIZATION NOTE: This is a short description of the 'allowSetDesc'
-# setting.
-allowSetDesc=Has the user enabled the 'pref set' command?
-
-# LOCALIZATION NOTE: This text is displayed at the top of the output for the
-# help command, just before the list of commands. This text is wrapped inside
-# a link to a localized MDN article.
-introBody=For more information see MDN.
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -99,17 +99,17 @@ screenshotFullPageDesc=Entire web page? 
 screenshotFullPageManual=True if the screenshot should also include parts of the web page which are outside the current scrolled bounds.
 
 # LOCALIZATION NOTE (screenshotSelectorChromeConflict) Exception thrown when user
 # tries to use 'selector' option along with 'chrome' option of the screenshot
 # command. Refer: https://bugzilla.mozilla.org/show_bug.cgi?id=659268#c7
 screenshotSelectorChromeConflict=selector option is not supported when chrome option is true
 
 # LOCALIZATION NOTE (screenshotGeneratedFilename) The auto generated filename
-# when no file name is provided. the first argument (%1$S) is the date string
+# when no file name is provided. The first argument (%1$S) is the date string
 # in yyyy-mm-dd format and the second argument (%2$S) is the time string
 # in HH.MM.SS format. Please don't add the extension here.
 screenshotGeneratedFilename=Screen Shot %1$S at %2$S
 
 # LOCALIZATION NOTE (screenshotErrorSavingToFile) Text displayed to user upon
 # encountering error while saving the screenshot to the file specified.
 screenshotErrorSavingToFile=Error saving to
 
@@ -120,16 +120,19 @@ screenshotSavedToFile=Saved to
 # LOCALIZATION NOTE (screenshotErrorCopying) Text displayed to user upon
 # encountering error while copying the screenshot to clipboard.
 screenshotErrorCopying=Error occurred while copying to clipboard.
 
 # LOCALIZATION NOTE (screenshotCopied) Text displayed to user when the
 # screenshot is successfully copied to the clipboard.
 screenshotCopied=Copied to clipboard.
 
+# LOCALIZATION NOTE (screenshotTooltip) Text displayed as tooltip for screenshot button in devtools ToolBox.
+screenshotTooltip=Take a fullpage screenshot
+
 # LOCALIZATION NOTE (restartBrowserDesc) A very short description of the
 # 'restart' command. This string is designed to be shown in a menu alongside the
 # command name, which is why it should be as short as possible.
 # The argument (%1$S) is the browser name.
 restartBrowserDesc=Restart %1$S
 
 # LOCALIZATION NOTE (restartBrowserNocacheDesc) A very short string to
 # describe the 'nocache' parameter to the 'restart' command, which is
@@ -148,29 +151,41 @@ restartBrowserRestarting=Restarting %1$S…
 # LOCALIZATION NOTE (inspectDesc) A very short description of the 'inspect'
 # command. See inspectManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 inspectDesc=Inspect a node
 
 # LOCALIZATION NOTE (inspectManual) A fuller description of the 'inspect'
 # command, displayed when the user asks for help on what it does.
-inspectManual=Investigate the dimensions and properties of an element using \
-a CSS selector to open the DOM highlighter
+inspectManual=Investigate the dimensions and properties of an element using a CSS selector to open the DOM highlighter
 
 # LOCALIZATION NOTE (inspectNodeDesc) A very short string to describe the
 # 'node' parameter to the 'inspect' command, which is displayed in a dialog
 # when the user is using this command.
 inspectNodeDesc=CSS selector
 
 # LOCALIZATION NOTE (inspectNodeManual) A fuller description of the 'node'
 # parameter to the 'inspect' command, displayed when the user asks for help
 # on what it does.
-inspectNodeManual=A CSS selector for use with Document.querySelector which \
-identifies a single element
+inspectNodeManual=A CSS selector for use with Document.querySelector which identifies a single element
+
+# LOCALIZATION NOTE (eyedropperDesc) A very short description of the 'eyedropper'
+# command. See eyedropperManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+eyedropperDesc=Grab a colour from the page
+
+# LOCALIZATION NOTE (eyedropperManual) A fuller description of the 'eyedropper'
+# command, displayed when the user asks for help on what it does.
+eyedropperManual=Open a panel that magnifies an area of page to inspect pixels and copy colour values
+
+# LOCALIZATION NOTE (eyedropperTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles the Eyedropper tool.
+eyedropperTooltip=Grab a colour from the page
 
 # LOCALIZATION NOTE (tiltDesc) A very short description of the 'tilt'
 # command. See tiltManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 tiltDesc=Visualise the web page in 3D
 
 # LOCALIZATION NOTE (tiltManual) A fuller description of the 'tilt'
@@ -294,24 +309,24 @@ tiltResetManual=Resets any transformatio
 # LOCALIZATION NOTE (tiltCloseDesc) A very short description of the 'tilt close'
 # command. See tiltCloseManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 tiltCloseDesc=Close the visualisation if open
 
 # LOCALIZATION NOTE (tiltCloseManual) A fuller description of the 'tilt close'
 # command, displayed when the user asks for help on what it does.
-tiltCloseManual=Close the visualisation and switch back to the Inspector default highlighter
+tiltCloseManual=Close the visualisation and switch back to the Inspector's default highlighter
 
 # LOCALIZATION NOTE (debuggerClosed) Used in the output of several commands
 # to explain that the debugger must be opened first.
 debuggerClosed=The debugger must be opened before using this command
 
 # LOCALIZATION NOTE (debuggerStopped) Used in the output of several commands
-# to explain that the debugger must be opened first.
+# to explain that the debugger must be opened first before setting breakpoints.
 debuggerStopped=The debugger must be opened before setting breakpoints
 
 # LOCALIZATION NOTE (breakDesc) A very short string used to describe the
 # function of the break command.
 breakDesc=Manage breakpoints
 
 # LOCALIZATION NOTE (breakManual) A longer description describing the
 # set of commands that control breakpoints.
@@ -401,17 +416,17 @@ dbgStepDesc=Manage stepping
 # set of commands that control stepping.
 dbgStepManual=Commands to step in, out and over lines of code
 
 # LOCALIZATION NOTE (dbgStepOverDesc) A very short string used to describe the
 # function of the dbg step over command.
 dbgStepOverDesc=Executes the current statement and then stops at the next statement. If the current statement is a function call then the debugger executes the whole function, and it stops at the next statement after the function call
 
 # LOCALIZATION NOTE (dbgStepInDesc) A very short string used to describe the
-# function of the dbg step over command.
+# function of the dbg step out command.
 dbgStepInDesc=Executes the current statement and then stops at the next statement. If the current statement is a function call, then the debugger steps into that function, otherwise it stops at the next statement
 
 # LOCALIZATION NOTE (dbgStepOutDesc) A very short string used to describe the
 # function of the dbg step over command.
 dbgStepOutDesc=Steps out of the current function and up one level if the function is nested. If in the main body, the script is executed to the end, or to the next breakpoint. The skipped statements are executed, but not stepped through
 
 # LOCALIZATION NOTE (dbgListSourcesDesc) A very short string used to describe the
 # function of the dbg list command.
@@ -481,17 +496,17 @@ dbgUnBlackBoxInvertDesc=Invert matching,
 consolecloseDesc=Close the console
 
 # LOCALIZATION NOTE (consoleopenDesc) A very short description of the
 # 'console open' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 consoleopenDesc=Open the console
 
 # LOCALIZATION NOTE (editDesc) A very short description of the 'edit'
-# command. See editManual for a fuller description of what it does. This
+# command. See editManual2 for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 editDesc=Tweak a page resource
 
 # LOCALIZATION NOTE (editManual2) A fuller description of the 'edit' command,
 # displayed when the user asks for help on what it does.
 editManual2=Edit one of the resources that is part of this page
 
@@ -559,26 +574,28 @@ resizeModeManual2=Responsive web sites r
 # name, which is why it should be as short as possible.
 cmdDesc=Manipulate the commands
 
 # LOCALIZATION NOTE (cmdRefreshDesc) A very short description of the 'cmd refresh'
 # command. This string is designed to be shown in a menu alongside the command
 # name, which is why it should be as short as possible.
 cmdRefreshDesc=Re-read mozcmd directory
 
-# LOCALIZATION NOTE (cmdStatus) When the we load new commands from mozcmd
-# directory, we report on how many we loaded. %1$S is a count of the number
-# of loaded commands, and %2$S is the directory we loaded from.
-cmdStatus=Read %1$S commands from '%2$S'
+# LOCALIZATION NOTE (cmdStatus3) When the we load new commands from mozcmd
+# directory, we report where we loaded from using %1$S.
+cmdStatus3=Loaded commands from '%1$S'
 
-# LOCALIZATION NOTE (cmdSetdirDesc) 
+# LOCALIZATION NOTE (cmdSetdirDesc)  A very short description of the 'cmd setdir'
+# command. This string is designed to be shown in a menu alongside the command
+# name, which is why it should be as short as possible.
 cmdSetdirDesc=Setup a mozcmd directory
 
-# LOCALIZATION NOTE (cmdSetdirManual) 
-cmdSetdirManual=A 'mozcmd' directory is an easy way to create new custom commands for the Firefox command line. For more information see the <a href="https://developer.mozilla.org/en-US/docs/Tools/GCLI/Customization">MDN documentation</a>.
+# LOCALIZATION NOTE (cmdSetdirManual2) A fuller description of the 'cmd setdir'
+# command, displayed when the user asks for help on what it does.
+cmdSetdirManual2=A 'mozcmd' directory is an easy way to create new custom commands. For more information see the <a href="https://developer.mozilla.org/docs/Tools/GCLI/Customization">MDN documentation</a>.
 
 # LOCALIZATION NOTE (cmdSetdirDirectoryDesc) The description of the directory
 # parameter to the 'cmd setdir' command.
 cmdSetdirDirectoryDesc=Directory containing .mozcmd files
 
 # LOCALIZATION NOTE (addonDesc) A very short description of the 'addon'
 # command. This string is designed to be shown in a menu alongside the command
 # name, which is why it should be as short as possible.
@@ -639,32 +656,32 @@ addonNameDesc=The name of the add-on
 addonNoneOfType=There are no add-ons of that type installed.
 
 # LOCALIZATION NOTE (addonEnableDesc) A very short description of the
 # 'addon enable <type>' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 addonEnableDesc=Enable the specified add-on
 
 # LOCALIZATION NOTE (addonAlreadyEnabled) Used in the output of the
-# 'addon enable' command when an attempt is made to enable an addon is already
-# enabled.
+# 'addon enable' command when an attempt is made to enable an add-on that is
+# already enabled.
 addonAlreadyEnabled=%S is already enabled.
 
 # LOCALIZATION NOTE (addonEnabled) Used in the output of the 'addon enable'
 # command when an addon is enabled.
 addonEnabled=%S enabled.
 
 # LOCALIZATION NOTE (addonDisableDesc) A very short description of the
 # 'addon disable <type>' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 addonDisableDesc=Disable the specified add-on
 
 # LOCALIZATION NOTE (addonAlreadyDisabled) Used in the output of the
-# 'addon disable' command when an attempt is made to disable an addon is already
-# disabled.
+# 'addon disable' command when an attempt is made to disable an add-on that is
+# already disabled.
 addonAlreadyDisabled=%S is already disabled.
 
 # LOCALIZATION NOTE (addonDisabled) Used in the output of the 'addon disable'
 # command when an addon is disabled.
 addonDisabled=%S disabled.
 
 # LOCALIZATION NOTE (exportDesc) A very short description of the 'export'
 # command. This string is designed to be shown in a menu alongside the command
@@ -915,17 +932,17 @@ cookieRemoveKeyDesc=The key of the cooki
 
 # LOCALIZATION NOTE (cookieSetDesc) A very short description of the
 # 'cookie set' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 cookieSetDesc=Set a cookie
 
 # LOCALIZATION NOTE (cookieSetManual) A fuller description of the 'cookie set'
 # command, displayed when the user asks for help on what it does.
-cookieSetManual=Set a cookie by specifying a key name, it's value and optionally one or more of the following attributes: expires (max-age in seconds or the expires date in GMTString format), path, domain, secure
+cookieSetManual=Set a cookie by specifying a key name, its value and optionally one or more of the following attributes: expires (max-age in seconds or the expires date in GMTString format), path, domain, secure
 
 # LOCALIZATION NOTE (cookieSetKeyDesc) A very short string to describe the
 # 'key' parameter to the 'cookie set' command, which is displayed in a dialog
 # when the user is using this command.
 cookieSetKeyDesc=The key of the cookie to set
 
 # LOCALIZATION NOTE (cookieSetValueDesc) A very short string to describe the
 # 'value' parameter to the 'cookie set' command, which is displayed in a dialog
@@ -964,17 +981,17 @@ cookieSetSessionDesc=Only valid for the 
 # LOCALIZATION NOTE (cookieSetExpiresDesc) A very short string to describe the
 # 'expires' parameter to the 'cookie set' command, which is displayed in a dialog
 # when the user is using this command.
 cookieSetExpiresDesc=The expiry date of the cookie (quoted RFC2822 or ISO 8601 date)
 
 # LOCALIZATION NOTE (jsbDesc) A very short description of the
 # 'jsb' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
-jsbDesc=Javascript beautifier
+jsbDesc=JavaScript beautifier
 
 # LOCALIZATION NOTE (jsbUrlDesc) A very short description of the
 # 'jsb <url>' parameter. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 jsbUrlDesc=The URL of the JS file to beautify
 
 # LOCALIZATION NOTE (jsbIndentSizeDesc) A very short description of the
 # 'jsb <indentSize>' parameter. This string is designed to be shown in a menu
@@ -989,17 +1006,17 @@ jsbIndentSizeManual=The number of chars 
 # LOCALIZATION NOTE (jsbIndentCharDesc) A very short description of the
 # 'jsb <indentChar>' parameter. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 jsbIndentCharDesc=The chars used to indent each line
 
 # LOCALIZATION NOTE (jsbIndentCharManual) A fuller description of the
 # 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
 # does.
-jsbIndentCharManual=The chars used to indent each line, the possible choices are space or tab.
+jsbIndentCharManual=The chars used to indent each line. The possible choices are space or tab.
 
 # the 'jsb <doNotPreserveNewlines>' parameter. This string is designed to be
 # shown in a menu alongside the command name, which is why it should be as short
 # as possible.
 jsbDoNotPreserveNewlinesDesc=Do not preserve line breaks
 
 # LOCALIZATION NOTE (jsbPreserveNewlinesManual) A fuller description of the
 # 'jsb <jsbPreserveNewlines>' parameter, displayed when the user asks for help
@@ -1147,17 +1164,17 @@ callLogChromeInvalidJSM=Invalid JSM!
 callLogChromeVarNotFoundContent=Variable not found in content window.
 
 # LOCALIZATION NOTE (callLogChromeVarNotFoundChrome) A string displayed as the
 # result of the 'calllog chromestart' command with a source type of
 # chrome-variable and an invalid variable name.
 callLogChromeVarNotFoundChrome=Variable not found in chrome window.
 
 # LOCALIZATION NOTE (callLogChromeEvalException) A string displayed as the
-# result of the 'calllog chromestart' command with a source type of javascript
+# result of the 'calllog chromestart' command with a source type of JavaScript
 # and invalid JavaScript code.
 callLogChromeEvalException=Evaluated JavaScript threw the following exception
 
 # LOCALIZATION NOTE (callLogChromeEvalNeedsObject) A string displayed as the
 # result of passing a non-JavaScript object creating source via the
 # 'calllog chromestart javascript' command.
 callLogChromeEvalNeedsObject=The JavaScript source must evaluate to an object whose method calls are to be logged e.g. "({a1: function() {this.a2()},a2: function() {}});"
 
@@ -1184,18 +1201,18 @@ paintflashingChromeDesc=chrome frames
 # LOCALIZATION NOTE (paintflashingManual) A longer description describing the
 # set of commands that control paint flashing.
 paintflashingManual=Draw repainted areas in different colours
 
 # LOCALIZATION NOTE (paintflashingTooltip) A string displayed as the
 # tooltip of button in devtools toolbox which toggles paint flashing.
 paintflashingTooltip=Highlight painted area
 
-# LOCALIZATION NOTE (paintflashingOnDesc) A very short string used to describe the
-# function of the "paintflashing on" command.
+# LOCALIZATION NOTE (paintflashingToggleDesc) A very short string used to describe the
+# function of the "paintflashing toggle" command.
 paintflashingToggleDesc=Toggle paint flashing
 
 # LOCALIZATION NOTE (splitconsoleTooltip) A string displayed as the
 # tooltip of button in devtools toolbox which toggles the split webconsole.
 splitconsoleTooltip=Toggle split console
 
 # LOCALIZATION NOTE (appCacheDesc) A very short string used to describe the
 # function of the "appcache" command
@@ -1369,9 +1386,8 @@ listenNoInitOutput=DebuggerServer not in
 # LOCALIZATION NOTE (mediaDesc, mediaEmulateDesc, mediaEmulateManual,
 # mediaEmulateType, mediaResetDesc, mediaResetManual) These strings describe
 # the 'media' commands and all available parameters.
 mediaDesc=CSS media type emulation
 mediaEmulateDesc=Emulate a specified CSS media type
 mediaEmulateManual=View the document as if rendered on a device supporting the given media type, with the relevant CSS rules applied.
 mediaEmulateType=The media type to emulate
 mediaResetDesc=Stop emulating a CSS media type
-mediaResetManual=Stop emulating a CSS media type
--- a/browser/chrome/browser/devtools/inspector.dtd
+++ b/browser/chrome/browser/devtools/inspector.dtd
@@ -5,15 +5,20 @@
 <!ENTITY inspectorHTMLCopyInner.accesskey   "I">
 
 <!ENTITY inspectorHTMLCopyOuter.label       "Copy Outer HTML">
 <!ENTITY inspectorHTMLCopyOuter.accesskey   "O">
 
 <!ENTITY inspectorCopyUniqueSelector.label       "Copy Unique Selector">
 <!ENTITY inspectorCopyUniqueSelector.accesskey   "U">
 
+<!ENTITY inspectorHTMLPasteOuter.label      "Paste Outer HTML">
+<!ENTITY inspectorHTMLPasteOuter.accesskey  "P">
+
 <!ENTITY inspectorHTMLDelete.label          "Delete Node">
 <!ENTITY inspectorHTMLDelete.accesskey      "D">
 
 <!ENTITY inspector.selectButton.tooltip     "Select element with mouse">
 
 <!ENTITY inspectorSearchHTML.label          "Search HTML">
 <!ENTITY inspectorSearchHTML.key            "F">
+
+<!ENTITY inspectorCopyImageDataUri.label       "Copy Image Data-URL">
--- a/browser/chrome/browser/devtools/layoutview.dtd
+++ b/browser/chrome/browser/devtools/layoutview.dtd
@@ -12,12 +12,12 @@
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
 <!-- LOCALIZATION NOTE (*.tooltip): These tooltips are not regular tooltips.
   -  The text appears on the bottom right corner of the layout view when
   -  the corresponding box is hovered. -->
 
 <!ENTITY title                  "Box Model">
-<!ENTITY margins.tooltip        "margins">
-<!ENTITY borders.tooltip        "borders">
+<!ENTITY margin.tooltip         "margin">
+<!ENTITY border.tooltip         "border">
 <!ENTITY padding.tooltip        "padding">
 <!ENTITY content.tooltip        "content">
--- a/browser/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -6,19 +6,24 @@
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
 
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
-<!-- LOCALIZATION NOTE (netmonitorUI.emptyNotice2): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.perfNotice1/2): These are the labels displayed
+  -  in the network table when empty to start performance analysis. -->
+<!ENTITY netmonitorUI.perfNotice1         "• Click on the">
+<!ENTITY netmonitorUI.perfNotice2         "button to start performance analysis.">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.emptyNotice3): This is the label displayed
   -  in the network table when empty. -->
-<!ENTITY netmonitorUI.emptyNotice2        "Perform a request or reload the page to see detailed information about network activity.">
+<!ENTITY netmonitorUI.emptyNotice3        "• Perform a request or reload the page to see detailed information about network activity.">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.status2): This is the label displayed
   -  in the network table toolbar, above the "status" column. -->
 <!ENTITY netmonitorUI.toolbar.status2     "✓">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.method): This is the label displayed
   -  in the network table toolbar, above the "method" column. -->
 <!ENTITY netmonitorUI.toolbar.method      "Method">
@@ -58,18 +63,22 @@
 <!-- LOCALIZATION NOTE (debuggerUI.tab.response): This is the label displayed
   -  in the network details pane identifying the response tab. -->
 <!ENTITY netmonitorUI.tab.response        "Response">
 
 <!-- LOCALIZATION NOTE (debuggerUI.tab.timings): This is the label displayed
   -  in the network details pane identifying the timings tab. -->
 <!ENTITY netmonitorUI.tab.timings         "Timings">
 
+<!-- LOCALIZATION NOTE (debuggerUI.tab.preview): This is the label displayed
+  -  in the network details pane identifying the preview tab. -->
+<!ENTITY netmonitorUI.tab.preview         "Preview">
+
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterAll): This is the label displayed
-       -  in the network details footer for the "All" filtering button. -->
+  -  in the network details footer for the "All" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterAll    "All">
 
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterHTML): This is the label displayed
   -  in the network details footer for the "HTML" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterHTML   "HTML">
 
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterCSS): This is the label displayed
   -  in the network details footer for the "CSS" filtering button. -->
@@ -94,20 +103,28 @@
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterMedia): This is the label displayed
   -  in the network details footer for the "Media" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterMedia  "Media">
 
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterFlash): This is the label displayed
   -  in the network details footer for the "Flash" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterFlash  "Flash">
 
+<!-- LOCALIZATION NOTE (debuggerUI.footer.filterOther): This is the label displayed
+  -  in the network details footer for the "Other" filtering button. -->
+<!ENTITY netmonitorUI.footer.filterOther  "Other">
+
 <!-- LOCALIZATION NOTE (debuggerUI.footer.clear): This is the label displayed
   -  in the network details footer for the "Clear" button. -->
 <!ENTITY netmonitorUI.footer.clear  "Clear">
 
+<!-- LOCALIZATION NOTE (debuggerUI.footer.perf): This is the label displayed
+  -  in the network details footer for the performance analysis button. -->
+<!ENTITY netmonitorUI.footer.perf   "Toggle performance analysis…">
+
 <!-- LOCALIZATION NOTE (debuggerUI.panesButton.tooltip): This is the tooltip for
   -  the button that toggles the panes visible or hidden in the netmonitor UI. -->
 <!ENTITY netmonitorUI.panesButton.tooltip "Toggle network info">
 
 <!-- LOCALIZATION NOTE (debuggerUI.summary.url): This is the label displayed
   -  in the network details headers tab identifying the URL. -->
 <!ENTITY netmonitorUI.summary.url         "Request URL:">
 
@@ -168,24 +185,46 @@
   -  in a "wait" state. -->
 <!ENTITY netmonitorUI.timings.wait        "Waiting:">
 
 <!-- LOCALIZATION NOTE (debuggerUI.timings.receive): This is the label displayed
   -  in the network details timings tab identifying the amount of time spent
   -  in a "receive" state. -->
 <!ENTITY netmonitorUI.timings.receive     "Receiving:">
 
+<!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools): This is the label displayed
+  -  on the context menu that shows the performance analysis tools -->
+<!ENTITY netmonitorUI.context.perfTools   "Start Performance Analysis…">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools.accesskey): This is the access key
+  -  for the performance analysis menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.perfTools.accesskey "S">
+
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl): This is the label displayed
   -  on the context menu that copies the selected request's url -->
 <!ENTITY netmonitorUI.context.copyUrl      "Copy URL">
 
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyAsCurl): This is the label displayed
+  -  on the context menu that copies the selected request as a cURL command.
+  -  The capitalization is part of the official name and should be used throughout all languages.
+  -  http://en.wikipedia.org/wiki/CURL -->
+<!ENTITY netmonitorUI.context.copyAsCurl    "Copy as cURL">
+
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl.accesskey): This is the access key
   -  for the Copy URL menu item displayed in the context menu for a request -->
 <!ENTITY netmonitorUI.context.copyUrl.accesskey  "C">
 
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyImageAsDataUri): This is the label displayed
+  -  on the context menu that copies the selected image as data uri -->
+<!ENTITY netmonitorUI.context.copyImageAsDataUri "Copy Image as Data URI">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyImageAsDataUri.accesskey): This is the access key
+  -  for the Copy Image As Data URI menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.copyImageAsDataUri.accesskey  "I">
+
 <!-- LOCALIZATION NOTE (debuggerUI.summary.editAndResend): This is the label displayed
   -  on the button in the headers tab that opens a form to edit and resend the currently
      displayed request -->
 <!ENTITY netmonitorUI.summary.editAndResend      "Edit and Resend">
 
 <!-- LOCALIZATION NOTE (debuggerUI.summary.editAndResend.accesskey): This is the access key
   -  for the "Edit and Resend" menu item displayed in the context menu for a request -->
 <!ENTITY netmonitorUI.summary.editAndResend.accesskey  "R">
@@ -218,8 +257,12 @@
 
 <!-- LOCALIZATION NOTE (debuggerUI.custom.send): This is the label displayed
   -  on the button which sends the custom request -->
 <!ENTITY netmonitorUI.custom.send         "Send">
 
 <!-- LOCALIZATION NOTE (debuggerUI.custom.cancel): This is the label displayed
   -  on the button which cancels and closes the custom request form -->
 <!ENTITY netmonitorUI.custom.cancel       "Cancel">
+
+<!-- LOCALIZATION NOTE (debuggerUI.backButton): This is the label displayed
+  -  on the button which exists the performance statistics view -->
+<!ENTITY netmonitorUI.backButton          "Back">
--- a/browser/chrome/browser/devtools/netmonitor.properties
+++ b/browser/chrome/browser/devtools/netmonitor.properties
@@ -68,16 +68,21 @@ paramsFormData=Form data
 # LOCALIZATION NOTE (paramsPostPayload): This is the label displayed
 # in the network details params tab identifying the request payload.
 paramsPostPayload=Request payload
 
 # LOCALIZATION NOTE (requestHeaders): This is the label displayed
 # in the network details headers tab identifying the request headers.
 requestHeaders=Request headers
 
+# LOCALIZATION NOTE (requestHeadersFromUpload): This is the label displayed
+# in the network details headers tab identifying the request headers from
+# the upload stream of a POST request's body.
+requestHeadersFromUpload=Request headers from upload stream
+
 # LOCALIZATION NOTE (responseHeaders): This is the label displayed
 # in the network details headers tab identifying the response headers.
 responseHeaders=Response headers
 
 # LOCALIZATION NOTE (requestCookies): This is the label displayed
 # in the network details params tab identifying the request cookies.
 requestCookies=Request cookies
 
@@ -109,21 +114,83 @@ networkMenu.sortedDesc=Sorted descending
 # in the network table footer when there are no requests available.
 networkMenu.empty=No requests
 
 # LOCALIZATION NOTE (networkMenu.summary): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # This label is displayed in the network table footer providing concise
 # information about all requests. Parameters: #1 is the number of requests,
 # #2 is the size, #3 is the number of seconds.
-networkMenu.summary=One request, #2 KB, #3 s;#1 requests, #2 KB, #3 s
+networkMenu.summary=One request, #2 kB, #3 s;#1 requests, #2 kB, #3 s
 
 # LOCALIZATION NOTE (networkMenu.sizeKB): This is the label displayed
 # in the network menu specifying the size of a request (in kilobytes).
-networkMenu.sizeKB=%S KB
+networkMenu.sizeKB=%S kB
 
 # LOCALIZATION NOTE (networkMenu.totalMS): This is the label displayed
 # in the network menu specifying the time for a request to finish (in milliseconds).
 networkMenu.totalMS=→ %S ms
 
-# LOCALIZATION NOTE (networkMenu.divisionMS): This is the label displayed
+# LOCALIZATION NOTE (networkMenu.millisecond): This is the label displayed
 # in the network menu specifying timing interval divisions (in milliseconds).
-networkMenu.divisionMS=%S ms
+networkMenu.millisecond=%S ms
+
+# LOCALIZATION NOTE (networkMenu.second): This is the label displayed
+# in the network menu specifying timing interval divisions (in seconds).
+networkMenu.second=%S s
+
+# LOCALIZATION NOTE (networkMenu.minute): This is the label displayed
+# in the network menu specifying timing interval divisions (in minutes).
+networkMenu.minute=%S min
+
+# LOCALIZATION NOTE (pieChart.loading): This is the label displayed
+# for pie charts (e.g., in the performance analysis view) when there is
+# no data available yet.
+pieChart.loading=Loading
+
+# LOCALIZATION NOTE (pieChart.unavailable): This is the label displayed
+# for pie charts (e.g., in the performance analysis view) when there is
+# no data available, even after loading it.
+pieChart.unavailable=Empty
+
+# LOCALIZATION NOTE (tableChart.loading): This is the label displayed
+# for table charts (e.g., in the performance analysis view) when there is
+# no data available yet.
+tableChart.loading=Please wait…
+
+# LOCALIZATION NOTE (tableChart.unavailable): This is the label displayed
+# for table charts (e.g., in the performance analysis view) when there is
+# no data available, even after loading it.
+tableChart.unavailable=No data available
+
+# LOCALIZATION NOTE (charts.sizeKB): This is the label displayed
+# in pie or table charts specifying the size of a request (in kilobytes).
+charts.sizeKB=%S kB
+
+# LOCALIZATION NOTE (charts.totalS): This is the label displayed
+# in pie or table charts specifying the time for a request to finish (in seconds).
+charts.totalS=%S s
+
+# LOCALIZATION NOTE (charts.cacheEnabled): This is the label displayed
+# in the performance analysis view for "cache enabled" charts.
+charts.cacheEnabled=Primed cache
+
+# LOCALIZATION NOTE (charts.cacheDisabled): This is the label displayed
+# in the performance analysis view for "cache disabled" charts.
+charts.cacheDisabled=Empty cache
+
+# LOCALIZATION NOTE (charts.totalSize): This is the label displayed
+# in the performance analysis view for total requests size, in kilobytes.
+charts.totalSize=Size: %S kB
+
+# LOCALIZATION NOTE (charts.totalSeconds): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# This is the label displayed in the performance analysis view for the
+# total requests time, in seconds.
+charts.totalSeconds=Time: #1 second;Time: #1 seconds
+
+# LOCALIZATION NOTE (charts.totalCached): This is the label displayed
+# in the performance analysis view for total cached responses.
+charts.totalCached=Cached responses: %S
+
+# LOCALIZATION NOTE (charts.totalCount): This is the label displayed
+# in the performance analysis view for total requests.
+charts.totalCount=Total requests: %S
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/projecteditor.properties
@@ -0,0 +1,49 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used inside the ProjectEditor component
+# which is used for editing files in a directory and is used inside the
+# App Manager.
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (projecteditor.deleteLabel):
+# This string is displayed as a context menu item for allowing the selected
+# file / folder to be deleted
+projecteditor.deleteLabel=Delete
+
+# LOCALIZATION NOTE (projecteditor.newLabel):
+# This string is displayed as a context menu item for adding a new file to
+# the directory
+projecteditor.newLabel=New…
+
+# LOCALIZATION NOTE (projecteditor.selectFileLabel):
+# This string is displayed as the title on the file picker when saving a file
+projecteditor.selectFileLabel=Select a File
+
+# LOCALIZATION NOTE (projecteditor.openFolderLabel):
+# This string is displayed as the title on the file picker when opening a folder
+projecteditor.openFolderLabel=Select a Folder
+
+# LOCALIZATION NOTE (projecteditor.openFileLabel):
+# This string is displayed as the title on the file picker when opening a file
+projecteditor.openFileLabel=Open a File
+
+# LOCALIZATION NOTE  (projecteditor.find.commandkey): This is the key to use in
+# conjunction with accel (Command on Mac or Ctrl on other platforms) to search
+# text in the files
+projecteditor.find.commandkey=F
+
+# LOCALIZATION NOTE  (projecteditor.save.commandkey): This is the key to use in
+# conjunction with accel (Command on Mac or Ctrl on other platforms) to
+# save the file.  It is used with accel+shift to "save as"
+projecteditor.save.commandkey=S
+
+# LOCALIZATION NOTE  (projecteditor.new.commandkey): This is the key to use in
+# conjunction with accel (Command on Mac or Ctrl on other platforms) to
+# create a new file
+projecteditor.new.commandkey=N
--- a/browser/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/chrome/browser/devtools/scratchpad.dtd
@@ -45,32 +45,57 @@
 
 <!ENTITY saveFileAsCmd.label          "Save As…">
 <!ENTITY saveFileAsCmd.accesskey      "A">
 
 <!ENTITY closeCmd.label               "Close">
 <!ENTITY closeCmd.key                 "W">
 <!ENTITY closeCmd.accesskey           "C">
 
+<!ENTITY viewMenu.label               "View">
+<!ENTITY viewMenu.accesskey           "V">
+
+<!ENTITY lineNumbers.label             "Show Line Numbers">
+<!ENTITY lineNumbers.accesskey         "L">
+
+<!ENTITY wordWrap.label                "Wrap Text">
+<!ENTITY wordWrap.accesskey            "W">
+
+<!ENTITY highlightTrailingSpace.label     "Highlight Trailing Space">
+<!ENTITY highlightTrailingSpace.accesskey "H">
+
+<!ENTITY largerFont.label             "Larger Font">
+<!ENTITY largerFont.accesskey         "a">
+<!ENTITY largerFont.commandkey        "+">
+
+<!ENTITY smallerFont.label            "Smaller Font">
+<!ENTITY smallerFont.accesskey        "m">
+<!ENTITY smallerFont.commandkey       "-">
+
+<!ENTITY normalSize.label             "Normal Size">
+<!ENTITY normalSize.accesskey         "N">
+<!ENTITY normalSize.commandkey        "0">
+
 <!ENTITY editMenu.label               "Edit">
 <!ENTITY editMenu.accesskey           "E">
 
 <!ENTITY run.label                    "Run">
 <!ENTITY run.accesskey                "R">
 <!ENTITY run.key                      "r">
 
 <!ENTITY inspect.label                "Inspect">
 <!ENTITY inspect.accesskey            "I">
 <!ENTITY inspect.key                  "i">
 
 <!ENTITY display.label                "Display">
 <!ENTITY display.accesskey            "D">
 <!ENTITY display.key                  "l">
 
 <!ENTITY pprint.label                 "Pretty Print">
+<!ENTITY pprint.accesskey             "P">
 <!ENTITY pprint.key                   "p">
 
 <!-- LOCALIZATION NOTE (environmentMenu.label, accesskey): This menu item was
   -  renamed from "Context" to avoid confusion with the right-click context
   -  menu in the text area. It refers to the JavaScript Environment (or context)
   -  the user is evaluating against. I.e., Content (current tab) or Chrome
   -  (browser).
   -->
--- a/browser/chrome/browser/devtools/sourceeditor.properties
+++ b/browser/chrome/browser/devtools/sourceeditor.properties
@@ -70,17 +70,23 @@ indentLess.commandkey=[
 # LOCALIZATION NOTE  (toolboxPrevTool.commandkey): This the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to increase
 # indentation level in CodeMirror. However, its default value also used by
 # the Toolbox to switch between tools
 #
 # DO NOT translate this key without proper synchronization with toolbox.dtd.
 indentMore.commandkey=]
 
-# LOCALIZATION NOTE  (moveLineUp.commandkey): This the key to use in
-# conjunction with accel (Command on Mac or Ctrl on other platforms) to move
+# LOCALIZATION NOTE  (moveLineUp.commandkey): This is the key to use to move
 # the selected lines up.
 moveLineUp.commandkey=Alt-Up
 
-# LOCALIZATION NOTE  (moveLineDown.commandkey): This the key to use in
-# conjunction with accel (Command on Mac or Ctrl on other platforms) to move
+# LOCALIZATION NOTE  (moveLineDown.commandkey): This is the key to use to move
 # the selected lines down.
 moveLineDown.commandkey=Alt-Down
+
+# LOCALIZATION NOTE  (autocomplete.commandkey): This is the key to use
+# in conjunction with Ctrl for autocompletion.
+autocompletion.commandkey=Space
+
+# LOCALIZATION NOTE  (showInformation.commandkey): This is the key to use to
+# show more information, like type inference.
+showInformation.commandkey=Shift-Space
--- a/browser/chrome/browser/devtools/styleeditor.dtd
+++ b/browser/chrome/browser/devtools/styleeditor.dtd
@@ -19,16 +19,38 @@
 <!ENTITY importButton.accesskey     "I">
 
 <!ENTITY visibilityToggle.tooltip   "Toggle style sheet visibility">
 
 <!ENTITY saveButton.label           "Save">
 <!ENTITY saveButton.tooltip         "Save this style sheet to a file">
 <!ENTITY saveButton.accesskey       "S">
 
+<!ENTITY optionsButton.tooltip      "Style Editor options">
+
+<!-- LOCALIZATION NOTE  (showOriginalSources.label): This is the label on the context
+     menu item to toggle showing original sources in the editor. -->
+<!ENTITY showOriginalSources.label     "Show original sources">
+
+<!-- LOCALIZATION NOTE  (showOriginalSources.accesskey): This is the access key for
+     the menu item to toggle showing original sources in the editor. -->
+<!ENTITY showOriginalSources.accesskey  "o">
+
+<!-- LOCALIZATION NOTE  (showMediaSidebar.label): This is the label on the context
+     menu item to toggle showing @media rule shortcuts in a sidebar. -->
+<!ENTITY showMediaSidebar.label     "Show @media sidebar">
+
+<!-- LOCALIZATION NOTE  (showMediaSidebar.accesskey): This is the access key for
+     the menu item to toggle showing the @media sidebar. -->
+<!ENTITY showMediaSidebar.accesskey     "m">
+
+<!-- LOCALICATION NOTE  (mediaRules.label): This is shown above the list of @media rules
+     in each stylesheet editor sidebar. -->
+<!ENTITY mediaRules.label           "@media rules">
+
 <!ENTITY editorTextbox.placeholder  "Type CSS here.">
 
 <!-- LOCALICATION NOTE  (noStyleSheet.label): This is shown when a page has no
      stylesheet. -->
 <!ENTITY noStyleSheet.label         "This page has no style sheet.">
 
 <!-- LOCALICATION NOTE  (noStyleSheet-tip-start.label): This is the start of a
      tip sentence shown when there is no stylesheet. It suggests to create a new
--- a/browser/chrome/browser/devtools/styleeditor.properties
+++ b/browser/chrome/browser/devtools/styleeditor.properties
@@ -33,16 +33,20 @@ newStyleSheet=New style sheet #%S
 ruleCount.label=#1 rule.;#1 rules.
 
 # LOCALIZATION NOTE  (error-load.label): This is shown when loading fails.
 error-load=Style sheet could not be loaded.
 
 # LOCALIZATION NOTE  (error-save.label): This is shown when saving fails.
 error-save=Style sheet could not be saved.
 
+# LOCALIZATION NOTE  (error-compressed): This is shown when we can't show
+# coverage information because the css source is compressed.
+error-compressed=Can't show coverage information for compressed stylesheets
+
 # LOCALIZATION NOTE  (importStyleSheet.title): This is the file picker title,
 # when you import a style sheet into the Style Editor.
 importStyleSheet.title=Import style sheet
 
 # LOCALIZATION NOTE  (importStyleSheet.title): This is the *.css filter title
 importStyleSheet.filter=CSS files
 
 # LOCALIZATION NOTE  (saveStyleSheet.title): This is the file picker title,
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -12,24 +12,32 @@
 <!ENTITY toolboxNextTool.key           "]">
 <!ENTITY toolboxPreviousTool.key       "[">
 
 <!ENTITY toolboxZoomIn.key             "+">
 <!ENTITY toolboxZoomIn.key2            "="> <!-- + is above this key on many keyboards -->
 <!ENTITY toolboxZoomOut.key            "-">
 <!ENTITY toolboxZoomReset.key          "0">
 
+<!ENTITY toolboxReload.key             "r">
+
 <!-- LOCALIZATION NOTE (options.context.advancedSettings): This is the label for
   -  the heading of the advanced settings group in the options panel. -->
 <!ENTITY options.context.advancedSettings "Advanced settings">
 
 <!-- LOCALIZATION NOTE (options.context.inspector): This is the label for
   -  the heading of the Inspector group in the options panel. -->
 <!ENTITY options.context.inspector "Inspector">
 
+<!-- LOCALIZATION NOTE (options.showUserAgentStyles.label): This is the label
+  -  for the checkbox option to show user agent styles in the Inspector
+  -  panel. -->
+<!ENTITY options.showUserAgentStyles.label "Show Browser Styles">
+<!ENTITY options.showUserAgentStyles.tooltip "Turning this on will show default styles that are loaded by the browser.">
+
 <!-- LOCALIZATION NOTE (options.defaultColorUnit.label): This is the label for a
   -  dropdown list that controls the default color unit used in the inspector.
   -  This label is visible in the options panel. -->
 <!ENTITY options.defaultColorUnit.label "Default colour unit">
 
 <!-- LOCALIZATION NOTE (options.defaultColorUnit.accesskey): This is the access
   -  key for a dropdown list that controls the default color unit used in the
   -  inspector. This is visible in the options panel. -->
@@ -47,82 +55,113 @@
   -  'Default color unit' dropdown list and is visible in the options panel. -->
 <!ENTITY options.defaultColorUnit.rgb "RGB(A)">
 
 <!-- LOCALIZATION NOTE (options.defaultColorUnit.name): This is used in
   -  the 'Default color unit' dropdown list and is visible in the options panel.
   -  -->
 <!ENTITY options.defaultColorUnit.name "Colour Names">
 
-<!-- LOCALIZATION NOTE (options.context.triggersPageRefresh2): This is the
-  -  triggers page refresh label next to the settings in the advanced settings
-  -  group in the options panel which trigger page reload. -->
-<!ENTITY options.context.triggersPageRefresh2  "Current session only, reloads the page">
+<!-- LOCALIZATION NOTE (options.context.triggersPageRefresh): This is the
+  -  triggers page refresh footnote under the advanced settings group in the
+  -  options panel and is used for settings that trigger page reload. -->
+<!ENTITY options.context.triggersPageRefresh  "* Current session only, reloads the page">
 
-<!-- LOCALIZATION NOTE (options.enableChrome.label3): This is the label for the
+<!-- LOCALIZATION NOTE (options.enableChrome.label4): This is the label for the
   -  checkbox that toggles chrome debugging, i.e. devtools.chrome.enabled
   -  boolean preference in about:config, in the options panel. -->
-<!ENTITY options.enableChrome.label3    "Enable chrome debugging">
-<!ENTITY options.enableChrome.tooltip   "Turning this option on will allow you to use various developer tools in browser context">
+<!ENTITY options.enableChrome.label4    "Enable chrome and addon debugging">
+<!ENTITY options.enableChrome.tooltip2  "Turning this option on will allow you to use various developer tools in browser context and debug addons from the Add-On Manager">
 
 <!-- LOCALIZATION NOTE (options.enableRemote.label3): This is the label for the
   -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
   -  boolean preference in about:config, in the options panel. -->
 <!ENTITY options.enableRemote.label3    "Enable remote debugging">
 <!ENTITY options.enableRemote.tooltip   "Turning this option on will allow the developer tools to debug remote Firefox instance like Firefox OS">
 
-<!-- LOCALIZATION NOTE (options.disableJavaScript.label2,
+<!-- LOCALIZATION NOTE (options.disableJavaScript.label,
   -  options.disableJavaScript.tooltip): This is the options panel label and
   -  tooltip for the checkbox that toggles JavaScript on or off. -->
-<!ENTITY options.disableJavaScript.label2    "Disable JavaScript">
+<!ENTITY options.disableJavaScript.label     "Disable JavaScript *">
 <!ENTITY options.disableJavaScript.tooltip   "Turning this option on will disable JavaScript for the current tab. If the tab or the toolbox is closed then this setting will be forgotten.">
 
+<!-- LOCALIZATION NOTE (options.disableCache.label,
+  -  options.disableCache.tooltip): This is the options panel label and
+  -  tooltip for the checkbox that toggles the cache on or off. -->
+<!ENTITY options.disableCache.label     "Disable Cache *">
+<!ENTITY options.disableCache.tooltip   "Turning this option on will disable the cache for the current tab. If the tab or the toolbox is closed then this setting will be forgotten.">
+
 <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the default developer
   -  tools. -->
 <!ENTITY options.selectDefaultTools.label     "Default Firefox Developer Tools">
 
 <!-- LOCALIZATION NOTE (options.selectAdditionalTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the developer tools
   -  added by add-ons. This heading is hidden when there is no developer tool
   -  installed by add-ons. -->
 <!ENTITY options.selectAdditionalTools.label  "Developer Tools installed by add-ons">
 
+<!-- LOCALIZATION NOTE (options.selectEnabledToolboxButtons.label): This is the label for
+  -  the heading of group of checkboxes corresponding to the default developer
+  -  tool buttons. -->
+<!ENTITY options.selectEnabledToolboxButtons.label     "Available Toolbox Buttons">
+
 <!-- LOCALIZATION NOTE (options.toolNotSupported.label): This is the label for
   -  the explanation of the * marker on a tool which is currently not supported
   -  for the target of the toolbox. -->
 <!ENTITY options.toolNotSupported.label  "* Not supported for current toolbox target">
 
 <!-- LOCALIZATION NOTE (options.selectDevToolsTheme.label): This is the label for
   -  the heading of the radiobox corresponding to the theme of the developer
   -  tools. -->
 <!ENTITY options.selectDevToolsTheme.label   "Choose DevTools theme:">
 <!ENTITY options.darkTheme.label             "Dark theme">
 <!ENTITY options.lightTheme.label            "Light theme">
 
 <!-- LOCALIZATION NOTE (options.webconsole.label): This is the label for the
   -  heading of the group of Web Console preferences in the options panel. -->
 <!ENTITY options.webconsole.label            "Web Console">
 
-<!-- LOCALIZATION NOTE (options.enablePersistentLogging.label): This is the
-  -  label for the checkbox that toggles persistent logs in the Web Console,
-  -  i.e. devtools.webconsole.persistlog a boolean preference in about:config,
-  -  in the options panel. -->
-<!ENTITY options.enablePersistentLogging.label    "Enable persistent logs">
-<!ENTITY options.enablePersistentLogging.tooltip  "If you enable this option the Web Console will not clear the output each time you navigate to a new page">
-
 <!-- LOCALIZATION NOTE (options.timestampMessages.label): This is the
         - label for the checkbox that toggles timestamps in the Web Console -->
 <!ENTITY options.timestampMessages.label      "Enable timestamps">
 <!ENTITY options.timestampMessages.tooltip    "If you enable this option commands and output in the Web Console will display a timestamp">
 
+<!-- LOCALIZATION NOTE (options.styleeditor.label): This is the label for the
+  -  heading of the group of Style Editor preferences in the options
+  -  panel. -->
+<!ENTITY options.styleeditor.label            "Style Editor">
+
+<!-- LOCALIZATION NOTE (options.stylesheetSourceMaps.label): This is the
+  - label for the checkbox that toggles showing original sources in the Style Editor -->
+<!ENTITY options.stylesheetSourceMaps.label      "Show original sources">
+<!ENTITY options.stylesheetSourceMaps.tooltip    "Show original sources (e.g. Sass files) in the Style Editor and Inspector">
+
+<!-- LOCALIZATION NOTE (options.stylesheetAutocompletion.label): This is the
+  -  label for the checkbox that toggles autocompletion of css in the Style Editor -->
+<!ENTITY options.stylesheetAutocompletion.label      "Autocomplete CSS">
+<!ENTITY options.stylesheetAutocompletion.tooltip    "Autocomplete CSS properties, values and selectors in Style Editor as you type">
+
 <!-- LOCALIZATION NOTE (options.profiler.label): This is the label for the
   -  heading of the group of JavaScript Profiler preferences in the options
   -  panel. -->
 <!ENTITY options.profiler.label            "JavaScript Profiler">
 
+<!-- LOCALICATION NOTE (options.commonprefs): This is the label for the heading
+      of all preferences that affect both the Web Console and the Network
+      Monitor -->
+<!ENTITY options.commonPrefs.label           "Common Preferences">
+
+<!-- LOCALIZATION NOTE (options.enablePersistentLogs.label): This is the
+  -  label for the checkbox that toggles persistent logs in the Web Console and
+  -  network monitor,  i.e. devtools.webconsole.persistlog a boolean preference in
+  -  about:config, in the options panel. -->
+<!ENTITY options.enablePersistentLogs.label    "Enable persistent logs">
+<!ENTITY options.enablePersistentLogs.tooltip  "If you enable this option the Web Console and Network Monitor will not clear the output each time you navigate to a new page">
+
 <!-- LOCALIZATION NOTE (options.showPlatformData.label): This is the
   -  label for the checkbox that toggles the display of the platform data in the,
   -  Profiler i.e. devtools.profiler.ui.show-platform-data a boolean preference
   -  in about:config, in the options panel. -->
 <!ENTITY options.showPlatformData.label    "Show Gecko platform data">
 <!ENTITY options.showPlatformData.tooltip  "If you enable this option the JavaScript Profiler reports will include
 Gecko platform symbols">
--- a/browser/chrome/browser/devtools/toolbox.properties
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -49,8 +49,12 @@ options.toolNotSupportedMarker=%1$S *
 # Used for opening scratchpad from the detached toolbox window
 # Needs to match scratchpad.keycode from browser.dtd
 scratchpad.keycode=VK_F4
 
 # LOCALIZATION NOTE (browserConsoleCmd.commandkey)
 # Used for toggling the browser console from the detached toolbox window
 # Needs to match browserConsoleCmd.commandkey from browser.dtd
 browserConsoleCmd.commandkey=j
+
+# LOCALIZATION NOTE (pickButton.tooltip)
+# This is the tooltip of the pick button in the toolbox toolbar
+pickButton.tooltip=Pick an element from the page
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -48,36 +48,37 @@
 <!ENTITY btnPageNet.accesskey "N">
 <!-- LOCALIZATION NOTE (btnPageNet.accesskeyMacOSX): This string is used as
   -  access key for the menu button that allows users to toggle the network
   -  logging output. On MacOSX accesskeys are available with Ctrl-*. Please make
   -  sure you do not use the following letters: A, E, N and P. These are used
   -  for editing commands in text inputs. -->
 <!ENTITY btnPageNet.accesskeyMacOSX "t">
 <!ENTITY btnPageCSS.label   "CSS">
-<!ENTITY btnPageCSS.tooltip "Log CSS parsing errors">
+<!ENTITY btnPageCSS.tooltip2 "Log CSS errors and warnings">
 <!ENTITY btnPageCSS.accesskey "C">
 <!ENTITY btnPageJS.label    "JS">
 <!ENTITY btnPageJS.tooltip  "Log JavaScript exceptions">
 <!ENTITY btnPageJS.accesskey  "J">
 <!ENTITY btnPageSecurity.label "Security">
 <!ENTITY btnPageSecurity.tooltip "Log security errors and warnings">
-<!ENTITY btnPageSecurity.accesskey "S">
+<!ENTITY btnPageSecurity.accesskey "u">
 
 <!-- LOCALIZATION NOTE (btnPageLogging): This is used as the text of the
   -  the toolbar. It shows or hides messages that the web developer inserted on
   -  the page for debugging purposes, using calls such console.log() and
   -  console.error(). -->
 <!ENTITY btnPageLogging.label   "Logging">
 <!ENTITY btnPageLogging.tooltip "Log messages sent to the window.console object">
 <!ENTITY btnPageLogging.accesskey3 "L">
 <!ENTITY btnConsoleErrors       "Errors">
 <!ENTITY btnConsoleInfo         "Info">
 <!ENTITY btnConsoleWarnings     "Warnings">
 <!ENTITY btnConsoleLog          "Log">
+<!ENTITY btnConsoleReflows      "Reflows">
 
 <!ENTITY filterOutput.placeholder "Filter output">
 <!ENTITY btnClear.label        "Clear">
 <!ENTITY btnClear.tooltip      "Clear the Web Console output">
 <!ENTITY btnClear.accesskey    "r">
 
 <!ENTITY fullZoomEnlargeCmd.commandkey  "+">
 <!ENTITY fullZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/webaudioeditor.dtd
@@ -0,0 +1,40 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- LOCALIZATION NOTE : FILE This file contains the Debugger strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
+
+<!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
+  - keep it in English, or another language commonly spoken among web developers.
+  - You want to make that choice consistent across the developer tools.
+  - A good criteria is the language in which you'd find the best
+  - documentation on web development on the web. -->
+
+<!-- LOCALIZATION NOTE (webAudioEditorUI.reloadNotice1): This is the label shown
+  -  on the button that triggers a page refresh. -->
+<!ENTITY webAudioEditorUI.reloadNotice1   "Reload">
+
+<!-- LOCALIZATION NOTE (webAudioEditorUI.reloadNotice2): This is the label shown
+  -  along with the button that triggers a page refresh. -->
+<!ENTITY webAudioEditorUI.reloadNotice2   "the page to view and edit the audio context.">
+
+<!-- LOCALIZATION NOTE (webAudioEditorUI.emptyNotice): This is the label shown
+  -  while the page is refreshing and the tool waits for a audio context. -->
+<!ENTITY webAudioEditorUI.emptyNotice     "Waiting for an audio context to be created…">
+
+<!-- LOCALIZATION NOTE (webAudioEditorUI.tab.properties): This is the label shown
+  -  for the properties tab view. -->
+<!ENTITY webAudioEditorUI.tab.properties  "Parameters">
+
+<!-- LOCALIZATION NOTE (webAudioEditorUI.inspectorTitle): This is the title for the
+  -  AudioNode inspector view. -->
+<!ENTITY webAudioEditorUI.inspectorTitle  "AudioNode Inspector">
+
+<!-- LOCALIZATION NOTE (webAudioEditorUI.inspectorEmpty): This is the title for the
+  -  AudioNode inspector view empty message. -->
+<!ENTITY webAudioEditorUI.inspectorEmpty  "No AudioNode selected.">
+
+<!-- LOCALIZATION NOTE (webAudioEditorUI.propertiesEmpty): This is the title for the
+  -  AudioNode inspector view properties tab empty message. -->
+<!ENTITY webAudioEditorUI.propertiesEmpty "Node does not have any properties.">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/webaudioeditor.properties
@@ -0,0 +1,30 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used inside the Web Audio tool
+# which is available in the developer tools' toolbox, once
+# enabled in the developer tools' preference "Web Audio".
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (ToolboxWebAudioEditor1.label):
+# This string is displayed in the title of the tab when the Web Audio Editor
+# is displayed inside the developer tools window and in the Developer Tools Menu.
+ToolboxWebAudioEditor1.label=Web Audio
+
+# LOCALIZATION NOTE (ToolboxWebAudioEditor1.tooltip):
+# This string is displayed in the tooltip of the tab when the Web Audio Editor is
+# displayed inside the developer tools window.
+ToolboxWebAudioEditor1.tooltip=Web Audio context visualiser and audio node inspector
+
+# LOCALIZATION NOTE (collapseInspector): This is the tooltip for the button
+# that collapses the inspector in the web audio tool UI.
+collapseInspector=Collapse inspector
+
+# LOCALIZATION NOTE (expandInspector): This is the tooltip for the button
+# that expands the inspector in the web audio tool UI.
+expandInspector=Expand inspector
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -100,38 +100,44 @@ reflow.messageWithNoLink=reflow: %Sms
 reflow.messageWithLink=reflow: %Sms\u0020
 reflow.messageLinkText=function %1$S, %2$S line %3$S
 
 # LOCALIZATION NOTE (stacktrace.anonymousFunction): this string is used to
 # display JavaScript functions that have no given name - they are said to be
 # anonymous. See also stacktrace.outputMessage.
 stacktrace.anonymousFunction=<anonymous>
 
-# LOCALIZATION NOTE (stacktrace.outputMessage): this string is used in the Web
-# Console output to identify a web developer call to console.trace(). The
-# stack trace of JavaScript function calls is displayed. In this minimal
-# message we only show the last call. Parameters: %1$S is the file name, %2$S
-# is the function name, %3$S is the line number.
-stacktrace.outputMessage=Stack trace from %1$S, function %2$S, line %3$S.
+# LOCALIZATION NOTE (unknownLocation): this string is used to
+# display messages with sources that have an unknown location, eg. from
+# console.trace() calls.
+unknownLocation=<unknown>
 
 # LOCALIZATION NOTE (timerStarted): this string is used to display the result
 # of the console.time() call. Parameters: %S is the name of the timer.
 timerStarted=%S: timer started
 
 # LOCALIZATION NOTE (timeEnd): this string is used to display the result of
 # the console.timeEnd() call. Parameters: %1$S is the name of the timer, %2$S
 # is the number of milliseconds.
 timeEnd=%1$S: %2$Sms
 
+# LOCALIZATION NOTE (noCounterLabel): this string is used to display
+# count-messages with no label provided.
+noCounterLabel=<no label>
+
 # LOCALIZATION NOTE (Autocomplete.blank): this string is used when inputnode
 # string containing anchor doesn't matches to any property in the content.
 Autocomplete.blank=  <- no result
 
 maxTimersExceeded=The maximum allowed number of timers in this page was exceeded.
 
+# LOCALIZATION NOTE (maxCountersExceeded): Error message shown when the maximum
+# number of console.count()-counters was exceeded.
+maxCountersExceeded=The maximum allowed number of counters in this page was exceeded.
+
 # LOCALIZATION NOTE (JSTerm.updateNotInspectable): this string is used when
 # the user inspects an evaluation result in the Web Console and tries the
 # Update button, but the new result no longer returns an object that can be
 # inspected.
 JSTerm.updateNotInspectable=After your input has been re-evaluated the result is no longer inspectable.
 
 # LOCALIZATION NOTE (remoteWebConsolePromptTitle): the title displayed on the
 # Web Console prompt asking for the remote host and port to connect to.
@@ -202,8 +208,32 @@ emptyPropertiesList=No properties to dis
 # LOCALIZATION NOTE (messageRepeats.tooltip2): the tooltip text that is displayed
 # when you hover the red bubble that shows how many times a message is repeated
 # in the web console output.
 # This is a semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of message repeats
 # example: 3 repeats
 messageRepeats.tooltip2=#1 repeat;#1 repeats
+
+# LOCALIZATION NOTE (openNodeInInspector): the text that is displayed in a
+# tooltip when hovering over the inspector icon next to a DOM Node in the console
+# output
+openNodeInInspector=Click to select the node in the inspector
+
+# LOCALIZATION NOTE (cdFunctionInvalidArgument): the text that is displayed when
+# cd() is invoked with an invalid argument.
+cdFunctionInvalidArgument=Cannot cd() to the given window. Invalid argument.
+
+# LOCALIZATION NOTE (selfxss.msg): the text that is displayed when
+# a new user of the developer tools pastes code into the console
+# %1 is the text of selfxss.okstring
+selfxss.msg=Scam Warning: Take care when pasting things you don't understand. This could allow attackers to steal your identity or take control of your computer. Please type '%S' below (no need to press enter) to allow pasting.
+
+# LOCALIZATION NOTE (selfxss.msg): the string to be typed
+# in by a new user of the developer tools when they receive the sefxss.msg prompt.
+# Please avoid using non-keyboard characters here
+selfxss.okstring=allow pasting
+
+# LOCALIZATION NOTE (messageToggleDetails): the text that is displayed when
+# you hover the arrow for expanding/collapsing the message details. For
+# console.error() and other messages we show the stacktrace.
+messageToggleDetails=Show/hide message details.
--- a/browser/chrome/browser/downloads/downloads.dtd
+++ b/browser/chrome/browser/downloads/downloads.dtd
@@ -79,13 +79,18 @@
 <!ENTITY clearDownloadsButton.tooltip     "Clears completed, cancelled and failed downloads">
 
 <!-- LOCALIZATION NOTE (downloadsListEmpty.label):
      This string is shown when there are no items in the Downloads view, when it
      is displayed inside a browser tab.
      -->
 <!ENTITY downloadsListEmpty.label         "There are no downloads.">
 
+<!-- LOCALIZATION NOTE (downloadsPanelEmpty.label):
+     This string is shown when there are no items in the Downloads Panel.
+     -->
+<!ENTITY downloadsPanelEmpty.label        "No downloads for this session.">
+
 <!-- LOCALIZATION NOTE (downloadsListNoMatch.label):
      This string is shown when some search terms are specified, but there are no
      results in the Downloads view.
      -->
 <!ENTITY downloadsListNoMatch.label       "Could not find any matching downloads.">
--- a/browser/chrome/browser/newTab.dtd
+++ b/browser/chrome/browser/newTab.dtd
@@ -3,8 +3,11 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- These strings are used in the about:newtab page -->
 <!ENTITY newtab.pageTitle "New Tab">
 <!ENTITY newtab.undo.removedLabel "Thumbnail removed.">
 <!ENTITY newtab.undo.undoButton "Undo.">
 <!ENTITY newtab.undo.restoreButton "Restore All.">
 <!ENTITY newtab.undo.closeTooltip "Hide">
+<!ENTITY newtab.sponsored.release.message "This Sponsor site was suggested because we hoped you’d find it interesting and because it supports Mozilla’s mission.">
+<!ENTITY newtab.sponsored.trial.message2 "This site was suggested because we hoped you’d find it interesting and because it supports Mozilla’s mission.">
+<!ENTITY newtab.panel.link.text "Learn more…">
--- a/browser/chrome/browser/newTab.properties
+++ b/browser/chrome/browser/newTab.properties
@@ -2,8 +2,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 newtab.pin=Pin this site at its current position
 newtab.unpin=Unpin this site
 newtab.block=Remove this site
 newtab.show=Show the new tab page
 newtab.hide=Hide the new tab page
+newtab.sponsored=Show information on sponsored tiles
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -8,17 +8,16 @@ noTitle=(no title)
 bookmarksMenuEmptyFolder=(Empty)
 
 bookmarksBackupTitle=Bookmarks backup filename
 
 bookmarksRestoreAlertTitle=Revert Bookmarks
 bookmarksRestoreAlert=This will replace all of your current bookmarks with the backup. Are you sure?
 bookmarksRestoreTitle=Select a bookmarks backup
 bookmarksRestoreFilterName=JSON
-bookmarksRestoreFilterExtension=*.json
 
 bookmarksRestoreFormatError=Unsupported file type.
 bookmarksRestoreParseError=Unable to process the backup file.
 
 bookmarksLivemarkLoading=Live Bookmark loading…
 bookmarksLivemarkFailed=Live Bookmark feed failed to load.
 
 menuOpenLivemarkOrigin.label=Open "%S"
@@ -65,20 +64,16 @@ detailsPane.noItems=No items
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of items
 # example: 111 items
 detailsPane.itemsCountLabel=One item;#1 items
 
 mostVisitedTitle=Most Visited
 recentlyBookmarkedTitle=Recently Bookmarked
 recentTagsTitle=Recent Tags
-# LOCALIZATION NOTE (windows8TouchTitle): this is the name of the folder used
-# to store bookmarks created in Metro mode and share bookmarks between Metro
-# and Desktop.
-windows8TouchTitle=Windows 8 Touch
 
 OrganizerQueryHistory=History
 OrganizerQueryDownloads=Downloads
 OrganizerQueryAllBookmarks=All Bookmarks
 OrganizerQueryTags=Tags
 
 # LOCALIZATION NOTE (tagResultLabel) :
 # This is what we use to form the label (for screen readers)
--- a/browser/chrome/browser/preferences/aboutPermissions.dtd
+++ b/browser/chrome/browser/preferences/aboutPermissions.dtd
@@ -37,8 +37,10 @@
 
 <!-- LOCALIZATION NOTE (indexedDB.label): This is describing indexedDB storage
      using the same language used for the permIndexedDB string in browser/pageInfo.dtd -->
 <!ENTITY indexedDB.label                 "Maintain Offline Storage">
 
 <!ENTITY popup.label                     "Open Popup Windows">
 
 <!ENTITY fullscreen.label                "Fullscreen">
+<!ENTITY camera.label                    "Use the Camera">
+<!ENTITY microphone.label                "Use the Microphone">
--- a/browser/chrome/browser/preferences/connection.dtd
+++ b/browser/chrome/browser/preferences/connection.dtd
@@ -27,18 +27,23 @@
 <!ENTITY  ssl.label                     "SSL Proxy:">
 <!ENTITY  ssl.accesskey                 "S">
 <!ENTITY  socks.label                   "SOCKS Host:">
 <!ENTITY  socks.accesskey               "C">
 <!ENTITY  socks4.label                  "SOCKS v4">
 <!ENTITY  socks4.accesskey              "K">
 <!ENTITY  socks5.label                  "SOCKS v5">
 <!ENTITY  socks5.accesskey              "v">
+<!ENTITY  socksRemoteDNS.label          "Remote DNS">
+<!ENTITY  socksRemoteDNS.accesskey      "D">
 <!ENTITY  port.label                    "Port:">
 <!ENTITY  HTTPport.accesskey            "P">
 <!ENTITY  SSLport.accesskey             "o">
 <!ENTITY  FTPport.accesskey             "r">
 <!ENTITY  SOCKSport.accesskey           "t">
 <!ENTITY  noproxy.label                 "No Proxy for:">
-<!ENTITY  noproxy.accesskey             "n">
+<!ENTITY  noproxy.accesskey             "N">
 <!ENTITY  noproxyExplain.label          "Example: .mozilla.org, .net.nz, 192.168.1.0/24">
 <!ENTITY  shareproxy.label              "Use this proxy server for all protocols">
 <!ENTITY  shareproxy.accesskey          "x">
+<!ENTITY  autologinproxy.label          "Do not prompt for authentication if password is saved">
+<!ENTITY  autologinproxy.accesskey      "i">
+<!ENTITY  autologinproxy.tooltip        "This option silently authenticates you to proxies when you have saved credentials for them. You will be prompted if authentication fails.">
--- a/browser/chrome/browser/preferences/content.dtd
+++ b/browser/chrome/browser/preferences/content.dtd
@@ -22,8 +22,13 @@
 <!ENTITY  colors.label                "Colours…">
 <!ENTITY  colors.accesskey            "C">
 
 
 <!ENTITY languages.label              "Languages">
 <!ENTITY chooseLanguage.label         "Choose your preferred language for displaying pages">
 <!ENTITY chooseButton.label           "Choose…">
 <!ENTITY chooseButton.accesskey       "o">
+
+<!ENTITY translateWebPages.label      "Translate web content">
+<!ENTITY translateWebPages.accesskey  "T">
+<!ENTITY translateExceptions.label    "Exceptions…">
+<!ENTITY translateExceptions.accesskey "x">
--- a/browser/chrome/browser/preferences/fonts.dtd
+++ b/browser/chrome/browser/preferences/fonts.dtd
@@ -31,17 +31,16 @@
 <!ENTITY  font.langGroup.simpl-chinese            "Simplified Chinese">
 <!ENTITY  font.langGroup.trad-chinese-hk          "Traditional Chinese (Hong Kong)">
 <!ENTITY  font.langGroup.korean                   "Korean">
 <!ENTITY  font.langGroup.cyrillic                 "Cyrillic">
 <!ENTITY  font.langGroup.baltic                   "Baltic">
 <!ENTITY  font.langGroup.el                       "Greek">
 <!ENTITY  font.langGroup.turkish                  "Turkish">
 <!ENTITY  font.langGroup.unicode                  "Other Languages">
-<!ENTITY  font.langGroup.user-def                 "User Defined">
 <!ENTITY  font.langGroup.thai                     "Thai">
 <!ENTITY  font.langGroup.hebrew                   "Hebrew">
 <!ENTITY  font.langGroup.arabic                   "Arabic">
 <!ENTITY  font.langGroup.devanagari               "Devanagari">
 <!ENTITY  font.langGroup.tamil                    "Tamil">
 <!ENTITY  font.langGroup.armenian                 "Armenian">
 <!ENTITY  font.langGroup.bengali                  "Bengali">
 <!ENTITY  font.langGroup.canadian                 "Unified Canadian Syllabary">
--- a/browser/chrome/browser/preferences/languages.dtd
+++ b/browser/chrome/browser/preferences/languages.dtd
@@ -1,17 +1,16 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY window.width                                   "30em">
 
 <!ENTITY languages.customize.Header                     "Languages">
-<!ENTITY languages.customize.prefLangDescript           "Web pages are sometimes offered in more than one language. Choose languages for displaying these web pages, in order of preference.">
-<!ENTITY languages.customize.active.label               "Languages in order of preference:">
+<!ENTITY languages.customize.description                "Web pages are sometimes offered in more than one language. Choose languages for displaying these web pages, in order of preference:">
 <!ENTITY languages.customize.moveUp.label               "Move Up">
 <!ENTITY languages.customize.moveUp.accesskey           "U">
 <!ENTITY languages.customize.moveDown.label             "Move Down">
 <!ENTITY languages.customize.moveDown.accesskey         "D">
 <!ENTITY languages.customize.deleteButton.label         "Remove">
 <!ENTITY languages.customize.deleteButton.accesskey     "R">
 <!ENTITY languages.customize.selectLanguage.label       "Select a language to add…">
 <!ENTITY languages.customize.addButton.label            "Add">
--- a/browser/chrome/browser/preferences/preferences.dtd
+++ b/browser/chrome/browser/preferences/preferences.dtd
@@ -18,8 +18,10 @@
 <!ENTITY  panePrivacy.title       "Privacy">
 <!ENTITY  paneSecurity.title      "Security">
 <!ENTITY  paneAdvanced.title      "Advanced">
 
 <!-- LOCALIZATION NOTE (paneSync.title): This should match syncBrand.shortName.label in ../syncBrand.dtd -->
 <!ENTITY  paneSync.title          "Sync">
 <!ENTITY  buttonForward.tooltip   "Go forwards one page">
 <!ENTITY  buttonBack.tooltip      "Go backwards one page">
+
+<!ENTITY  helpButton.label        "Help">
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -109,16 +109,17 @@ offlinepermissionstext=The following web
 offlinepermissionstitle=Offline Data
 
 ####Preferences::Advanced::Network
 #LOCALIZATION NOTE: The next string is for the disk usage of the web content cache.
 #   e.g., "Your web content cache is currently using 200 MB"
 #   %1$S = size
 #   %2$S = unit (MB, KB, etc.)
 actualDiskCacheSize=Your web content cache is currently using %1$S %2$S of disc space
+actualDiskCacheSizeCalculated=Calculating web content cache size…
 
 ####Preferences::Advanced::Network
 #LOCALIZATION NOTE: The next string is for the disk usage of the application cache.
 #   e.g., "Your application cache is currently using 200 MB"
 #   %1$S = size
 #   %2$S = unit (MB, KB, etc.)
 actualAppCacheSize=Your application cache is currently using %1$S %2$S of disc space
 
@@ -130,8 +131,14 @@ updateAutoDesktop.accessKey=A
 syncUnlink.title=Do you want to unlink your device?
 syncUnlink.label=This device will no longer be associated with your Sync account. All of your personal data, both on this device and in your Sync account, will remain intact.
 syncUnlinkConfirm.label=Unlink
 
 # LOCALIZATION NOTE (featureEnableRequiresRestart, featureDisableRequiresRestart, restartTitle): %S = brandShortName
 featureEnableRequiresRestart=%S must restart to enable this feature.
 featureDisableRequiresRestart=%S must restart to disable this feature.
 shouldRestartTitle=Restart %S
+
+###Preferences::Sync::Firefox Accounts
+firefoxAccountsVerificationSentTitle=Verification Sent
+# LOCALIZATION NOTE: %S = user's email address.
+firefoxAccountsVerificationSentHeading=A verification link has been sent to %S
+firefoxAccountVerificationSentDescription=Please check your email and click the link to begin synchronising.
--- a/browser/chrome/browser/preferences/sync.dtd
+++ b/browser/chrome/browser/preferences/sync.dtd
@@ -40,8 +40,41 @@
 <!-- Device Settings -->
 <!ENTITY syncDeviceName.label       "Device Name:">
 <!ENTITY syncDeviceName.accesskey   "c">
 <!ENTITY unlinkDevice.label           "Unlink This Device">
 
 <!-- Footer stuff -->
 <!ENTITY prefs.tosLink.label        "Terms of Service">
 <!ENTITY prefs.ppLink.label         "Privacy Policy">
+
+<!-- Firefox Accounts stuff -->
+<!ENTITY fxaPrivacyNotice.link.label "Privacy Notice">
+<!ENTITY determiningAcctStatus.label     "Determining your account status…">
+
+<!-- LOCALIZATION NOTE (signedInUnverified.beforename.label,
+signedInUnverified.aftername.label): these two string are used respectively
+before and after the account email address. Localizers can use one of them, or
+both, to better adapt this sentence to their language.
+-->
+<!ENTITY signedInUnverified.beforename.label "">
+<!ENTITY signedInUnverified.aftername.label "is not verified.">
+
+<!-- LOCALIZATION NOTE (signedInLoginFailure.beforename.label,
+signedInLoginFailure.aftername.label): these two string are used respectively
+before and after the account email address. Localizers can use one of them, or
+both, to better adapt this sentence to their language.
+-->
+<!ENTITY signedInLoginFailure.beforename.label "Please sign in to reconnect">
+<!ENTITY signedInLoginFailure.aftername.label "">
+
+<!ENTITY notSignedIn.label           "You are not signed in.">
+<!ENTITY signIn.label                "Sign in">
+<!ENTITY manage.label                "Manage">
+<!ENTITY disconnect.label            "Disconnect…">
+<!ENTITY verify.label                "Verify Email">
+<!ENTITY forget.label                "Forget this Email">
+
+<!ENTITY welcome.description "Access your tabs, bookmarks, passwords and more wherever you use &brandShortName;.">
+<!ENTITY welcome.signIn.label "Sign In">
+<!ENTITY welcome.createAccount.label "Create Account">
+
+<!ENTITY welcome.useOldSync.label "Using an older version of Sync?">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/preferences/translation.dtd
@@ -0,0 +1,24 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY window.title                     "Exceptions - Translation">
+<!ENTITY window.width                     "36em">
+<!ENTITY windowClose.key                  "w">
+
+<!ENTITY noTranslationForLanguages.label  "Translation will not be offered for the following languages:">
+<!ENTITY treehead.languageName.label      "Languages">
+<!ENTITY removeLanguage.label             "Remove Language">
+<!ENTITY removeLanguage.accesskey         "R">
+<!ENTITY removeAllLanguages.label         "Remove All Languages">
+<!ENTITY removeAllLanguages.accesskey     "e">
+
+<!ENTITY noTranslationForSites.label      "Translation will not be offered for the following sites:">
+<!ENTITY treehead.siteName.label          "Sites">
+<!ENTITY removeSite.label                 "Remove Site">
+<!ENTITY removeSite.accesskey             "S">
+<!ENTITY removeAllSites.label             "Remove All Sites">
+<!ENTITY removeAllSites.accesskey         "i">
+
+<!ENTITY button.close.label               "Close">
+<!ENTITY button.close.accesskey           "C">
--- a/browser/chrome/browser/sitePermissions.properties
+++ b/browser/chrome/browser/sitePermissions.properties
@@ -5,15 +5,17 @@
 allow = Allow
 allowForSession = Allow for Session
 block = Block
 alwaysAsk = Always Ask
 
 permission.cookie.label = Set Cookies
 permission.desktop-notification.label = Show Notifications
 permission.image.label = Load Images
+permission.camera.label = Use the Camera
+permission.microphone.label = Use the Microphone
 permission.install.label = Install Add-ons
 permission.popup.label = Open Pop-up Windows
 permission.geo.label = Access Your Location
 permission.indexedDB.label = Maintain Offline Storage
 permission.fullscreen.label = Enter Fullscreen
 permission.pointerLock.label = Hide the Mouse Pointer
 
--- a/browser/chrome/browser/syncBrand.dtd
+++ b/browser/chrome/browser/syncBrand.dtd
@@ -1,6 +1,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY syncBrand.shortName.label  "Sync">
 <!ENTITY syncBrand.fullName.label   "Firefox Sync">
+<!ENTITY syncBrand.fxAccount.label  "Firefox Account">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/syncCustomize.dtd
@@ -0,0 +1,27 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY syncCustomize.dialog.title       "Sync Selection">
+<!ENTITY syncCustomize.acceptButton.label "Start">
+
+<!ENTITY syncCustomize.title              "What would you like to synchronise?">
+<!ENTITY syncCustomize.description        "You can change this selection in Options.">
+<!ENTITY syncCustomizeUnix.description    "You can change this selection in Preferences.">
+
+<!--
+  These engine names are the same as in browser/preferences/sync.dtd except
+  for the last two that are marked as being specific to Desktop browsers.
+-->
+<!ENTITY engine.bookmarks.label           "Bookmarks">
+<!ENTITY engine.bookmarks.accesskey       "m">
+<!ENTITY engine.history.label             "History">
+<!ENTITY engine.history.accesskey         "r">
+<!ENTITY engine.tabs.label                "Tabs">
+<!ENTITY engine.tabs.accesskey            "T">
+<!ENTITY engine.passwords.label           "Passwords">
+<!ENTITY engine.passwords.accesskey       "P">
+<!ENTITY engine.addons.label              "Desktop Add-ons">
+<!ENTITY engine.addons.accesskey          "A">
+<!ENTITY engine.prefs.label               "Desktop Preferences">
+<!ENTITY engine.prefs.accesskey           "s">
--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -28,16 +28,18 @@
 <!-- New Account Page 1: Basic Account Info -->
 <!ENTITY setup.newAccountDetailsPage.title.label "Account Details">
 <!ENTITY setup.emailAddress.label     "Email Address">
 <!ENTITY setup.emailAddress.accesskey "E">
 <!ENTITY setup.choosePassword.label      "Choose a Password">
 <!ENTITY setup.choosePassword.accesskey  "P">
 <!ENTITY setup.confirmPassword.label     "Confirm Password">
 <!ENTITY setup.confirmPassword.accesskey "m">
+<!ENTITY setup.setupMetro.label     "Synchronise with Windows 8 style &brandShortName;">
+<!ENTITY setup.setupMetro.accesskey "S">
 
 <!-- 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">
--- a/browser/chrome/browser/syncSetup.properties
+++ b/browser/chrome/browser/syncSetup.properties
@@ -27,24 +27,40 @@ bookmarksCount.label        = #1 bookmar
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of days (was %S for a short while, use #1 instead, even if both work)
 historyDaysCount.label      = #1 day of history;#1 days of history
 # LOCALIZATION NOTE (passwordsCount.label):
 # Semi-colon list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of passwords (was %S for a short while, use #1 instead, even if both work)
 passwordsCount.label        = #1 password;#1 passwords
-# LOCALIZATION NOTE (addonsCount.label):
+# LOCALIZATION NOTE (addonsCount.label): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of add-ons, see the link above for forms
 addonsCount.label        = #1 addon;#1 addons
 
 save.recoverykey.title = Save Recovery Key
 save.recoverykey.defaultfilename = Firefox Recovery Key.html
 
 newAccount.action.label = Firefox Sync is now set up to automatically synchronise all your browser data.
 newAccount.change.label = You can choose exactly what to synchronise by selecting Sync Options below.
 resetClient.change2.label = Firefox Sync will now merge all this device's browser data into your Sync account.
 wipeClient.change2.label = Firefox Sync will now replace all of the browser data on this device with the data in your Sync account.
 wipeRemote.change2.label = Firefox Sync will now replace all of the browser data in your Sync account with the data on this device.
 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
+
+# Firefox Accounts based setup.
+continue.label = Continue
+disconnect.verify.title = Disconnect
+disconnect.verify.heading = Are you sure?
+# LOCALIZATION NOTE (disconnect.verify.description): %S will be replaced with
+# brandShortName
+disconnect.verify.description = %S will stop synchronising with your account, but won’t delete any of your browsing data on this computer.
+
+relinkVerify.title = Merge Warning
+relinkVerify.heading = Are you sure you want to sign in to Sync?
+# LOCALIZATION NOTE (relinkVerify.description): Email address of a user previously signed into sync.
+relinkVerify.description = A different user was previously signed in to Sync on this computer. Signing in will merge this browser’s bookmarks, passwords and other settings with %S
+
+manage.pageTitle = Manage Sync
--- a/browser/chrome/browser/tabbrowser.dtd
+++ b/browser/chrome/browser/tabbrowser.dtd
@@ -1,6 +1,5 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY closeTab.label             "Close Tab">
-<!ENTITY newTabButton.tooltip "Open a new tab">
--- a/browser/chrome/browser/tabbrowser.properties
+++ b/browser/chrome/browser/tabbrowser.properties
@@ -16,11 +16,16 @@ tabs.searching=Searching…
 tabs.loading=Loading…
 tabs.waiting=Waiting…
 tabs.downloading=Downloading…
 
 tabs.emptyTabTitle=New Tab
 tabs.closeTab=Close Tab
 tabs.close=Close
 tabs.closeWarningTitle=Confirm close
-tabs.closeWarningMultipleTabs=You are about to close %S tabs. Are you sure you want to continue?
+# LOCALIZATION NOTE (tabs.closeWarningMultiple):
+# Semicolon-separated list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# The singular form is not considered since this string is used only for
+# multiple tabs.
+tabs.closeWarningMultiple=;You are about to close #1 tabs. Are you sure you want to continue?
 tabs.closeButtonMultiple=Close tabs
 tabs.closeWarningPromptMe=Warn me when I attempt to close multiple tabs
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/translation.dtd
@@ -0,0 +1,58 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- LOCALIZATION NOTE (translation.thisPageIsIn.label,
+  -                     translation.translateThisPage.label):
+  -  These 2 strings are used to construct a sentence that contains a dropdown
+  -  showing the detected language of the current web page.
+  -  In en-US it looks like this:
+  -    This page is in [detected language] Translate this page?
+  -  "detected language" here is a language name coming from the
+  -  global/languageNames.properties file; for some locales it may not be in
+  -  the correct grammar case to keep the same structure of the original
+  -  sentence. -->
+<!ENTITY translation.thisPageIsIn.label         "This page is in">
+<!ENTITY translation.translateThisPage.label    "Translate this page?">
+<!ENTITY translation.translate.button           "Translate">
+<!ENTITY translation.notNow.button              "Not Now">
+
+<!ENTITY translation.translatingContent.label   "Translating page content…">
+
+<!-- LOCALIZATION NOTE (translation.translatedFrom.label,
+  -                     translation.translatedTo.label,
+  -                     translation.translatedToSuffix.label):
+  -  These 3 strings are used to construct a sentence that contains 2 dropdowns
+  -  showing the source and target language of a translated web page.
+  -  In en-US it looks like this:
+  -    This page has been translated from [from language] to [to language]
+  -  "from language" and "to language" here are language names coming from the
+  -  global/languageNames.properties file; for some locales they may not be in
+  -  the correct grammar case to keep the same structure of the original
+  -  sentence.
+  -
+  -  translation.translatedToSuffix.label (empty in en-US) is for locales that
+  -  need to display some text after the second drop down for the sentence to
+  -  be grammatically correct. -->
+<!ENTITY translation.translatedFrom.label       "This page has been translated from">
+<!ENTITY translation.translatedTo.label         "to">
+<!ENTITY translation.translatedToSuffix.label   "">
+
+<!ENTITY translation.showOriginal.button        "Show Original">
+<!ENTITY translation.showTranslation.button     "Show Translation">
+
+<!ENTITY translation.errorTranslating.label     "There has been an error translating this page.">
+<!ENTITY translation.tryAgain.button            "Try Again">
+
+<!ENTITY translation.serviceUnavailable.label   "Translation is not available at the moment. Please try again later.">
+
+<!ENTITY translation.options.menu               "Options">
+<!-- LOCALIZATION NOTE (translation.options.neverForSite.accesskey,
+  -                     translation.options.preferences.accesskey):
+  -  The accesskey values used here should not clash with the value used for
+  -  translation.options.neverForLanguage.accesskey in translation.properties
+  -->
+<!ENTITY translation.options.neverForSite.label "Never translate this site">
+<!ENTITY translation.options.neverForSite.accesskey "e">
+<!ENTITY translation.options.preferences.label  "Translation preferences">
+<!ENTITY translation.options.preferences.accesskey "T">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/translation.properties
@@ -0,0 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE (translation.options.neverForLanguage.label):
+#  %S is a language name coming from the global/languageNames.properties file.
+translation.options.neverForLanguage.label=Never translate %S
+
+# LOCALIZATION NOTE (translation.options.neverForLanguage.accesskey):
+# The accesskey value used here should not clash with the values used for
+# translation.options.*.accesskey in translation.dtd
+translation.options.neverForLanguage.accesskey=N
--- a/browser/chrome/overrides/appstrings.properties
+++ b/browser/chrome/overrides/appstrings.properties
@@ -1,16 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 malformedURI=The URL is not valid and cannot be loaded.
 fileNotFound=Firefox can't find the file at %S.
 dnsNotFound=Firefox can't find the server at %S.
-protocolNotFound=Firefox doesn't know how to open this address, because the protocol (%S) isn't associated with any program.
+unknownProtocolFound=Firefox doesn't know how to open this address, because one of the following protocols (%S) isn't associated with any program or is not allowed in this context.
 connectionFailure=Firefox can't establish a connection to the server at %S.
 netInterrupt=The connection to %S was interrupted while the page was loading.
 netTimeout=The server at %S is taking too long to respond.
 redirectLoop=Firefox has detected that the server is redirecting the request for this address in a way that will never complete.
 ## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don't translate "%S"
 confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier.
 resendButton.label=Resend
 unknownSocketType=Firefox doesn't know how to communicate with the server.
--- a/browser/chrome/overrides/netError.dtd
+++ b/browser/chrome/overrides/netError.dtd
@@ -81,18 +81,18 @@
 ">
 
 <!ENTITY netReset.title "The connection was reset">
 <!ENTITY netReset.longDesc "&sharedLongDesc;">
 
 <!ENTITY netTimeout.title "The connection has timed out">
 <!ENTITY netTimeout.longDesc "&sharedLongDesc;">
 
-<!ENTITY protocolNotFound.title "The address wasn't understood">
-<!ENTITY protocolNotFound.longDesc "
+<!ENTITY unknownProtocolFound.title "The address wasn't understood">
+<!ENTITY unknownProtocolFound.longDesc "
 <ul>
   <li>You might need to install other software to open this address.</li>
 </ul>
 ">
 
 <!ENTITY proxyConnectFailure.title "The proxy server is refusing connections">
 <!ENTITY proxyConnectFailure.longDesc "
 <ul>
@@ -125,20 +125,20 @@
 <ul>
   <li>Check to make sure your system has the Personal Security Manager
     installed.</li>
   <li>This might be due to a non-standard configuration on the server.</li>
 </ul>
 ">
 
 <!ENTITY nssFailure2.title "Secure Connection Failed">
-<!ENTITY nssFailure2.longDesc "
+<!ENTITY nssFailure2.longDesc2 "
 <ul>
   <li>The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.</li>
-  <li>Please contact the web site owners to inform them of this problem. Alternatively, use the command found in the help menu to report this broken site.</li>
+  <li>Please contact the web site owners to inform them of this problem.</li>
 </ul>
 ">
 
 <!ENTITY nssBadCert.title "Secure Connection Failed">
 <!ENTITY nssBadCert.longDesc2 "
 <ul>
   <li>This could be a problem with the server's configuration, or it could be
 someone trying to impersonate the server.</li>
--- a/browser/installer/custom.properties
+++ b/browser/installer/custom.properties
@@ -53,18 +53,16 @@ WARN_RESTART_REQUIRED_UNINSTALL=Your com
 WARN_RESTART_REQUIRED_UPGRADE=Your computer must be restarted to complete a previous upgrade of $BrandShortName. Do you want to reboot now?
 ERROR_CREATE_DIRECTORY_PREFIX=Error creating directory:
 ERROR_CREATE_DIRECTORY_SUFFIX=Click Cancel to stop the installation or\nRetry to try again.
 
 UN_CONFIRM_PAGE_TITLE=Uninstall $BrandFullName
 UN_CONFIRM_PAGE_SUBTITLE=Remove $BrandFullName from your computer.
 UN_CONFIRM_UNINSTALLED_FROM=$BrandShortName will be uninstalled from the following location:
 UN_CONFIRM_CLICK=Click Uninstall to continue.
-UN_REMOVE_PROFILES=&Remove my $BrandShortName personal data and customisations
-UN_REMOVE_PROFILES_DESC=This will permanently remove your bookmarks, saved passwords, cookies and customisations. You may wish to keep this information if you plan on installing another version of $BrandShortName in the future.
 
 BANNER_CHECK_EXISTING=Checking existing installation…
 
 STATUS_INSTALL_APP=Installing $BrandShortName…
 STATUS_INSTALL_LANG=Installing Language Files (${AB_CD})…
 STATUS_UNINSTALL_MAIN=Uninstalling $BrandShortName…
 STATUS_CLEANUP=A Little Housekeeping…
 
--- a/browser/installer/nsisstrings.properties
+++ b/browser/installer/nsisstrings.properties
@@ -41,25 +41,25 @@ OPTIONS_BUTTON=&Options
 MAKE_DEFAULT=&Make $BrandShortName my default browser
 CREATE_SHORTCUTS=Create Shortcuts for $BrandShortName:
 ADD_SC_TASKBAR=On my &Task bar
 ADD_SC_QUICKLAUNCHBAR=On my &Quick Launch bar
 ADD_CheckboxShortcutInStartMenu=In my &Start Menu Programs Folder
 ADD_CheckboxShortcutOnDesktop=On my &Desktop
 SPACE_REQUIRED=Space Required:
 SPACE_AVAILABLE=Space Available:
-ONE_MOMENT=One moment, $BrandShortName will launch as soon as the install is complete…
+ONE_MOMENT_INSTALL=One moment, $BrandShortName will launch as soon as the install is complete…
+ONE_MOMENT_UPGRADE=One moment, $BrandShortName will launch as soon as the upgrade is complete…
 INSTALL_MAINT_SERVICE=&Install the $BrandShortName background update service
 SEND_PING=S&end information about this installation to Mozilla
 BROWSE_BUTTON=B&rowse…
 DEST_FOLDER=Destination Folder
 
-DOWNLOADING_IN_PROGRESS=Downloading…
-DOWNLOADING_DONE=Downloaded
-INSTALLING_TO_BE_DONE=Installing
-INSTALLING_IN_PROGRESS=Installing…
+DOWNLOADING_LABEL=Downloading $BrandShortName…
+INSTALLING_LABEL=Installing $BrandShortName…
+UPGRADING_LABEL=Upgrading $BrandShortName…
 
 SELECT_FOLDER_TEXT=Select the folder to install $BrandShortName in.
 
 BYTE=B
 KILO=k
 MEGA=M
 GIGA=G
deleted file mode 100644
--- a/browser/metro/chrome/aboutAddons.dtd
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY % brandDTD
-     SYSTEM "chrome://branding/locale/brand.dtd">
-   %brandDTD;
-
-<!ENTITY aboutAddons.title              "&brandShortName; Add-ons are a Work In Progress">
-<!ENTITY aboutAddons.messageTitle       "Uh-Oh!">
-<!ENTITY aboutAddons.message            "Sorry, &brandShortName; is busy working on supporting add-ons for you.">
-<!-- LOCALIZATION NOTE (aboutAddons.goBackToStartStart, aboutAddons.goBacktoStartLink, aboutAddons.goBacktoStartEnd):
-     These three entities form a single sentence. aboutAddons.goBackToStartStart is the start of the sentence,
-     aboutAddons.goBacktoStartLink is a clickable link the middle and aboutAddons.goBacktoStartEnd is the end of the sentence.
-     -->
-<!ENTITY aboutAddons.goBackToStartStart "Go back to the ">
-<!ENTITY aboutAddons.goBacktoStartLink  "&brandShortName; Start Page">
-<!ENTITY aboutAddons.goBacktoStartEnd   ".">
deleted file mode 100644
--- a/browser/metro/chrome/aboutCertError.dtd
+++ /dev/null
@@ -1,38 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY % brandDTD
-    SYSTEM "chrome://branding/locale/brand.dtd">
-  %brandDTD;
-
-<!-- These strings are used by Firefox's custom about:certerror page,
-a replacement for the standard security certificate errors produced
-by NSS/PSM via netError.xhtml. -->
-
-<!ENTITY certerror.pagetitle  "Untrusted Connection">
-<!ENTITY certerror.longpagetitle "This Connection is Untrusted">
-
-<!-- Localization note (certerror.introPara1) - The string "#1" will
-be replaced at runtime with the name of the server to which the user
-was trying to connect. -->
-<!ENTITY certerror.introPara1 "You have asked &brandShortName; to connect
-securely to <b>#1</b>, but we can't confirm that your connection is secure.">
-
-<!ENTITY certerror.whatShouldIDo.heading "What Should I Do?">
-<!ENTITY certerror.whatShouldIDo.content "If you usually connect to
-this site without problems, this error could mean that someone is
-trying to impersonate the site, and you shouldn't continue.">
-<!ENTITY certerror.getMeOutOfHere.label "Get me out of here!">
-
-<!ENTITY certerror.expert.heading "I Understand the Risks">
-<!ENTITY certerror.expert.content "If you understand what's going on, you
-can tell &brandShortName; to start trusting this site's identification.
-<b>Even if you trust the site, this error could mean that someone is
-tampering with your connection.</b>">
-<!ENTITY certerror.expert.contentPara2 "Don't add an exception unless
-you know there's a good reason why this site doesn't use trusted identification.">
-<!ENTITY certerror.addTemporaryException.label "Visit site">
-<!ENTITY certerror.addPermanentException.label "Add permanent exception">
-
-<!ENTITY certerror.technical.heading "Technical Details">
deleted file mode 100644
--- a/browser/metro/chrome/aboutPanel.dtd
+++ /dev/null
@@ -1,52 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-
-<!ENTITY aboutHeader.title          "About">
-<!ENTITY aboutHeader.product.label  "&brandShortName;">
-<!ENTITY aboutHeader.company.label  "By &vendorShortName;">
-<!ENTITY aboutHeader.policy.label   "Read the &brandShortName; privacy policy online">
-<!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
-<!ENTITY update.checkingForUpdates  "Checking for updates…">
-<!-- LOCALIZATION NOTE (update.checkingAddonCompat): try to make the localized text short (see bug 596813 for screenshots). -->
-<!ENTITY update.checkingAddonCompat "Checking Add-on compatibility…">
-<!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
-<!ENTITY update.noUpdatesFound      "&brandShortName; is up to date">
-<!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
-<!ENTITY update.adminDisabled       "Updates disabled by your system administrator">
-<!-- LOCALIZATION NOTE (update.otherInstanceHandlingUpdates): try to make the localized text short -->
-<!ENTITY update.otherInstanceHandlingUpdates      "&brandShortName; is being updated by another instance">
-
-<!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
-     update.failed.start, update.failed.linkText, and update.failed.end all go into
-     one line with linkText being wrapped in an anchor that links to a site to download
-     the latest version of Firefox (e.g. http://www.firefox.com). As this is all in
-     one line, try to make the localized text short (see bug 596813 for screenshots). -->
-<!ENTITY update.failed.start        "Update failed. ">
-<!ENTITY update.failed.linkText     "Download the latest version">
-<!ENTITY update.failed.end          "">
-
-<!-- LOCALIZATION NOTE (update.manual.start,update.manual.end): update.manual.start and update.manual.end
-     all go into one line and have an anchor in between with text that is the same as the link to a site
-     to download the latest version of Firefox (e.g. http://www.firefox.com). As this is all in one line,
-     try to make the localized text short (see bug 596813 for screenshots). -->
-<!ENTITY update.manual.start        "Updates available at ">
-<!ENTITY update.manual.end          "">
-
-<!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
-     update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
-     is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
-     the "em dash" (long dash).
-     example: Downloading update — 111 KB of 13 MB -->
-<!ENTITY update.downloading.start   "Downloading update — ">
-<!ENTITY update.downloading.end     "">
-
-<!ENTITY update.applying            "Applying update…">
-
-<!-- LOCALIZATION NOTE (channel.description.start,channel.description.end): channel.description.start and
-     channel.description.end create one sentence, with the current channel label inserted in between.
-     example: You are currently on the _Stable_ update channel. -->
-<!ENTITY channel.description.start  "You are currently on the ">
-<!ENTITY channel.description.end    " update channel. ">
-
deleted file mode 100644
--- a/browser/metro/chrome/browser.dtd
+++ /dev/null
@@ -1,132 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!-- NAVBAR AND AUTOCOMPLETE -->
-
-<!ENTITY urlbar.emptytext      "Enter Search or Address">
-
-<!ENTITY back.label            "Back">
-<!ENTITY forward.label         "Forwards">
-<!ENTITY newtab.label          "New Tab">
-<!ENTITY closetab.label        "Close Tab">
-
-<!ENTITY autocompleteResultsHeader.label  "Your Results">
-
-<!ENTITY appbarErrorConsole.label      "Open error console">
-<!ENTITY appbarJSShell.label           "Open JavaScript shell">
-<!ENTITY appbarFindInPage2.label       "Find in page">
-<!ENTITY appbarRelaunchInDesktop.label "Relaunch in Desktop">
-<!ENTITY appbarMSMetaData2.label       "Get app for this site">
-<!ENTITY appbarViewPageSource.label    "View page source">
-
-<!ENTITY topSitesHeader.label        "Top Sites">
-<!ENTITY bookmarksHeader.label       "Bookmarks">
-<!ENTITY recentHistoryHeader.label   "Recent History">
-<!ENTITY remoteTabsHeader.label      "Tabs from Other Devices">
-
-<!-- LOCALIZATION NOTE (narrowTopSitesHeader.label,
-                        narrowBookmarksHeader.label,
-                        narrowHistoryHeader.label,
-                        narrowRemoteTabsHeader.label )
-     are shortened versions of topSitesHeader.label, bookmarksHeader.label, recentHistoryHeader.label
-     and remoteTabsHeader.label. Need to be two words or shorter to fit in narrow vertical space.
-      -->
-<!ENTITY narrowTopSitesHeader.label      "Top Sites">
-<!ENTITY narrowBookmarksHeader.label     "Bookmarks">
-<!ENTITY narrowRecentHistoryHeader.label "Recent History">
-<!ENTITY narrowRemoteTabsHeader.label    "Remote Tabs">
-
-<!ENTITY downloadsHeader.label     "Downloads">
-<!ENTITY downloadShowPage.label    "Go to Page">
-<!ENTITY downloadShow2.label       "Find">
-<!ENTITY downloadOpen2.label       "Open">
-<!ENTITY downloadCancel.label      "Cancel">
-<!ENTITY downloadPause.label       "Pause">
-<!ENTITY downloadResume.label      "Resume">
-<!ENTITY downloadRetry.label       "Retry">
-<!ENTITY downloadRemove.label      "Remove">
-<!ENTITY downloadDelete.label      "Delete">
-<!ENTITY downloadFailed.label      "Failed">
-
-<!ENTITY allBookmarks.label        "See all bookmarks">
-
-<!ENTITY consoleHeader.label       "Error Console">
-<!ENTITY consoleAll.label          "All">
-<!ENTITY consoleErrors.label       "Errors">
-<!ENTITY consoleWarnings.label     "Warnings">
-<!ENTITY consoleMessages.label     "Messages">
-<!ENTITY consoleCodeEval.label     "Code:">
-<!ENTITY consoleClear.label        "Clear">
-<!ENTITY consoleEvaluate.label     "…">
-<!ENTITY consoleErrFile.label      "Source File:">
-<!ENTITY consoleErrLine.label      "Line:">
-<!ENTITY consoleErrColumn.label    "Column:">
-
-<!--  TEXT CONTEXT MENU -->
-<!ENTITY contextTextCut.label              "Cut">
-<!ENTITY contextTextCopy.label             "Copy">
-<!ENTITY contextTextPaste.label            "Paste">
-<!-- unique item that is only added to the url bar context menu -->
-<!ENTITY contextTextPasteAndGo.label       "Paste &amp; go">
-<!ENTITY contextTextSelect.label           "Select">
-<!ENTITY contextTextSelectAll.label        "Select all">
-
-<!-- LINK CONTEXT MENU -->
-<!ENTITY contextOpenLinkTab.label          "Open link in new tab">
-<!ENTITY contextCopyLinkHref.label         "Copy link">
-<!ENTITY contextBookmarkLinkHref.label     "Bookmark link">
-
-<!-- IMAGE CONTEXT MENU -->
-<!-- LOCALIZATION NOTE (contextSaveImageLib.label): saves an image to the users "pictures library"
-     (Explorer -> left hand side navigation pane -> Libraries -> Pictures) -->
-<!ENTITY contextSaveImageLib.label         "Save to picture library">
-<!ENTITY contextCopyImage.label            "Copy image">
-<!ENTITY contextCopyImageLocation.label    "Copy image location">
-<!ENTITY contextOpenImageTab.label         "Open image in new tab">
-
-<!-- VIDEO CONTEXT MENU -->
-<!ENTITY contextSaveVideoLib.label         "Save to video library">
-<!ENTITY contextCopyVideoLocation.label    "Copy video location">
-<!ENTITY contextOpenVideoTab.label         "Open video in new tab">
-
-<!-- KEYBOARD SHORTCUTS -->
-<!ENTITY reload.key "r">
-<!ENTITY focusURL.key "l">
-<!ENTITY urlbar.accesskey "d">
-<!ENTITY openFile.key "o">
-<!ENTITY savePage.key "s">
-<!ENTITY find.key "f">
-<!ENTITY findNext.key "g">
-<!ENTITY quit.key "q">
-<!ENTITY addBookmark.key "d">
-<!ENTITY newTab.key "t">
-<!ENTITY newTab2.key "n">
-<!ENTITY closeTab.key "w">
-
-<!-- DEVELOPER SHORTCUTS (control+shift+key) -->
-<!ENTITY jsConsole.key "j">
-<!ENTITY optionsFlyout.key "o">
-<!ENTITY syncFlyout.key "s">
-<!ENTITY aboutFlyout.key "a">
-
-<!-- FIRT RUN EXPERIENCE -->
-<!-- LOCALIZATION NOTE (firstRunTabs.label,
-                        firstRunTopSites.label,
-                        firstRunBookmarks.label,
-                        firstRunMenu.label,
-                        firstRunHistory.label )
-     These strings appear on the Firefox Start page the first time
-     Firefox for Windows 8 Touch (Metro) is launched.  Each one
-     has an arrow pointing toward the feature it references.  The code
-     to display these strings is not enabled yet, but will be soon.
-     For now, you can see this mockup for an example of how they are
-     used: https://bug941284.bugzilla.mozilla.org/attachment.cgi?id=8344046
-     -->
-<!ENTITY firstRunTabs.label "Looking for your tabs? Just pull down or right-click">
-<!ENTITY firstRunTopSites.label "Go to the sites you visit most">
-<!ENTITY firstRunBookmarks.label "Find pages you've saved for later">
-<!ENTITY firstRunMenu.label "Access more features and options">
-<!ENTITY firstRunHistory.label "See where you've been on the Web">
-<!ENTITY firstRunWelcome.label "Welcome to &brandShortName;">
-<!ENTITY firstRunDifferent.label "Different by design">
deleted file mode 100644
--- a/browser/metro/chrome/browser.properties
+++ /dev/null
@@ -1,150 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# LOCALIZATION NOTE : FILE Capitalized phrases like "Top Sites", "Bookmarks",
-# and "Recent History" are typically used as proper noun phrases to refer to
-# the specific visual set (usually displayed as a grid) of top sites,
-# bookmarks, etc. displayed on screen, rather than those concepts in general.
-# Buttons (like with contextAppbar2.pin.topSites) refer to actions against
-# the specific on-screen sets with similarly-named headings.
-
-# LOCALIZATION NOTE (browser.search.contextTextSearchLabel2): search context
-# menu item text will be: |Search (browser.search.defaultenginename) for "string"|
-# browser.search.defaultenginename is defined in region.properties
-browser.search.contextTextSearchLabel2=Search %S for "%S"
-
-# Contextual Appbar - Button Labels
-
-contextAppbar2.pin.topSites=Pin to Top Sites
-contextAppbar2.pin.bookmarks=Pin to Bookmarks
-contextAppbar2.pin.recentHistory=Pin to Recent History
-contextAppbar2.pin.downloads=Pin to Downloads
-
-contextAppbar2.unpin.topSites=Unpin from Top Sites
-contextAppbar2.hide.bookmarks=Hide Bookmark
-contextAppbar2.hide.recentHistory=Hide
-contextAppbar2.unpin.downloads=Unpin from Downloads
-
-# LOCALIZATION NOTE (contextAppbar2.delete): Deletes selected pages.
-contextAppbar2.delete=Delete
-
-# LOCALIZATION NOTE (contextAppbar2.restore): Undoes a previous deletion.
-# Button with this label only appears immediately after a deletion.
-contextAppbar2.restore=Undo delete
-
-# LOCALIZATION NOTE (contextAppbar2.clear): Unselects pages without modification.
-contextAppbar2.clear=Clear selection
-
-# Clear private data
-clearPrivateData.clearButton=Clear
-clearPrivateData.title=Clear Private Data
-clearPrivateData.message=Clear your private data?
-
-# Settings Charms
-aboutCharm1=About
-optionsCharm=Options
-searchCharm=Search
-helpOnlineCharm=Help (online)
-
-# General
-# LOCALIZATION NOTE (browserForSaveLocation): Title for the "Save..." file picker dialog
-browserForSaveLocation=Save Location
-# LOCALIZATION NOTE (browserForSaveLocation): Title for the "Open..." file picker dialog
-browserForOpenLocation=Open Location
-
-# Download Manager
-downloadsUnknownSize=Unknown size
-downloadOpen=Open
-downloadSave=Save
-downloadCancel=Cancel
-downloadTryAgain=Try Again
-downloadOpenNow=Open it now
-# LOCALIZATION NOTE (downloadShowInFiles): 'Files' refers to the Windows 8 file explorer
-downloadShowInFiles=Show in Files
-
-# Alerts
-alertLinkBookmarked=Bookmark added
-alertDownloads=Downloads
-alertDownloadsStart=Downloading: %S
-alertDownloadsDone=%S has finished downloading
-# LOCALIZATION NOTE (alertDownloadsStart2): Used in a notification bar for download progress
-# #1 is the file name, #2 is the amount downloaded so far / total amount to download, and #3 is seconds remaining.
-alertDownloadsStart2=Downloading #1, #2, #3
-alertDownloadsDone2=%S has been downloaded
-alertTapToSave=Tap to save this file.
-alertDownloadsSize=Download too big
-alertDownloadsNoSpace=Not enough storage space
-# LOCALIZATION NOTE (alertDownloadSave2): #1 is the file name, #2 is the file size, #3 is the file host
-alertDownloadSave2=Do you want to open or save #1 (#2) from #3?
-# LOCALIZATION NOTE (alertDownloadMultiple): Semi-colon list of plural forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# #1 is the number of files, #2 is (amount downloaded so far / total amount to download) and #3 is seconds remaining
-alertDownloadMultiple=Downloading one file, #2, #3;Downloading #1 files, #2, #3
-# LOCALIZATION NOTE (alertMultipleDownloadsComplete): Semi-colon list of plural forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# #1 is the number of downloads completed
-alertMultipleDownloadsComplete=One download has been completed;#1 downloads have been completed
-alertDownloadFailed=Sorry, downloading %S failed.
-
-# Popup Blocker
-# LOCALIZATION NOTE (popupWarning.message): Semi-colon list of plural forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# #1 is brandShortName and #2 is the number of pop-ups blocked.
-popupWarning.message=#1 prevented this site from opening a pop-up window.;#1 prevented this site from opening #2 pop-up windows.
-popupButtonAllowOnce2=Allow once
-popupButtonAlwaysAllow3=Always allow
-popupButtonNeverWarn3=Never allow
-
-# ContentPermissionsPrompt
-contentPermissions.alwaysForSite=Always for this site
-contentPermissions.neverForSite=Never for this site
-
-# Geolocation UI
-# LOCALIZATION NOTE (geolocation2.allow): If you're having trouble with the
-# word Share, please use Allow and Block in your language.
-geolocation2.allow=Share location
-
-# LOCALIZATION NOTE (geolocation2.wantsTo offlineApps.wantsTo indexedDBQuota.wantsTo):
-# %S is the domain name of the web site.
-geolocation2.wantsTo=Share your location with %S?
-
-geolocation.learnMore=Learn more…
-
-# Error Console
-typeError=Error:
-typeWarning=Warning:
-
-# Offline web applications
-offlineApps.allow=Allow
-offlineApps.wantsTo=%S wants to store data on your device for offline use.
-
-# IndexedDB Quota increases
-indexedDBQuota.allow=Allow
-indexedDBQuota.wantsTo=%S wants to store a lot of data on your device for offline use.
-
-tabs.emptyTabTitle=New Tab
-
-# Open Search
-# LOCALIZATION NOTE (opensearch.search.header): %S is the word or phrase
-# typed by the user in the urlbar to search
-opensearch.search.header=Search for “%S” on:
-
-# Check for Updates in the About Panel - button labels and accesskeys
-# LOCALIZATION NOTE - all of the following update buttons labels will only be
-# displayed one at a time. So, if a button is displayed nothing else will
-# be displayed alongside of the button. The button when displayed is located
-# directly under the Firefox version in the about dialog (see bug 596813 for
-# screenshots).
-update.checkInsideButton.label=Check for Updates
-update.checkInsideButton.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.updateButton.label=Restart to Update
-update.restart.updateButton.accesskey=R
-update.openUpdateUI.upgradeButton.label=Upgrade Now…
-update.openUpdateUI.upgradeButton.accesskey=U
-update.restart.upgradeButton.label=Upgrade Now
-update.restart.upgradeButton.accesskey=U
deleted file mode 100644
--- a/browser/metro/chrome/checkbox.dtd
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY checkbox.on.label    "On">
-<!ENTITY checkbox.off.label     "Off">
deleted file mode 100644
--- a/browser/metro/chrome/config.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY empty.label            "Search">
-<!ENTITY newpref.label          "Add a New Preference">
-<!ENTITY addpref.name           "Name">
-<!ENTITY addpref.value          "Value">
-
-<!ENTITY cancel.label           "Cancel">
-<!ENTITY reset.label            "Reset">
-<!ENTITY done.label             "Done">
-
-<!ENTITY integer.label          "Integer">
-<!ENTITY string.label           "String">
-<!ENTITY boolean.label          "Boolean">
deleted file mode 100644
--- a/browser/metro/chrome/crashprompt.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-
-<!ENTITY crashprompt.title           "Would you like to send Mozilla crash reports?">
-<!ENTITY crashprompt.message         "We are sorry, &brandShortName; just recovered from a crash. Sending crash reports will help Mozilla make &brandShortName; more stable and secure. You can always change your preference in Settings/Options.">
-<!ENTITY crashprompt.detailsLink     "What's in a crash report?">
-<!ENTITY crashprompt.detailedMessage.firstParagraph "A crash report contains some details about the crash, your machine, as well as a snapshot of the state of your browser when it crashed.">
-<!ENTITY crashprompt.detailedMessage.secondParagraph "This may include things like open pages, text typed into forms and the content of open messages, recent browsing history, or geolocation shared with a site.">
-<!ENTITY crashprompt.detailedMessage.thirdParagraph "We use crash reports to try to fix problems and improve our products. We handle your information as we describe in our ">
-<!ENTITY crashprompt.privacyPolicyLink "&brandShortName; privacy policy">
-<!ENTITY crashprompt.includeURLLabel "Include the address of the page I was on">
-<!ENTITY crashprompt.acceptbutton    "Send reports">
-<!ENTITY crashprompt.refusebutton    "Don't send">
-<!ENTITY crashprompt.privacyPolicy.title "&brandShortName; privacy policy">
deleted file mode 100644
--- a/browser/metro/chrome/passwordmgr.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-rememberPassword = Use Password Manager to remember this password.
-savePasswordTitle = Confirm
-# 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 = Do you want %1$S to remember the password for "%2$S" on %3$S?
-# 1st string is product name, 2nd is the login's hostname
-saveLoginTextNoUsername = Do you want %1$S to remember this password on %2$S?
-notifyBarNotForThisSiteButtonText = Not for this site
-notifyBarNotForThisSiteButtonAccessKey =
-notifyBarRememberPasswordButtonText = Remember password
-notifyBarRememberPasswordButtonAccessKey =
-passwordChangeTitle = Confirm Password Change
-passwordChangeText = Would you like to change the stored password for %S?
-passwordChangeTextNoUser = Would you like to change the stored password for this login?
-notifyBarChangeButtonText = Change
-notifyBarChangeButtonAccessKey =
-notifyBarDontChangeButtonText2 = Don't change
-notifyBarDontChangeButtonAccessKey =
-userSelectText = Please confirm which user you are changing the password for
deleted file mode 100644
--- a/browser/metro/chrome/phishing.dtd
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY safeb.palm.accept.label "Get me out of here!">
-<!ENTITY safeb.palm.decline.label "Ignore this warning">
-<!ENTITY safeb.palm.notforgery.label2 "This isn't a web forgery…">
-<!ENTITY safeb.palm.reportPage.label "Why was this page blocked?">
-
-<!ENTITY safeb.blocked.malwarePage.title "Reported Attack Page!">
-<!-- Localization note (safeb.blocked.malware.shortDesc) - Please don't translate the contents of the <span id="malware_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
-<!ENTITY safeb.blocked.malwarePage.shortDesc "This web page at <span id='malware_sitename'/> has been reported as an attack page and has been blocked based on your security preferences.">
-<!ENTITY safeb.blocked.malwarePage.longDesc "<p>Attack pages try to install programs that steal private information, use your computer to attack others, or damage your system.</p><p>Some attack pages intentionally distribute harmful software, but many are compromised without the knowledge or permission of their owners.</p>">
-
-<!ENTITY safeb.blocked.phishingPage.title2 "Suspected Web Forgery!">
-<!ENTITY safeb.blocked.phishingPage.shortDesc2 "Entering any personal information on this page may result in identity theft or other fraud.">
-<!ENTITY safeb.blocked.phishingPage.longDesc2 "<p>These types of web forgeries are used in scams known as phishing attacks, in which fraudulent web pages and emails are used to imitate sources you may trust.</p>">
deleted file mode 100644
--- a/browser/metro/chrome/preferences.dtd
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!-- ## Sync Flyout Panel ## -->
-<!-- see sync.dtd -->
-
-<!-- ## Options Flyout Panel ## -->
-<!ENTITY optionsHeader.title                                     "Options">
-<!ENTITY optionsHeader.char.title                                "Character Encoding">
-<!ENTITY optionsHeader.char.autodetect.label                     "Auto-detect">
-<!ENTITY optionsHeader.char.options.label                        "Show encoding options on the App Bar">
-
-<!ENTITY clearPrivateData.title                                  "Clear Private Data">
-<!ENTITY clearPrivateData.label                                  "Clear your browsing history, passwords, cookies, and form data on this device">
-<!ENTITY clearPrivateData.button                                 "Clear">
-<!ENTITY clearPrivateData.done                                   "Done!">
-<!ENTITY clearPrivateData.history                                "Browsing history">
-<!ENTITY clearPrivateData.otherdata                              "Other data (passwords, cache, cookies, etc)">
-<!ENTITY clearPrivateData.downloadHist                           "Download history">
-<!ENTITY clearPrivateData.cookies                                "Cookies">
-<!ENTITY clearPrivateData.cache                                  "Cache">
-<!ENTITY clearPrivateData.sitePref                               "Site preferences">
-<!ENTITY clearPrivateData.formSearchHist                         "Form &amp; search history">
-<!ENTITY clearPrivateData.passwords                              "Saved passwords">
-<!ENTITY clearPrivateData.offline                                "Offline web site data">
-<!ENTITY clearPrivateData.logins                                 "Active logins">
-
-<!ENTITY optionsHeader.privacy.passwords.label                   "Remember Passwords">
-<!ENTITY doNotTrack.title                                        "Do Not Track">
-<!ENTITY doNotTrack.options.doNotTrack                           "Tell web sites that I do not want to be tracked">
-<!ENTITY doNotTrack.options.doTrack                              "Tell web sites that I want to be tracked">
-<!ENTITY doNotTrack.options.default                              "Do not tell web sites anything about my tracking preferences">
-<!ENTITY doNotTrack.learnMoreLink                                "Learn more&#x2026;">
-
-<!ENTITY optionsHeader.reporting.title                           "Crash Reporter">
-<!ENTITY optionsHeader.reporting.crashes.label                   "&brandShortName; submits crash reports to help Mozilla make your browser more stable and secure">
-<!ENTITY optionsHeader.reporting.crashes.submitURLs             "Include the address of the page I was on">
-<!ENTITY optionsHeader.telemetry.title                            "Telemetry">
-<!ENTITY optionsHeader.telemetry.label                            "Shares usage statistics about &brandShortName; with Mozilla to help us make your browser better">
deleted file mode 100644
--- a/browser/metro/chrome/region.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# LOCALIZATION NOTE: REVIEW_REQUIRED
-# For all locales: please do not commit any changes to this file without a
-# review from the l10n-drivers team. In order to get one, please file a bug,
-# add the "productization" keyword and CC l10n@mozilla.com.
-# en-US: if you're changing this file, please CC l10n@mozilla.com in the
-# associated bug to help us determine if these changes are relevant for other
-# locales and how to localize them.
-
-# Default search engine
-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.co.uk
-browser.search.order.3=Bing
deleted file mode 100644
--- a/browser/metro/chrome/searchPanel.dtd
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-
-<!ENTITY searchFlyoutHeader.title  "Search">
-<!ENTITY searchSetting.title  "Default Search Provider">
deleted file mode 100644
--- a/browser/metro/chrome/sync.dtd
+++ /dev/null
@@ -1,58 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!-- Flyout -->
-<!ENTITY sync.flyout.title                     "&syncBrand.shortName.label;">
-
-<!-- Flyout when not connected -->
-<!ENTITY sync.flyout.presetup.description1     "Access your bookmarks, passwords, and open tabs across your devices">
-<!ENTITY sync.flyout.presetup.setup.label      "Set Up &syncBrand.shortName.label;">
-
-<!-- Flyout when setting up sync -->
-<!ENTITY sync.flyout.setup.title               "Set Up &syncBrand.shortName.label;">
-<!ENTITY sync.flyout.setup.description1        "If you have a &syncBrand.shortName.label; account, select &quot;Pair a Device&quot; on your other device and enter this code.">
-<!ENTITY sync.flyout.setup.description2        "If you don&apos;t have a &syncBrand.shortName.label; account, you can create one on your &brandShortName; desktop browser.">
-<!ENTITY sync.flyout.setup.manual.label_2      "I&apos;m not near my computer…">
-<!ENTITY sync.flyout.setup.description3        "Note:">
-<!ENTITY sync.flyout.setup.description4_2      "To find &quot;Pair a Device&quot;,">
-<!ENTITY sync.flyout.setup.description5_2      "[Desktop] Open &quot;Options&quot; or &quot;Preferences&quot; and then select &quot;&syncBrand.shortName.label;&quot;">
-<!ENTITY sync.flyout.setup.description6_2      "[Android] More &gt; Settings &gt; &syncBrand.shortName.label;">
-
-<!-- Flyout when setting up manually -->
-<!ENTITY sync.flyout.manualsetup.description1_2  "Please enter your &syncBrand.shortName.label; account information and the Recovery Key generated by your computer">
-<!ENTITY sync.flyout.manualsetup.account.placeholder "Account Name">
-<!ENTITY sync.flyout.manualsetup.password.placeholder "Password">
-<!ENTITY sync.flyout.manualsetup.recoveryKey.placeholder "Recovery Key">
-<!ENTITY sync.flyout.manualsetup.connect.label           "Connect">
-
-<!-- Flyout when user has just connected -->
-<!ENTITY sync.flyout.setupsuccess.description1      "You just connected &brandShortName; to &syncBrand.shortName.label; account">
-<!ENTITY sync.flyout.setupsuccess.description2      "Your &syncBrand.shortName.label; data is now being downloaded in the background. Your synchronised tabs can be found on &brandShortName; Start Page">
-
-<!-- Flyout when setup failed -->
-<!ENTITY sync.flyout.setupfailure.description       "&brandShortName; could not connect to your &syncBrand.shortName.label; account.">
-<!ENTITY sync.flyout.setupfailure.cancelButton      "Cancel">
-<!ENTITY sync.flyout.setupfailure.tryAgainButton    "Try Again">
-
-<!-- Flyout when connected and functioning normally -->
-<!ENTITY sync.flyout.connected.account                    "Account:">
-<!ENTITY sync.flyout.connected.device                     "Your device:">
-<!ENTITY sync.flyout.connected.disconnect                 "Disconnect">
-<!ENTITY sync.flyout.connected.disconnectWarningHeader    "Disconnect your device with &syncBrand.shortName.label;?">
-<!ENTITY sync.flyout.connected.disconnectWarning          "All your personal data on both this device and &syncBrand.shortName.label; account will remain intact.">
-<!ENTITY sync.flyout.connected.cancel                     "Cancel">
-<!ENTITY sync.flyout.connected.pair                       "Pair a Device">
-
-<!-- Flyout when pairing a device -->
-<!ENTITY sync.flyout.pairNewDevice.description            "On the new device you want to pair with, select &quot;Set Up &syncBrand.shortName.label;&quot; and enter the code the device produces">
-<!ENTITY sync.flyout.pairNewDevice.pair                   "Pair">
-<!ENTITY sync.flyout.pairNewDevice.note1                  "Note:">
-<!ENTITY sync.flyout.pairNewDevice.note2_2                "To find the code,">
-<!ENTITY sync.flyout.pairNewDevice.note3_2                "[Desktop] Open &quot;Options&quot; or &quot;Preferences&quot; and then follow the steps: &syncBrand.shortName.label; -&gt; Set up &syncBrand.shortName.label; -&gt; I have an account">
-<!ENTITY sync.flyout.pairNewDevice.note4                  "[Android] More &gt; Settings &gt; &syncBrand.shortName.label;">
-<!ENTITY sync.flyout.pairNewDevice.failure                "Please try again">
-
-<!-- Flyout when a device has been successfully paired -->
-<!ENTITY sync.flyout.pairSuccess.description1             "The new device has been successfully added.">
-<!ENTITY sync.flyout.pairSuccess.description2             "Your &syncBrand.shortName.label; data is now being downloaded in the background. Your remote tabs can be found on &brandShortName; Start Page.">
deleted file mode 100644
--- a/browser/metro/chrome/sync.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# LOCALIZATION NOTE: Used in the default os description when a new account
-# is being set up. Should be unique to Metro, so that it does not conflict
-# with Desktop. See /services/sync/modules/engines/clients.js locaName.
-sync.defaultAccountApplication=Metro %S
-
-# %S is the date and time at which the last sync successfully completed
-sync.flyout.connected.lastSynced=Last synchronisation: %S
-# %S is the username logged in
-sync.flyout.connected.account=Account: %S
-# %S is the name that the user has chosen for this device
-sync.flyout.connected.device=Your device: %S
--- a/browser/pdfviewer/chrome.properties
+++ b/browser/pdfviewer/chrome.properties
@@ -1,8 +1,19 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 # Chrome notification bar messages and buttons
 unsupported_feature=This PDF document might not be displayed correctly.
+unsupported_feature_forms=This PDF document contains forms. The filling of form fields is not supported.
 open_with_different_viewer=Open With Different Viewer
 open_with_different_viewer.accessKey=O
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -25,22 +25,22 @@ next_label=Next
 page_label=Page:
 page_of=of {{pageCount}}
 
 zoom_out.title=Zoom Out
 zoom_out_label=Zoom Out
 zoom_in.title=Zoom In
 zoom_in_label=Zoom In
 zoom.title=Zoom
-print.title=Print
-print_label=Print
 presentation_mode.title=Switch to Presentation Mode
 presentation_mode_label=Presentation Mode
 open_file.title=Open File
 open_file_label=Open
+print.title=Print
+print_label=Print
 download.title=Download
 download_label=Download
 bookmark.title=Current view (copy or open in new window)
 bookmark_label=Current View
 
 # Secondary toolbar and context menu
 tools.title=Tools
 tools_label=Tools
@@ -48,27 +48,54 @@ first_page.title=Go to First Page
 first_page.label=Go to First Page
 first_page_label=Go to First Page
 last_page.title=Go to Last Page
 last_page.label=Go to Last Page
 last_page_label=Go to Last Page
 page_rotate_cw.title=Rotate Clockwise
 page_rotate_cw.label=Rotate Clockwise
 page_rotate_cw_label=Rotate Clockwise
-page_rotate_ccw.title=Rotate Counter-Clockwise
-page_rotate_ccw.label=Rotate Counter-Clockwise
-page_rotate_ccw_label=Rotate Counter-Clockwise
+page_rotate_ccw.title=Rotate Anti-Clockwise
+page_rotate_ccw.label=Rotate Anti-Clockwise
+page_rotate_ccw_label=Rotate Anti-Clockwise
+
+hand_tool_enable.title=Enable hand tool
+hand_tool_enable_label=Enable hand tool
+hand_tool_disable.title=Disable hand tool
+hand_tool_disable_label=Disable hand tool
+
+# Document properties dialog box
+document_properties.title=Document Properties…
+document_properties_label=Document Properties…
+document_properties_file_name=File name:
+document_properties_file_size=File size:
+document_properties_kb={{size_kb}} kB ({{size_b}} bytes)
+document_properties_mb={{size_mb}} MB ({{size_b}} bytes)
+document_properties_title=Title:
+document_properties_author=Author:
+document_properties_subject=Subject:
+document_properties_keywords=Keywords:
+document_properties_creation_date=Creation Date:
+document_properties_modification_date=Modification Date:
+document_properties_date_string={{date}}, {{time}}
+document_properties_creator=Creator:
+document_properties_producer=PDF Producer:
+document_properties_version=PDF Version:
+document_properties_page_count=Page Count:
+document_properties_close=Close
 
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Toggle Sidebar
 toggle_sidebar_label=Toggle Sidebar
 outline.title=Show Document Outline
 outline_label=Document Outline
+attachments.title=Show Attachments
+attachments_label=Attachments
 thumbs.title=Show Thumbnails
 thumbs_label=Thumbnails
 findbar.title=Find in Document
 findbar_label=Find
 
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
--- a/browser/profile/bookmarks.inc
+++ b/browser/profile/bookmarks.inc
@@ -1,8 +1,11 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #filter emptyLines
 
 # LOCALIZATION NOTE: The 'en-US' strings in the URLs will be replaced with
 # your locale code, and link to your translated pages as soon as they're 
 # live.
 
 #define bookmarks_title Bookmarks
 #define bookmarks_heading Bookmarks
@@ -29,9 +32,14 @@
 # LOCALIZATION NOTE (firefox_community):
 # link title for http://en-US.www.mozilla.com/en-US/firefox/community/
 #define firefox_community Get Involved
 
 # LOCALIZATION NOTE (firefox_about):
 # link title for http://en-US.www.mozilla.com/en-US/about/
 #define firefox_about About Us
 
+# LOCALIZATION NOTE (firefox_feedback):
+# link title for browser feedback page
+# currently used by Metro only: https://input.mozilla.org/feedback/metrofirefox
+#define firefox_feedback Give Feedback
+
 #unfilter emptyLines
--- a/calendar/chrome/calendar/calendar-alarms.properties
+++ b/calendar/chrome/calendar/calendar-alarms.properties
@@ -1,29 +1,25 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE (reminderCustomTitle):
-# %1$S = reminderCustomUnit, %2$S = reminderCustomOrigin
+# %1$S = unit, %2$S = reminderCustomOrigin
 # Example: "3 minutes" "before the task starts"
 reminderCustomTitle=%1$S %2$S
 reminderTitleAtStartEvent=The moment the event starts
 reminderTitleAtStartTask=The moment the task starts
 reminderTitleAtEndEvent=The moment the event ends
 reminderTitleAtEndTask=The moment the task ends
 
-reminderCustomUnitMinutes=#1 minute;#1 minutes
-reminderCustomUnitHours=#1 hour;#1 hours 
-reminderCustomUnitDays=#1 day;#1 days
-
 # LOCALIZATION NOTE (reminderSnoozeOkA11y)
 # This string is not seen in the UI, it is read by screen readers when the user
 # focuses the "OK" button in the "Snooze for..." popup of the alarm dialog.
-# %1$S = any of reminderCustomUnit*
+# %1$S = any of unit*
 reminderSnoozeOkA11y=Snooze reminder for %1$S
 
 reminderCustomOriginBeginBeforeEvent=before the event starts
 reminderCustomOriginBeginAfterEvent=after the event starts
 reminderCustomOriginEndBeforeEvent=before the event ends
 reminderCustomOriginEndAfterEvent=after the event ends
 reminderCustomOriginBeginBeforeTask=before the task starts
 reminderCustomOriginBeginAfterTask=after the task starts
--- a/calendar/chrome/calendar/calendar-event-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-event-dialog.dtd
@@ -4,17 +4,16 @@
 
 <!ENTITY event.title.label                  "Edit Item" >
 
 <!ENTITY event.dialog.keepDurationButton.tooltip   "Keep the duration when changing the end date">
 <!ENTITY event.dialog.keepDurationButton.accesskey "K">
 
 <!ENTITY newevent.from.label                "From" >
 <!ENTITY newevent.to.label                  "To" >
-<!ENTITY newevent.attendees.notify.label    "Notify attendees">
 
 <!ENTITY newevent.status.label                    "Status" >
 <!ENTITY newevent.status.accesskey                "S" >
 <!ENTITY newevent.eventStatus.none.label          "Not specified" >
 <!ENTITY newevent.eventStatus.none.accesskey      "o" >
 <!ENTITY newevent.todoStatus.none.label           "Not specified" >
 <!ENTITY newevent.eventStatus.cancelled.label     "Cancelled" >
 <!ENTITY newevent.eventStatus.cancelled.accesskey "n" >
@@ -25,16 +24,23 @@
 <!ENTITY newevent.status.confirmed.accesskey      "C" >
 <!ENTITY newevent.status.needsaction.label        "Needs Action" >
 <!ENTITY newevent.status.inprogress.label         "In Process" >
 <!ENTITY newevent.status.completed.label          "Completed on" >
 
 <!-- The following entity is for New Task dialog only -->
 <!ENTITY newtodo.percentcomplete.label      "&#37; complete">
 
+<!-- LOCALIZATON NOTE(event.attendees.notify.label,event.attendees.notifyundisclosed.label)
+   - These two labels are displayed side by side in the event dialog, make sure
+   - they still fit in. -->
+<!ENTITY event.attendees.notify.label               "Notify attendees">
+<!ENTITY event.attendees.notifyundisclosed.label    "Separate invitation per attendee">
+<!ENTITY event.attendees.notifyundisclosed.tooltip  "This option sends one invitation email per attendee. Each invitation only contains the recipient attendee so that other attendee identities are not disclosed.">
+
 <!-- Keyboard Shortcuts -->
 <!ENTITY event.dialog.new.event.key2              "I">
 <!ENTITY event.dialog.new.task.key2               "D">
 <!ENTITY event.dialog.new.message.key2            "N">
 <!ENTITY event.dialog.close.key                   "W">
 <!ENTITY event.dialog.save.key                    "S">
 <!ENTITY event.dialog.saveandclose.key            "L">
 <!ENTITY event.dialog.print.key                   "P">
@@ -94,22 +100,16 @@
 <!ENTITY  event.menu.view.toolbars.customize.accesskey    "C">
 <!ENTITY  event.menu.view.showlink.label                  "Show Related Link">
 <!ENTITY  event.menu.view.showlink.accesskey              "R">
 
 <!ENTITY  event.menu.options.label                            "Options">
 <!ENTITY  event.menu.options.accesskey                        "O">
 <!ENTITY  event.menu.options.attendees.label                  "Invite Attendees…">
 <!ENTITY  event.menu.options.attendees.accesskey              "I">
-<!ENTITY  event.menu.options.spellcheck.label                 "Check Spelling…">
-<!ENTITY  event.menu.options.spellcheck.accesskey             "h">
-<!ENTITY  event.menu.options.inline.spellcheck.label          "Spell Check As You Type">
-<!ENTITY  event.menu.options.inline.spellcheck.accesskey      "S">
-<!ENTITY  event.menu.options.link.label                       "Add Link…">
-<!ENTITY  event.menu.options.link.accesskey                   "L">
 <!ENTITY  event.menu.options.timezone2.label                  "Show Timezones">
 <!ENTITY  event.menu.options.timezone2.accesskey              "z">
 <!ENTITY  event.menu.options.priority2.label                  "Priority">
 <!ENTITY  event.menu.options.priority2.accesskey              "y">
 <!ENTITY  event.menu.options.priority.notspecified.label      "Not specified">
 <!ENTITY  event.menu.options.priority.notspecified.accesskey  "o">
 <!ENTITY  event.menu.options.priority.low.label               "Low">
 <!ENTITY  event.menu.options.priority.low.accesskey           "L">
@@ -138,38 +138,35 @@
 <!ENTITY event.email.attendees.accesskey                  "A">
 <!ENTITY event.email.tentative.attendees.label            "Compose Email to Undecided Attendees…">
 <!ENTITY event.email.tentative.attendees.accesskey        "U">
 
 <!-- Toolbar -->
 <!ENTITY  event.toolbar.save.label                        "Save and Close">
 <!ENTITY  event.toolbar.delete.label                      "Delete">
 <!ENTITY  event.toolbar.attendees.label                   "Invite Attendees">
-<!ENTITY  event.toolbar.spellcheck.label                  "Spellcheck">
 <!ENTITY  event.toolbar.privacy.label                     "Privacy">
 
 <!ENTITY  event.toolbar.save.tooltip                      "Save and Close">
 <!ENTITY  event.toolbar.delete.tooltip                    "Delete">
 <!ENTITY  event.toolbar.attendees.tooltip                 "Invite Attendees">
-<!ENTITY  event.toolbar.spellcheck.tooltip                "Spellcheck">
 <!ENTITY  event.toolbar.attachments.tooltip               "Add Attachments">
 <!ENTITY  event.toolbar.privacy.tooltip                   "Change Privacy">
 <!ENTITY  event.toolbar.priority.tooltip                  "Change Priority">
 <!ENTITY  event.toolbar.status.tooltip                    "Change Status">
 <!ENTITY  event.toolbar.freebusy.tooltip                  "Change Free/Busy time">
 
 <!-- Main page -->
 <!ENTITY event.title.textbox.label                        "Title:" >
 <!ENTITY event.title.textbox.accesskey                    "T">
 <!ENTITY event.location.label                             "Location:" >
 <!ENTITY event.location.accesskey                         "L">
 <!ENTITY event.categories.label                           "Category:">
 <!ENTITY event.categories.accesskey                       "y">
 <!ENTITY event.categories.textbox.label                   "Add a new category" >
-<!ENTITY event.categories.textbox.accesskey               "A">
 <!ENTITY event.calendar.label                             "Calendar:" >
 <!ENTITY event.calendar.accesskey                         "C">
 <!ENTITY event.attendees.label                            "Attendees:" >
 <!ENTITY event.attendees.accesskey                        "I" >
 <!ENTITY event.alldayevent.label                          "All day Event" >
 <!ENTITY event.alldayevent.accesskey                      "d">
 <!ENTITY event.from.label                                 "Start:" >
 <!ENTITY event.from.accesskey                             "S">
@@ -329,18 +326,18 @@
 <!ENTITY event.recurrence.appointments.label            "Appointment(s)" >
 <!ENTITY event.repeat.until.label                       "Repeat until" >
 <!ENTITY event.recurrence.preview.label                 "Preview">
 
 <!-- Attendees dialog -->
 <!ENTITY invite.title.label                     "Invite Attendees">
 <!ENTITY event.organizer.label                  "Organiser">
 <!ENTITY event.freebusy.suggest.slot            "Suggest time slot:">
-<!ENTITY event.freebusy.next.slot               "Next slot " >
-<!ENTITY event.freebusy.previous.slot           " Previous slot" >
+<!ENTITY event.freebusy.button.next.slot        "Next slot">
+<!ENTITY event.freebusy.button.previous.slot    "Previous slot">
 <!ENTITY event.freebusy.zoom                    "Zoom:">
 <!ENTITY event.freebusy.legend.free             "Free" >
 <!ENTITY event.freebusy.legend.busy             "Busy" >
 <!ENTITY event.freebusy.legend.busy_tentative   "Tentative" >
 <!ENTITY event.freebusy.legend.busy_unavailable "Out of Office" >
 <!ENTITY event.freebusy.legend.unknown          "No Information" >
 <!ENTITY event.attendee.role.required           "Required Attendee">
 <!ENTITY event.attendee.role.optional           "Optional Attendee">
@@ -369,10 +366,9 @@
 <!ENTITY read.only.reply.label           "Reply:">
 <!ENTITY read.only.accept.label          "I will attend">
 <!ENTITY read.only.decline.label         "I will not attend">
 <!ENTITY read.only.tentative.label       "I might attend">
 <!ENTITY read.only.needs.action.label    "I will confirm later">
 <!ENTITY read.only.reminder.label        "Reminder:">
 <!ENTITY read.only.attendees.label       "Attendees">
 <!ENTITY read.only.description.label     "Description">
-<!ENTITY read.only.documents.label       "Documents">
 <!ENTITY read.only.link.label            "Related Link">
--- a/calendar/chrome/calendar/calendar-event-dialog.properties
+++ b/calendar/chrome/calendar/calendar-event-dialog.properties
@@ -109,22 +109,46 @@ ordinalWeekdayOrder=%1$S %2$S
 # "nounclass..." must be written in 'repeatDetailsDayxNounclass' strings.
 # %1$S - list of single weekdays and/or weekdays with ordinal, article and
 #        noun class/gender when rule contains also specific day in the month
 # #2 - interval
 # e.g. "every Monday, Tuesday and the second Sunday of every month"
 monthlyEveryOfEveryNounclass1=every %1$S of every month;every %1$S of every #2 months
 monthlyEveryOfEveryNounclass2=every %1$S of every month;every %1$S of every #2 months
 
-# LOCALIZATION NOTE (monthlyDayOfNth):
+# LOCALIZATION NOTE (monthlyDaysOfNth_ordSymbol):
 # Edit recurrence window -> Recurrence pattern -> Monthly repeat rules
-# %1$S - day of month
-# #2 - month interval
-# e.g. "day 3 of every 2 months"
-monthlyDayOfNth=day %1$S of every month;day %1$S of every #2 months
+# Allows to insert a string, a character or a symbol after the numbers of a day
+# in a monthly rule monthlyDaysOfNth in order to give to each day number the
+# meaning of ordinal number (e.g.  1 -> 1st; 2 -> 2nd etc.).
+# Use a single string if the symbol used is the same for every monthday, otherwise
+# write a sequence of _31_ strings (one for every monthday) separated with commas.
+# If your language doesn't require that in monthlyDaysOfNth, leave it empty.
+# e.g.
+# monthlyDaysOfNth_ordSymbol=.
+#    -> "Occurs days 1., 2., 10. and 11. of every 2 months"
+# monthlyDaysOfNth_ordSymbol=st,nd,rd,th,th,th,th,th,th,th,th,th,th,th,th,
+#                            th,th,th,th,th,st,nd,rd,th,th,th,th,th,th,th,st
+#    -> "Occurs days 1st, 2nd, 10th and 11th of every 2 months"
+monthlyDaysOfNth_ordSymbol=
+
+# LOCALIZATION NOTE (monthlyDaysOfNth_day):
+# Edit recurrence window -> Recurrence pattern -> Monthly repeat rules
+# %1$S - day of month or a sequence of days of month, eventually with ordinal symbol
+#        coming from monthlyDaysOfNth_ordSymbol, separated with commas;
+# e.g. "days 3, 6 and 9" or "days 3rd, 6th and 9th"
+monthlyDaysOfNth_day=day %1$S;days %1$S
+
+# LOCALIZATION NOTE (monthlyDaysOfNth):
+# Edit recurrence window -> Recurrence pattern -> Monthly repeat rules
+# %1$S - it's the strig monthlyDaysOfNth_day: day of month or a sequence of days
+#        of month, eventually with ordinal symbol, separated with commas;
+# #2   - monthly interval
+# e.g. "days 3, 6, 9 and 12 of every 3 months"
+monthlyDaysOfNth=%1$S of every month;%1$S of every #2 months
 
 # LOCALIZATION NOTE (monthlyLastDayOfNth):
 # Edit recurrence window -> Recurrence pattern -> Monthly repeat rules
 # %1$S - day of month
 # #2 - month interval
 # e.g. "the last day of every 3 months"
 monthlyLastDayOfNth=the last day of the month; the last day of every #1 months
 
@@ -317,17 +341,21 @@ specifyLinkLocation=Please specify the l
 enterLinkLocation=Enter a web page, or document location.
 
 summaryDueTaskLabel=Due:
 
 # Attach File Dialog
 attachViaFilelink=File using %1$S
 selectAFile=Please select the file(s) to attach
 removeCalendarsTitle=Remove Attachments
-removeCalendarsText=Do you really want to remove %1$S attachments?
+
+# LOCALIZATION NOTE (removeAttachmentsText): Semi-colon list of plural forms for
+# prompting attachment removal.
+# See http://developer.mozilla.org/en/Localization_and_Plurals
+removeAttachmentsText=Do you really want to remove #1 attachment?;Do you really want to remove #1 attachments?
 
 # Recurrence Dialog Widget Order
 # LOCALIZATION NOTE: You can change the order of below params
 # Edit recurrence window -> Recurrence pattern -> Repeat monthly
 # %1$S - ordinal with article, %2$S - weekday
 # e.g. "the First Saturday"
 # DONT_TRANSLATE: Make sure there are no extra words in this property, just variables.
 monthlyOrder=%1$S %2$S
--- a/calendar/chrome/calendar/calendar.dtd
+++ b/calendar/chrome/calendar/calendar.dtd
@@ -21,43 +21,46 @@
 <!ENTITY calendar.events.filter.future.label "All Future Events">
 <!ENTITY calendar.events.filter.current.label "Currently Selected Day">
 <!ENTITY calendar.events.filter.currentview.label "Events in Current View">
 <!ENTITY calendar.events.filter.next7Days.label "Events in the Next 7 Days">
 <!ENTITY calendar.events.filter.next14Days.label "Events in the Next 14 Days">
 <!ENTITY calendar.events.filter.next31Days.label "Events in the Next 31 Days">
 <!ENTITY calendar.events.filter.thisCalendarMonth.label "Events in this Calendar Month">
 
-<!ENTITY calendar.unifinder.tree.done.label              "Done">
-<!ENTITY calendar.unifinder.tree.done.tooltip            "Click to sort by Done">
-<!ENTITY calendar.unifinder.tree.priority.label          "Priority">
-<!ENTITY calendar.unifinder.tree.priority.tooltip        "Click to sort by Priority">
-<!ENTITY calendar.unifinder.tree.title.label             "Title">
-<!ENTITY calendar.unifinder.tree.title.tooltip           "Click to sort by Title">
-<!ENTITY calendar.unifinder.tree.percentcomplete.label   "&#37; Complete">
-<!ENTITY calendar.unifinder.tree.percentcomplete.tooltip "Click to sort by &#37; Complete">
-<!ENTITY calendar.unifinder.tree.startdate.label         "Start">
-<!ENTITY calendar.unifinder.tree.startdate.tooltip       "Click to sort by Start Date">
-<!ENTITY calendar.unifinder.tree.enddate.label           "End">
-<!ENTITY calendar.unifinder.tree.enddate.tooltip         "Click to sort by End Date">
-<!ENTITY calendar.unifinder.tree.duedate.label           "Due">
-<!ENTITY calendar.unifinder.tree.duedate.tooltip         "Click to sort by Due Date">
-<!ENTITY calendar.unifinder.tree.completeddate.label     "Completed">
-<!ENTITY calendar.unifinder.tree.completeddate.tooltip   "Click to sort by Completed">
-<!ENTITY calendar.unifinder.tree.categories.label        "Category">
-<!ENTITY calendar.unifinder.tree.categories.tooltip      "Click to sort by Category">
-<!ENTITY calendar.unifinder.tree.location.label          "Location">
-<!ENTITY calendar.unifinder.tree.location.tooltip        "Click to sort by Location">
-<!ENTITY calendar.unifinder.tree.status.label            "Status">
-<!ENTITY calendar.unifinder.tree.status.tooltip          "Click to sort by Status">
-<!ENTITY calendar.unifinder.tree.calendarname.label      "Calendar Name">
-<!ENTITY calendar.unifinder.tree.calendarname.tooltip    "Click to sort by Calendar Name">
-<!ENTITY calendar.unifinder.tree.duration.label          "Due in">
-<!ENTITY calendar.unifinder.tree.duration.tooltip        "Click to sort by Due in">
-<!ENTITY calendar.unifinder.close.tooltip                "Close event search and event list">
+<!-- LOCALIZATION NOTE(calendar.unifinder.tree.done.tooltip)
+   - This label and tooltip is used for the column with the checkbox in the
+   - task tree view. -->
+<!ENTITY calendar.unifinder.tree.done.label                "Done">
+<!ENTITY calendar.unifinder.tree.done.tooltip2             "Sort by completion">
+<!ENTITY calendar.unifinder.tree.priority.label            "Priority">
+<!ENTITY calendar.unifinder.tree.priority.tooltip2         "Sort by priority">
+<!ENTITY calendar.unifinder.tree.title.label               "Title">
+<!ENTITY calendar.unifinder.tree.title.tooltip2            "Sort by title">
+<!ENTITY calendar.unifinder.tree.percentcomplete.label     "&#37; Complete">
+<!ENTITY calendar.unifinder.tree.percentcomplete.tooltip2  "Sort by &#37; complete">
+<!ENTITY calendar.unifinder.tree.startdate.label           "Start">
+<!ENTITY calendar.unifinder.tree.startdate.tooltip2        "Sort by start date">
+<!ENTITY calendar.unifinder.tree.enddate.label             "End">
+<!ENTITY calendar.unifinder.tree.enddate.tooltip2          "Sort by end date">
+<!ENTITY calendar.unifinder.tree.duedate.label             "Due">
+<!ENTITY calendar.unifinder.tree.duedate.tooltip2          "Sort by due date">
+<!ENTITY calendar.unifinder.tree.completeddate.label       "Completed">
+<!ENTITY calendar.unifinder.tree.completeddate.tooltip2    "Sort by completed date">
+<!ENTITY calendar.unifinder.tree.categories.label          "Category">
+<!ENTITY calendar.unifinder.tree.categories.tooltip2       "Sort by category">
+<!ENTITY calendar.unifinder.tree.location.label            "Location">
+<!ENTITY calendar.unifinder.tree.location.tooltip2         "Sort by location">
+<!ENTITY calendar.unifinder.tree.status.label              "Status">
+<!ENTITY calendar.unifinder.tree.status.tooltip2           "Sort by status">
+<!ENTITY calendar.unifinder.tree.calendarname.label        "Calendar Name">
+<!ENTITY calendar.unifinder.tree.calendarname.tooltip2     "Sort by calendar name">
+<!ENTITY calendar.unifinder.tree.duration.label            "Due in">
+<!ENTITY calendar.unifinder.tree.duration.tooltip2         "Sort by time until due">
+<!ENTITY calendar.unifinder.close.tooltip                  "Close event search and event list">
 
 <!ENTITY calendar.today.button.tooltip          "Go to Today" >
 <!ENTITY calendar.todaypane.button.tooltip      "Show Today Pane" >
 
 <!ENTITY calendar.day.button.tooltip            "Switch to day view" >
 <!ENTITY calendar.week.button.tooltip           "Switch to week view" >
 <!ENTITY calendar.month.button.tooltip          "Switch to month view" >
 <!ENTITY calendar.multiweek.button.tooltip      "Switch to multiweek view" >
@@ -80,18 +83,17 @@
 <!ENTITY calendar.navigation.nextweek.tooltip   "One Week Forwards" >
 <!ENTITY calendar.navigation.prevweek.tooltip   "One Week Backwards" >
 <!ENTITY calendar.navigation.nextmonth.tooltip  "One Month Forwards" >
 <!ENTITY calendar.navigation.prevmonth.tooltip  "One Month Backwards" >
 
 <!ENTITY calendar.newevent.button.label         "New Event" >
 <!ENTITY calendar.newtask.button.label          "New Task" >
 <!ENTITY calendar.print.button.label            "Print" >
-
-<!ENTITY calendar.export.calendar                "Export Calendar…" >
+<!ENTITY calendar.print.button.accesskey        "P">
 
 <!ENTITY calendar.day.button.label              "Day" >
 <!ENTITY calendar.week.button.label             "Week" >
 <!ENTITY calendar.month.button.label            "Month" >
 <!ENTITY calendar.multiweek.button.label        "Multiweek" >
 <!ENTITY calendar.onlyworkday.checkbox.label    "Workweek days only" >
 <!ENTITY calendar.onlyworkday.checkbox.accesskey  "r" >
 <!ENTITY calendar.displaytodos.checkbox.label   "Tasks in View" >
@@ -124,18 +126,16 @@
 
 <!-- LOCALIZATION NOTE(calendar.task.filter.current.label)
      "Current Tasks" will show all tasks, except those with a start date set
      that is after today and after the selected date. If a task repeats, a
      separate entry will be shown for each of the occurrences that happen on or
      before today (or the selected date, whichever is later). -->
 <!ENTITY calendar.task.filter.current.label         "Current Tasks">
 <!ENTITY calendar.task.filter.current.accesskey     "u">
-<!ENTITY calendar.task.filter.repeating.label       "Repeating Tasks">
-<!ENTITY calendar.task.filter.repeating.accesskey   "R">
 
 <!ENTITY calendar.task-details.title.label           "title">
 <!ENTITY calendar.task-details.organizer.label       "from">
 <!ENTITY calendar.task-details.priority.label        "priority">
 <!ENTITY calendar.task-details.priority.low.label    "Low">
 <!ENTITY calendar.task-details.priority.normal.label "Normal">
 <!ENTITY calendar.task-details.priority.high.label   "High">
 <!ENTITY calendar.task-details.status.label          "status">
@@ -148,19 +148,16 @@
 <!ENTITY calendar.task.category.button.tooltip  "Categorise tasks">
 <!ENTITY calendar.task.complete.button.tooltip  "Mark selected tasks completed">
 <!ENTITY calendar.task.priority.button.tooltip  "Change the priority">
 
 <!ENTITY calendar.task.text-filter.textbox.emptytext.base            "Filter tasks… #1">
 <!ENTITY calendar.task.text-filter.textbox.emptytext.keylabel.nonmac "&lt;Ctrl+Shift+K&gt;">
 <!ENTITY calendar.task.text-filter.textbox.emptytext.keylabel.mac    "&lt;&#x21E7;&#x2318;K&gt;">
 
-<!-- Statusbar -->
-<!ENTITY statusText.label            "Document: Done">
-
 <!-- Context Menu -->
 <!ENTITY calendar.context.modifyorviewitem.label      "Open">
 <!ENTITY calendar.context.modifyorviewitem.accesskey  "O">
 <!ENTITY calendar.context.modifyorviewtask.label      "Open Task…">
 <!ENTITY calendar.context.modifyorviewtask.accesskey  "O">
 <!ENTITY calendar.context.newevent.label              "New Event…">
 <!ENTITY calendar.context.newevent.accesskey          "N">
 <!ENTITY calendar.context.newtodo.label               "New Task…">
@@ -224,17 +221,16 @@
 
 <!ENTITY calendar.copylink.label       "Copy Link Location">
 <!ENTITY calendar.copylink.accesskey   "C">
 
 <!-- Task View -->
 <!-- Note that the above *.context.* strings are currently used for the other
      task action buttons -->
 <!ENTITY calendar.taskview.delete.label     "Delete">
-<!ENTITY calendar.taskview.delete.accesskey "l">
 
 <!-- Server Context Menu -->
 <!ENTITY calendar.context.newserver.label              "New Calendar…">
 <!ENTITY calendar.context.newserver.accesskey          "N">
 <!ENTITY calendar.context.findcalendar.label           "Find Calendar…" >
 <!ENTITY calendar.context.findcalendar.accesskey       "F" >
 <!ENTITY calendar.context.deleteserver.label           "Delete Calendar">
 <!ENTITY calendar.context.deleteserver.accesskey       "D">
@@ -329,17 +325,16 @@
 <!ENTITY calendar.print.window.title "Print A Calendar">
 <!ENTITY calendar.print.title.label "Title:">
 <!ENTITY calendar.print.layout.label "Layout:">
 <!ENTITY calendar.print.range.label "What to Print">
 <!ENTITY calendar.print.currentView2.label "Current view">
 <!ENTITY calendar.print.selectedEventsAndTasks.label "Selected events/tasks">
 <!ENTITY calendar.print.tasks.label "Tasks">
 <!ENTITY calendar.print.events.label "Events">
-<!ENTITY calendar.print.selected.label "Selected events">
 <!ENTITY calendar.print.custom.label "Custom date range:">
 <!ENTITY calendar.print.from.label "From:">
 <!ENTITY calendar.print.to.label "To:">
 <!ENTITY calendar.print.settingsGroup.label "Print Settings">
 <!ENTITY calendar.print.optionsGroup.label "Options">
 <!ENTITY calendar.print.taskswithnoduedate.label "Tasks with no due date">
 <!ENTITY calendar.print.completedtasks.label "Completed tasks">
 
--- a/calendar/chrome/calendar/calendar.properties
+++ b/calendar/chrome/calendar/calendar.properties
@@ -102,21 +102,16 @@ None=None
 ## @loc none
 tooNewSchemaErrorBoxTitle=Your calendar data isn't compatible with this version of %1$S
 
 # LOCALIZATION NOTE (tooNewSchemaErrorBoxTextLightning):
 #    %1$S will be replaced with the name of the calendar application e.g. 'Lightning'
 #    %2$S will be replaced with the name of the host application 'calendar'
 tooNewSchemaErrorBoxTextLightning=The calendar data in your profile was updated by a newer version of %1$S, and continuing will probably cause the information to be lost or corrupted. %1$S will now be disabled and %2$S restarted.
 
-# LOCALIZATION NOTE (tooNewSchemaErrorBoxTextSunbird):
-#    %1$S will be replaced with the name of the calendar application e.g. 'Sunbird'
-#    %2$S will be replaced with the name of the host application 'calendar'
-tooNewSchemaErrorBoxTextSunbird=The calendar data in your profile was updated by a newer version of %1$S, and continuing will probably cause the information to be lost or corrupted. %1$S will now quit.
-
 # LOCALIZATION NOTE (tooNewSchemaButtonRestart):
 #    %1$S will be replaced with the name of the host application 'Calendar'
 tooNewSchemaButtonRestart=Restart %1$S
 
 # LOCALIZATION NOTE (tooNewSchemaButtonQuit):
 #    %1$S will be replaced with the name of the host application 'Calendar'
 tooNewSchemaButtonQuit=Quit %1$S
 
@@ -334,31 +329,16 @@ go=Go
 # Some languages have different conjugations of 'next' and 'last'.  If yours
 # does not, simply repeat the value.  This will be used with day names, as in
 # 'next Sunday'.
 next1=next
 next2=next
 last1=last
 last2=last
 
-# Master Password
-changeMasterPassword=Change Master Password…
-pw_change2empty_in_fips_mode=You are currently in FIPS mode. FIPS requires a non-empty Master Password.
-pw_change_failed_title=Password Change Failed
-
-# Check for Updates     (SUNBIRD_ONLY)
-updatesItem_default=Check for Updates…
-updatesItem_defaultFallback=Check for Updates…
-updatesItem_downloading=Downloading %S…
-updatesItem_downloadingFallback=Downloading Update…
-updatesItem_resume=Resume Downloading %S…
-updatesItem_resumeFallback=Resume Downloading Update…
-updatesItem_pending=Apply Downloaded Update Now…
-updatesItem_pendingFallback=Apply Downloaded Update Now…
-
 # Alarm Dialog
 # LOCALIZATION NOTE (alarmWindowTitle.label): Semi-colon list of plural
 # forms. See: http://developer.mozilla.org/en/Localization_and_Plurals
 alarmWindowTitle.label=#1 Reminder;#1 Reminders
 
 # LOCALIZATION NOTE (alarmStarts):
 # used for a display the start of an alarm like 'Starts:  Thu 2 Oct 2008 13:21'
 #    %1$S will be replaced with a date-time
@@ -381,20 +361,16 @@ alarmYesterdayAt=Yesterday at %1$S
 
 # Alarm interface strings
 # LOCALIZATION NOTE: These strings do not get displayed. They are only visible
 # when exporting an item with i.e a DISPLAY alarm, that doesn't have a
 # description set, or an EMAIL alarm that doesn't have a summary set.
 alarmDefaultDescription=Default Mozilla Description
 alarmDefaultSummary=Default Mozilla Summary
 
-# offline support strings (SUNBIRD ONLY)
-offlineTooltip=You are currently offline.
-onlineTooltip=You are currently online.
-
 taskDetailsStatusNeedsAction=Needs Action
 
 # LOCALIZATION NOTE (taskDetailsStatusInProgress):
 # used for a display of how much of a task is completed '25% Complete'
 #    %1$S will be replaced with the number of percentage completed
 taskDetailsStatusInProgress=%1$S%% Complete
 taskDetailsStatusCompleted=Completed
 
@@ -430,19 +406,19 @@ errorWriting=An error occurred when writ
 #    %1$S will be replaced with the name of a calendar
 tooltipCalendarDisabled=The calendar %1$S is momentarily not available
 
 # LOCALIZATION NOTE (tooltipCalendarReadOnly):
 # used for an message like 'The calendar Home is readonly'
 #    %1$S will be replaced with the name of a calendar
 tooltipCalendarReadOnly=The calendar %1$S is readonly
 
-taskEditInstructions=Click Here to Add a New Task
-taskEditInstructionsReadonly=Please Select a Writable Calendar
-taskEditInstructionsCapability=Please Select a Calendar that Supports Tasks
+taskEditInstructions=Click here to add a new task
+taskEditInstructionsReadonly=Please select a writable calendar
+taskEditInstructionsCapability=Please select a calendar that supports tasks
 
 eventDetailsStartDate=Start:
 eventDetailsEndDate=End:
 
 # LOCALIZATION NOTE (datetimeWithTimezone):
 # used for a display of a date-time with timezone 'Thu 2 Oct 2008 13:21', Europe/Paris
 #    %1$S will be replaced with the completion date-time
 #    %2$S will be replaced with the name of the timezone
@@ -602,8 +578,14 @@ calendarPropertiesEveryMinute=Every minu
 #    %1$S will be replaced with language name from languageNames.properties
 extractUsing=Using %1$S
 
 # LOCALIZATION NOTE (extractUsingRegion)
 # Used in message header
 #    %1$S will be replaced with language name from languageNames.properties
 #    %2$S will be replaced with region like US in en-US
 extractUsingRegion=Using %1$S (%2$S)
+
+# LOCALIZATION NOTE (unit)
+# Used to determine the correct plural form of a unit
+unitMinutes=#1 minute;#1 minutes
+unitHours=#1 hour;#1 hours
+unitDays=#1 day;#1 days
--- a/calendar/chrome/calendar/dialogs/calendar-event-dialog-reminder.dtd
+++ b/calendar/chrome/calendar/dialogs/calendar-event-dialog-reminder.dtd
@@ -6,17 +6,14 @@
 <!ENTITY reminder.add.label                                "Add">
 <!ENTITY reminder.add.accesskey                            "A">
 <!ENTITY reminder.remove.label                             "Remove">
 <!ENTITY reminder.remove.accesskey                         "R">
 
 <!ENTITY reminder.reminderDetails.label                    "Reminder Details">
 <!ENTITY reminder.action.label                             "Choose a Reminder Action">
 
-<!ENTITY reminder.relation.before.label                    "before" >
-<!ENTITY reminder.relation.after.label                     "after" >
-
 <!ENTITY reminder.action.alert.label                       "Show an Alert">
 <!ENTITY reminder.action.email.label                       "Send an Email">
 
 <!ENTITY alarm.units.minutes                               "minutes" >
 <!ENTITY alarm.units.hours                                 "hours" >
 <!ENTITY alarm.units.days                                  "days" >
--- a/calendar/chrome/calendar/global.dtd
+++ b/calendar/chrome/calendar/global.dtd
@@ -26,24 +26,16 @@
 <!ENTITY day.1.name "Sunday" >
 <!ENTITY day.2.name "Monday" >
 <!ENTITY day.3.name "Tuesday" >
 <!ENTITY day.4.name "Wednesday" >
 <!ENTITY day.5.name "Thursday" >
 <!ENTITY day.6.name "Friday" >
 <!ENTITY day.7.name "Saturday" >
 
-<!-- Units -->
-<!ENTITY calendar.global.units.minute   "minute">
-<!ENTITY calendar.global.units.minutes  "minutes">
-<!ENTITY calendar.global.units.hour     "hour">
-<!ENTITY calendar.global.units.hours    "hours">
-<!ENTITY calendar.global.units.day      "day">
-<!ENTITY calendar.global.units.days     "days">
-
 <!ENTITY month.1.name "January" >
 <!ENTITY month.2.name "February" >
 <!ENTITY month.3.name "March" >
 <!ENTITY month.4.name "April" >
 <!ENTITY month.5.name "May" >
 <!ENTITY month.6.name "June" >
 <!ENTITY month.7.name "July" >
 <!ENTITY month.8.name "August" >
--- a/calendar/chrome/calendar/menuOverlay.dtd
+++ b/calendar/chrome/calendar/menuOverlay.dtd
@@ -1,60 +1,40 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- Event Menu -->
 <!ENTITY event.new.event                        "New Event…">
-<!ENTITY event.new.event.key                    "N">
 <!ENTITY event.new.event.accesskey              "N">
 
 <!ENTITY event.new.task                         "New Task…">
-<!ENTITY event.new.task.key                     "K">
 <!ENTITY event.new.task.accesskey               "k">
 
-<!ENTITY calendar.new.server.label              "New Calendar…">
-<!ENTITY calendar.new.server.key                "L">
-<!ENTITY calendar.new.server.accesskey          "l">
-
-<!ENTITY calendar.print.label                   "Print…">
-<!ENTITY calendar.print.key                     "P">
-<!ENTITY calendar.print.accesskey               "P">
-
 <!ENTITY calendar.import.label                  "Import…">
-<!ENTITY calendar.import.key                    "I">
 <!ENTITY calendar.import.accesskey              "I">
 
 <!ENTITY calendar.export.label                  "Export…">
 <!ENTITY calendar.export.accesskey              "E">
-<!ENTITY calendar.export.selection.label        "Export Selection…">
-<!ENTITY calendar.export.selection.accesskey    "S">
 
 <!ENTITY calendar.publish.label                 "Publish…">
 <!ENTITY calendar.publish.accesskey             "b">
 
 <!ENTITY calendar.deletecalendar.label          "Delete Selected Calendar…">
 <!ENTITY calendar.deletecalendar.accesskey      "D">
 
 <!ENTITY calendar.menu.customize.label          "Customise…">
 <!ENTITY calendar.menu.customize.accesskey      "C">
 
 <!ENTITY showUnifinderCmd.label                 "Find Events">
 <!ENTITY showUnifinderCmd.accesskey             "F">
 
 <!ENTITY calendar.displaytodos.checkbox.label       "Show Tasks in Calendar">
 <!ENTITY calendar.displaytodos.checkbox.accesskey   "T">
 
-<!ENTITY calendar.menu.numberofweeks.label      "Multiweek View Size">
-<!ENTITY calendar.menu.numberofweeks.2          "Two Weeks">
-<!ENTITY calendar.menu.numberofweeks.3          "Three Weeks">
-<!ENTITY calendar.menu.numberofweeks.4          "Four Weeks">
-<!ENTITY calendar.menu.numberofweeks.5          "Five Weeks">
-<!ENTITY calendar.menu.numberofweeks.6          "Six Weeks">
-
 <!ENTITY goTodayCmd.label                       "Today">
 <!ENTITY goTodayCmd.accesskey                   "T">
 
 <!ENTITY showCurrentView.label                  "Current View">
 <!ENTITY showCurrentView.accesskey              "V">
 
 <!ENTITY calendar.properties.label              "Calendar Properties…">
 <!ENTITY calendar.properties.accesskey          "C">
--- a/calendar/chrome/calendar/preferences/alarms.dtd
+++ b/calendar/chrome/calendar/preferences/alarms.dtd
@@ -2,34 +2,35 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- WARNING! This file contains UTF-8 encoded characters!
    - If this ==> … <== doesn't look like an ellipsis (three dots in a row),
    - your editor isn't using UTF-8 encoding and may munge up the document!
   -->
 
-<!ENTITY pref.alarmgoesoff.label "When an alarm goes off:">
+<!ENTITY pref.alarmgoesoff.label "When a Reminder is Due:">
 <!ENTITY pref.playasound "Play a sound">
 <!ENTITY pref.calendar.alarms.playsound.accessKey "s">
 <!ENTITY pref.calendar.alarms.sound.useDefault.label "Use default sound">
 <!ENTITY pref.calendar.alarms.sound.useDefault.accessKey "d">
 <!ENTITY pref.calendar.alarms.sound.browse.label "Browse…">
 <!ENTITY pref.calendar.alarms.sound.browse.accessKey "B">
 <!ENTITY pref.calendar.alarms.sound.preview.label "Preview">
 <!ENTITY pref.calendar.alarms.sound.preview.accessKey "P">
-<!ENTITY pref.showalarmbox "Show an alarm box">
+<!ENTITY pref.showalarmbox "Show the reminder dialogue">
 <!ENTITY pref.calendar.alarms.showAlarmBox.accessKey "x">
-<!ENTITY pref.missedalarms "Show missed alarms">
+<!ENTITY pref.missedalarms "Show missed reminders">
 <!ENTITY pref.calendar.alarms.missedAlarms.accessKey "m">
-<!ENTITY pref.calendar.alarms.defaults.label "Alarm Defaults">
-<!ENTITY pref.defalarm4events.label "Default alarm setting for events:">
+<!ENTITY pref.calendar.alarms.defaults.label "Reminder Defaults">
+<!ENTITY pref.defalarm4events.label "Default reminder setting for events:">
 <!ENTITY pref.defalarm4events.accesskey "e">
-<!ENTITY pref.defalarm4todos.label "Default alarm setting for tasks:">
+<!ENTITY pref.defalarm4todos.label "Default reminder setting for tasks:">
 <!ENTITY pref.defalarm4todos.accesskey "a">
 <!ENTITY pref.alarm.on "On">
 <!ENTITY pref.alarm.off "Off">
-<!ENTITY pref.defalarmlen4events.label "Default time an alarm goes off before an event:">
+<!ENTITY pref.defalarmlen4events.label "Default time a reminder is set before an event:">
 <!ENTITY pref.defalarmlen4events.accesskey "u">
-<!ENTITY pref.defalarmlen4todos.label "Default time an alarm goes off before a task:">
+<!ENTITY pref.defalarmlen4todos.label "Default time a reminder is set before a task:">
 <!ENTITY pref.defalarmlen4todos.accesskey "o">
-<!ENTITY pref.defaultemail.label "Default address to send alarms to:">
-<!ENTITY pref.defaulttext.label "Default text for alarms:">
+
+<!ENTITY pref.defaultsnoozelength.label "Default Snooze Length:" >
+<!ENTITY pref.defaultsnoozelength.accesskey "S">
--- a/calendar/chrome/calendar/preferences/general.dtd
+++ b/calendar/chrome/calendar/preferences/general.dtd
@@ -7,16 +7,28 @@
    - your editor isn't using UTF-8 encoding and may munge up the document!
   -->
 
 <!ENTITY pref.mainbox.label "General Settings" >
 <!ENTITY pref.dateformat.label "Date Text Format:" >
 <!ENTITY pref.dateformat.accesskey "D">
 <!ENTITY pref.dateformat.long "Long" >
 <!ENTITY pref.dateformat.short "Short"  >
-<!ENTITY pref.defaultlength.label "Default Event Length:" >
-<!ENTITY pref.defaultlength.accesskey "E">
-<!ENTITY pref.defaultsnoozelength.label "Default Snooze Length:" >
-<!ENTITY pref.defaultsnoozelength.accesskey "S">
+
+<!ENTITY pref.defaults.label "Default Values for New Items">
+<!ENTITY pref.events.label "Events">
+<!ENTITY pref.tasks.label "Tasks">
+
+<!ENTITY pref.default_event_length.label "Default Length:" >
+<!ENTITY pref.default_event_length.accesskey "E">
+
+<!ENTITY pref.default_task_none.label "None">
+<!ENTITY pref.default_task_start_of_day.label "Start of Day">
+<!ENTITY pref.default_task_end_of_day.label "End of Day">
+<!ENTITY pref.default_task_tomorrow.label "Tomorrow">
+<!ENTITY pref.default_task_next_week.label "Next Week">
+<!ENTITY pref.default_task_offset_current.label "Relative to Current Time">
+<!ENTITY pref.default_task_offset_start.label "Relative to Start">
+<!ENTITY pref.default_task_offset_next_hour.label "Relative to Next Hour">
 
 <!ENTITY pref.accessibility.label "Accessibility" >
 <!ENTITY pref.systemcolors.label "Optimise colours for accessibility" >
 <!ENTITY pref.systemcolors.accesskey "c">
--- a/calendar/chrome/calendar/timezones.properties
+++ b/calendar/chrome/calendar/timezones.properties
@@ -446,8 +446,11 @@ pref.timezone.America.Metlakatla=America
 pref.timezone.America.Sitka=America/Sitka
 pref.timezone.Asia.Hebron=Asia/Hebron
 
 #added with 0.1.2013a
 pref.timezone.America.Creston=America/Creston
 pref.timezone.Asia.Khandyga=Asia/Khandyga
 pref.timezone.Asia.Ust-Nera=Asia/Ust-Nera
 pref.timezone.Europe.Busingen=Europe/Busingen
+
+#added with 0.1.2014b
+pref.timezone.Antarctica.Troll=Antarctica/Troll
--- a/calendar/chrome/lightning/lightning.dtd
+++ b/calendar/chrome/lightning/lightning.dtd
@@ -35,17 +35,41 @@
 <!-- Events and Tasks menu -->
 <!ENTITY lightning.menu.eventtask.label                "Events and Tasks">
 <!ENTITY lightning.menu.eventtask.accesskey            "n">
 
 <!-- properties dialog, calendar creation wizard -->
 <!ENTITY lightning.calendarproperties.email.label               "Email:">
 
 <!-- iMIP Bar (meeting support) -->
-<!ENTITY lightning.imipbar.description "This message contains an invitation to an event.">
+<!ENTITY lightning.imipbar.btnAccept.label                                  "Accept">
+<!ENTITY lightning.imipbar.btnAccept2.tooltiptext                           "Accept event invitation">
+<!ENTITY lightning.imipbar.btnAcceptRecurrences.label                       "Accept all">
+<!ENTITY lightning.imipbar.btnAcceptRecurrences2.tooltiptext                "Accept event invitation for all occurrences of the event">
+<!ENTITY lightning.imipbar.btnAdd.label                                     "Add">
+<!ENTITY lightning.imipbar.btnAdd.tooltiptext                               "Add the event to the calendar">
+<!ENTITY lightning.imipbar.btnDecline.label                                 "Decline">
+<!ENTITY lightning.imipbar.btnDecline2.tooltiptext                          "Decline event invitation">
+<!ENTITY lightning.imipbar.btnDeclineRecurrences.label                      "Decline all">
+<!ENTITY lightning.imipbar.btnDeclineRecurrences2.tooltiptext               "Decline event invitation for all occurrences of the event">
+<!ENTITY lightning.imipbar.btnDelete.label                                  "Delete">
+<!ENTITY lightning.imipbar.btnDelete.tooltiptext                            "Delete from calendar">
+<!ENTITY lightning.imipbar.btnDetails.label                                 "Details…">
+<!ENTITY lightning.imipbar.btnDetails.tooltiptext                           "Show event details">
+<!ENTITY lightning.imipbar.btnMore.label                                    "More">
+<!ENTITY lightning.imipbar.btnMore.tooltiptext                              "Click to show more options">
+<!ENTITY lightning.imipbar.btnReconfirm2.label                              "Reconfirm">
+<!ENTITY lightning.imipbar.btnReconfirm.tooltiptext                         "Sends a reconfirmation to the organiser">
+<!ENTITY lightning.imipbar.btnTentative.label                               "Tentative">
+<!ENTITY lightning.imipbar.btnTentative2.tooltiptext                        "Accept event invitation tentatively">
+<!ENTITY lightning.imipbar.btnTentativeRecurrences.label                    "Tentative all">
+<!ENTITY lightning.imipbar.btnTentativeRecurrences2.tooltiptext             "Accept event invitation tentatively for all occurrences of the event">
+<!ENTITY lightning.imipbar.btnUpdate.label                                  "Update">
+<!ENTITY lightning.imipbar.btnUpdate.tooltiptext                            "Update event in calendar">
+<!ENTITY lightning.imipbar.description                                      "This message contains an invitation to an event.">
 
 <!-- Lightning specific keybindings -->
 <!ENTITY lightning.keys.event.showCalendar.key "C">
 <!ENTITY lightning.keys.event.showTasks.key "D">
 <!ENTITY lightning.keys.event.new "I">
 <!ENTITY lightning.keys.todo.new "D">
 
 <!-- Account Central page -->
--- a/calendar/chrome/lightning/lightning.properties
+++ b/calendar/chrome/lightning/lightning.properties
@@ -21,17 +21,17 @@ tabTitleTasks=Tasks
 imipHtml.header=Event Invitation
 imipHtml.summary=Title:
 imipHtml.location=Location:
 imipHtml.when=When:
 imipHtml.organizer=Organiser:
 imipHtml.description=Description:
 imipHtml.comment=Comment:
 imipHtml.attendees=Attendees:
-imipHtml.canceledOccurrences=Canceled Occurrences:
+imipHtml.canceledOccurrences=Cancelled Occurrences:
 imipHtml.modifiedOccurrences=Modified Occurrences:
 imipHtml.newLocation=New Location: %1$S
 
 imipAddToCalendar.label=Add To Calendar
 imipAddedItemToCal=Event Added to Calendar
 imipCanceledItem=Event has been deleted
 imipUpdatedItem=Event has been updated
 imipBarCancelText=This message contains an event cancellation.
@@ -40,23 +40,16 @@ imipBarPublishText=This message contains
 imipBarRequestText=This message contains an invitation to an event.
 imipBarUpdateText=This message contains an update to an existing event.
 imipBarAlreadyProcessedText=This message contains an event that has already been processed.
 imipBarProcessedNeedsAction=This message contains an event that you have not yet responded to.
 imipBarReplyText=This message contains a reply to an invitation.
 imipBarUnsupportedText=This message contains an event that this version of Lightning cannot process.
 imipBarProcessingFailed=Processing message failed. Status: %1$S.
 imipBarNotWritable=No writable calendars are configured for invitations, please check the calendar properties.
-imipAcceptInvitation.label=Accept
-imipCancelInvitation.label=Delete
-imipDeclineInvitation.label=Decline
-imipUpdate.label=Update
-imipDetails.label=Details…
-imipAcceptTentativeInvitation.label=Tentative
-imipSend.label=Send
 imipSendMail.title=Email Notification
 imipSendMail.text=Would you like to send out notification Email now?
 imipSendMail.Outlook2000CompatMode.text=Support Outlook 2000 and Outlook 2002/XP
 imipNoIdentity=None
 imipNoCalendarAvailable=There are no writable calendars available.
 
 itipReplySubject=Event Invitation Reply: %1$S
 itipReplyBodyAccept=%1$S has accepted your event invitation.
deleted file mode 100644
--- a/calendar/chrome/sunbird/aboutDialog.dtd
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- -*- Mode: HTML; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY aboutDialog.title      "About &brandFullName;">
-<!ENTITY copyright.label        "Credits">
-<!ENTITY copyright.accesskey    "C">
-<!ENTITY aboutLink.label        "&lt; About &brandFullName;">
-<!ENTITY aboutLink.accesskey    "A">
-<!ENTITY aboutVersion           "version">
-<!ENTITY copyrightText          "&#169;1998-2010 Contributors. All rights
-                                 reserved. Mozilla Sunbird, Sunbird, and the
-                                 Sunbird logos are trademarks of the Mozilla
-                                 Foundation. All rights reserved.">
-
-<!ENTITY brandMotto       "it's about time">
-<!ENTITY credit.thanks    "Special Thanks To">
-
-<!-- localization credits look like this: -->
-<!--
-<!ENTITY credit.translation
-  "<h3>Translators</h3><ul><li>Name Here</li></ul>">
--->
-<!ENTITY credit.translation "">
-
-<!ENTITY credit.powered     "Powered by">
-<!ENTITY license.and        "and">
-<!ENTITY cmdClose.macKey  "W">
deleted file mode 100644
--- a/calendar/chrome/sunbird/menuOverlay.dtd
+++ /dev/null
@@ -1,145 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY calendar.open.file.label                          "Open Calendar File…">
-<!ENTITY calendar.open.file.key                            "O">
-<!ENTITY calendar.open.file.accesskey                      "O">
-
-<!ENTITY event.edit.event                                  "Edit Selection…">
-<!ENTITY event.edit.event.key                              "E">
-<!ENTITY event.edit.event.accesskey                        "E">
-
-<!ENTITY event.delete.event                                "Delete Selected Events">
-<!ENTITY event.delete.event.accesskey                      "D">
-
-<!ENTITY event.delete.tasks                                "Delete Selected Tasks">
-<!ENTITY event.delete.tasks.accesskey                      "T">
-
-<!ENTITY calendar.pagesetup.label                          "Page Setup…">
-<!ENTITY calendar.pagesetup.accesskey                      "u">
-
-<!ENTITY calendar.subscribe.label                          "Subscribe to Remote Calendar…">
-<!ENTITY calendar.subscribe.accesskey                      "R">
-
-<!ENTITY calendar.synccalendars.label                      "Synchronise Calendars">
-<!ENTITY calendar.synccalendars.key                        "R">
-<!ENTITY calendar.synccalendars.accesskey                  "S">
-
-<!ENTITY calendar.publish.calendar.label                   "Publish Calendar…">
-<!ENTITY calendar.publish.calendar.accesskey               "b">
-<!ENTITY calendar.publish.selection.label                  "Publish Selection…">
-<!ENTITY calendar.publish.selection.accesskey              "c">
-
-<!ENTITY calendar.quit.label                               "Quit">
-<!ENTITY calendar.quit.accesskey                           "Q">
-<!ENTITY calendar.quit.key                                 "Q">
-<!ENTITY calendar.quit.label.mac                           "Quit &brandShortName;">
-
-<!ENTITY calendar.exit.label                               "Exit">
-<!ENTITY calendar.exit.accesskey                           "x">
-
-<!ENTITY calendar.undo.label                               "Undo">
-<!ENTITY calendar.undo.key                                 "Z">
-<!ENTITY calendar.undo.accesskey                           "u">
-
-<!ENTITY calendar.redo.label                               "Redo">
-<!ENTITY calendar.redo.key                                 "Y">
-<!ENTITY calendar.redo.accesskey                           "r">
-
-<!ENTITY calendar.cut.label                                "Cut">
-<!ENTITY calendar.cut.key                                  "X">
-<!ENTITY calendar.cut.accesskey                            "t">
-
-<!ENTITY calendar.copy.label                               "Copy">
-<!ENTITY calendar.copy.key                                 "C">
-<!ENTITY calendar.copy.accesskey                           "C">
-
-<!ENTITY calendar.paste.label                              "Paste">
-<!ENTITY calendar.paste.key                                "V">
-<!ENTITY calendar.paste.accesskey                          "P">
-
-<!ENTITY calendar.selectall.label                          "Select All">
-<!ENTITY calendar.selectall.key                            "A">
-<!ENTITY calendar.selectall.accesskey                      "A">
-
-<!ENTITY toolbarsMenu.label                                "Toolbars">
-<!ENTITY toolbarsMenu.accesskey                            "T">
-
-<!ENTITY showStatusBarCmd.label                            "Status Bar">
-<!ENTITY showStatusBarCmd.accesskey                        "B">
-
-<!ENTITY showTaskBoxCmd.label                              "Task List">
-<!ENTITY showTaskBoxCmd.accesskey                          "L">
-
-<!ENTITY calendar.fullscreen.label                         "Full Screen">
-<!ENTITY calendar.fullscreen.accesskey                     "F">
-
-<!ENTITY calendar.addons.label                             "Add-ons">
-<!ENTITY calendar.addons.accesskey                         "d">
-
-<!ENTITY goMenu.label                                      "Go">
-<!ENTITY goMenu.accesskey                                  "G">
-
-<!ENTITY goDateCmd.label                                   "Date…">
-<!ENTITY goDateCmd.accesskey                               "D">
-
-<!ENTITY toolsMenu.label                                   "Tools">
-<!ENTITY toolsMenu.accesskey                               "T">
-
-<!ENTITY errorConsoleCmd.label                             "Error Console">
-<!ENTITY errorConsoleCmd.accesskey                         "C">
-
-<!ENTITY helpMenu.label                                    "Help">
-<!ENTITY helpMenu.accesskey                                "H">
-<!-- LOCALIZATION NOTE some localizations of Windows use "?"
-           for the help button in the menubar but Gnome does not.   -->
-<!ENTITY helpMenuWin.label                                 "Help">
-<!ENTITY helpMenuWin.accesskey                             "H">
-
-<!ENTITY fileMenu.label                                    "File">
-<!ENTITY fileMenu.accesskey                                "F">
-
-<!ENTITY editMenu.label                                    "Edit">
-<!ENTITY editMenu.accesskey                                "E">
-
-<!ENTITY optionsCmd.label                                  "Options…">
-<!ENTITY optionsCmd.accesskey                              "O">
-
-<!ENTITY preferencesCmd.label                              "Preferences">
-<!ENTITY preferencesCmd.accesskey                          "n">
-<!ENTITY preferencesCmdMac.label                           "Preferences…">
-<!ENTITY preferencesCmdMac.commandkey                      ",">
-<!ENTITY preferencesCmdMac.modifiers                       "accel">
-
-<!ENTITY viewMenu.label                                    "View">
-<!ENTITY viewMenu.accesskey                                "V">
-
-<!ENTITY releaseCmd.label                                  "Release Notes">
-<!ENTITY releaseCmd.accesskey                              "R">
-
-<!ENTITY aboutCmd.label                                    "About &brandFullName;">
-<!ENTITY aboutCmd.accesskey                                "A">
-
-<!ENTITY updateCmd.label                                   "Check for Updates…">
-<!ENTITY updateCmd.accesskey                               "o">
-
-<!ENTITY sunbird.export.calendar.label                     "Export Calendar…">
-<!ENTITY sunbird.export.calendar.accesskey                 "E">
-
-<!-- Mac OS X "Window" menu items -->
-<!ENTITY windowMenu.label                                  "Window">
-<!ENTITY minimizeWindow.label                              "Minimise">
-<!ENTITY zoomWindow.label                                  "Zoom">
-<!ENTITY minimizeWindow.key                                "M">
-<!ENTITY bringAllToFront.label                             "Bring All to Front">
-
-<!-- Mac OS X Application menu items -->
-<!ENTITY servicesMenuMac.label                             "Services">
-<!ENTITY hideThisAppCmdMac.label                           "Hide &brandShortName;">
-<!ENTITY hideThisAppCmdMac.commandkey                      "H">
-<!ENTITY hideThisAppCmdMac.modifiers                       "accel">
-<!ENTITY hideOtherAppsCmdMac.label                         "Hide Others">
-<!ENTITY hideOtherAppsCmdMac.commandkey                    "H">
-<!ENTITY hideOtherAppsCmdMac.modifiers                     "accel,alt">
-<!ENTITY showAllAppsCmdMac.label                           "Show All">
deleted file mode 100644
--- a/calendar/chrome/sunbird/sunbird.dtd
+++ /dev/null
@@ -1,72 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY sunbird.choosedate.button.tooltip                 "Choose date to go to" >
-<!ENTITY sunbird.cut.button.tooltip                        "Cut" >
-<!ENTITY sunbird.copy.button.tooltip                       "Copy" >
-<!ENTITY sunbird.paste.button.tooltip                      "Paste" >
-<!ENTITY sunbird.print.button.tooltip                      "Print calendar" >
-<!ENTITY sunbird.delete.button.tooltip                     "Delete selected event" >
-<!ENTITY sunbird.remotereload.button.tooltip               "Reload all remote calendars" >
-<!ENTITY sunbird.import.button.tooltip                     "Import events from a local file" >
-<!ENTITY sunbird.export.button.tooltip                     "Export events to a local file" >
-<!ENTITY sunbird.subscribe.button.tooltip                  "Subscribe to a calendar file on a remote machine" >
-<!ENTITY sunbird.publish.button.tooltip                    "Publish events to a remote machine" >
-<!ENTITY sunbird.unifinder.button.tooltip                  "Find and list events" >
-<!ENTITY sunbird.edit.button.tooltip                       "Edit selected event" >
-
-<!ENTITY sunbird.choosedate.button.label                   "Choose Date" >
-<!ENTITY sunbird.cut.button.label                          "Cut" >
-<!ENTITY sunbird.copy.button.label                         "Copy" >
-<!ENTITY sunbird.paste.button.label                        "Paste" >
-<!ENTITY sunbird.delete.button.label                       "Delete" >
-<!ENTITY sunbird.remotereload.button.label                 "Reload" >
-<!ENTITY sunbird.import.button.label                       "Import" >
-<!ENTITY sunbird.export.button.label                       "Export" >
-<!ENTITY sunbird.subscribe.button.label                    "Subscribe" >
-<!ENTITY sunbird.publish.button.label                      "Publish" >
-<!ENTITY sunbird.unifinder.button.label                    "Find Events" >
-<!ENTITY sunbird.edit.button.label                         "Edit" >
-
-<!ENTITY sunbird.flat.topbar.choosedate                    "Go to Date" >
-<!ENTITY sunbird.flat.topbar.dayview                       "Day View" >
-<!ENTITY sunbird.flat.topbar.weekview                      "Week View" >
-<!ENTITY sunbird.flat.topbar.monthview                     "Month View" >
-<!ENTITY sunbird.flat.topbar.multiweekview                 "Multiweek View" >
-
-<!ENTITY sunbird.dayview.accesskey                         "D" >
-<!ENTITY sunbird.weekview.accesskey                        "W" >
-<!ENTITY sunbird.monthview.accesskey                       "M" >
-<!ENTITY sunbird.multiweekview.accesskey                   "u" >
-
-
-<!ENTITY sunbird.calendartab.label                         "Date">
-<!ENTITY sunbird.listofcalendarstab.label                  "Calendars">
-
-<!ENTITY sunbird.find.key                                  "F">
-<!ENTITY sunbird.close.key                                 "W">
-
-<!ENTITY sunbird.menu.numberofweeks.label                  "Number of Weeks" >
-<!ENTITY sunbird.menu.numberofweeks.accesskey              "N" >
-<!ENTITY sunbird.menu.numberofweeks.1                      "1 Week" >
-<!ENTITY sunbird.menu.numberofweeks.2                      "2 Weeks" >
-<!ENTITY sunbird.menu.numberofweeks.3                      "3 Weeks" >
-<!ENTITY sunbird.menu.numberofweeks.4                      "4 Weeks" >
-<!ENTITY sunbird.menu.numberofweeks.5                      "5 Weeks" >
-<!ENTITY sunbird.menu.numberofweeks.6                      "6 Weeks" >
-
-<!-- customizable toolbars -->
-<!ENTITY sunbird.context.customize.label                   "Customise…">
-<!ENTITY sunbird.context.customize.accesskey               "C">
-<!ENTITY sunbird.menu.customize.label                      "Customise Toolbar…">
-<!ENTITY sunbird.menu.customize.accesskey                  "C">
-<!ENTITY sunbird.maintoolbar.name                          "Main Toolbar">
-<!ENTITY sunbird.maintoolbar.accesskey                     "M">
-
-<!-- Sunbird Help -->
-<!ENTITY sunbird.help.label                                "Help Contents">
-<!ENTITY sunbird.help.accesskey                            "H">
-
-<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
-<!ENTITY mainWindow.title                                  "&brandFullName;">
deleted file mode 100644
--- a/calendar/defines.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-#filter emptyLines
-
-#define MOZ_LANGPACK_CREATOR Mark Tyndall
-
-# If non-English locales wish to credit multiple contributors, uncomment this
-# variable definition and use the format specified.
-#define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>Ian Neal</em:contributor>
-
-#unfilter emptyLines
deleted file mode 100644
--- a/calendar/extra-jar.mn
+++ /dev/null
@@ -1,8 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# this is an empty file
-# locales can ship "extra" files from here, to ship a custom set
-# of files for the help system
-# do not put any blank lines in this file
deleted file mode 100644
--- a/calendar/installer/custom.properties
+++ /dev/null
@@ -1,70 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# LOCALIZATION NOTE:
-
-# This file must be saved as UTF8
-
-# Accesskeys are defined by prefixing the letter that is to be used for the
-# accesskey with an ampersand (e.g. &).
-
-# Do not replace $BrandShortName, $BrandFullName, or $BrandFullNameDA with a
-# custom string and always use the same one as used by the en-US files.
-# $BrandFullNameDA allows the string to contain an ampersand (e.g. DA stands
-# for double ampersand) and prevents the letter following the ampersand from
-# being used as an accesskey.
-
-# You can use \n to create a newline in the string but only when the string
-# from en-US contains a \n.
-
-CONTEXT_OPTIONS=$BrandShortName &Options
-CONTEXT_SAFE_MODE=$BrandShortName &Safe Mode
-SAFE_MODE=Safe Mode
-OPTIONS_PAGE_TITLE=Setup Type
-OPTIONS_PAGE_SUBTITLE=Choose setup options
-SHORTCUTS_PAGE_TITLE=Set Up Shortcuts
-SHORTCUTS_PAGE_SUBTITLE=Create Program Icons
-SUMMARY_PAGE_TITLE=Summary
-SUMMARY_PAGE_SUBTITLE=Ready to start installing $BrandShortName
-SUMMARY_INSTALLED_TO=$BrandShortName will be installed to the following location:
-SUMMARY_REBOOT_REQUIRED_INSTALL=A restart of your computer may be required to complete the installation.
-SUMMARY_REBOOT_REQUIRED_UNINSTALL=A restart of your computer may be required to complete the uninstall.
-SUMMARY_CLICK=Click Install to continue.
-LAUNCH_TEXT=&Launch $BrandShortName now
-CREATE_ICONS_DESC=Create icons for $BrandShortName:
-ICONS_DESKTOP=On my &Desktop
-ICONS_STARTMENU=In my &Start Menu Programs folder
-ICONS_QUICKLAUNCH=In my &Quick Launch bar
-WARN_MANUALLY_CLOSE_APP_INSTALL=$BrandShortName must be closed to proceed with the installation.\n\nPlease close $BrandShortName to continue.
-WARN_MANUALLY_CLOSE_APP_UNINSTALL=$BrandShortName must be closed to proceed with the uninstall.\n\nPlease close $BrandShortName to continue.
-WARN_MANUALLY_CLOSE_APP_LAUNCH=$BrandShortName is already running.\n\nPlease close $BrandShortName prior to launching the version you have just installed.
-WARN_WRITE_ACCESS=You don't have access to write to the installation directory.\n\nClick OK to select a different directory.
-WARN_DISK_SPACE=You don't have sufficient disc space to install to this location.\n\nClick OK to select a different location.
-WARN_MIN_SUPPORTED_OS_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer.
-WARN_RESTART_REQUIRED_UNINSTALL=Your computer must be restarted to complete a previous uninstall of $BrandShortName. Do you want to reboot now?
-WARN_RESTART_REQUIRED_UPGRADE=Your computer must be restarted to complete a previous upgrade of $BrandShortName. Do you want to reboot now?
-ERROR_CREATE_DIRECTORY_PREFIX=Error creating directory:
-ERROR_CREATE_DIRECTORY_SUFFIX=Click Cancel to stop the installation or\nRetry to try again.
-
-UN_CONFIRM_PAGE_TITLE=Uninstall $BrandFullName
-UN_CONFIRM_PAGE_SUBTITLE=Remove $BrandFullName from your computer.
-UN_CONFIRM_UNINSTALLED_FROM=$BrandShortName will be uninstalled from the following location:
-UN_CONFIRM_CLICK=Click Uninstall to continue.
-
-BANNER_CHECK_EXISTING=Checking existing installation…
-
-STATUS_INSTALL_APP=Installing $BrandShortName…
-STATUS_INSTALL_LANG=Installing Language Files (${AB_CD})…
-STATUS_UNINSTALL_MAIN=Uninstalling $BrandShortName…
-STATUS_CLEANUP=A Little Housekeeping…
-
-# _DESC strings support approximately 65 characters per line.
-# One line
-OPTIONS_SUMMARY=Choose the type of setup you prefer, then click Next.
-# One line
-OPTION_STANDARD_DESC=$BrandShortName will be installed with the most common options.
-OPTION_STANDARD_RADIO=&Standard
-# Two lines
-OPTION_CUSTOM_DESC=You may choose individual options to be installed. Recommended for experienced users.
-OPTION_CUSTOM_RADIO=&Custom
deleted file mode 100644
--- a/calendar/installer/mui.properties
+++ /dev/null
@@ -1,65 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# To make the l10n tinderboxen see changes to this file you can change a value
-# name by adding - to the end of the name followed by chars (e.g. Branding-2).
-
-# LOCALIZATION NOTE:
-
-# This file must be saved as UTF8
-
-# Accesskeys are defined by prefixing the letter that is to be used for the
-# accesskey with an ampersand (e.g. &).
-
-# Do not replace $BrandShortName, $BrandFullName, or $BrandFullNameDA with a
-# custom string and always use the same one as used by the en-US files.
-# $BrandFullNameDA allows the string to contain an ampersand (e.g. DA stands
-# for double ampersand) and prevents the letter following the ampersand from
-# being used as an accesskey.
-
-# You can use \n to create a newline in the string but only when the string
-# from en-US contains a \n.
-
-MUI_TEXT_WELCOME_INFO_TITLE=Welcome to the $BrandFullNameDA Setup Wizard
-MUI_TEXT_WELCOME_INFO_TEXT=This wizard will guide you through the installation of $BrandFullNameDA.\n\nIt is recommended that you close all other applications before starting Setup. This will make it possible to update relevant system files without having to reboot your computer.\n\n$_CLICK
-MUI_TEXT_LICENSE_TITLE=Licence Agreement
-MUI_TEXT_LICENSE_SUBTITLE=Please review the licence terms before installing $BrandFullNameDA.
-MUI_INNERTEXT_LICENSE_TOP=Press Page Down to see the rest of the agreement.
-MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX=If you accept the terms of the agreement, tick the box below. You must accept the agreement to install $BrandFullNameDA. $_CLICK
-MUI_TEXT_COMPONENTS_TITLE=Choose Components
-MUI_TEXT_COMPONENTS_SUBTITLE=Choose which features of $BrandFullNameDA you want to install.
-MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE=Description
-MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO=Position your mouse over a component to see its description.
-MUI_TEXT_DIRECTORY_TITLE=Choose Install Location
-MUI_TEXT_DIRECTORY_SUBTITLE=Choose the folder in which to install $BrandFullNameDA.
-MUI_TEXT_INSTALLING_TITLE=Installing
-MUI_TEXT_INSTALLING_SUBTITLE=Please wait while $BrandFullNameDA is being installed.
-MUI_TEXT_FINISH_TITLE=Installation Complete
-MUI_TEXT_FINISH_SUBTITLE=Setup was completed successfully.
-MUI_TEXT_ABORT_TITLE=Installation Aborted
-MUI_TEXT_ABORT_SUBTITLE=Setup was not completed successfully.
-MUI_BUTTONTEXT_FINISH=&Finish
-MUI_TEXT_FINISH_INFO_TITLE=Completing the $BrandFullNameDA Setup Wizard
-MUI_TEXT_FINISH_INFO_TEXT=$BrandFullNameDA has been installed on your computer.\n\nClick Finish to close this wizard.
-MUI_TEXT_FINISH_INFO_REBOOT=Your computer must be restarted in order to complete the installation of $BrandFullNameDA. Do you want to reboot now?
-MUI_TEXT_FINISH_REBOOTNOW=Reboot now
-MUI_TEXT_FINISH_REBOOTLATER=I want to manually reboot later
-MUI_TEXT_STARTMENU_TITLE=Choose Start Menu Folder
-MUI_TEXT_STARTMENU_SUBTITLE=Choose a Start Menu folder for the $BrandFullNameDA shortcuts.
-MUI_INNERTEXT_STARTMENU_TOP=Select the Start Menu folder in which you would like to create the program's shortcuts. You can also enter a name to create a new folder.
-MUI_TEXT_ABORTWARNING=Are you sure you want to quit $BrandFullName Setup?
-MUI_UNTEXT_WELCOME_INFO_TITLE=Welcome to the $BrandFullNameDA Uninstall Wizard
-MUI_UNTEXT_WELCOME_INFO_TEXT=This wizard will guide you through the uninstallation of $BrandFullNameDA.\n\nBefore starting the uninstallation, make sure $BrandFullNameDA is not running.\n\n$_CLICK
-MUI_UNTEXT_CONFIRM_TITLE=Uninstall $BrandFullNameDA
-MUI_UNTEXT_CONFIRM_SUBTITLE=Remove $BrandFullNameDA from your computer.
-MUI_UNTEXT_UNINSTALLING_TITLE=Uninstalling
-MUI_UNTEXT_UNINSTALLING_SUBTITLE=Please wait while $BrandFullNameDA is being uninstalled.
-MUI_UNTEXT_FINISH_TITLE=Uninstallation Complete
-MUI_UNTEXT_FINISH_SUBTITLE=Uninstall was completed successfully.
-MUI_UNTEXT_ABORT_TITLE=Uninstallation Aborted
-MUI_UNTEXT_ABORT_SUBTITLE=Uninstall was not completed successfully.
-MUI_UNTEXT_FINISH_INFO_TITLE=Completing the $BrandFullNameDA Uninstall Wizard
-MUI_UNTEXT_FINISH_INFO_TEXT=$BrandFullNameDA has been uninstalled from your computer.\n\nClick Finish to close this wizard.
-MUI_UNTEXT_FINISH_INFO_REBOOT=Your computer must be restarted in order to complete the uninstallation of $BrandFullNameDA. Do you want to reboot now?
-MUI_UNTEXT_ABORTWARNING=Are you sure you want to quit $BrandFullName Uninstall?
deleted file mode 100644
--- a/calendar/installer/override.properties
+++ /dev/null
@@ -1,86 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# LOCALIZATION NOTE:
-
-# This file must be saved as UTF8
-
-# Accesskeys are defined by prefixing the letter that is to be used for the
-# accesskey with an ampersand (e.g. &).
-
-# Do not replace $BrandShortName, $BrandFullName, or $BrandFullNameDA with a
-# custom string and always use the same one as used by the en-US files.
-# $BrandFullNameDA allows the string to contain an ampersand (e.g. DA stands
-# for double ampersand) and prevents the letter following the ampersand from
-# being used as an accesskey.
-
-# You can use \n to create a newline in the string but only when the string
-# from en-US contains a \n.
-
-# Strings that require a space at the end should be enclosed with double
-# quotes and the double quotes will be removed. To add quotes to the beginning
-# and end of a strong enclose the add and additional double quote to the
-# beginning and end of the string (e.g. ""This will include quotes"").
-
-SetupCaption=$BrandFullName Setup
-UninstallCaption=$BrandFullName Uninstall
-BackBtn=< &Back
-NextBtn=&Next >
-AcceptBtn=I &accept the terms in the Licence Agreement
-DontAcceptBtn=I &do not accept the terms in the Licence Agreement
-InstallBtn=&Install
-UninstallBtn=&Uninstall
-CancelBtn=Cancel
-CloseBtn=&Close
-BrowseBtn=B&rowse...
-ShowDetailsBtn=Show &details
-ClickNext=Click Next to continue.
-ClickInstall=Click Install to start the installation.
-ClickUninstall=Click Uninstall to start the uninstallation.
-Completed=Completed
-LicenseTextRB=Please review the licence agreement before installing $BrandFullNameDA. If you accept all terms of the agreement, select the first option below. $_CLICK
-ComponentsText=Tick the components you want to install and clear the components you don't want to install. $_CLICK
-ComponentsSubText2_NoInstTypes=Select components to install:
-DirText=Setup will install $BrandFullNameDA in the following folder. To install in a different folder, click Browse and select another folder. $_CLICK
-DirSubText=Destination Folder
-DirBrowseText=Select the folder to install $BrandFullNameDA in:
-SpaceAvailable="Space available: "
-SpaceRequired="Space required: "
-UninstallingText=$BrandFullNameDA will be uninstalled from the following folder. $_CLICK
-UninstallingSubText=Uninstalling from:
-FileError=Error opening file for writing: \r\n\r\n$0\r\n\r\nClick Abort to stop the installation,\r\nRetry to try again, or\r\nIgnore to skip this file.
-FileError_NoIgnore=Error opening file for writing: \r\n\r\n$0\r\n\r\nClick Retry to try again, or\r\nCancel to stop the installation.
-CantWrite="Can't write: "
-CopyFailed=Copy failed
-CopyTo="Copy to "
-Registering="Registering: "
-Unregistering="Unregistering: "
-SymbolNotFound="Could not find symbol: "
-CouldNotLoad="Could not load: "
-CreateFolder="Create folder: "
-CreateShortcut="Create shortcut: "
-CreatedUninstaller="Created uninstaller: "
-Delete="Delete file: "
-DeleteOnReboot="Delete on reboot: "
-ErrorCreatingShortcut="Error creating shortcut: "
-ErrorCreating="Error creating: "
-ErrorDecompressing=Error decompressing data! Corrupted installer?
-ErrorRegistering=Error registering DLL
-ExecShell="ExecShell: "
-Exec="Execute: "
-Extract="Extract: "
-ErrorWriting="Extract: error writing to file "
-InvalidOpcode=Installer corrupted: invalid opcode
-NoOLE="No OLE for: "
-OutputFolder="Output folder: "
-RemoveFolder="Remove folder: "
-RenameOnReboot="Rename on reboot: "
-Rename="Rename: "
-Skipped="Skipped: "
-CopyDetails=Copy Details To Clipboard
-LogInstall=Log install process
-Byte=B
-Kilo=k
-Mega=M
-Giga=G
deleted file mode 100644
--- a/calendar/sunbird-l10n.js
+++ /dev/null
@@ -1,23 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#filter substitution
-
-# the default day to start the week on
-#0=Sunday 1=Monday 2=Tuesday 3=Wednesday 4=Thursday 5=Friday 6=Saturday
-pref("calendar.week.start", 0);
-
-# default days off (not in work week)
-pref("calendar.week.d0sundaysoff", true);
-pref("calendar.week.d1mondaysoff", false);
-pref("calendar.week.d2tuesdaysoff", false);
-pref("calendar.week.d3wednesdaysoff", false);
-pref("calendar.week.d4thursdaysoff", false);
-pref("calendar.week.d5fridaysoff", false);
-pref("calendar.week.d6saturdaysoff", true);
-
-pref("general.useragent.locale", "@AB_CD@");
-
-# categories
-pref("calendar.categories.names", "Anniversary,Birthday,Business,Calls,Clients,Competition,Customer,Favourites,Follow up,Gifts,Holidays,Ideas,Issues,Meeting,Miscellaneous,Personal,Projects,Public Holiday,Status,Suppliers,Travel,Vacation");
deleted file mode 100644
--- a/calendar/updater/updater.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-; This file is in the UTF-8 encoding
-[Strings]
-TitleText=%MOZ_APP_DISPLAYNAME% Update
-InfoText=%MOZ_APP_DISPLAYNAME% is installing your updates and will start in a few moments…
new file mode 100644
--- /dev/null
+++ b/chat/contacts.properties
@@ -0,0 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE (defaultGroup):
+# This is the name of the group that will automatically be created when adding a
+# buddy without specifying a group.
+defaultGroup=Contacts
--- a/chat/conversations.properties
+++ b/chat/conversations.properties
@@ -34,16 +34,20 @@ statusUnknown=Your account is disconnect
 
 accountDisconnected=Your account is disconnected.
 accountReconnected=Your account has been reconnected.
 
 # LOCALIZATION NOTE (autoReply):
 #  %S is replaced by the text of a message that was sent as an automatic reply.
 autoReply=Auto-reply - %S
 
+# LOCALIZATION NOTE (noTopic):
+# Displayed instead of the topic when no topic is set.
+noTopic=No topic message for this room.
+
 # LOCALIZATION NOTE (topicSet):
 #  %1$S is the conversation name, %2$S is the topic.
 topicSet=The topic for %1$S is: %2$S.
 # LOCALIZATION NOTE (topicNotSet):
 #  %S is the conversation name.
 topicNotSet=There is no topic for %S.
 # LOCALIZATION NOTE (topicChanged):
 #  %1$S is the user who changed the topic, %2$S is the new topic.
new file mode 100644
--- /dev/null
+++ b/chat/imtooltip.properties
@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+buddy.username=Username
+buddy.account=Account
+contact.tags=Tags
--- a/chat/irc.properties
+++ b/chat/irc.properties
@@ -26,22 +26,18 @@ joinChat.password=_Password
 #   account wizard windows.
 options.server=Server
 options.port=Port
 options.ssl=Use SSL
 options.encoding=Character Set
 options.quitMessage=Quit message
 options.partMessage=Part message
 options.showServerTab=Show messages from the server
+options.alternateNicks=Alternate nicks
 
-# LOCALIZATION NOTE (ctcp.ping): Semi-colon list of plural forms.
-#  See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-#   %1$S is the nickname of the user who was pinged.
-#   #2 is the delay (in seconds).
-ctcp.ping=Ping reply from %1$S in #2 second.;Ping reply from %1$S in #2 seconds.
 # LOCALIZATION NOTE (ctcp.version):
 #   %1$S is the nickname of the user whose version was requested.
 #   %2$S is the version response from the client.
 ctcp.version=%1$S is using "%2$S"
 # LOCALIZATION NOTE (ctcp.time):
 #   %1$S is the nickname of the user whose time was requested.
 #   %2$S is the time response.
 ctcp.time=The time for %1$S is %2$S.
@@ -50,17 +46,17 @@ ctcp.time=The time for %1$S is %2$S.
 #   These are the help messages for each command, the %S is the command name
 #   Each command first gives the parameter it accepts and then a description of
 #   the command.
 command.action=%S &lt;action to perform&gt;: Perform an action.
 command.ctcp=%S &lt;nick&gt; &lt;msg&gt;: Sends a CTCP message to the nick.
 command.chanserv=%S &lt;command&gt;: Send a command to ChanServ.
 command.deop=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Remove channel operator status from someone. You must be a channel operator to do this.
 command.devoice=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this.
-command.invite=%S &lt;nick&gt; [&lt;room&gt;]: Invite someone to join you in the specified channel, or the current channel.
+command.invite2=%S &lt;nick&gt;[ &lt;nick&gt;]* [&lt;channel&gt;]: Invite one or more nicks to join you in the current channel, or to join the specified channel.
 command.join=%S &lt;room1&gt;[ &lt;key1&gt;][,&lt;room2&gt;[ &lt;key2&gt;]]*: Enter one or more channels, optionally providing a channel key for each if needed.
 command.kick=%S &lt;nick&gt; [&lt;message&gt;]: Remove someone from a channel. You must be a channel operator to do this.
 command.list=%S: Display a list of chat rooms on the network. Warning, some servers may disconnect you upon doing this.
 command.memoserv=%S &lt;command&gt;: Send a command to MemoServ.
 command.modeUser=%S (+|-)&lt;new mode&gt; [&lt;nick&gt;]: Set or unset a user's mode.
 command.modeChannel=%S &lt;channel&gt;[ (+|-)&lt;new mode&gt; [&lt;parameter&gt;][,&lt;parameter&gt;]*]: Get, set or unset a channel mode.
 command.msg=%S &lt;nick&gt; &lt;message&gt;: Send a private message to a user (as opposed to a channel).
 command.nick=%S &lt;new nickname&gt;: Change your nickname.
@@ -116,16 +112,19 @@ message.quit=%1$S has left the room (Qui
 #    The paramter is the quit message given by the user.
 message.quit2=: %S
 #    %1$S is the nickname of the user that invited us, %2$S is the conversation
 #    name.
 message.inviteReceived=%1$S has invited you to %2$S.
 #    %1$S is the nickname of the invited user, %2$S is the conversation name
 #    they were invited to.
 message.invited=%1$S was successfully invited to %2$S.
+#    %1$S is the nickname of the invited user, %2$S is the conversation name
+#    they were invited to but are already in
+message.alreadyInChannel=%1$S is already in %2$S.
 #    %S is the nickname of the user who was summoned.
 message.summoned=%S was summoned.
 #    %S is the nickname of the user whose WHOIS information follows this message.
 message.whois=WHOIS information for %S:
 #    %1$S is the nickname of the (offline) user whose WHOWAS information follows this message.
 message.whowas=%1$S is offline. WHOWAS information for %1$S:
 #    %1$S is the entry description (from tooltip.*), %2$S is its value.
 message.whoisEntry=\ua0\ua0\ua0\ua0%1$S: %2$S
@@ -135,38 +134,49 @@ message.unknownNick=%S is an unknown nic
 #    channel key (password).
 message.channelKeyAdded=%1$S changed the channel password to %2$S.
 message.channelKeyRemoved=%S removed the channel password.
 #    This will be followed by a list of ban masks.
 message.banMasks=Users connected from the following locations are banned from %S:
 message.noBanMasks=There are no banned locations for %S.
 message.banMaskAdded=Users connected from locations matching %1$S have been banned by %2$S.
 message.banMaskRemoved=Users connected from locations matching %1$S are no longer banned by %2$S.
+# LOCALIZATION NOTE (message.ping): Semi-colon list of plural forms.
+#  See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+#   %1$S is the nickname of the user or the server that was pinged.
+#   #2 is the delay (in milliseconds).
+message.ping=Ping reply from %1$S in #2 millisecond.;Ping reply from %1$S in #2 milliseconds.
+
 
 # LOCALIZATION NOTE (error.*):
 #    These are shown as error messages in the conversation.
 #    %S is the channel name.
 error.noChannel=There is no channel: %S.
 error.tooManyChannels=Cannot join %S; you've joined too many channels.
 #    %1$S is your new nick, %2$S is the kill message from the server.
 error.nickCollision=Nick already in use, changing nick to %1$S [%2$S].
 error.erroneousNickname=%S is not an allowed nickname.
 error.banned=You are banned from this server.
 error.bannedSoon=You will soon be banned from this server.
 error.mode.wrongUser=You cannot change modes for other users.
 #    %S is the nickname or channel name that isn't available.
 error.noSuchNick=%S is not online.
 error.wasNoSuchNick=There was no nickname: %S
 error.noSuchChannel=There is no channel: %S.
+error.unavailable=%S is temporarily unavailable.
 #    %S is the channel name.
+error.channelBanned=You have been banned from %S.
 error.cannotSendToChannel=You cannot send messages to %S.
+error.channelFull=The channel %S is full.
+error.inviteOnly=You must be invited to join %S.
 error.nonUniqueTarget=%S is not a unique user@host or shortname or you have tried to join too many channels at once.
 error.notChannelOp=You are not a channel operator on %S.
 error.notChannelOwner=You are not a channel owner of %S.
 error.wrongKey=Cannot join %S, invalid channel password.
+error.sendMessageFailed=An error occurred while sending your last message. Please try again once the connection has been reestablished.
 
 # LOCALIZATION NOTE (tooltip.*):
 #    These are the descriptions given in a tooltip with information received
 #    from a whois response.
 #    The human readable ("realname") description of the user.
 tooltip.realname=Name
 tooltip.server=Connected to
 #    The username and hostname that the user connects from (usually based on the
@@ -175,17 +185,19 @@ tooltip.server=Connected to
 tooltip.connectedFrom=Connected from
 tooltip.registered=Registered
 tooltip.registeredAs=Registered as
 tooltip.secure=Using a secure connection
 # The away message of the user
 tooltip.away=Away
 tooltip.ircOp=IRC Operator
 tooltip.bot=Bot
-tooltip.idleTime=Idle for
+tooltip.lastActivity=Last activity
+# %S is the timespan elapsed since the last activity.
+tooltip.timespan=%S ago
 tooltip.channels=Currently on
 
 #    %1$S is the server name, %2$S is some generic server information (usually a
 #    location or the date the user was last seen).
 tooltip.serverValue=%1$S (%2$S)
 
 # LOCALIZATION NOTE (yes, no):
 #  These are used to turn true/false values into a yes/no response.
new file mode 100644
--- /dev/null
+++ b/chat/logger.properties
@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE (badLogfile):
+#  %S is the filename of the log file.
+badLogfile=Empty or corrupt log file: %S
--- a/chat/status.properties
+++ b/chat/status.properties
@@ -8,11 +8,16 @@ unavailableStatusType=Unavailable
 offlineStatusType=Offline
 invisibleStatusType=Invisible
 idleStatusType=Idle
 mobileStatusType=Mobile
 # LOCALIZATION NOTE (unknownStatusType):
 # the status of a buddy is unknown when it's in the list of a disconnected account
 unknownStatusType=Unknown
 
+# LOCALIZATION NOTE (statusWithStatusMessage):
+# Used to display the status of a buddy together with its status message.
+# %1$S is the status type, %2$S is the status message text.
+statusWithStatusMessage=%1$S - %2$S
+
 # LOCALIZATION NOTE (messenger.status.defaultIdleAwayMessage):
 #  This will be the away message put automatically when the user is idle.
 messenger.status.defaultIdleAwayMessage=I am currently away from the computer.
--- a/chat/twitter.properties
+++ b/chat/twitter.properties
@@ -1,12 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+# LOCALIZATION NOTE (twitter.protocolName)
+#  This name is used whenever the name of the protocol is shown.
+twitter.protocolName=Twitter
+
 # LOCALIZATION NOTE (error.*):
 #   These are errors that will be shown to the user in conversation.
 error.tooLong=Status is over 140 characters.
 # LOCALIZATION NOTE (error.general, error.retweet, error.delete):
 #   %1$S will be either the error string returned by the twitter server,
 #   in English, inside parenthesis, or the empty string if we have no specific
 #   message for the error.
 #   %2$S is the message that caused the error.
@@ -102,8 +106,11 @@ tooltip.friends_count=Following
 tooltip.statuses_count=Tweets
 tooltip.followers_count=Followers
 tooltip.listed_count=Listed
 
 # LOCALIZATION NOTE (yes, no):
 #  These are used to turn true/false values into a yes/no response.
 yes=Yes
 no=No
+
+command.follow=%S &lt;username&gt;[ &lt;username&gt;]*: Start following a user / users.
+command.unfollow=%S &lt;username&gt;[ &lt;username&gt;]*: Stop following a user / users.
--- a/chat/xmpp.properties
+++ b/chat/xmpp.properties
@@ -56,42 +56,36 @@ tooltip.subscription=Subscription
 #   The _ character won't be displayed; it indicates the next
 #   character of the string should be used as the access key for this
 #   field.
 chatRoomField.room=_Room
 chatRoomField.server=_Server
 chatRoomField.nick=_Nick
 chatRoomField.password=_Password
 
-# LOCALIZATION NOTE
-#  Buddies that aren't in any group on the server will appear in this group.
-#  Try to use the same translation as for defaultGroup in instantbird.properties
-defaultGroup=Contacts
-
 # LOCALIZATION NOTE (options.*):
 #   These are the protocol specific options shown in the account manager and
 #   account wizard windows.
 options.resource=Resource
 options.priority=Priority
 options.connectionSecurity=Connection security
 options.connectionSecurity.requireEncryption=Require encryption
 options.connectionSecurity.opportunisticTLS=Use encryption if available
 options.connectionSecurity.allowUnencryptedAuth=Allow sending the password unencrypted
 options.connectServer=Server
 options.connectPort=Port
 
+# LOCALIZATION NOTE (*.protocolName)
+#  This name is used whenever the name of the protocol is shown.
+gtalk.protocolName=Google Talk
+odnoklassniki.protocolName=Odnoklassniki
+
 # LOCALIZATION NOTE (gtalk.usernameHint):
 #  This is displayed inside the accountUsernameInfoWithDescription
 #  string defined in imAccounts.properties when the user is
 #  configuring a Google Talk account.
 gtalk.usernameHint=email address
 
-# LOCALIZATION NOTE (vkontakte.usernameHint):
-#  This is displayed inside the accountUsernameInfoWithDescription
-#  string defined in imAccounts.properties when the user is
-#  configuring a Vkontakte account.
-vkontakte.usernameHint=Profile ID
-
 # LOCALIZATION NOTE (odnoklassniki.usernameHint):
 #  This is displayed inside the accountUsernameInfoWithDescription
 #  string defined in imAccounts.properties when the user is
 #  configuring a Odnoklassniki account.
 odnoklassniki.usernameHint=Profile ID
new file mode 100644
--- /dev/null
+++ b/chat/yahoo.properties
@@ -0,0 +1,37 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+login.error.badCredentials=Username or password is incorrect.
+login.error.accountLockedFailed=Account locked due to too many failed login attempts.
+login.error.accountLockedGeneral=Account locked due to too many login attempts.
+login.error.accountDeactivated=Account has been deactivated.
+login.error.usernameNotExist=The username does not exist.
+# The %S will be an error code returned by the server.
+login.error.unknown=Unknown error: %S
+network.error.http=HTTP connection error.
+
+conference.invite.message=Join my conference.
+
+# Some options are commented out because they aren't used. We do the same thing
+# to their description strings.
+options.pagerPort=Port
+options.transferHost=File transfer server
+options.transferPort=File transfer port
+options.chatEncoding=Encoding
+options.ignoreInvites=Ignore conference invitations
+
+# In this message, %S is replaced with the username of the user who left.
+system.message.conferenceLogoff=%S has left the conference.
+system.message.conferenceLogon=%S has joined the conference.
+
+# LOCALZIATION NOTE (command.*):
+#   These are the help messages for each command, the %S is the command name
+#   Each command first gives the parameter it accepts and then a description of
+#   the command.
+command.help.invite2=%S &lt;user1&gt;[,&lt;user2&gt;,...] [&lt;invite message&gt;]: invite one or more users into this conference chat.
+command.help.conference=%S: Create a new conference room in which you can later invite other users.
+
+# LOCALIZATION NOTE (command.feedback.invite):
+#   %S is the user, or comma separated list of users, invited to the conference.
+command.feedback.invite=You have invited %S to the conference.
--- a/dom/chrome/accessibility/AccessFu.properties
+++ b/dom/chrome/accessibility/AccessFu.properties
@@ -1,12 +1,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
+# Screen reader started/stopped
+screenReaderStarted = Screen reader started
+screenReaderStopped = Screen reader stopped
+
+# Roles
 menubar        =       menu bar
 scrollbar      =       scroll bar
 grip           =       grip
 alert          =       alert
 menupopup      =       menu popup
 document       =       document
 pane           =       pane
 dialog         =       dialogue
@@ -74,17 +79,17 @@ textarea       =       text area
 
 # Text input types
 textInputType_date   =       date
 textInputType_email  =       e-mail
 textInputType_search =       search
 textInputType_tel    =       telephone
 textInputType_url    =       URL
 
-# More sophisiticated object descriptions
+# More sophisticated object descriptions
 headingLevel   =       heading level %S
 
 # more sophisticated list announcement
 listStart      =       First item
 listEnd        =       Last item
 # LOCALIZATION NOTE (listItemsCount): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 listItemsCount =       1 item;#1 items
@@ -146,16 +151,18 @@ tabLoading     =      loading
 tabLoaded      =      loaded
 tabNew         =      new tab
 tabLoadStopped =      loading stopped
 tabReload      =      reloading
 
 # Object states
 stateChecked     =    ticked
 stateNotChecked  =    not ticked
+statePressed     =    pressed
+# No string for a not pressed toggle button
 stateExpanded    =    expanded
 stateCollapsed   =    collapsed
 stateUnavailable =    unavailable
 stateRequired    =    required
 stateTraversed   =    visited
 stateHasPopup    =    has pop up
 stateSelected    =    selected
 
@@ -163,18 +170,18 @@ stateSelected    =    selected
 editingMode    =      editing
 navigationMode =      navigating
 
 # Quick navigation modes
 quicknav_Simple      = Default
 quicknav_Anchor      = Anchors
 quicknav_Button      = Buttons
 quicknav_Combobox    = Combo boxes
+quicknav_Landmark    = Landmarks
 quicknav_Entry       = Entries
-quicknav_Landmark    = Landmarks
 quicknav_FormElement = Form elements
 quicknav_Graphic     = Images
 quicknav_Heading     = Headings
 quicknav_ListItem    = List items
 quicknav_Link        = Links
 quicknav_List        = Lists
 quicknav_PageTab     = Page tabs
 quicknav_RadioButton = Radio buttons
--- a/dom/chrome/appstrings.properties
+++ b/dom/chrome/appstrings.properties
@@ -1,16 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 malformedURI=The URL is not valid and cannot be loaded.
 fileNotFound=The file %S cannot be found. Please check the location and try again.
 dnsNotFound=%S could not be found. Please check the name and try again.
-protocolNotFound=%S is not a registered protocol.
+unknownProtocolFound=One of the following (%S) is not a registered protocol or is not allowed in this context.
 connectionFailure=The connection was refused when attempting to contact %S.
 netInterrupt=The connection to %S has terminated unexpectedly. Some data may have been transferred.
 netTimeout=The operation timed out when attempting to contact %S.
 redirectLoop=Redirection limit for this URL exceeded.  Unable to load the requested page.  This may be caused by cookies that are blocked.
 confirmRepostPrompt=To display this page, the application must send information that will repeat any action (such as a search or order confirmation) that was performed earlier.
 resendButton.label=Resend
 unknownSocketType=This document cannot be displayed unless you install the Personal Security Manager (PSM). Download and install PSM and try again, or contact your system administrator.
 netReset=The document contains no data.
deleted file mode 100644
--- a/dom/chrome/charsetTitles.properties
+++ /dev/null
@@ -1,107 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-## Rule of this file:
-## 1. key should always be in lower case ascii so we can do case insensitive
-##    comparison in the code faster.
-
-## Format of this file:
-## charset_name.title = a_title  -  specifies the human readable title for 
-## this charset
-
-us-ascii.title    = English (US-ASCII)
-iso-8859-1.title    = Western (ISO-8859-1)
-iso-8859-2.title    = Central European (ISO-8859-2)
-iso-8859-3.title    = South European (ISO-8859-3)
-iso-8859-4.title    = Baltic (ISO-8859-4)
-iso-8859-9.title    = Turkish (ISO-8859-9)
-iso-8859-10.title   = Nordic (ISO-8859-10)
-iso-8859-13.title   = Baltic (ISO-8859-13)
-iso-8859-14.title   = Celtic (ISO-8859-14)
-iso-8859-15.title   = Western (ISO-8859-15)
-iso-8859-16.title   = Romanian (ISO-8859-16)
-windows-1250.title  = Central European (Windows-1250)
-windows-1252.title  = Western (Windows-1252)
-windows-1254.title  = Turkish (Windows-1254)
-windows-1257.title  = Baltic (Windows-1257)
-macintosh.title         = Western (MacRoman)
-x-mac-ce.title          = Central European (MacCE)
-x-mac-turkish.title     = Turkish (MacTurkish)
-x-mac-croatian.title    = Croatian (MacCroatian)
-x-mac-romanian.title    = Romanian (MacRomanian)
-x-mac-icelandic.title   = Icelandic (MacIcelandic)
-iso-2022-jp.title = Japanese (ISO-2022-JP)
-shift_jis.title = Japanese (Shift_JIS)
-euc-jp.title = Japanese (EUC-JP)
-big5.title = Chinese Traditional (Big5)
-big5-hkscs.title = Chinese Traditional (Big5-HKSCS)
-x-euc-tw.title = Chinese Traditional (EUC-TW)
-gb2312.title = Chinese Simplified (GB2312)
-hz-gb-2312.title = Chinese Simplified (HZ)
-gbk.title = Chinese Simplified (GBK)
-iso-2022-cn.title = Chinese Simplified (ISO-2022-CN)
-euc-kr.title = Korean (EUC-KR)
-x-johab.title = Korean (JOHAB)
-iso-2022-kr.title = Korean (ISO-2022-KR)
-utf-7.title = Unicode (UTF-7)
-utf-8.title = Unicode (UTF-8)
-utf-16.title = Unicode (UTF-16)
-utf-16le.title = Unicode (UTF-16LE)
-utf-16be.title = Unicode (UTF-16BE)
-iso-8859-5.title = Cyrillic (ISO-8859-5)
-iso-ir-111.title = Cyrillic (ISO-IR-111)
-windows-1251.title = Cyrillic (Windows-1251)
-x-mac-cyrillic.title = Cyrillic (MacCyrillic)
-x-mac-ukrainian.title = Cyrillic/Ukrainian (MacUkrainian)
-koi8-r.title = Cyrillic (KOI8-R)
-koi8-u.title = Cyrillic/Ukrainian (KOI8-U)
-iso-8859-7.title = Greek (ISO-8859-7)
-windows-1253.title = Greek (Windows-1253)
-x-mac-greek.title = Greek (MacGreek)
-windows-1258.title = Vietnamese (Windows-1258)
-x-viet-tcvn5712.title = Vietnamese (TCVN)
-viscii.title = Vietnamese (VISCII)
-x-viet-vps.title = Vietnamese (VPS)
-tis-620.title = Thai (TIS-620)
-iso-8859-11.title = Thai (ISO-8859-11)
-windows-874.title = Thai (Windows-874)
-ibm874.title = Thai (IBM-874)
-armscii-8.title = Armenian (ARMSCII-8)
-iso-8859-6.title = Arabic (ISO-8859-6)
-iso-8859-6-i.title = Arabic (ISO-8859-6-I)
-iso-8859-6-e.title = Arabic (ISO-8859-6-E)
-iso-8859-8.title = Hebrew Visual (ISO-8859-8)
-iso-8859-8-i.title = Hebrew (ISO-8859-8-I)
-iso-8859-8-e.title = Hebrew (ISO-8859-8-E)
-windows-1255.title = Hebrew (Windows-1255)
-windows-1256.title = Arabic (Windows-1256)
-x-user-defined.title = User Defined
-ibm866.title = Cyrillic/Russian (CP-866)
-ibm850.title = Western (IBM-850)
-ibm852.title = Central European (IBM-852)
-ibm855.title = Cyrillic (IBM-855)
-ibm857.title = Turkish (IBM-857)
-ibm862.title = Hebrew (IBM-862)
-gb18030.title = Chinese Simplified (GB18030)
-x-mac-arabic.title = Arabic (MacArabic)
-x-iso-8859-6-8-x.title = Arabic (Langbox ISO-8859-6.8x)
-x-iso-8859-6-16.title = Arabic (Langbox ISO-8859-6.16)
-x-mac-farsi.title = Farsi (MacFarsi)
-x-mac-hebrew.title = Hebrew (MacHebrew)
-x-mac-devanagari.title = Hindi (MacDevanagari)
-x-mac-gujarati.title = Gujarati (MacGujarati)
-x-mac-gurmukhi.title = Gurmukhi (MacGurmukhi)
-x-sun-unicode-india-0.title = Hindi (SunDevanagari)
-
-
-chardet.off.title                           = (Off)
-chardet.universal_charset_detector.title    = Universal
-chardet.ja_parallel_state_machine.title     = Japanese
-chardet.ko_parallel_state_machine.title     = Korean
-chardet.zhtw_parallel_state_machine.title   = Traditional Chinese
-chardet.zhcn_parallel_state_machine.title   = Simplified Chinese
-chardet.zh_parallel_state_machine.title     = Chinese
-chardet.cjk_parallel_state_machine.title    = East Asian
-chardet.ruprob.title                        = Russian
-chardet.ukprob.title                        = Ukrainian
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -28,32 +28,40 @@ FormValidationCheckboxMissing=Please tic
 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.
 # LOCALIZATION NOTE (FormValidationPatternMismatchWithTitle): %S is the (possibly truncated) title attribute value.
 FormValidationPatternMismatchWithTitle=Please match the requested format: %S.
-# LOCALIZATION NOTE (FormValidationRangeOverflow): %S can be a number, a date or a time.
-FormValidationRangeOverflow=Please select a value that is lower than %S.
-# LOCALIZATION NOTE (FormValidationRangeUnderflow): %S can be a number, a date or a time.
-FormValidationRangeUnderflow=Please select a value that is higher than %S.
+# LOCALIZATION NOTE (FormValidationNumberRangeOverflow): %S is a number.
+FormValidationNumberRangeOverflow=Please select a value that is no more than %S.
+# LOCALIZATION NOTE (FormValidationDateRangeOverflow): %S is a date.
+FormValidationDateRangeOverflow=Please select a value that is no later than %S.
+# LOCALIZATION NOTE (FormValidationTimeRangeOverflow): %S is a time.
+FormValidationTimeRangeOverflow=Please select a value that is no later than %S.
+# LOCALIZATION NOTE (FormValidationNumberRangeUnderflow): %S is a number.
+FormValidationNumberRangeUnderflow=Please select a value that is no less than %S.
+# LOCALIZATION NOTE (FormValidationDateRangeUnderflow): %S is a date.
+FormValidationDateRangeUnderflow=Please select a value that is no earlier than %S.
+# LOCALIZATION NOTE (FormValidationTimeRangeUnderflow): %S is a time.
+FormValidationTimeRangeUnderflow=Please select a value that is no earlier than %S.
 # LOCALIZATION NOTE (FormValidationStepMismatch): both %S can be a number, a date or a time.
 FormValidationStepMismatch=Please select a valid value. The two nearest valid values are %S and %S.
 # LOCALIZATION NOTE (FormValidationStepMismatchOneValue): %S can be a number, a date or a time. This is called instead of FormValidationStepMismatch when the second value is the same as the first.
 FormValidationStepMismatchOneValue=Please select a valid value. The nearest valid value is %S.
+FormValidationBadInputNumber=Please enter a number.
 GetAttributeNodeWarning=Use of getAttributeNode() is deprecated. Use getAttribute() instead.
 SetAttributeNodeWarning=Use of setAttributeNode() is deprecated. Use setAttribute() instead.
 GetAttributeNodeNSWarning=Use of getAttributeNodeNS() is deprecated. Use getAttributeNS() instead.
 SetAttributeNodeNSWarning=Use of setAttributeNodeNS() is deprecated. Use setAttributeNS() instead.
 RemoveAttributeNodeWarning=Use of removeAttributeNode() is deprecated. Use removeAttribute() instead.
 CreateAttributeWarning=Use of document.createAttribute() is deprecated. Use element.setAttribute() instead.
 CreateAttributeNSWarning=Use of document.createAttributeNS() is deprecated. Use element.setAttributeNS() instead.
-SpecifiedWarning=Use of attributes' specified attribute is deprecated. It always returns true.
 OwnerElementWarning=Use of attributes' ownerElement attribute is deprecated.
 NodeValueWarning=Use of attributes' nodeValue attribute is deprecated. Use value instead.
 TextContentWarning=Use of attributes' textContent attribute is deprecated. Use value instead.
 EnablePrivilegeWarning=Use of enablePrivilege is deprecated.  Please use code that runs with the system principal (e.g. an extension) instead.
 nsIJSONDecodeDeprecatedWarning=nsIJSON.decode is deprecated.  Please use JSON.parse instead.
 nsIJSONEncodeDeprecatedWarning=nsIJSON.encode is deprecated.  Please use JSON.stringify instead.
 nsIDOMWindowInternalWarning=Use of nsIDOMWindowInternal is deprecated. Use nsIDOMWindow instead.
 InputEncodingWarning=Use of inputEncoding is deprecated.
@@ -105,30 +113,26 @@ MediaLoadUnsupportedMimeType=HTTP "Conte
 # LOCALIZATION NOTE: %S is the URL of the media resource which failed to load because of error in decoding.
 MediaLoadDecodeError=Media resource %S could not be decoded.
 # LOCALIZATION NOTE: Do not translate "DOMException", "code" and "name"
 DOMExceptionCodeWarning=Use of DOMException's code attribute is deprecated. Use name instead.
 # LOCALIZATION NOTE: Do not translate "__exposedProps__"
 NoExposedPropsWarning=Exposing chrome JS objects to content without __exposedProps__ is insecure and deprecated. See https://developer.mozilla.org/en/XPConnect_wrappers for more information.
 # LOCALIZATION NOTE: Do not translate "Mutation Event" and "MutationObserver"
 MutationEventWarning=Use of Mutation Events is deprecated. Use MutationObserver instead.
-# LOCALIZATION NOTE: Do not translate "Blob", "mozSlice", or "slice"
-MozSliceWarning=Use of mozSlice on the Blob object is deprecated.  Use slice instead.
 # LOCALIZATION NOTE: Do not translate "Components"
 ComponentsWarning=The Components object is deprecated. It will soon be removed.
 PluginHangUITitle=Warning: Unresponsive plugin
 PluginHangUIMessage=%S may be busy, or it may have stopped responding. You can stop the plugin now, or you can continue to see if the plugin will complete.
 PluginHangUIWaitButton=Continue
 PluginHangUIStopButton=Stop plugin
 # LOCALIZATION NOTE: Do not translate "mozHidden", "mozVisibilityState", "hidden", or "visibilityState"
 PrefixedVisibilityApiWarning='mozHidden' and 'mozVisibilityState' are deprecated.  Please use the unprefixed 'hidden' and 'visibilityState' instead.
 # LOCALIZATION NOTE: Do not translate "NodeIterator" or "detach()".
 NodeIteratorDetachWarning=Calling detach() on a NodeIterator no longer has an effect.
-# LOCALIZATION NOTE: Do not translate "Mozilla Audio Data API" and "Web Audio API".
-MozAudioDataWarning=The Mozilla Audio Data API is deprecated.  Please use the Web Audio API instead.
 # LOCALIZATION NOTE: Do not translate "LenientThis" and "this"
 LenientThisWarning=Ignoring get or set of property that has [LenientThis] because the "this" object is incorrect.
 # LOCALIZATION NOTE: Do not translate "nsIDOMWindowUtils", "getWindowWithOuterId", or "nsIWindowMediator"
 GetWindowWithOuterIdWarning=Use of nsIDOMWindowUtils.getOuterWindowWithId() is deprecated.  Instead, use the nsIWindowMediator method of the same name.
 # LOCALIZATION NOTE: Do not translate "getPreventDefault" or "defaultPrevented".
 GetPreventDefaultWarning=Use of getPreventDefault() is deprecated.  Use defaultPrevented instead.
 # LOCALIZATION NOTE: Do not translate "getUserData", "setUserData", "WeakMap", or "element.dataset".
 GetSetUserDataWarning=Use of getUserData() or setUserData() is deprecated.  Use WeakMap or element.dataset instead.
@@ -137,12 +141,19 @@ MozGetAsFileWarning=The non-standard moz
 # LOCALIZATION NOTE: Do not translate "captureEvents()" or "addEventListener()"
 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
 # LOCALIZATION NOTE: Do not translate "releaseEvents()" or "removeEventListener()"
 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
 # LOCALIZATION NOTE: Do not translate "document.load()" or "XMLHttpRequest"
 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
 # LOCALIZATION NOTE: Do not translate "window.showModalDialog()" or "window.open()" 
 ShowModalDialogWarning=Use of window.showModalDialog() is deprecated. Use window.open() instead. For more help https://developer.mozilla.org/en-US/docs/Web/API/Window.open
-# LOCALIZATION NOTE: Do not translate "cloneNode()"
-UnsafeCloneNodeWarning=The behaviour of cloneNode() with no boolean argument is about to change from doing a deep clone to doing a shallow clone.  Make sure to pass an explicit boolean argument to keep your current behaviour.
-# LOCALIZATION NOTE: Do not translate "importNode()"
-UnsafeImportNodeWarning=The behaviour of importNode() with no boolean argument is about to change from doing a deep clone to doing a shallow clone.  Make sure to pass an explicit boolean argument to keep your current behaviour.
+# LOCALIZATION NOTE: Do not translate "window._content" or "window.content"
+Window_ContentWarning=window._content is deprecated.  Please use window.content instead.
+# LOCALIZATION NOTE: Do not translate "XMLHttpRequest"
+SyncXMLHttpRequestWarning=Synchronous XMLHttpRequest on the main thread is deprecated because of its detrimental effects to the end user's experience. For more help http://xhr.spec.whatwg.org/
+ImplicitMetaViewportTagFallback=No meta-viewport tag found. Please explicitly specify one to prevent unexpected behavioural changes in future versions. For more help https://developer.mozilla.org/en/docs/Mozilla/Mobile/Viewport_meta_tag
+# LOCALIZATION NOTE: Do not translate "DataContainerEvent" or "CustomEvent"
+DataContainerEventWarning=Use of DataContainerEvent is deprecated. Use CustomEvent instead.
+# LOCALIZATION NOTE: Do not translate "sendAsBinary" or "send(Blob data)"
+SendAsBinaryWarning=The non-standard sendAsBinary method is deprecated and will soon be removed. Use the standard send(Blob data) method instead.
+# LOCALIZATION NOTE: Do not translate "window.controllers"
+Window_ControllersWarning=window.controllers is deprecated. Do not use it for UA detection.
--- a/dom/chrome/layout/css.properties
+++ b/dom/chrome/layout/css.properties
@@ -21,17 +21,17 @@ PEGatherMediaEOF=end of media list in @i
 PEGatherMediaNotComma=Expected ',' in media list but found '%1$S'.
 PEGatherMediaNotIdent=Expected identifier in media list but found '%1$S'.
 PEGatherMediaReservedMediaType=Found reserved keyword '%1$S' when looking for media type.
 PEImportNotURI=Expected URI in @import rule but found '%1$S'.
 PEImportBadURI=Invalid URI in @import rule: '%1$S'.
 PEImportUnexpected=Found unexpected '%1$S' within @import.
 PEGroupRuleEOF2=end of @media, @supports or @-moz-document rule
 PEGroupRuleNestedAtRule=%1$S rule not allowed within @media or @-moz-document rule.
-PEMozDocRuleBadFunc=Expected url(), url-prefix(), or domain() in @-moz-document rule but found '%1$S'.
+PEMozDocRuleBadFunc2=Expected url(), url-prefix(), domain() or regexp() in @-moz-document rule but found '%1$S'.
 PEMozDocRuleNotURI=Expected URI in @-moz-document rule but found '%1$S'.
 PEMozDocRuleNotString=Expected string in @-moz-document rule regexp() function but found '%1$S'.
 PEMozDocRuleEOF=next URI in @-moz-document rule
 PEAtNSPrefixEOF=namespace prefix in @namespace rule
 PEAtNSURIEOF=namespace URI in @namespace rule
 PEAtNSUnexpected=Unexpected token within @namespace: '%1$S'.
 PEKeyframeNameEOF=name of @keyframes rule.
 PEKeyframeBadName=Expected identifier for name of @keyframes rule.
@@ -139,8 +139,19 @@ PESupportsConditionExpectedCloseParen=Ex
 PESupportsConditionExpectedStart2=Expected 'not', '(', or function while parsing supports condition but found '%1$S'.
 PESupportsConditionExpectedNot=Expected 'not' while parsing supports condition but found '%1$S'.
 PESupportsGroupRuleStart=Expected '{' to begin @supports rule but found '%1$S'.
 PEFilterEOF=filter
 PEExpectedNoneOrURL=Expected 'none' or URL but found '%1$S'.
 PEExpectedNoneOrURLOrFilterFunction=Expected 'none', URL, or filter function but found '%1$S'.
 PEExpectedNonnegativeNP=Expected non-negative number or percentage.
 PEFilterFunctionArgumentsParsingError=Error in parsing arguments for filter function.
+PEVariableEOF=variable
+PEVariableEmpty=Expected variable value but found '%1$S'.
+PEValueWithVariablesParsingError=Error in parsing value for '%1$S' after substituting variables.
+PEValueWithVariablesFallbackInherit=Falling back to 'inherit'.
+PEValueWithVariablesFallbackInitial=Falling back to 'initial'.
+PEInvalidVariableReference=Property contained reference to invalid variable.
+PEInvalidVariableTokenFallback=Found invalid token '%1$S' at top level of variable reference fallback.
+PEExpectedVariableNameEOF=identifier for variable name
+PEExpectedVariableName=Expected identifier for variable name but found '%1$S'.
+PEExpectedVariableFallback=Expected variable reference fallback after ','.
+PEExpectedVariableCommaOrCloseParen=Expected ',' or ')' after variable name in variable reference but found '%1$S'.
--- a/dom/chrome/layout/htmlparser.properties
+++ b/dom/chrome/layout/htmlparser.properties
@@ -1,24 +1,25 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Encoding warnings and errors
 EncNoDeclarationFrame=The character encoding of a framed document was not declared. The document may appear different if viewed without the document framing it.
 EncNoDeclarationPlain=The character encoding of the plain text document was not declared. The document will render with garbled text in some browser configurations if the document contains characters from outside the US-ASCII range. The character encoding of the file needs to be declared in the transfer protocol or file needs to use a byte order mark as an encoding signature.
-EncNoDeclaration=The character encoding of the HTML document was not declared. The document will render with garbled text in some browser configurations if the document contains characters from outside the US-ASCII range. The character encoding of the page must to be declared in the document or in the transfer protocol.
+EncNoDeclaration=The character encoding of the HTML document was not declared. The document will render with garbled text in some browser configurations if the document contains characters from outside the US-ASCII range. The character encoding of the page must be declared in the document or in the transfer protocol.
 EncLateMetaFrame=The character encoding declaration of the framed HTML document was not found when prescanning the first 1024 bytes of the file. When viewed without the document framing it, the page will reload automatically. The encoding declaration needs to be moved to be within the first 1024 bytes of the file.
 EncLateMeta=The character encoding declaration of the HTML document was not found when prescanning the first 1024 bytes of the file. When viewed in a differently-configured browser, this page will reload automatically. The encoding declaration needs to be moved to be within the first 1024 bytes of the file.
 EncLateMetaReload=The page was reloaded, because the character encoding declaration of the HTML document was not found when prescanning the first 1024 bytes of the file. The encoding declaration needs to be moved to be within the first 1024 bytes of the file.
 EncLateMetaTooLate=The character encoding declaration of document was found too late for it to take effect. The encoding declaration needs to be moved to be within the first 1024 bytes of the file.
 EncMetaUnsupported=An unsupported character encoding was declared for the HTML document using a meta tag. The declaration was ignored.
 EncProtocolUnsupported=An unsupported character encoding was declared on the transfer protocol level. The declaration was ignored.
 EncBomlessUtf16=Detected UTF-16-encoded Basic Latin-only text without a byte order mark and without a transfer protocol-level declaration. Encoding this content in UTF-16 is inefficient and the character encoding should have been declared in any case.
 EncMetaUtf16=A meta tag was used to declare the character encoding as UTF-16. This was interpreted as an UTF-8 declaration instead.
+EncMetaUserDefined=A meta tag was used to declare the character encoding as x-user-defined. This was interpreted as a windows-1252 declaration instead for compatibility with intentionally mis-encoded legacy fonts. This site should migrate to Unicode.
 
 # The bulk of the messages in this file are derived from 
 # http://hg.mozilla.org/projects/htmlparser/file/1f633cef7de7/src/nu/validator/htmlparser/impl/ErrorReportingTokenizer.java
 # which is available under the MIT license.
 
 # Tokenizer errors
 errGarbageAfterLtSlash=Garbage after “</”.
 errLtSlashGt=Saw “</>”. Probable causes: Unescaped “<” (escape as “&lt;”) or mistyped end tag.
@@ -123,8 +124,9 @@ errTableClosedWhileCaptionOpen=“table” closed but “caption” was still open.
 errNoTableRowToClose=No table row to close.
 errNonSpaceInTable=Misplaced non-space characters inside a table.
 errUnclosedChildrenInRuby=Unclosed children in “ruby”.
 errStartTagSeenWithoutRuby=Start tag “%1$S” seen without a “ruby” element being open.
 errSelfClosing=Self-closing syntax (“/>”) used on a non-void HTML element. Ignoring the slash and treating as a start tag.
 errNoCheckUnclosedElementsOnStack=Unclosed elements on stack.
 errEndTagDidNotMatchCurrentOpenElement=End tag “%1$S” did not match the name of the current open element (“%2$S”).
 errEndTagViolatesNestingRules=End tag “%1$S” violates nesting rules.
+errEndWithUnclosedElements=End tag for “%1$S” seen, but there were unclosed elements.
--- a/dom/chrome/layout/layout_errors.properties
+++ b/dom/chrome/layout/layout_errors.properties
@@ -2,8 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ImageMapRectBoundsError=The "coords" attribute of the <area shape="rect"> tag is not in the "left,top,right,bottom" format.
 ImageMapCircleWrongNumberOfCoords=The "coords" attribute of the <area shape="circle"> tag is not in the "center-x,center-y,radius" format.
 ImageMapCircleNegativeRadius=The "coords" attribute of the <area shape="circle"> tag has a negative radius.
 ImageMapPolyWrongNumberOfCoords=The "coords" attribute of the <area shape="poly"> tag is not in the "x1,y1,x2,y2 …" format.
 ImageMapPolyOddNumberOfCoords=The "coords" attribute of the <area shape="poly"> tag is missing the last "y" coordinate (the correct format is "x1,y1,x2,y2 …").
+
+TablePartRelPosWarning=Relative positioning of table rows and row groups is now supported. This site may need to be updated because it may depend on this feature having no effect.
--- a/dom/chrome/layout/printing.properties
+++ b/dom/chrome/layout/printing.properties
@@ -53,9 +53,8 @@ PERR_GFX_PRINTER_NO_PRINTER_AVAILABLE=No
 PERR_GFX_PRINTER_NO_PRINTER_AVAILABLE_PP=No printers available, cannot show print preview.
 PERR_GFX_PRINTER_NAME_NOT_FOUND=The selected printer could not be found.
 PERR_GFX_PRINTER_COULD_NOT_OPEN_FILE=Failed to open output file for print to file.
 PERR_GFX_PRINTER_STARTDOC=Printing failed while starting the print job.
 PERR_GFX_PRINTER_ENDDOC=Printing failed while completing the print job.
 PERR_GFX_PRINTER_STARTPAGE=Printing failed while starting a new page.
 PERR_GFX_PRINTER_DOC_IS_BUSY=Cannot print this document yet, it is still being loaded.
 PERR_GFX_PRINTER_DOC_IS_BUSY_PP=Cannot print-preview this document yet, it is still being loaded.
-PERR_GFX_PRINTER_NO_XUL=Printing XUL documents is not supported.
--- a/dom/chrome/netError.dtd
+++ b/dom/chrome/netError.dtd
@@ -90,19 +90,19 @@
 <p>The requested site did not respond to a connection request and the browser has stopped waiting for a reply.</p>
 <ul>
  <li>Could the server be experiencing high demand or a temporary failure?  Try again later.</li>
  <li>Are you unable to browse other sites? Check the computer's network connection.</li>
  <li>Is your computer or network protected by a firewall or proxy?  Incorrect settings can interfere with Web browsing.</li>
  <li>Still having trouble? Consult your network administrator or Internet provider for assistance.</li>
 </ul>">
 
-<!ENTITY protocolNotFound.title "Unknown Protocol">
-<!ENTITY protocolNotFound.longDesc "<p>The address specifies a protocol (e.g. <q>wxyz://</q>) the browser does not
- recognise, so the browser cannot properly connect to the site.</p>
+<!ENTITY unknownProtocolFound.title "Unknown Protocol">
+<!ENTITY unknownProtocolFound.longDesc "
+<p>The address specifies a protocol (e.g. <q>wxyz://</q>) the browser does not recognise, so the browser cannot properly connect to the site.</p>
 <ul>
  <li>Are you trying to access multimedia or other non-text services? Check the site for extra requirements.</li>
  <li>Some protocols may require third-party software or plugins before the browser can recognise them.</li>
 </ul>">
 
 <!ENTITY proxyConnectFailure.title "Proxy Server Refused Connection">
 <!ENTITY proxyConnectFailure.longDesc "
 <p>The browser is configured to use a proxy server, but the proxy refused a connection.</p>
@@ -130,18 +130,17 @@
   issue and not your computer.</li>
 </ul>">
 
 <!ENTITY unknownSocketType.title "Incorrect Response">
 <!ENTITY unknownSocketType.longDesc "<p>The site responded to the network request in an unexpected way and the browser
  cannot continue.</p>">
 
 <!ENTITY nssFailure2.title "Secure Connection Failed">
-<!ENTITY nssFailure2.longDesc "<p>The page you are trying to view cannot be shown because the authenticity of the
- received data could not be verified.</p>
+<!ENTITY nssFailure2.longDesc2 "<p>The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.</p>
 <ul>
  <li>Please contact the web site owners to inform them of this problem.</li>
 </ul>">
 
 <!ENTITY nssBadCert.title "Secure Connection Failed">
 <!ENTITY nssBadCert.longDesc2 "<ul>
 <li>This could be a problem with the server's configuration, or it could be someone trying to impersonate the server.</li>
 <li>If you have connected to this server successfully in the past, the error may be temporary, and you can try again later.</li>
--- a/dom/chrome/nsWebBrowserPersist.properties
+++ b/dom/chrome/nsWebBrowserPersist.properties
@@ -1,16 +1,17 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-readError=%S could not be saved, because the source file could not be read.\n\nTry again later, or contact the server administrator.
-writeError=%S could not be saved, because an unknown error occurred.\n\nTry saving to a different location.
-launchError=%S could not be opened, because an unknown error occurred.\n\nTry saving to disc first and then opening the file.
-diskFull=There is not enough room on the disc to save %S.\n\nRemove unnecessary files from the disc and try again, or try saving in a different location.
-readOnly=%S could not be saved, because the disc, folder, or file is write-protected.\n\nWrite-enable the disc and try again, or try saving in a different location.
-accessError=%S could not be saved, because you cannot change the contents of that folder.\n\nChange the folder properties and try again, or try saving in a different location.
-accessErrorSD=No SD card.\n\nAn SD card is required to download %S.
-helperAppNotFound=%S could not be opened, because the associated helper application does not exist. Change the association in your preferences.
-noMemory=There is not sufficient memory to complete the action you requested.\n\nQuit some applications and try again.
-title=Downloading %S
-fileAlreadyExistsError=%S could not be saved, because a file already exists with the same name as the '_files' directory.\n\nTry saving to a different location.
-fileNameTooLongError=%S could not be saved, because the file name was too long.\n\nTry saving with a shorter file name.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+readError=%S could not be saved, because the source file could not be read.\n\nTry again later, or contact the server administrator.
+writeError=%S could not be saved, because an unknown error occurred.\n\nTry saving to a different location.
+launchError=%S could not be opened, because an unknown error occurred.\n\nTry saving to disc first and then opening the file.
+diskFull=There is not enough room on the disc to save %S.\n\nRemove unnecessary files from the disc and try again, or try saving in a different location.
+readOnly=%S could not be saved, because the disc, folder, or file is write-protected.\n\nWrite-enable the disc and try again, or try saving in a different location.
+accessError=%S could not be saved, because you cannot change the contents of that folder.\n\nChange the folder properties and try again, or try saving in a different location.
+SDAccessErrorCardReadOnly=Cannot download file because the SD card is in use.
+SDAccessErrorCardMissing=Cannot download file because the SD card is missing.
+helperAppNotFound=%S could not be opened, because the associated helper application does not exist. Change the association in your preferences.
+noMemory=There is not sufficient memory to complete the action you requested.\n\nQuit some applications and try again.
+title=Downloading %S
+fileAlreadyExistsError=%S could not be saved, because a file already exists with the same name as the '_files' directory.\n\nTry saving to a different location.
+fileNameTooLongError=%S could not be saved, because the file name was too long.\n\nTry saving with a shorter file name.
--- a/dom/chrome/security/csp.properties
+++ b/dom/chrome/security/csp.properties
@@ -5,38 +5,44 @@
 # CSP Warnings:
 # LOCALIZATION NOTE (CSPViolation):
 # %1$S is the reason why the resource has not been loaded.
 CSPViolation = The page's settings blocked the loading of a resource: %1$S
 # LOCALIZATION NOTE (CSPViolationWithURI):
 # %1$S is the directive that has been violated.
 # %2$S is the URI of the resource which violated the directive.
 CSPViolationWithURI = The page's settings blocked the loading of a resource at %2$S ("%1$S").
+# LOCALIZATION NOTE (CSPROViolation):
+# %1$S is the reason why the resource has not been loaded.
+CSPROViolation = A violation occurred for a report-only CSP policy ("%1$S"). The behaviour was allowed, and a CSP report was sent.
+# LOCALIZATION NOTE (CSPROViolationWithURI):
+# %1$S is the directive that has been violated.
+# %2$S is the URI of the resource which violated the directive.
+CSPROViolationWithURI = The page's settings observed the loading of a resource at %2$S ("%1$S"). A CSP report is being sent.
 # LOCALIZATION NOTE (triedToSendReport):
 # %1$S is the URI we attempted to send a report to.
 triedToSendReport = Tried to send report to invalid URI: "%1$S"
 # LOCALIZATION NOTE (errorWas):
 # %1$S is the error resulting from attempting to send the report
 errorWas = error was: "%1$S"
 # LOCALIZATION NOTE (couldNotParseReportURI):
 # %1$S is the report URI that could not be parsed
 couldNotParseReportURI = couldn't parse report URI: %1$S
 # LOCALIZATION NOTE (couldNotProcessUnknownDirective):
 # %1$S is the unknown directive
 couldNotProcessUnknownDirective = Couldn't process unknown directive '%1$S'
 # LOCALIZATION NOTE (ignoringUnknownOption):
 # %1$S is the option that could not be understood
 ignoringUnknownOption = Ignoring unknown option %1$S
-# LOCALIZATION NOTE (reportURInotETLDPlus1):
-# %1$S is the ETLD of the report URI that could not be used
-reportURInotETLDPlus1 = The report URI (%1$S) must be from the same eTLD+1.
-# LOCALIZATION NOTE (reportURInotSameSchemeAsSelf, reportURInotSamePortAsSelf):
-# %1$S is the report URI that could not be used
-reportURInotSameSchemeAsSelf = The report URI (%1$S) must use the same scheme as the originating document.
-reportURInotSamePortAsSelf = The report URI (%1$S) must use the same port as the originating document.
+# LOCALIZATION NOTE (reportURInotHttpsOrHttp2):
+# %1$S is the ETLD of the report URI that is not HTTP or HTTPS
+reportURInotHttpsOrHttp2 = The report URI (%1$S) should be an HTTP or HTTPS URI.
+# LOCALIZATION NOTE (reportURInotInReportOnlyHeader):
+# %1$S is the ETLD of the page with the policy
+reportURInotInReportOnlyHeader = This site (%1$S) has a Report-Only policy without a report URI. CSP will not block and cannot report violations of this policy.
 # LOCALIZATION NOTE (pageCannotSendReportsTo):
 # %1$S is the URI of the page with the policy
 # %2$S is the report URI that could not be used
 pageCannotSendReportsTo = page on %1$S cannot send reports to %2$S
 allowOrDefaultSrcRequired = 'allow' or 'default-src' directive required but not present.  Reverting to "default-src 'none'"
 # LOCALIZATION NOTE (failedToParseUnrecognizedSource):
 # %1$S is the CSP Source that could not be parsed
 failedToParseUnrecognizedSource = Failed to parse unrecognised source %1$S
@@ -51,16 +57,19 @@ allowDirectiveIsDeprecated = allow direc
 # inline script refers to JavaScript code that is embedded into the HTML document.
 inlineScriptBlocked = An attempt to execute inline scripts has been blocked
 # LOCALIZATION NOTE (inlineStyleBlocked):
 # inline style refers to CSS code that is embedded into the HTML document.
 inlineStyleBlocked = An attempt to apply inline style sheets has been blocked
 # LOCALIZATION NOTE (scriptFromStringBlocked):
 # eval is a name and should not be localized.
 scriptFromStringBlocked = An attempt to call JavaScript from a string (by calling a function like eval) has been blocked
+# LOCALIZATION NOTE (hostNameMightBeKeyword):
+# %1$S is the hostname in question and %2$S is the keyword
+hostNameMightBeKeyword = Interpreting %1$S as a hostname, not a keyword. If you intended this to be a keyword, use '%2$S' (wrapped in single quotes).
 
 # CSP Errors:
 policyURINotAlone = policy-uri directive can only appear alone
 noParentRequest = The policy-uri cannot be fetched without a parent request and a CSP.
 # LOCALIZATION NOTE (policyURIParseError):
 # %1$S is the URI that could not be parsed
 policyURIParseError = could not parse URI in policy URI: %1$S
 # LOCALIZATION NOTE (nonMatchingHost):
--- a/dom/chrome/security/security.properties
+++ b/dom/chrome/security/security.properties
@@ -4,15 +4,19 @@ BlockMixedDisplayContent = Blocked loadi
 BlockMixedActiveContent = Blocked loading mixed active content "%1$S"
 
 # CSP
 ReportOnlyCSPIgnored=Report-only CSP policy will be ignored because there are other non-report-only CSP policies applied.
 # LOCALIZATION NOTE: Do not translate "X-Content-Security-Policy", "X-Content-Security-Policy-Report-Only",  "Content-Security-Policy" or "Content-Security-Policy-Report-Only"
 OldCSPHeaderDeprecated=The X-Content-Security-Policy and X-Content-Security-Report-Only headers will be deprecated in the future. Please use the Content-Security-Policy and Content-Security-Report-Only headers with CSP spec compliant syntax instead.
 # LOCALIZATION NOTE: Do not translate "X-Content-Security-Policy/Report-Only" or "Content-Security-Policy/Report-Only"
 BothCSPHeadersPresent=This site specified both an X-Content-Security-Policy/Report-Only header and a Content-Security-Policy/Report-Only header. The X-Content-Security-Policy/Report-Only header(s) will be ignored.
+
+# CORS
+CrossSiteRequestBlocked=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. This can be fixed by moving the resource to the same domain or enabling CORS.
+
 # LOCALIZATION NOTE: Do not translate "Strict-Transport-Security" or "HSTS"
 InvalidSTSHeaders=The site specified an invalid Strict-Transport-Security header.
 InsecurePasswordsPresentOnPage=Password fields present on an insecure (http://) page. This is a security risk that allows user login credentials to be stolen.
 InsecureFormActionPasswordsPresent=Password fields present in a form with an insecure (http://) form action. This is a security risk that allows user login credentials to be stolen.
 InsecurePasswordsPresentOnIframe=Password fields present on an insecure (http://) iframe. This is a security risk that allows user login credentials to be stolen.
 LoadingMixedActiveContent=Loading mixed (insecure) active content on a secure page "%1$S"
 LoadingMixedDisplayContent=Loading mixed (insecure) display content on a secure page "%1$S"
--- a/editor/ui/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/chrome/composer/editorOverlay.dtd
@@ -11,17 +11,18 @@
 <!ENTITY pasteNoFormatting.label "Paste Without Formatting">
 <!ENTITY pasteNoFormatting.accesskey "o">
 <!ENTITY pasteNoFormatting.key "V">
 <!ENTITY pasteAs.label "Paste As">
 <!ENTITY pasteAs.accesskey "a">
 <!ENTITY pasteAsQuotationCmd.label "Paste As Quotation">
 <!ENTITY pasteAsQuotationCmd.accesskey "Q">
 <!ENTITY pasteAsQuotationCmd.key "o">
-<!ENTITY findCmd.label "Find and Replace…">
+<!ENTITY findBarCmd.label "Find…">
+<!ENTITY findReplaceCmd.label "Find and Replace…">
 <!ENTITY enableInlineSpellChecker.label "Spellcheck As You Type">
 <!ENTITY enableInlineSpellChecker.accesskey "S">
 <!ENTITY checkSpellingCmd2.label "Check Spelling…">
 <!ENTITY checkSpellingCmd2.accesskey "h">
 <!ENTITY checkSpellingCmd2.key "p">
 
 <!-- Insert menu items -->
 <!ENTITY insertMenu.label "Insert">
@@ -34,16 +35,18 @@
 <!ENTITY insertImageCmd.label "Image…">
 <!ENTITY insertImageCmd.accesskey "I">
 <!ENTITY insertHLineCmd.label "Horizontal Line">
 <!ENTITY insertHLineCmd.accesskey "o">
 <!ENTITY insertTableCmd.label "Table…">
 <!ENTITY insertTableCmd.accesskey "T">
 <!ENTITY insertHTMLCmd.label "HTML…">
 <!ENTITY insertHTMLCmd.accesskey "H">
+<!ENTITY insertMathCmd.label "Mathematical Formula…">
+<!ENTITY insertMathCmd.accesskey "M">
 <!ENTITY insertCharsCmd.label "Characters and Symbols…">
 <!ENTITY insertCharsCmd.accesskey "C">
 <!ENTITY insertBreakAllCmd.label "Break Below Image(s)">
 <!ENTITY insertBreakAllCmd.accesskey "k">
 
 <!-- Used just in context popup. -->
 <!ENTITY createLinkCmd.label "Create Link…">
 <!ENTITY createLinkCmd.accesskey "k">
new file mode 100644
--- /dev/null
+++ b/editor/ui/chrome/dialogs/EditorInsertMath.dtd
@@ -0,0 +1,25 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- Window title -->
+<!ENTITY windowTitle.label "Insert Mathematical Formula">
+
+<!ENTITY sourceEditField.label "Enter LaTeX source code:">
+
+<!ENTITY options.label "Options">
+<!ENTITY optionInline.label "Inline mode">
+<!ENTITY optionInline.accesskey "N">
+<!ENTITY optionDisplay.label "Display mode">
+<!ENTITY optionDisplay.accesskey "D">
+<!ENTITY optionLTR.label "Left-to-right direction">
+<!ENTITY optionLTR.accesskey "L">
+<!ENTITY optionRTL.label "Right-to-left direction">
+<!ENTITY optionRTL.accesskey "R">
+
+<!ENTITY example.label "Example: ">
+<!-- LOCALIZATION NOTE (exampleText.label): DONT_TRANSLATE. This is a LaTeX example. -->
+<!ENTITY exampleText.label "\sqrt{x_1} + \frac{π^3}{2}">
+
+<!ENTITY insertButton.label "Insert">
+<!ENTITY insertButton.accesskey "I">
--- a/mail/chrome/communicator/utilityOverlay.dtd
+++ b/mail/chrome/communicator/utilityOverlay.dtd
@@ -2,62 +2,59 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- these things need to move into utilityOverlay.xul -->
 
 <!-- LOCALIZATION NOTE : FILE This file contains the global menu items -->
 
 <!ENTITY fileMenu.label          "File">
-<!ENTITY fileMenu.accesskey        "f">
+<!ENTITY fileMenu.accesskey        "F">
 <!ENTITY newMenu.label            "New">
 <!ENTITY newMenu.accesskey          "N">
 
 <!ENTITY editMenu.label          "Edit">
-<!ENTITY editMenu.accesskey        "e">
+<!ENTITY editMenu.accesskey        "E">
 <!ENTITY undoCmd.label            "Undo">
 <!ENTITY undoCmd.key            "Z">
-<!ENTITY undoCmd.accesskey          "u">
+<!ENTITY undoCmd.accesskey          "U">
 <!ENTITY redoCmd.label            "Redo">
 <!ENTITY redoCmd.key            "Y">
-<!ENTITY redoCmd.accesskey          "r">
+<!ENTITY redoCmd.accesskey          "R">
 <!ENTITY cutCmd.label            "Cut">
 <!ENTITY cutCmd.key              "X">
 <!ENTITY cutCmd.accesskey          "t">
 <!ENTITY copyCmd.label            "Copy">
 <!ENTITY copyCmd.key            "C">
-<!ENTITY copyCmd.accesskey          "c">
+<!ENTITY copyCmd.accesskey          "C">
 <!ENTITY pasteCmd.label            "Paste">
 <!ENTITY pasteCmd.key            "V">
-<!ENTITY pasteCmd.accesskey          "p">
+<!ENTITY pasteCmd.accesskey          "P">
 <!ENTITY deleteCmd.label          "Delete">
-<!ENTITY deleteCmd.accesskey        "d">
+<!ENTITY deleteCmd.accesskey        "D">
 <!ENTITY selectAllCmd.label          "Select All">
 <!ENTITY selectAllCmd.key          "A">
-<!ENTITY selectAllCmd.accesskey        "a">
-<!ENTITY preferencesCmd.label        "Options…">
-<!ENTITY preferencesCmd.accesskey      "O">
+<!ENTITY selectAllCmd.accesskey        "A">
+<!ENTITY preferencesCmd2.label "Options">
+<!ENTITY preferencesCmd2.accesskey "O">
 <!ENTITY preferencesCmdUnix.label       "Preferences">
 <!ENTITY preferencesCmdUnix.accesskey     "n">
 
 <!ENTITY viewMenu.label          "View">
-<!ENTITY viewMenu.accesskey        "v">
+<!ENTITY viewMenu.accesskey        "V">
 <!ENTITY viewToolbarsMenu.label        "Toolbars">
 <!ENTITY viewToolbarsMenu.accesskey      "T">
 <!ENTITY showTaskbarCmd.label          "Status Bar">
 <!ENTITY showTaskbarCmd.accesskey        "S">
 
-<!ENTITY proxy.label                                    "Proxy Configuration…">
-<!ENTITY proxy.accesskey                                "C">
-
 <!ENTITY closeCmd.label      "Close">
 <!ENTITY closeCmd.key      "W">
-<!ENTITY closeCmd.accesskey    "c">
+<!ENTITY closeCmd.accesskey    "C">
 
 <!ENTITY quitApplicationCmd.label  "Exit">
 <!ENTITY quitApplicationCmd.key    "Q">
 <!ENTITY quitApplicationCmd.accesskey  "x">
 
 <!ENTITY quitApplicationCmdUnix.label  "Quit">
-<!ENTITY quitApplicationCmdUnix.accesskey  "q">
+<!ENTITY quitApplicationCmdUnix.accesskey  "Q">
 
 <!ENTITY quitApplicationCmdMac.label  "Quit &brandShortName;">
-<!ENTITY quitApplicationCmdMac.accesskey  "q">
+<!ENTITY quitApplicationCmdMac.accesskey  "Q">
--- a/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
+++ b/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
@@ -14,24 +14,31 @@
 <!ENTITY feedLocation.placeholder    "Enter a valid feed url to Add">
 
 <!ENTITY feedFolder.label            "Store Articles in:">
 <!ENTITY feedFolder.accesskey        "S">
 
 <!ENTITY quickMode.label             "Show the article summary instead of loading the web page">
 <!ENTITY quickMode.accesskey         "h">
 
+<!ENTITY autotagEnable.label         "Automatically create tags from feed &lt;category&gt; names">
+<!ENTITY autotagEnable.accesskey     "c">
+<!ENTITY autotagUsePrefix.label      "Prefix tags with:">
+<!ENTITY autotagUsePrefix.accesskey  "P">
+<!ENTITY autoTagPrefix.placeholder   "Enter a tag prefix">
+
 <!ENTITY locationValidate.label      "Validate">
 <!ENTITY validateText.label          "Check validation and retrieve a valid url.">
 
 <!ENTITY button.addFeed.label        "Add">
 <!ENTITY button.addFeed.accesskey    "A">
 <!ENTITY button.editFeed.label       "Update">
 <!ENTITY button.editFeed.accesskey   "U">
 <!ENTITY button.removeFeed.label     "Remove">
 <!ENTITY button.removeFeed.accesskey "R">
 <!ENTITY button.importOPML.label     "Import">
 <!ENTITY button.importOPML.accesskey "I">
 <!ENTITY button.exportOPML.label     "Export">
 <!ENTITY button.exportOPML.accesskey "x">
 <!ENTITY button.exportOPML.tooltip   "Export Feeds with folder structure; ctrl click or ctrl enter to export Feeds as a list">
 
 <!ENTITY cmd.close.commandKey        "w">
+<!ENTITY button.close.label          "Close">
--- a/mail/chrome/messenger/FilterListDialog.dtd
+++ b/mail/chrome/messenger/FilterListDialog.dtd
@@ -27,14 +27,12 @@
 <!ENTITY viewLogButton.label "Filter Log">
 <!ENTITY viewLogButton.accesskey "L">
 <!ENTITY runFilters.label "Run Now">
 <!ENTITY runFilters.accesskey "R">
 <!ENTITY stopFilters.label "Stop">
 <!ENTITY stopFilters.accesskey "S">
 <!ENTITY folderPickerPrefix.label "Run selected filter(s) on:">
 <!ENTITY folderPickerPrefix.accesskey "c">
-<!ENTITY choosethis.label "choose this folder">
-<!ENTITY choosethisnewsserver.label "choose this news server">
 <!ENTITY helpButton.label "Help">
 <!ENTITY helpButton.accesskey "H">
 <!ENTITY closeCmd.key "W"> 
 <!ENTITY searchBox.emptyText "Search filters by name…">
--- a/mail/chrome/messenger/SearchDialog.dtd
+++ b/mail/chrome/messenger/SearchDialog.dtd
@@ -12,18 +12,16 @@
 <!ENTITY resetButton.label           "Clear">
 <!ENTITY resetButton.accesskey       "C">
 <!ENTITY openButton.label            "Open">
 <!ENTITY openButton.accesskey        "n">
 <!ENTITY deleteButton.label          "Delete">
 <!ENTITY deleteButton.accesskey      "D">
 <!ENTITY searchDialogTitle.label     "Search Messages">
 <!ENTITY results.label               "Results">
-<!ENTITY moveHereMenu.label          "Move Here">
-<!ENTITY moveHereMenu.accesskey      "H">
 <!ENTITY moveButton.label            "Move To">
 <!ENTITY moveButton.accesskey        "T">
 <!ENTITY closeCmd.key                "W"> 
 <!ENTITY openInFolder.label          "Open in Folder">
 <!ENTITY openInFolder.accesskey      "r">
 <!ENTITY saveAsVFButton.label        "Save as Search Folder">
 <!ENTITY saveAsVFButton.accesskey    "a">
 
@@ -54,27 +52,27 @@
 <!ENTITY totalColumn.label "Total">
 <!ENTITY readColumn.label "Read">
 <!ENTITY receivedColumn.label "Received">
 <!ENTITY starredColumn.label "Starred">
 <!ENTITY locationColumn.label "Location">
 <!ENTITY idColumn.label "Order Received">
 
 <!-- Thread Pane Tooltips -->
-<!ENTITY columnChooser.tooltip "Click to select columns to display">
-<!ENTITY threadColumn.tooltip "Click to display message threads"> 
-<!ENTITY fromColumn.tooltip "Click to sort by from">
-<!ENTITY recipientColumn.tooltip "Click to sort by recipient">
-<!ENTITY subjectColumn.tooltip "Click to sort by subject">
-<!ENTITY dateColumn.tooltip "Click to sort by date">
-<!ENTITY priorityColumn.tooltip "Click to sort by priority">
-<!ENTITY tagsColumn.tooltip "Click to sort by tags">
-<!ENTITY accountColumn.tooltip "Click to sort by account">
-<!ENTITY statusColumn.tooltip "Click to sort by status">
-<!ENTITY sizeColumn.tooltip "Click to sort by size">
-<!ENTITY junkStatusColumn.tooltip "Click to sort by junk status">
-<!ENTITY unreadColumn.tooltip "Number of unread messages in thread">
-<!ENTITY totalColumn.tooltip "Total number of messages in thread">
-<!ENTITY readColumn.tooltip "Click to sort by read">
-<!ENTITY receivedColumn.tooltip "Click to sort by date received">
-<!ENTITY starredColumn.tooltip "Click to sort by star">
-<!ENTITY locationColumn.tooltip "Click to sort by location">
-<!ENTITY idColumn.tooltip "Click to sort by order received">
+<!ENTITY columnChooser2.tooltip "Select columns to display">
+<!ENTITY threadColumn2.tooltip "Display message threads">
+<!ENTITY fromColumn2.tooltip "Sort by from">
+<!ENTITY recipientColumn2.tooltip "Sort by recipient">
+<!ENTITY subjectColumn2.tooltip "Sort by subject">
+<!ENTITY dateColumn2.tooltip "Sort by date">
+<!ENTITY priorityColumn2.tooltip "Sort by priority">
+<!ENTITY tagsColumn2.tooltip "Sort by tags">
+<!ENTITY accountColumn2.tooltip "Sort by account">
+<!ENTITY statusColumn2.tooltip "Sort by status">
+<!ENTITY sizeColumn2.tooltip "Sort by size">
+<!ENTITY junkStatusColumn2.tooltip "Sort by junk status">
+<!ENTITY unreadColumn2.tooltip "Number of unread messages in thread">
+<!ENTITY totalColumn2.tooltip "Total number of messages in thread">
+<!ENTITY readColumn2.tooltip "Sort by read">
+<!ENTITY receivedColumn2.tooltip "Sort by date received">
+<!ENTITY starredColumn2.tooltip "Sort by star">
+<!ENTITY locationColumn2.tooltip "Sort by location">
+<!ENTITY idColumn2.tooltip "Sort by order received">
--- a/mail/chrome/messenger/aboutDialog.dtd
+++ b/mail/chrome/messenger/aboutDialog.dtd
@@ -1,10 +1,23 @@
 <!ENTITY aboutDialog.title      "About &brandFullName;">
 
+
+<!-- LOCALIZATION NOTE (update.checkForUpdatesButton.*, update.updateButton.*, update.applyButtonBillboard.*):
+# Only one button is present at a time.
+# The button when displayed is located directly under the Thunderbird version in
+# the about dialog.
+-->
+<!ENTITY update.checkForUpdatesButton.label       "Check for Updates">
+<!ENTITY update.checkForUpdatesButton.accesskey   "C">
+<!ENTITY update.updateButton.label                "Restart to Update">
+<!ENTITY update.updateButton.accesskey            "R">
+<!ENTITY update.applyButtonBillboard.label        "Apply Update…">
+<!ENTITY update.applyButtonBillboard.accesskey    "A">
+
 <!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.">
 
@@ -19,18 +32,16 @@
 <!-- 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">
 
 <!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.checkingForUpdates  "Checking for updates…">
-<!-- LOCALIZATION NOTE (update.checkingAddonCompat): try to make the localized text short (see bug 596813 for screenshots). -->
-<!ENTITY update.checkingAddonCompat "Checking Add-on compatibility…">
 <!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.noUpdatesFound      "&brandShortName; is up to date">
 <!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.adminDisabled       "Updates disabled by your system administrator">
 
 <!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
      update.failed.start, update.failed.linkText, and update.failed.end all go into
      one line with linkText being wrapped in an anchor that links to a site to download
--- a/mail/chrome/messenger/addressbook/abCardOverlay.dtd
+++ b/mail/chrome/messenger/addressbook/abCardOverlay.dtd
@@ -42,24 +42,16 @@
 <!ENTITY SecondEmail.accesskey          "i">
 <!ENTITY PreferMailFormat.label         "Prefers to receive messages formatted as:">
 <!ENTITY PreferMailFormat.accesskey     "v">
 <!ENTITY PlainText.label                "Plain Text">
 <!ENTITY HTML.label                     "HTML">
 <!ENTITY Unknown.label                  "Unknown">
 <!ENTITY chatName.label                 "Chat Name:">
 
-<!ENTITY allowRemoteContent1.label      "Allow remote content.">
-<!ENTITY allowRemoteContent1.accesskey  "r">
-<!ENTITY allowRemoteContent1.tooltip    "In HTML messages it is possible to
-embed content from remote sources. Opening such a message will open a
-connection to this external source. This may allow tracking of the
-message being read. Ticking this box will allow such external embedded
-content in HTML messages from this contact.">
-
 <!ENTITY WorkPhone.label                "Work:">
 <!ENTITY WorkPhone.accesskey            "k">
 <!ENTITY HomePhone.label                "Home:">
 <!ENTITY HomePhone.accesskey            "m">
 <!ENTITY FaxNumber.label                "Fax:">
 <!ENTITY FaxNumber.accesskey            "x">
 <!ENTITY PagerNumber.label              "Pager:">
 <!ENTITY PagerNumber.accesskey          "g">
--- a/mail/chrome/messenger/addressbook/abMainWindow.dtd
+++ b/mail/chrome/messenger/addressbook/abMainWindow.dtd
@@ -1,91 +1,91 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY addressbookWindow.title                        "Address Book">
 
 <!-- File Menu -->
 <!ENTITY fileMenu.label                                 "File">
-<!ENTITY fileMenu.accesskey                             "f">
+<!ENTITY fileMenu.accesskey                             "F">
 <!ENTITY newMenu.label                                  "New">
 <!ENTITY newMenu.accesskey                              "N">
 <!ENTITY newContact.label                               "Address Book Contact…">
 <!ENTITY newContact.accesskey                           "C">
 <!ENTITY newContact.key                                 "N">
 <!ENTITY newListCmd.label                               "Mailing List…">
 <!ENTITY newListCmd.accesskey                           "L">
 <!ENTITY newAddressBookCmd.label                        "Address Book…">
 <!ENTITY newAddressBookCmd.accesskey                    "B">
 <!ENTITY newLDAPDirectoryCmd.label                      "LDAP Directory…">
 <!ENTITY newLDAPDirectoryCmd.accesskey                  "D">
 <!ENTITY newMessageCmd.label                            "Message">
 <!ENTITY newMessageCmd.key                              "M">
-<!ENTITY newMessageCmd.accesskey                        "m">
+<!ENTITY newMessageCmd.accesskey                        "M">
 <!-- LOCALIZATION NOTE (osxAddressBook) : These entities are only used on Mac -->
 <!ENTITY osxAddressBook.label                           "Use Mac OS X Address Book">
 <!ENTITY osxAddressBook.accesskey                       "O">
 <!ENTITY closeCmd.label                                 "Close">
 <!ENTITY closeCmd.key                                   "W">
-<!ENTITY closeCmd.accesskey                             "c">
+<!ENTITY closeCmd.accesskey                             "C">
 <!ENTITY printSetupCmd.label                            "Page Setup…">
 <!ENTITY printSetupCmd.accesskey                        "u">
 <!ENTITY printPreviewContactCmd.label                   "Print Preview Contact">
 <!ENTITY printPreviewContactCmd.accesskey               "v">
 <!ENTITY printPreviewAddressBook.label                  "Print Preview Address Book">
 <!ENTITY printPreviewAddressBook.accesskey              "B">
 <!ENTITY printContactCmd.label                          "Print Contact…">
 <!ENTITY printContactCmd.accesskey                      "P">
 <!ENTITY printContactCmd.key                            "P">
 <!ENTITY printAddressBook.label                         "Print Address Book…">
 <!ENTITY printAddressBook.accesskey                     "A">
 
 <!-- Edit Menu -->
 <!ENTITY editMenu.label                                 "Edit">
-<!ENTITY editMenu.accesskey                             "e">
+<!ENTITY editMenu.accesskey                             "E">
 <!ENTITY undoCmd.label                                  "Undo">
 <!ENTITY undoCmd.key                                    "Z">
-<!ENTITY undoCmd.accesskey                              "u">
+<!ENTITY undoCmd.accesskey                              "U">
 <!ENTITY redoCmd.label                                  "Redo">
 <!ENTITY redoCmd.key                                    "Y">
-<!ENTITY redoCmd.accesskey                              "r">
+<!ENTITY redoCmd.accesskey                              "R">
 <!ENTITY cutCmd.label                                   "Cut">
 <!ENTITY cutCmd.key                                     "X">
 <!ENTITY cutCmd.accesskey                               "t">
 <!ENTITY copyCmd.label                                  "Copy">
 <!ENTITY copyCmd.key                                    "C">
-<!ENTITY copyCmd.accesskey                              "c">
+<!ENTITY copyCmd.accesskey                              "C">
 <!ENTITY pasteCmd.label                                 "Paste">
 <!ENTITY pasteCmd.key                                   "V">
-<!ENTITY pasteCmd.accesskey                             "p">
+<!ENTITY pasteCmd.accesskey                             "P">
 <!ENTITY deleteCmd.label                                "Delete">
-<!ENTITY deleteCmd.accesskey                            "d">
+<!ENTITY deleteCmd.accesskey                            "D">
 <!ENTITY deleteAbCmd.label                              "Delete Address Book">
 <!ENTITY deleteContactCmd.label                         "Delete Contact">
 <!ENTITY deleteContactsCmd.label                        "Delete Contacts">
 <!ENTITY deleteListCmd.label                            "Delete List">
 <!ENTITY deleteListsCmd.label                           "Delete Lists">
 <!ENTITY deleteItemsCmd.label                           "Delete Items">
 <!ENTITY selectAllCmd.label                             "Select All">
 <!ENTITY selectAllCmd.key                               "A">
 <!ENTITY searchAddressesCmd.key                         "f">
-<!ENTITY selectAllCmd.accesskey                         "a">
+<!ENTITY selectAllCmd.accesskey                         "A">
 <!ENTITY swapFirstNameLastNameCmd.label                 "Swap First/Last Name">
 <!ENTITY swapFirstNameLastNameCmd.accesskey             "w">
 <!-- LOCALIZATION NOTE (hideSwapFnLnUI) : DONT_TRANSLATE -->
 <!-- Swap FN/LN UI  Set to "false" to show swap fn/ln UI -->
 <!ENTITY hideSwapFnLnUI "true">
-<!ENTITY propertiesCmd.label                            "Properties…">
-<!ENTITY propertiesCmd.accesskey                        "i">
+<!ENTITY propertiesCmd2.label                           "Properties…">
+<!ENTITY propertiesCmd2.accesskey                       "i">
 <!ENTITY propertiesCmd.key                              "i">
 
 <!-- View Menu -->
 <!ENTITY viewMenu.label                                 "View">
-<!ENTITY viewMenu.accesskey                             "v">
+<!ENTITY viewMenu.accesskey                             "V">
 <!ENTITY viewToolbarsMenu.label                         "Toolbars">
 <!ENTITY viewToolbarsMenu.accesskey                     "T"> 
 <!ENTITY menubarCmd.label                               "Menu Bar">
 <!ENTITY menubarCmd.accesskey                           "M">
 <!ENTITY showAbToolbarCmd.label                         "Address Book Toolbar">
 <!ENTITY showAbToolbarCmd.accesskey                     "o">
 <!ENTITY showTaskbarCmd.label                           "Status Bar">
 <!ENTITY showTaskbarCmd.accesskey                       "S">
@@ -93,42 +93,42 @@
 <!ENTITY customizeToolbar.accesskey                     "C">
 <!ENTITY layoutMenu.label                               "Layout">
 <!ENTITY layoutMenu.accesskey                           "L">
 <!ENTITY showDirectoryPane.label                        "Directory Pane">
 <!ENTITY showDirectoryPane.accesskey                    "D">
 <!ENTITY showContactPane2.label                         "Contact Pane">
 <!ENTITY showContactPane2.accesskey                     "C">
 <!ENTITY menu_ShowNameAs.label                          "Show Name As">
-<!ENTITY menu_ShowNameAs.accesskey                      "n"> 
+<!ENTITY menu_ShowNameAs.accesskey                      "N"> 
 <!-- LOCALIZATION NOTE (firstLastCmd2.label): We're not including a comma here
 because displayed names don't have the comma in between. -->
 <!ENTITY firstLastCmd2.label                            "First Last">
-<!ENTITY firstLastCmd2.accesskey                        "f"> 
+<!ENTITY firstLastCmd2.accesskey                        "F"> 
 <!ENTITY lastFirstCmd.label                             "Last, First">
-<!ENTITY lastFirstCmd.accesskey                         "l">
+<!ENTITY lastFirstCmd.accesskey                         "L">
 <!ENTITY displayNameCmd.label                           "Display Name">
-<!ENTITY displayNameCmd.accesskey                       "d">
+<!ENTITY displayNameCmd.accesskey                       "D">
 <!ENTITY sortMenu.label                                 "Sort by">
 <!ENTITY sortMenu.accesskey                             "S">
 
 <!-- Tools Menu -->
 <!ENTITY tasksMenu.label                                "Tools">
 <!ENTITY tasksMenu.accesskey                            "T">
 <!ENTITY messengerCmd.label                             "Mail &amp; Newsgroups">
-<!ENTITY messengerCmd.accesskey                         "m">
+<!ENTITY messengerCmd.accesskey                         "M">
 <!ENTITY messengerCmd.commandkey                        "1">
 <!ENTITY searchAddressesCmd.label                       "Search Addresses…">
 <!ENTITY searchAddressesCmd.accesskey                   "S">
 <!ENTITY importCmd.label                                "Import…">
 <!ENTITY importCmd.accesskey                            "I">
 <!ENTITY exportCmd.label                                "Export…">
 <!ENTITY exportCmd.accesskey                            "E">
-<!ENTITY preferencesCmd.label                           "Options…">
-<!ENTITY preferencesCmd.accesskey                       "O">
+<!ENTITY preferencesCmd2.label                          "Options">
+<!ENTITY preferencesCmd2.accesskey                      "O">
 <!ENTITY preferencesCmdUnix.label                       "Preferences">
 <!ENTITY preferencesCmdUnix.accesskey                   "n">
 
 <!-- Address Book Toolbar and Context Menus -->  
 <!ENTITY newContactButton.label                         "New Contact">
 <!ENTITY newContactButton.accesskey                     "C">
 <!ENTITY newlistButton.label                            "New List">
 <!ENTITY newlistButton.accesskey                        "L">
@@ -142,17 +142,17 @@ because displayed names don't have the c
 <!ENTITY deleteButton2.accesskey                        "D">
 
 <!-- Address Book Toolbar Tooltips -->
 <!ENTITY newContactButton.tooltip                       "Create a new address book contact">
 <!ENTITY newlistButton.tooltip                          "Create a new list">
 <!ENTITY editButton2.tooltip                            "Edit the selected item">
 <!ENTITY newmsgButton.tooltip                           "Send a mail message">
 <!ENTITY newIM.tooltip                                  "Send an instant message or chat">
-<!ENTITY deleteButton2.tooltip                           "Delete selected item">
+<!ENTITY deleteButton2.tooltip                          "Delete selected item">
 
 <!-- Dir Tree header -->
 <!ENTITY dirTreeHeader.label                            "Address Books">
 
 <!-- Search Bar -->
 <!ENTITY SearchNameOrEmail.label                        "Name or Email">
 <!ENTITY SearchNameOrEmail.accesskey                    "N">
 <!ENTITY advancedButton.tooltip                         "Advanced address search">
--- a/mail/chrome/messenger/addressbook/addressBook.properties
+++ b/mail/chrome/messenger/addressbook/addressBook.properties
@@ -62,22 +62,23 @@ propertyAIM=AIM
 propertyYahoo=Yahoo!
 propertySkype=Skype
 propertyQQ=QQ
 propertyMSN=MSN
 propertyICQ=ICQ
 propertyXMPP=Jabber ID
 propertyIRC=IRC Nick
 
-## LOCALIZATION NOTE (dateformat)
-## Only used if the year isn't present and should be in the format used by Date.toLocaleFormat
-## see http://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Global_Objects/Date/toLocaleFormat
-## %B is the month's localized name and %e is the day of the month [1-31]
+## LOCALIZATION NOTE (dateFormatMonthDay)
+## Only used if the year isn't present and should be in the format used by
+## Date.toLocaleFormat see http://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Global_Objects/Date/toLocaleFormat
+## %B is the month's localized name and %d is the day of the month [01-31].
+## Don't go using %e here, since it breaks things on Windows!
 ## Separators (a space, dash, etc.) can be used
-dateformat=%e %B
+dateFormatMonthDay=%d %B
 
 ## LOCALIZATION NOTE (cityAndStateAndZip): 
 ## %1$S is city, %2$S is state, %3$S is zip
 cityAndStateAndZip=%1$S, %2$S %3$S
 ## LOCALIZATION NOTE (cityAndStateNoZip): 
 ## %1$S is city, %2$S is state
 cityAndStateNoZip=%1$S, %2$S
 ## LOCALIZATION NOTE (cityOrStateAndZip): 
--- a/mail/chrome/messenger/appleMailImportMsgs.properties
+++ b/mail/chrome/messenger/appleMailImportMsgs.properties
@@ -1,32 +1,21 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 # Short name of import module
-## @name APPLEMAILIMPORT_NAME
-## @loc None
-2000=Apple Mail
+ApplemailImportName=Apple Mail
 
 # Description of import module
-## @name APPLEMAILIMPORT_DESCRIPTION
-## @loc None
-2001=Import Local Mail from Mac OS X Mail
+ApplemailImportDescription=Import Local Mail from Mac OS X Mail
 
 # Success Message
-# LOCALIZATION NOTE : Do not translate the word "%S" below.
-## @name APPLEMAILIMPORT_MAILBOX_SUCCESS
-## @loc None
-2002=Local messages were successfully imported from %S
+# LOCALIZATION NOTE(ApplemailImportMailboxSuccess): Do not translate the word "%S" below.
+ApplemailImportMailboxSuccess=Local messages were successfully imported from %S
 
 # Error Message
-## @name APPLEMAILIMPORT_MAILBOX_BADPARAM
-## @loc None
-2003=An internal error occurred. Importing failed. Try importing again.
+ApplemailImportMailboxBadparam=An internal error occurred. Importing failed. Try importing again.
 
 # Error message
-# LOCALIZATION NOTE : Do not translate the word "%S" below.
-## @name APPLEMAILIMPORT_MAILBOX_CONVERTERROR
-## @loc None
-2004=An error occurred while importing messages from %S. Messages were not imported. 
+# LOCALIZATION NOTE(ApplemailImportMailboxConverterror): Do not translate the word "%S" below.
+ApplemailImportMailboxConverterror=An error occurred while importing messages from %S. Messages were not imported.
 
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/charsetTitles.properties
@@ -0,0 +1,104 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## Rule of this file:
+## 1. key should always be in lower case ascii so we can do case insensitive
+##    comparison in the code faster.
+
+## Format of this file:
+## charset_name.title = a_title  -  specifies the human readable title for 
+## this charset
+
+us-ascii.title    = English (US-ASCII)
+iso-8859-1.title    = Western (ISO-8859-1)
+iso-8859-2.title    = Central European (ISO-8859-2)
+iso-8859-3.title    = South European (ISO-8859-3)
+iso-8859-4.title    = Baltic (ISO-8859-4)
+iso-8859-9.title    = Turkish (ISO-8859-9)
+iso-8859-10.title   = Nordic (ISO-8859-10)
+iso-8859-13.title   = Baltic (ISO-8859-13)
+iso-8859-14.title   = Celtic (ISO-8859-14)
+iso-8859-15.title   = Western (ISO-8859-15)
+iso-8859-16.title   = Romanian (ISO-8859-16)
+windows-1250.title  = Central European (Windows-1250)
+windows-1252.title  = Western (Windows-1252)
+windows-1254.title  = Turkish (Windows-1254)
+windows-1257.title  = Baltic (Windows-1257)
+macintosh.title         = Western (MacRoman)
+x-mac-ce.title          = Central European (MacCE)
+x-mac-turkish.title     = Turkish (MacTurkish)
+x-mac-croatian.title    = Croatian (MacCroatian)
+x-mac-romanian.title    = Romanian (MacRomanian)
+x-mac-icelandic.title   = Icelandic (MacIcelandic)
+iso-2022-jp.title = Japanese (ISO-2022-JP)
+shift_jis.title = Japanese (Shift_JIS)
+euc-jp.title = Japanese (EUC-JP)
+big5.title = Chinese Traditional (Big5)
+big5-hkscs.title = Chinese Traditional (Big5-HKSCS)
+x-euc-tw.title = Chinese Traditional (EUC-TW)
+gb2312.title = Chinese Simplified (GB2312)
+hz-gb-2312.title = Chinese Simplified (HZ)
+gbk.title = Chinese Simplified (GBK)
+iso-2022-cn.title = Chinese Simplified (ISO-2022-CN)
+euc-kr.title = Korean (EUC-KR)
+x-johab.title = Korean (JOHAB)
+iso-2022-kr.title = Korean (ISO-2022-KR)
+utf-7.title = Unicode (UTF-7)
+utf-8.title = Unicode (UTF-8)
+utf-16.title = Unicode (UTF-16)
+utf-16le.title = Unicode (UTF-16LE)
+utf-16be.title = Unicode (UTF-16BE)
+iso-8859-5.title = Cyrillic (ISO-8859-5)
+iso-ir-111.title = Cyrillic (ISO-IR-111)
+windows-1251.title = Cyrillic (Windows-1251)
+x-mac-cyrillic.title = Cyrillic (MacCyrillic)
+x-mac-ukrainian.title = Cyrillic/Ukrainian (MacUkrainian)
+koi8-r.title = Cyrillic (KOI8-R)
+koi8-u.title = Cyrillic/Ukrainian (KOI8-U)
+iso-8859-7.title = Greek (ISO-8859-7)
+windows-1253.title = Greek (Windows-1253)
+x-mac-greek.title = Greek (MacGreek)
+windows-1258.title = Vietnamese (Windows-1258)
+x-viet-tcvn5712.title = Vietnamese (TCVN)
+viscii.title = Vietnamese (VISCII)
+x-viet-vps.title = Vietnamese (VPS)
+tis-620.title = Thai (TIS-620)
+iso-8859-11.title = Thai (ISO-8859-11)
+windows-874.title = Thai (Windows-874)
+ibm874.title = Thai (IBM-874)
+armscii-8.title = Armenian (ARMSCII-8)
+iso-8859-6.title = Arabic (ISO-8859-6)
+iso-8859-6-i.title = Arabic (ISO-8859-6-I)
+iso-8859-6-e.title = Arabic (ISO-8859-6-E)
+iso-8859-8.title = Hebrew Visual (ISO-8859-8)
+iso-8859-8-i.title = Hebrew (ISO-8859-8-I)
+iso-8859-8-e.title = Hebrew (ISO-8859-8-E)
+windows-1255.title = Hebrew (Windows-1255)
+windows-1256.title = Arabic (Windows-1256)
+x-user-defined.title = User Defined
+ibm866.title = Cyrillic/Russian (CP-866)
+ibm850.title = Western (IBM-850)
+ibm852.title = Central European (IBM-852)
+ibm855.title = Cyrillic (IBM-855)
+ibm857.title = Turkish (IBM-857)
+ibm862.title = Hebrew (IBM-862)
+gb18030.title = Chinese Simplified (GB18030)
+x-mac-arabic.title = Arabic (MacArabic)
+x-mac-farsi.title = Farsi (MacFarsi)
+x-mac-hebrew.title = Hebrew (MacHebrew)
+x-mac-devanagari.title = Hindi (MacDevanagari)
+x-mac-gujarati.title = Gujarati (MacGujarati)
+x-mac-gurmukhi.title = Gurmukhi (MacGurmukhi)
+
+
+chardet.off.title                           = (Off)
+chardet.universal_charset_detector.title    = Universal
+chardet.ja_parallel_state_machine.title     = Japanese
+chardet.ko_parallel_state_machine.title     = Korean
+chardet.zhtw_parallel_state_machine.title   = Traditional Chinese
+chardet.zhcn_parallel_state_machine.title   = Simplified Chinese
+chardet.zh_parallel_state_machine.title     = Chinese
+chardet.cjk_parallel_state_machine.title    = East Asian
+chardet.ruprob.title                        = Russian
+chardet.ukprob.title                        = Ukrainian
--- a/mail/chrome/messenger/chat.properties
+++ b/mail/chrome/messenger/chat.properties
@@ -63,32 +63,31 @@ userIconFilePickerTitle=Select the new icon…
 chat.isTyping=is typing…
 chat.hasStoppedTyping=has stopped typing.
 # LOCALIZATION NOTE (chat.contactIsTyping, chat.contactHasStoppedTyping):
 #  These strings are displayed in a tooltip when hovering the status type icon.
 #  %S is replaced with the display name of the contact.
 chat.contactIsTyping=%S is typing.
 chat.contactHasStoppedTyping=%S has stopped typing.
 
-noTopic=No topic message for this room.
-
 # LOCALIZATION NOTE (unknownCommand):
 # This is shown when an unknown command (/foo) is attempted. %S is the command.
 unknownCommand=%S is not a supported command. Type /help to see the list of commands.
 
-# LOCALIZATION NOTE (buddytooltip.username, buddytooltip.account):
-# This is for the tooltip that appears when hovering
-# a contact or a conversation in the left pane.
-buddytooltip.username=Username
-buddytooltip.account=Account
-
 # LOCALIZATION NOTE (today, yesterday):
 # These 3 strings are used to display when previous conversations happened.
 # In 'today' and 'yesterday', %S is replaced with the time.
 today=Today %S
 yesterday=Yesterday %S
 # LOCALIZATION NOTE (dateTime):
 # %1$S is the date, %2$S is the date.
 dateTime=%1$S %2$S
+
+#LOCALIZATION NOTE
+# These are special entries in the log tree for the corresponding days.
 log.today=Today
 log.yesterday=Yesterday
-log.lastWeek=Last Week
-log.twoWeeksAgo=Two Weeks Ago
+
+#LOCALIZATION NOTE
+# These are special groups in the log tree for the last 3-7 days and
+# the last 8-14 days.
+log.currentWeek=This Week
+log.previousWeek=Last Week
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/Hightail/fileExceeds2GB.dtd
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
+   - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+<!ENTITY fileExceeds2GB.title   "Hightail">
+<!ENTITY fileExceeds2GB.cancel "OK">
+<!ENTITY fileExceeds2GB.description "Sending files over 2GB is not supported.">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/Hightail/fileExceedsLimit.dtd
@@ -0,0 +1,13 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
+   - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+<!ENTITY fileExceedsLimit.title   "Hightail">
+<!ENTITY fileExceedsLimit.thatsBigFile   "Sending files larger than 50 MB">
+<!ENTITY fileExceedsLimit.thatsBigFile2   "is a premium feature.">
+<!ENTITY fileExceedsLimit.accept "Upgrade">