Base import of Tycho code (warning: huge commit)

46 files changed, 829 insertions, 146 deletions

diff --git a/toolkit/locales/en-US/chrome/global/actions.dtd b/toolkit/locales/en-US/chrome/formautofill/requestAutocomplete.dtd
index 457be04d6..53a1d0d23 100644
--- a/toolkit/locales/en-US/chrome/global/actions.dtd
+++ b/toolkit/locales/en-US/chrome/formautofill/requestAutocomplete.dtd
@@ -2,4 +2,4 @@
    - 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 action.switchToTab.label "Switch to tab">
+<!-- This file has no entities because the feature is still experimental. -->
diff --git a/toolkit/locales/en-US/chrome/global-platform/mac/intl.properties b/toolkit/locales/en-US/chrome/global-platform/mac/intl.properties
index 93ba2e3a4..71265a9ef 100644
--- a/toolkit/locales/en-US/chrome/global-platform/mac/intl.properties
+++ b/toolkit/locales/en-US/chrome/global-platform/mac/intl.properties
@@ -2,8 +2,6 @@
 # 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/.
 
-# moved from navigator/locale/navigator.properties
-intl.charset.default=ISO-8859-1
 # LOCALIZATION NOTE (intl.ellipsis): Use the unicode ellipsis char, \u2026,
 # or use "..." if \u2026 doesn't suit traditions in your locale.
 intl.ellipsis=…
diff --git a/toolkit/locales/en-US/chrome/global-platform/unix/intl.properties b/toolkit/locales/en-US/chrome/global-platform/unix/intl.properties
index 93ba2e3a4..71265a9ef 100644
--- a/toolkit/locales/en-US/chrome/global-platform/unix/intl.properties
+++ b/toolkit/locales/en-US/chrome/global-platform/unix/intl.properties
@@ -2,8 +2,6 @@
 # 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/.
 
-# moved from navigator/locale/navigator.properties
-intl.charset.default=ISO-8859-1
 # LOCALIZATION NOTE (intl.ellipsis): Use the unicode ellipsis char, \u2026,
 # or use "..." if \u2026 doesn't suit traditions in your locale.
 intl.ellipsis=…
diff --git a/toolkit/locales/en-US/chrome/global-platform/win/intl.properties b/toolkit/locales/en-US/chrome/global-platform/win/intl.properties
index 93ba2e3a4..71265a9ef 100644
--- a/toolkit/locales/en-US/chrome/global-platform/win/intl.properties
+++ b/toolkit/locales/en-US/chrome/global-platform/win/intl.properties
@@ -2,8 +2,6 @@
 # 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/.
 
-# moved from navigator/locale/navigator.properties
-intl.charset.default=ISO-8859-1
 # LOCALIZATION NOTE (intl.ellipsis): Use the unicode ellipsis char, \u2026,
 # or use "..." if \u2026 doesn't suit traditions in your locale.
 intl.ellipsis=…
diff --git a/toolkit/locales/en-US/chrome/global/about.dtd b/toolkit/locales/en-US/chrome/global/about.dtd
index 6df685747..89de0e4ad 100644
--- a/toolkit/locales/en-US/chrome/global/about.dtd
+++ b/toolkit/locales/en-US/chrome/global/about.dtd
@@ -1,7 +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 about.version                "version">
+<!ENTITY about.version                "Version: ">
 
 <!-- LOCALIZATION NOTE (about.credits.beforeLink): note that there is no space between this phrase and the linked about.credits.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
 <!ENTITY about.credits.beforeLink     "See a list of ">
@@ -27,4 +27,5 @@
 <!-- LOCALIZATION NOTE (about.buildconfig.afterTheLink): note that there is no space between the linked about.buildconfig.linkTitle phrase and this phrase, so if your locale needs a space between words, add it at the start of this entity. -->
 <!ENTITY about.buildconfig.afterTheLink  " used for this version.">
 
-<!ENTITY about.buildIdentifier        "Build identifier: ">
+<!ENTITY about.buildIdentifier        "Build Identifier: ">
+<!ENTITY about.userAgent        "User Agent: ">
diff --git a/toolkit/locales/en-US/chrome/global/aboutNetworking.dtd b/toolkit/locales/en-US/chrome/global/aboutNetworking.dtd
new file mode 100644
index 000000000..ee9e4f243
--- /dev/null
+++ b/toolkit/locales/en-US/chrome/global/aboutNetworking.dtd
@@ -0,0 +1,31 @@
+<!-- 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 aboutNetworking.title                 "About Networking">
+<!ENTITY aboutNetworking.warning               "This is very experimental. Do not use without adult supervision.">
+<!ENTITY aboutNetworking.showNextTime          "Show this warning next time">
+<!ENTITY aboutNetworking.ok                    "OK">
+<!ENTITY aboutNetworking.http                  "Http">
+<!ENTITY aboutNetworking.sockets               "Sockets">
+<!ENTITY aboutNetworking.dns                   "DNS">
+<!ENTITY aboutNetworking.websockets            "WebSockets">
+<!ENTITY aboutNetworking.refresh               "Refresh">
+<!ENTITY aboutNetworking.autoRefresh           "Autorefresh every 3 seconds">
+<!ENTITY aboutNetworking.hostname              "Hostname">
+<!ENTITY aboutNetworking.port                  "Port">
+<!ENTITY aboutNetworking.spdy                  "SPDY">
+<!ENTITY aboutNetworking.ssl                   "SSL">
+<!ENTITY aboutNetworking.active                "Active">
+<!ENTITY aboutNetworking.idle                  "Idle">
+<!ENTITY aboutNetworking.host                  "Host">
+<!ENTITY aboutNetworking.tcp                   "TCP">
+<!ENTITY aboutNetworking.sent                  "Sent">
+<!ENTITY aboutNetworking.received              "Received">
+<!ENTITY aboutNetworking.family                "Family">
+<!ENTITY aboutNetworking.addresses             "Addresses">
+<!ENTITY aboutNetworking.expires               "Expires (Seconds)">
+<!ENTITY aboutNetworking.messagesSent          "Messages Sent">
+<!ENTITY aboutNetworking.messagesReceived      "Messages Received">
+<!ENTITY aboutNetworking.bytesSent             "Bytes Sent">
+<!ENTITY aboutNetworking.bytesReceived         "Bytes Received">
diff --git a/toolkit/locales/en-US/chrome/global/aboutReader.properties b/toolkit/locales/en-US/chrome/global/aboutReader.properties
new file mode 100644
index 000000000..621c5d353
--- /dev/null
+++ b/toolkit/locales/en-US/chrome/global/aboutReader.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/.
+
+aboutReader.loading=Loading...
+aboutReader.loadError=Failed to load article from page
+
+aboutReader.colorScheme.light=Light
+aboutReader.colorScheme.dark=Dark
+aboutReader.colorScheme.sepia=Sepia
+aboutReader.colorScheme.auto=Auto
+
+# LOCALIZATION NOTE (aboutReader.fontType.serif, aboutReader.fontType.sans-serif):
+# These are the styles of typeface that are options in the reader view controls.
+aboutReader.fontType.serif=Serif
+aboutReader.fontType.sans-serif=Sans-serif
+
+# LOCALIZATION NOTE (aboutReader.fontTypeSample): String used to sample font types.
+aboutReader.fontTypeSample=Aa
+
+# LOCALIZATION NOTE (aboutReader.fontSizeSample): String used to sample a relative font size
+# for the font size setting. Tapping different samples will change the font size.
+aboutReader.fontSizeSample=A
+
+aboutReader.toolbar.close=Close Reader View
+aboutReader.toolbar.typeControls=Type controls
+aboutReader.toolbar.addToReadingList=Add to Reading List
+aboutReader.toolbar.removeFromReadingList=Remove from Reading List
+aboutReader.toolbar.openReadingList=Open Reading List
+aboutReader.toolbar.closeReadingList=Close Reading List
+aboutReader.toolbar.share=Share
+
+aboutReader.footer.deleteThisArticle=Delete this article
+
+# Reader View toolbar button
+readerView.enter=Enter Reader View
+readerView.close=Close Reader View
diff --git a/toolkit/locales/en-US/chrome/global/aboutRights.dtd b/toolkit/locales/en-US/chrome/global/aboutRights.dtd
index 66bdaa204..bbe5774b8 100644
--- a/toolkit/locales/en-US/chrome/global/aboutRights.dtd
+++ b/toolkit/locales/en-US/chrome/global/aboutRights.dtd
@@ -17,14 +17,14 @@
      deliberate for formatting around the embedded links. -->
 <!ENTITY rights.intro-point1a "&brandShortName; is made available to you under the terms of the ">
 <!ENTITY rights.intro-point1b "Mozilla Public License">
-<!ENTITY rights.intro-point1c ". This means you may use, copy and distribute &brandShortName; to others in its source form. Binaries are subject to the Pale Moon redistribution license found on the Pale Moon website. You are also welcome to modify the source code of &brandShortName; as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions.">

+<!ENTITY rights.intro-point1c ". This means you may use, copy and distribute &brandShortName; to others.  You are also welcome to modify the source code of &brandShortName; as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions.">
 
-<!ENTITY rights.intro-point2-a "You are, however, not granted any rights or licenses to the intellectual property of Moonchild Productions or any other party, including without limitation the Pale Moon name or logo. Additional information on trademarks may be found ">

+<!ENTITY rights.intro-point2-a "You are not granted any trademark rights or licenses to the trademarks of the Mozilla Foundation or any party, including without limitation the Firefox name or logo. Additional information on trademarks may be found ">
 <!ENTITY rights.intro-point2-b "here">
 <!ENTITY rights.intro-point2-c ".">
 
 <!-- point 2.5 text for official branded builds -->
-<!ENTITY rights.intro-point2.5 "Some features in &brandShortName; may give you the option to provide feedback to &vendorShortName;. By choosing to submit feedback, you give &vendorShortName; permission to use the feedback to improve its products, to publish the feedback on its websites, and to distribute the feedback.">

+<!ENTITY rights.intro-point2.5 "Some features in &brandShortName;, such as the Crash Reporter, give you the option to provide feedback to &vendorShortName;. By choosing to submit feedback, you give &vendorShortName; permission to use the feedback to improve its products, to publish the feedback on its websites, and to distribute the feedback.">
 
 <!-- point 3 text for official branded builds -->
 <!ENTITY rights2.intro-point3a "How we use your personal information and feedback submitted to &vendorShortName; through &brandShortName; is described in the ">
diff --git a/toolkit/locales/en-US/chrome/global/aboutSupport.dtd b/toolkit/locales/en-US/chrome/global/aboutSupport.dtd
index c6d814bc4..51f3bb36c 100644
--- a/toolkit/locales/en-US/chrome/global/aboutSupport.dtd
+++ b/toolkit/locales/en-US/chrome/global/aboutSupport.dtd
@@ -11,18 +11,37 @@
   about &brandShortName;, check out our <a id='supportLink'>support website</a>.
 ">
 
+<!ENTITY aboutSupport.crashes.title "Crash Reports">
+<!-- LOCALIZATION NOTE (aboutSupport.crashes.id):
+This is likely the same like id.heading in crashes.dtd. -->
+<!ENTITY aboutSupport.crashes.id "Report ID">
+<!ENTITY aboutSupport.crashes.sendDate "Submitted">
+<!ENTITY aboutSupport.crashes.allReports "All Crash Reports">
+<!ENTITY aboutSupport.crashes.noConfig "This application has not been configured to display crash reports.">
+
 <!ENTITY aboutSupport.extensionsTitle "Extensions">
 <!ENTITY aboutSupport.extensionName "Name">
 <!ENTITY aboutSupport.extensionEnabled "Enabled">
 <!ENTITY aboutSupport.extensionVersion "Version">
 <!ENTITY aboutSupport.extensionId "ID">
 
+<!ENTITY aboutSupport.experimentsTitle "Experimental Features">
+<!ENTITY aboutSupport.experimentName "Name">
+<!ENTITY aboutSupport.experimentId "ID">
+<!ENTITY aboutSupport.experimentDescription "Description">
+<!ENTITY aboutSupport.experimentActive "Active">
+<!ENTITY aboutSupport.experimentEndDate "End Date">
+<!ENTITY aboutSupport.experimentHomepage "Homepage">
+
+
 <!ENTITY aboutSupport.appBasicsTitle "Application Basics">
 <!ENTITY aboutSupport.appBasicsName "Name">
 <!ENTITY aboutSupport.appBasicsVersion "Version">
+<!ENTITY aboutSupport.appBasicsBuildID "Build ID">
 
-<!-- LOCALIZATION NOTE (aboutSupport.appBasicsUpdateHistory, aboutSupport.appBasicsShowUpdateHistory):
+<!-- LOCALIZATION NOTE (aboutSupport.appBasicsUpdateChannel, aboutSupport.appBasicsUpdateHistory, aboutSupport.appBasicsShowUpdateHistory):
 "Update" is a noun here, not a verb. -->
+<!ENTITY aboutSupport.appBasicsUpdateChannel "Update Channel">
 <!ENTITY aboutSupport.appBasicsUpdateHistory "Update History">
 <!ENTITY aboutSupport.appBasicsShowUpdateHistory "Show Update History">
 
@@ -35,9 +54,10 @@ Windows/Mac use the term "Folder" instead of "Directory" -->
 <!ENTITY aboutSupport.appBasicsEnabledPlugins "Enabled Plugins">
 <!ENTITY aboutSupport.appBasicsBuildConfig "Build Configuration">
 <!ENTITY aboutSupport.appBasicsUserAgent "User Agent">
-<!ENTITY aboutSupport.appBasicsCrashIDs "Crash Reports">
 <!ENTITY aboutSupport.appBasicsMemoryUse "Memory Use">
 
+<!ENTITY aboutSupport.appBasicsMultiProcessSupport "Multiprocess Windows">
+
 <!ENTITY aboutSupport.showDir.label "Open Directory">
 <!-- LOCALIZATION NOTE (aboutSupport.showMac.label): This is the Mac-specific
 variant of aboutSupport.showDir.label.  This allows us to use the preferred
@@ -55,6 +75,10 @@ variant of aboutSupport.showDir.label. -->
 <!ENTITY aboutSupport.userJSTitle "user.js Preferences">
 <!ENTITY aboutSupport.userJSDescription "Your profile folder contains a <a id='prefs-user-js-link'>user.js file</a>, which includes preferences that were not created by &brandShortName;.">
 
+<!ENTITY aboutSupport.lockedKeyPrefsTitle "Important Locked Preferences">
+<!ENTITY aboutSupport.lockedPrefsName "Name">
+<!ENTITY aboutSupport.lockedPrefsValue "Value">
+
 <!ENTITY aboutSupport.graphicsTitle "Graphics">
 
 <!ENTITY aboutSupport.jsTitle "JavaScript">
@@ -71,3 +95,8 @@ variant of aboutSupport.showDir.label. -->
 
 <!ENTITY aboutSupport.copyTextToClipboard.label "Copy text to clipboard">
 <!ENTITY aboutSupport.copyRawDataToClipboard.label "Copy raw data to clipboard">
+
+<!ENTITY aboutSupport.sandboxTitle "Sandbox">
+
+<!ENTITY aboutSupport.safeModeTitle "Try Safe Mode">
+<!ENTITY aboutSupport.restartInSafeMode.label "Restart with Add-ons Disabled…">
diff --git a/toolkit/locales/en-US/chrome/global/aboutSupport.properties b/toolkit/locales/en-US/chrome/global/aboutSupport.properties
index 8304d86e9..65c1e283f 100644
--- a/toolkit/locales/en-US/chrome/global/aboutSupport.properties
+++ b/toolkit/locales/en-US/chrome/global/aboutSupport.properties
@@ -2,6 +2,31 @@
 # 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 (downloadsTitleFiles): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of relevant days with crash reports
+crashesTitle=Crash Reports for the Last #1 Day;Crash Reports for the Last #1 Days
+
+# LOCALIZATION NOTE (crashesTimeMinutes): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of minutes (between 1 and 59) which have passed since the crash
+crashesTimeMinutes=#1 minute ago;#1 minutes ago
+
+# LOCALIZATION NOTE (crashesTimeHours): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of hours (between 1 and 23) which have passed since the crash
+crashesTimeHours=#1 hour ago;#1 hours ago
+
+# LOCALIZATION NOTE (crashesTimeDays): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of days (1 or more) which have passed since the crash
+crashesTimeDays=#1 day ago;#1 days ago
+
+# LOCALIZATION NOTE (downloadsTitleFiles): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of pending crash reports
+pendingReports=All Crash Reports (including #1 pending crash in the given time range);All Crash Reports (including #1 pending crashes in the given time range)
+
 # LOCALIZATION NOTE In the following strings, "Direct2D", "DirectWrite" and "ClearType" 
 # are proper nouns and should not be translated. Feel free to leave english strings if 
 # there are no good translations, these are only used in about:support
@@ -39,6 +64,7 @@ clearTypeParametersNotFound = ClearType parameters not found
 adapterDescription = Adapter Description
 adapterVendorID = Vendor ID
 adapterDeviceID = Device ID
+adapterSubsysID = Subsys ID
 adapterDrivers = Adapter Drivers
 adapterRAM = Adapter RAM
 driverVersion = Driver Version
@@ -46,6 +72,7 @@ driverDate = Driver Date
 adapterDescription2 = Adapter Description (GPU #2) 
 adapterVendorID2 = Vendor ID (GPU #2) 
 adapterDeviceID2 = Device ID (GPU #2)
+adapterSubsysID2 = Subsys ID (GPU #2)
 adapterDrivers2 = Adapter Drivers (GPU #2)
 adapterRAM2 = Adapter RAM (GPU #2)
 driverVersion2 = Driver Version (GPU #2)
@@ -55,3 +82,12 @@ webglRenderer = WebGL Renderer
 
 minLibVersions = Expected minimum version
 loadedLibVersions = Version in use
+
+hasSeccompBPF = Seccomp-BPF (System Call Filtering)
+canSandboxContent = Content Process Sandboxing
+canSandboxMedia = Media Plugin Sandboxing
+
+# LOCALIZATION NOTE %1$S and %2$S will be replaced with the number of remote and the total number
+# of windows, respectively, while %3$S will indicate whether windows are remote by default ('true'
+# or 'false')
+multiProcessStatus = %1$S/%2$S (default: %3$S)
diff --git a/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd b/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd
new file mode 100644
index 000000000..78ed6d210
--- /dev/null
+++ b/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd
@@ -0,0 +1,81 @@
+<!-- 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 aboutTelemetry.pageTitle "Telemetry Data">
+
+<!ENTITY aboutTelemetry.telemetryEnabled "
+  Telemetry is <span>enabled</span>.
+">
+
+<!ENTITY aboutTelemetry.telemetryDisabled "
+  Telemetry is <span>disabled</span>.
+">
+
+<!ENTITY aboutTelemetry.generalDataSection "
+  General Data
+">
+
+<!ENTITY aboutTelemetry.slowSqlSection "
+  Slow SQL Statements
+">
+
+<!ENTITY aboutTelemetry.chromeHangsSection "
+  Browser Hangs
+">
+
+<!ENTITY aboutTelemetry.threadHangStatsSection "
+  Thread Hangs
+">
+
+<!ENTITY aboutTelemetry.histogramsSection "
+  Histograms
+">
+
+<!ENTITY aboutTelemetry.keyedHistogramsSection "
+  Keyed Histograms
+">
+
+<!ENTITY aboutTelemetry.simpleMeasurementsSection "
+  Simple Measurements
+">
+
+<!ENTITY aboutTelemetry.addonDetailsSection "
+  Add-on Details
+">
+
+<!ENTITY aboutTelemetry.lateWritesSection "
+  Late Writes
+">
+
+<!ENTITY aboutTelemetry.systemInfoSection "
+  System Information
+">
+
+<!ENTITY aboutTelemetry.addonHistogramsSection "
+  Histograms Collected by Add-ons
+">
+
+<!ENTITY aboutTelemetry.toggle "
+  Click to toggle section
+">
+
+<!ENTITY aboutTelemetry.emptySection "
+  (No data collected)
+">
+
+<!ENTITY aboutTelemetry.fullSqlWarning "
+  NOTE: Slow SQL debugging is enabled. Full SQL strings may be displayed below but they will not be submitted to Telemetry.
+">
+
+<!ENTITY aboutTelemetry.fetchSymbols "
+  Fetch function names for hang stacks
+">
+
+<!ENTITY aboutTelemetry.hideSymbols "
+  Show raw data from hangs
+">
+
+<!ENTITY aboutTelemetry.filterText "
+  Filter (strings or /regexp/)
+">
diff --git a/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties b/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
new file mode 100644
index 000000000..1604a1ba9
--- /dev/null
+++ b/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
@@ -0,0 +1,63 @@
+# 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/.
+
+# Note to translators:
+# - %1$S will be replaced by brandFullName
+# - %2$S will be replaced with the value of the toolkit.telemetry.server_owner preference
+pageSubtitle = This page shows the information about performance, hardware, usage and customizations collected by Telemetry. This information is submitted to %1$S to help improve %2$S.
+
+generalDataTitle = General Data
+
+generalDataHeadingName = Name
+
+generalDataHeadingValue = Value
+
+slowSqlMain = Slow SQL Statements on Main Thread
+
+slowSqlOther = Slow SQL Statements on Helper Threads
+
+slowSqlHits = Hits
+
+slowSqlAverage = Avg. Time (ms)
+
+slowSqlStatement = Statement
+
+# Note to translators:
+# - The %1$S will be replaced with the number of the hang
+# - The %2$S will be replaced with the duration of the hang
+chrome-hangs-title = Hang Report #%1$S (%2$S seconds)
+
+# Note to translators:
+# - The %1$S will be replaced with the number of the late write
+late-writes-title = Late Write #%1$S
+
+stackTitle = Stack:
+
+memoryMapTitle = Memory map:
+
+errorFetchingSymbols = An error occurred while fetching symbols. Check that you are connected to the Internet and try again.
+
+histogramSamples = samples
+
+histogramAverage = average
+
+histogramSum = sum
+
+histogramCopy = Copy
+
+disableTelemetry = Disable Telemetry
+
+enableTelemetry = Enable Telemetry
+
+keysHeader = Property
+
+valuesHeader = Value
+
+addonTableID = Add-on ID
+
+addonTableDetails = Details
+
+# Note to translators:
+# - The %1$S will be replaced with the name of an Add-on Provider (e.g. "XPI", "Plugin")
+addonProvider = %1$S Provider
diff --git a/toolkit/locales/en-US/chrome/global/autocomplete.properties b/toolkit/locales/en-US/chrome/global/autocomplete.properties
new file mode 100644
index 000000000..93342831c
--- /dev/null
+++ b/toolkit/locales/en-US/chrome/global/autocomplete.properties
@@ -0,0 +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/.
+
+# LOCALIZATION NOTE (searchWithEngine): %S will be replaced with
+# the search engine provider's name. This format was chosen because
+# the provider can also end with "Search" (e.g.: MSN Search).
+searchWithEngine = Search with %S
+# LOCALIZATION NOTE (searchWithEngineForQuery):
+# %1$S is the search engine's name, %2$S is the search query.
+# This format was chosen because the provider can also end with "Search"
+# (e.g.: MSN Search).
+searchWithEngineForQuery = %2$S — Search with %1$S 
+switchToTab = Switch to tab
+# LOCALIZATION NOTE (visitURL):
+# %S is the URL to visit.
+visitURL = Visit %S
diff --git a/toolkit/locales/en-US/chrome/global/browser.properties b/toolkit/locales/en-US/chrome/global/browser.properties
index 0e5409fd1..2b3150629 100644
--- a/toolkit/locales/en-US/chrome/global/browser.properties
+++ b/toolkit/locales/en-US/chrome/global/browser.properties
@@ -8,3 +8,7 @@ browsewithcaret.checkLabel=Pressing F7 turns Caret Browsing on or off. This feat
 browsewithcaret.checkButtonLabel=Yes
 
 plainText.wordWrap=Wrap Long Lines
+
+formPostSecureToInsecureWarning.title = Security Warning
+formPostSecureToInsecureWarning.message = The information you have entered on this page will be sent over an insecure connection and could be read by a third party.\n\nAre you sure you want to send this information?
+formPostSecureToInsecureWarning.continue = Continue
diff --git a/toolkit/locales/en-US/chrome/global/charsetMenu.dtd b/toolkit/locales/en-US/chrome/global/charsetMenu.dtd
new file mode 100644
index 000000000..1acd9732b
--- /dev/null
+++ b/toolkit/locales/en-US/chrome/global/charsetMenu.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 charsetMenu.label             "Character Encoding">
+<!ENTITY charsetMenu.accesskey         "C">
diff --git a/toolkit/locales/en-US/chrome/global/charsetMenu.properties b/toolkit/locales/en-US/chrome/global/charsetMenu.properties
new file mode 100644
index 000000000..a86a58320
--- /dev/null
+++ b/toolkit/locales/en-US/chrome/global/charsetMenu.properties
@@ -0,0 +1,116 @@
+# 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.
+#
+# For gbk, gbk.bis and gbk.bis.key are used to trigger string changes in
+# localizations.
+#
+# 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.)
+
+# Auto-Detect (sub)menu
+charsetMenuCharsets = Character Encoding
+charsetMenuAutodet = Auto-Detect
+# 'A' is reserved for Arabic:
+charsetMenuAutodet.key = D
+charsetMenuAutodet.off = (off)
+charsetMenuAutodet.off.key = o
+charsetMenuAutodet.ja = Japanese
+charsetMenuAutodet.ja.key = J
+charsetMenuAutodet.ru = Russian
+charsetMenuAutodet.ru.key = R
+charsetMenuAutodet.uk = Ukrainian
+charsetMenuAutodet.uk.key = U
+
+# 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.bis.key      =          S
+gbk.bis          = Chinese, Simplified
+
+# 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
+
diff --git a/toolkit/locales/en-US/chrome/global/charsetOverlay.dtd b/toolkit/locales/en-US/chrome/global/charsetOverlay.dtd
deleted file mode 100644
index 11ee98b0c..000000000
--- a/toolkit/locales/en-US/chrome/global/charsetOverlay.dtd
+++ /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/. -->
-
-<!-- extracted from charsetOverlay.xul -->
-<!ENTITY charsetMenu.label             "Character Encoding">
-<!ENTITY charsetMenu.accesskey         "C">
-<!ENTITY charsetMenuAutodet.label      "Auto-Detect">
-<!ENTITY charsetMenuAutodet.accesskey  "a">
-<!ENTITY charsetMenuMore.label         "More Encodings">
-<!ENTITY charsetMenuMore.accesskey     "m">
-<!ENTITY charsetMenuMore1.label        "West European">
-<!ENTITY charsetMenuMore1.accesskey    "w">
-<!ENTITY charsetMenuMore2.label        "East European">
-<!ENTITY charsetMenuMore2.accesskey    "E">
-<!ENTITY charsetMenuMore3.label        "East Asian">
-<!ENTITY charsetMenuMore3.accesskey    "A">
-<!ENTITY charsetMenuMore4.label        "SE &amp; SW Asian">
-<!ENTITY charsetMenuMore4.accesskey    "S">
-<!ENTITY charsetMenuMore5.label        "Middle Eastern">
-<!ENTITY charsetMenuMore5.accesskey    "M">
-<!ENTITY charsetCustomize.label        "Customize List…">
-<!ENTITY charsetCustomize.accesskey    "c">
diff --git a/toolkit/locales/en-US/chrome/global/console.properties b/toolkit/locales/en-US/chrome/global/console.properties
index f7616687e..d01b5e59b 100644
--- a/toolkit/locales/en-US/chrome/global/console.properties
+++ b/toolkit/locales/en-US/chrome/global/console.properties
@@ -9,3 +9,8 @@ errLine=Line: %S
 errLineCol=Line: %S, Column: %S
 errCode=Source Code:
 errTime=Timestamp: %S
+
+# LOCALIZATION NOTE (evaluationContextChanged): The message displayed when the
+# browser console's evaluation context (window against which input is evaluated)
+# changes.
+evaluationContextChanged=The console's evaluation context changed, probably because the target window was closed or because you opened a main window from the browser console's window.
diff --git a/toolkit/locales/en-US/chrome/global/customizeCharset.dtd b/toolkit/locales/en-US/chrome/global/customizeCharset.dtd
deleted file mode 100644
index 7751b7665..000000000
--- a/toolkit/locales/en-US/chrome/global/customizeCharset.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- -*- Mode: HTML -*- -->
-<!-- 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 title.label        "Customize Character Encoding">
-<!ENTITY current.label      "Active Character Encodings:">
-<!ENTITY remove.label       "Remove">
-<!ENTITY remove.accessKey   "R">
-<!ENTITY additional.label   "Available Character Encodings:">
-<!ENTITY add.label          "Add">
-<!ENTITY add.accessKey      "A">
-<!ENTITY moveUp.label       "Move Up">
-<!ENTITY moveUp.accessKey   "U">
-<!ENTITY moveDown.label     "Move Down">
-<!ENTITY moveDown.accessKey "D">
diff --git a/toolkit/locales/en-US/chrome/global/devtools/csscoverage.dtd b/toolkit/locales/en-US/chrome/global/devtools/csscoverage.dtd
new file mode 100644
index 000000000..5f104e7c2
--- /dev/null
+++ b/toolkit/locales/en-US/chrome/global/devtools/csscoverage.dtd
@@ -0,0 +1,47 @@
+<!-- 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 CSS Coverage Report
+   - strings. See the 'csscoverage' command for more information, and
+   - browser/devtools/styleeditor/styleeditor.xul for context -->
+
+<!-- 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 (csscoverage.backButton):
+  -  Text on the button to go back to the main style editor -->
+<!ENTITY csscoverage.backButton "Back">
+
+<!-- LOCALIZATION NOTE (csscoverage.unused, csscoverage.noMatches):
+  -  This is the heading and body text for the CSS usage part of the report -->
+<!ENTITY csscoverage.unused "Unused Rules">
+<!ENTITY csscoverage.noMatches "No matches found for the following rules:">
+
+<!-- LOCALIZATION NOTE (csscoverage.optimize.header):
+  -  This is the heading for the CSS optimization part of the report -->
+<!ENTITY csscoverage.optimize.header "Optimizable Pages">
+
+<!-- LOCALIZATION NOTE (csscoverage.preload1, csscoverage.preload2,
+  -  csscoverage.preload3): These 3 are part of a paragraph with 1 and 2
+  -  separated by a styled <link> tag and 2 and 3 separated by a styled
+  -  <style> tag -->
+<!ENTITY csscoverage.optimize.body1 "You can sometimes speed up loading by moving">
+<!ENTITY csscoverage.optimize.body2 "tags to the bottom of the page and creating a new inline">
+<!ENTITY csscoverage.optimize.body3 "element with the styles needed before the 'load' event to the top. Here are the style blocks you need:">
+
+<!-- LOCALIZATION NOTE (csscoverage.optimize.bodyX):
+  -  This is what we say when we have no optimization suggestions -->
+<!ENTITY csscoverage.optimize.bodyX "All rules are inlined.">
+
+<!-- LOCALIZATION NOTE (csscoverage.footer1, csscoverage.footer2a,
+  -  csscoverage.footer3, csscoverage.footer4): The text displayed at the
+  -  bottom of the page, with 2a being the URL opened when the link text in 3
+  -  is clicked -->
+<!ENTITY csscoverage.footer1 "See">
+<!ENTITY csscoverage.footer2a "https://developer.mozilla.org/docs/Tools/CSS_Coverage">
+<!ENTITY csscoverage.footer3 "the MDN article on the CSS Coverage Tool">
+<!ENTITY csscoverage.footer4 "for caveats in the generation of this report.">
diff --git a/toolkit/locales/en-US/chrome/global/devtools/csscoverage.properties b/toolkit/locales/en-US/chrome/global/devtools/csscoverage.properties
new file mode 100644
index 000000000..c1df46a09
--- /dev/null
+++ b/toolkit/locales/en-US/chrome/global/devtools/csscoverage.properties
@@ -0,0 +1,32 @@
+# 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 'csscoverage' command and in
+# the user interface that this command creates.
+
+# LOCALIZATION NOTE (csscoverageDesc, csscoverageStartDesc2,
+# csscoverageStopDesc2, csscoverageOneShotDesc2, csscoverageToggleDesc2,
+# csscoverageReportDesc2): Short descriptions of the csscoverage commands
+csscoverageDesc=Control CSS coverage analysis
+csscoverageStartDesc2=Begin collecting CSS coverage data
+csscoverageStopDesc2=Stop collecting CSS coverage data
+csscoverageOneShotDesc2=Collect instantaneous CSS coverage data
+csscoverageToggleDesc2=Toggle collecting CSS coverage data
+csscoverageReportDesc2=Show CSS coverage report
+csscoverageStartNoReloadDesc=Don't start with a page reload
+csscoverageStartNoReloadManual=It's best if we start by reloading the current page because that starts the test at a known point, but there could be reasons why we don't want to do that (e.g. the page contains state that will be lost across a reload)
+
+# LOCALIZATION NOTE (csscoverageRunningReply, csscoverageDoneReply): Text that
+# describes the current state of the css coverage system
+csscoverageRunningReply=Running CSS coverage analysis
+csscoverageDoneReply=CSS Coverage analysis completed
+
+# LOCALIZATION NOTE (csscoverageRunningError, csscoverageNotRunningError,
+# csscoverageNotRunError): Error message that describe things that can go wrong
+# with the css coverage system
+csscoverageRunningError=CSS coverage analysis already running
+csscoverageNotRunningError=CSS coverage analysis not running
+csscoverageNotRunError=CSS coverage analysis has not been run
+csscoverageNoRemoteError=Target does not support CSS Coverage
+csscoverageOneShotReportError=CSS coverage report is not available for 'oneshot' data. Please use start/stop.
diff --git a/toolkit/locales/en-US/chrome/global/devtools/debugger.properties b/toolkit/locales/en-US/chrome/global/devtools/debugger.properties
index 4c84d30df..50e42a725 100644
--- a/toolkit/locales/en-US/chrome/global/devtools/debugger.properties
+++ b/toolkit/locales/en-US/chrome/global/devtools/debugger.properties
@@ -14,11 +14,46 @@
 # dialog that prompts the user to allow the incoming connection.
 remoteIncomingPromptTitle=Incoming Connection
 
-# LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the
+# LOCALIZATION NOTE (remoteIncomingPromptHeader): Header displayed on the
 # dialog that prompts the user to allow the incoming connection.
-remoteIncomingPromptMessage=An incoming request to permit remote debugging connection was detected. A remote client can take complete control over your browser! Allow connection?
+remoteIncomingPromptHeader=An incoming request to permit remote debugging connection was detected. A remote client can take complete control over your browser!
+# LOCALIZATION NOTE (remoteIncomingPromptClientEndpoint): Part of the prompt
+# dialog for the user to choose whether an incoming connection should be
+# allowed.
+# %1$S: The host and port of the client such as "127.0.0.1:6000"
+remoteIncomingPromptClientEndpoint=Client Endpoint: %1$S
+# LOCALIZATION NOTE (remoteIncomingPromptServerEndpoint): Part of the prompt
+# dialog for the user to choose whether an incoming connection should be
+# allowed.
+# %1$S: The host and port of the server such as "127.0.0.1:6000"
+remoteIncomingPromptServerEndpoint=Server Endpoint: %1$S
+# LOCALIZATION NOTE (remoteIncomingPromptFooter): Footer displayed on the
+# dialog that prompts the user to allow the incoming connection.
+remoteIncomingPromptFooter=Allow connection?
 
 # LOCALIZATION NOTE (remoteIncomingPromptDisable): The label displayed on the
 # third button in the incoming connection dialog that lets the user disable the
 # remote debugger server.
 remoteIncomingPromptDisable=Disable
+
+# LOCALIZATION NOTE (clientSendOOBTitle): The title displayed on the dialog that
+# instructs the user to transfer an authentication token to the server.
+clientSendOOBTitle=Client Identification
+# LOCALIZATION NOTE (clientSendOOBHeader): Header displayed on the dialog that
+# instructs the user to transfer an authentication token to the server.
+clientSendOOBHeader=The endpoint you are connecting to needs more information to authenticate this connection.  Please provide the token below in the prompt that appears on the other end.
+# LOCALIZATION NOTE (clientSendOOBHash): Part of the dialog that instructs the
+# user to transfer an authentication token to the server.
+# %1$S: The client's cert fingerprint
+clientSendOOBHash=My Cert: %1$S
+# LOCALIZATION NOTE (clientSendOOBToken): Part of the dialog that instructs the
+# user to transfer an authentication token to the server.
+# %1$S: The authentication token that the user will transfer.
+clientSendOOBToken=Token: %1$S
+
+# LOCALIZATION NOTE (serverReceiveOOBTitle): The title displayed on the dialog
+# that instructs the user to provide an authentication token from the client.
+serverReceiveOOBTitle=Provide Client Token
+# LOCALIZATION NOTE (serverReceiveOOBBody): Main text displayed on the dialog
+# that instructs the user to provide an authentication token from the client.
+serverReceiveOOBBody=The client should be displaying a token value.  Enter that token value here to complete authentication with this client.
diff --git a/toolkit/locales/en-US/chrome/global/devtools/styleinspector.properties b/toolkit/locales/en-US/chrome/global/devtools/styleinspector.properties
new file mode 100644
index 000000000..4b9a49e5f
--- /dev/null
+++ b/toolkit/locales/en-US/chrome/global/devtools/styleinspector.properties
@@ -0,0 +1,125 @@
+# 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 Style Inspector.
+#
+# 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 (panelTitle): This is the panel title
+panelTitle=Style Inspector
+
+# LOCALIZATION NOTE (rule.status): For each style property the panel shows
+# the rules which hold that specific property. For every rule, the rule status
+# is also displayed: a rule can be the best match, a match, a parent match, or a
+# rule did not match the element the user has highlighted.
+rule.status.BEST=Best Match
+rule.status.MATCHED=Matched
+rule.status.PARENT_MATCH=Parent Match
+
+# LOCALIZATION NOTE (rule.sourceElement, rule.sourceInline): For each
+# style property the panel shows the rules which hold that specific property.
+# For every rule, the rule source is also displayed: a rule can come from a
+# file, from the same page (inline), or from the element itself (element).
+rule.sourceInline=inline
+rule.sourceElement=element
+
+# LOCALIZATION NOTE (rule.inheritedFrom): Shown for CSS rules
+# that were inherited from a parent node. Will be passed a node
+# identifier of the parent node.
+# e.g "Inherited from body#bodyID"
+rule.inheritedFrom=Inherited from %S
+
+# LOCALIZATION NOTE (rule.keyframe): Shown for CSS Rules keyframe header.
+# Will be passed an identifier of the keyframe animation name.
+rule.keyframe=Keyframes %S
+
+# LOCALIZATION NOTE (rule.userAgentStyles): Shown next to the style sheet
+# link for CSS rules that were loaded from a user agent style sheet.
+# These styles will not be editable, and will only be visible if the
+# devtools.inspector.showUserAgentStyles pref is true.
+rule.userAgentStyles=(user agent)
+
+# LOCALIZATION NOTE (rule.pseudoElement): Shown for CSS rules
+# pseudo element header
+rule.pseudoElement=Pseudo-elements
+
+# LOCALIZATION NOTE (rule.pseudoElement): Shown for CSS rules
+# pseudo element header
+rule.selectedElement=This Element
+
+# LOCALIZATION NOTE (helpLinkTitle): For each style property
+# the user can hover it and get a help link button which allows one to
+# quickly jump to the documentation from the Mozilla Developer Network site.
+# This is the link title shown in the hover tooltip.
+helpLinkTitle=Read the documentation for this property
+
+# LOCALIZATION NOTE (rule.warning.title): When an invalid property value is
+# entered into the rule view a warning icon is displayed. This text is used for
+# the title attribute of the warning icon.
+rule.warning.title=Invalid property value
+
+# LOCALIZATION NOTE (ruleView.empty): Text displayed when the highlighter is
+# first opened and there's no node selected in the rule view.
+rule.empty=No element selected.
+
+# LOCALIZATION NOTE (ruleView.contextmenu.selectAll): Text displayed in the
+# rule view context menu.
+ruleView.contextmenu.selectAll=Select all
+
+# LOCALIZATION NOTE (ruleView.contextmenu.selectAll.accessKey): Access key for
+# the rule view context menu "Select all" entry.
+ruleView.contextmenu.selectAll.accessKey=A
+
+# LOCALIZATION NOTE (ruleView.contextmenu.copy): Text displayed in the rule view
+# context menu.
+ruleView.contextmenu.copy=Copy
+
+# LOCALIZATION NOTE (ruleView.contextmenu.copy.accessKey): Access key for
+# the rule view context menu "Select all" entry.
+ruleView.contextmenu.copy.accessKey=C
+
+# LOCALIZATION NOTE (ruleView.contextmenu.copyColor): Text displayed in the rule
+# and computed view context menu when a color value was clicked.
+ruleView.contextmenu.copyColor=Copy Color
+
+# LOCALIZATION NOTE (ruleView.contextmenu.copyColor.accessKey): Access key for
+# the rule and computed view context menu "Copy Color" entry.
+ruleView.contextmenu.copyColor.accessKey=L
+
+# LOCALIZATION NOTE (ruleView.contextmenu.showOrigSources): Text displayed in the rule view
+# context menu.
+ruleView.contextmenu.showOrigSources=Show original sources
+
+# LOCALIZATION NOTE (ruleView.contextmenu.showOrigSources.accessKey): Access key for
+# the rule view context menu "Show original sources" entry.
+ruleView.contextmenu.showOrigSources.accessKey=O
+
+# LOCALIZATION NOTE (ruleView.contextmenu.addRule): Text displayed in the
+# rule view context menu for adding a new rule to the element.
+ruleView.contextmenu.addRule=Add rule
+
+# LOCALIZATION NOTE (ruleView.contextmenu.addRule.accessKey): Access key for
+# the rule view context menu "Add rule" entry.
+ruleView.contextmenu.addRule.accessKey=R
+
+# LOCALIZATION NOTE (computedView.contextmenu.selectAll): Text displayed in the
+# computed view context menu.
+computedView.contextmenu.selectAll=Select all
+
+# LOCALIZATION NOTE (computedView.contextmenu.selectAll.accessKey): Access key for
+# the computed view context menu "Select all" entry.
+computedView.contextmenu.selectAll.accessKey=A
+
+# LOCALIZATION NOTE (computedView.contextmenu.copy): Text displayed in the
+# computed view context menu.
+computedView.contextmenu.copy=Copy
+
+# LOCALIZATION NOTE (computedView.contextmenu.copy.accessKey): Access key for
+# the computed view context menu "Select all" entry.
+computedView.contextmenu.copy.accessKey=C
diff --git a/toolkit/locales/en-US/chrome/global/fallbackMenubar.properties b/toolkit/locales/en-US/chrome/global/fallbackMenubar.properties
new file mode 100644
index 000000000..9765689ec
--- /dev/null
+++ b/toolkit/locales/en-US/chrome/global/fallbackMenubar.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/.
+
+# OSX only. Default menu label when there is no xul menubar.
+
+quitMenuitem.label=Quit
+quitMenuitem.key=q
diff --git a/toolkit/locales/en-US/chrome/global/findbar.dtd b/toolkit/locales/en-US/chrome/global/findbar.dtd
index 9ba120148..ed580ab59 100644
--- a/toolkit/locales/en-US/chrome/global/findbar.dtd
+++ b/toolkit/locales/en-US/chrome/global/findbar.dtd
@@ -5,16 +5,16 @@
 <!-- LOCALIZATION NOTE : FILE This file contains the entities needed to -->
 <!-- LOCALIZATION NOTE : FILE use the Find Bar. --> 
 
-<!-- entities split out from browser.dtd -->
 <!ENTITY next.label "Next">
 <!ENTITY next.accesskey "N">
 <!ENTITY next.tooltip "Find the next occurrence of the phrase">
 <!ENTITY previous.label "Previous">
 <!ENTITY previous.accesskey "P">
 <!ENTITY previous.tooltip "Find the previous occurrence of the phrase">
-<!ENTITY findCloseButton.tooltip "Close Find bar">
-<!ENTITY highlight.label "Highlight all">
-<!ENTITY highlight.accesskey "a">
-<!ENTITY highlight.tooltiptext "Highlight all occurrences of the phrase">
-<!ENTITY caseSensitiveCheckbox.label "Match case">
-<!ENTITY caseSensitiveCheckbox.accesskey "c">
+<!ENTITY findCloseButton.tooltip "Close find bar">
+<!ENTITY highlightAll.label "Highlight All">
+<!ENTITY highlightAll.accesskey "a">
+<!ENTITY highlightAll.tooltiptext "Highlight all occurrences of the phrase">
+<!ENTITY caseSensitive.label "Match Case">
+<!ENTITY caseSensitive.accesskey "c">
+<!ENTITY caseSensitive.tooltiptext "Search with case sensitivity">
diff --git a/toolkit/locales/en-US/chrome/global/findbar.properties b/toolkit/locales/en-US/chrome/global/findbar.properties
index 3ea8d6e0f..c5b696e56 100644
--- a/toolkit/locales/en-US/chrome/global/findbar.properties
+++ b/toolkit/locales/en-US/chrome/global/findbar.properties
@@ -6,13 +6,16 @@
 NotFound=Phrase not found
 WrappedToTop=Reached end of page, continued from top
 WrappedToBottom=Reached top of page, continued from bottom
-NormalFindLabel=Find:
-FastFindLabel=Quick Find:
-FastFindLinksLabel=Quick Find (links only):
+NormalFind=Find in page
+FastFind=Quick find
+FastFindLinks=Quick find (links only)
 CaseSensitive=(Case sensitive)
 # LOCALIZATION NOTE (FoundMatches): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is currently selected match and #2 the total amount of matches.
 FoundMatches=#1 of #2 match;#1 of #2 matches
-# LOCALIZATION NOTE (FoundTooManyMatches): Semicolon-separated list of plural
-# forms. #1 is the total amount of matches allowed before counting stops.
-FoundTooManyMatches=More than #1 match;More than #1 matches
+# LOCALIZATION NOTE (FoundMatchesCountLimit): Semicolon-separated list of plural
+# forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the total amount of matches allowed before counting stops.
+FoundMatchesCountLimit=More than #1 match;More than #1 matches
diff --git a/toolkit/locales/en-US/chrome/global/finddialog.properties b/toolkit/locales/en-US/chrome/global/finddialog.properties
index 0f7208c5a..67b0b3c41 100644
--- a/toolkit/locales/en-US/chrome/global/finddialog.properties
+++ b/toolkit/locales/en-US/chrome/global/finddialog.properties
@@ -3,4 +3,4 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 notFoundWarning=The text you entered was not found.
-notFoundTitle=Find
+notFoundTitle=Find
\ No newline at end of file
diff --git a/toolkit/locales/en-US/chrome/global/intl.properties b/toolkit/locales/en-US/chrome/global/intl.properties
index a9e270529..ffa3e0c6b 100644
--- a/toolkit/locales/en-US/chrome/global/intl.properties
+++ b/toolkit/locales/en-US/chrome/global/intl.properties
@@ -40,20 +40,13 @@ intl.accept_languages=en-US, en
 # http://mxr.mozilla.org/mozilla/source/browser/components/preferences/fonts.xul
 font.language.group=x-western
 
-# LOCALIZATION NOTE (intl.charset.detector, intl.charset.default, intl.charsetmenu.browser.static, intl.charsetmenu.mailedit):
-# For the list of canonical charset values, refer to:
-# http://mxr.mozilla.org/mozilla-central/source/intl/locale/src/charsetalias.properties
-#
-# If you are modifying the charset preferences for your locale, be sure to use
-# the values from that list, not the keys. Note that these values are
-# case-sensitive and must be reproduced exactly as listed.
-#
-# Note also that the list of charsets in 'intl.charsetmenu.browser.static'
-# must always include "UTF-8".
+# LOCALIZATION NOTE (intl.charset.detector):
+# This preference controls the initial setting for the character encoding
+# detector. Valid values are ja_parallel_state_machine for Japanese, ruprob
+# for Russian and ukprob for Ukrainian and the empty string to turn detection
+# off. The value must be empty for locales other than Japanese, Russian and
+# Ukrainian.
 intl.charset.detector=
-intl.charset.default=ISO-8859-1
-intl.charsetmenu.browser.static=ISO-8859-1, UTF-8
-intl.charsetmenu.mailedit=ISO-8859-1, ISO-8859-15, ISO-8859-6, armscii-8, ISO-8859-13, ISO-8859-14, ISO-8859-2, GB2312, GB18030, Big5, KOI8-R, windows-1251, KOI8-U, ISO-8859-7, ISO-8859-8-I, windows-1255, ISO-2022-JP, EUC-KR, ISO-8859-10, ISO-8859-3, TIS-620, ISO-8859-9, UTF-8, VISCII
 
 # LOCALIZATION NOTE (pluralRule): Pick the appropriate plural rule for your
 # language. This will determine how many plural forms of a word you will need
diff --git a/toolkit/locales/en-US/chrome/global/keys.properties b/toolkit/locales/en-US/chrome/global/keys.properties
index 39d816660..1137bf7c6 100644
--- a/toolkit/locales/en-US/chrome/global/keys.properties
+++ b/toolkit/locales/en-US/chrome/global/keys.properties
@@ -57,7 +57,6 @@ VK_PAGE_DOWN=Page Down
 # otherwise you should probably just translate the glyph regions
 
 # LOCALIZATION NOTE : BLOCK maybe GLYPHS
-VK_ENTER=Enter
 VK_RETURN=Return
 VK_TAB=Tab
 VK_BACK=Backspace
diff --git a/toolkit/locales/en-US/chrome/global/notification.dtd b/toolkit/locales/en-US/chrome/global/notification.dtd
index 74bbdbb32..75aea0b98 100644
--- a/toolkit/locales/en-US/chrome/global/notification.dtd
+++ b/toolkit/locales/en-US/chrome/global/notification.dtd
@@ -7,3 +7,5 @@
 <!ENTITY closeNotificationItem.label "Not Now">
 
 <!ENTITY checkForUpdates "Check for updates…">
+
+<!ENTITY learnMore "Learn more…">
diff --git a/toolkit/locales/en-US/chrome/global/resetProfile.dtd b/toolkit/locales/en-US/chrome/global/resetProfile.dtd
index 1ae3b88e0..831b901c5 100644
--- a/toolkit/locales/en-US/chrome/global/resetProfile.dtd
+++ b/toolkit/locales/en-US/chrome/global/resetProfile.dtd
@@ -2,14 +2,14 @@
    - 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 resetProfile.dialog.title        "Reset &brandShortName;">
-<!ENTITY resetProfile.dialog.description  "Are you sure you want to reset &brandShortName; to its initial state?">
-<!ENTITY resetProfile.dialog.items2.label "&brandShortName; will try to preserve your:">
-<!ENTITY resetProfile.dialog.footer.label "&brandShortName; will restart and everything else will be removed.">
-<!ENTITY resetProfile.dialog.button.label "Reset &brandShortName;">
+<!ENTITY refreshProfile.dialog.title         "Refresh &brandShortName;">
+<!ENTITY refreshProfile.dialog.description1  "Start fresh to fix problems and restore performance.">
+<!ENTITY refreshProfile.dialog.description2  "This will:">
+<!ENTITY refreshProfile.dialog.items.label1  "Remove your add-ons and customizations">
+<!ENTITY refreshProfile.dialog.items.label2  "Restore your browser settings to their defaults">
+<!ENTITY refreshProfile.dialog.button.label  "Refresh &brandShortName;">
 
-<!ENTITY resetProfile.title               "Reset &brandShortName; to its default state">
-<!ENTITY resetProfile.description         "If you're having major problems which you can't resolve, start fresh with only your essential information.">
-<!ENTITY resetProfile.button.label2       "Reset &brandShortName;…">
+<!ENTITY refreshProfile.title                "Give &brandShortName; a tune up">
+<!ENTITY refreshProfile.button.label         "Refresh &brandShortName;…">
 
-<!ENTITY resetProfile.cleaning.description "Please wait while &brandShortName; cleans up your old data…">
+<!ENTITY refreshProfile.cleaning.description "Almost done…">
diff --git a/toolkit/locales/en-US/chrome/global/resetProfile.properties b/toolkit/locales/en-US/chrome/global/resetProfile.properties
new file mode 100644
index 000000000..5b3d96dd9
--- /dev/null
+++ b/toolkit/locales/en-US/chrome/global/resetProfile.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: These strings are used for profile reset.
+
+# LOCALIZATION NOTE (resetUnusedProfile.message): %S is brandShortName.
+resetUnusedProfile.message=It looks like you haven't started %S in a while. Do you want to clean it up for a fresh, like-new experience? And by the way, welcome back!
+
+# LOCALIZATION NOTE (refreshProfile.resetButton.label): %S is brandShortName.
+refreshProfile.resetButton.label=Refresh %S…
+refreshProfile.resetButton.accesskey=e
diff --git a/toolkit/locales/en-US/chrome/global/textcontext.dtd b/toolkit/locales/en-US/chrome/global/textcontext.dtd
index d3b43fda9..62fbdfa85 100644
--- a/toolkit/locales/en-US/chrome/global/textcontext.dtd
+++ b/toolkit/locales/en-US/chrome/global/textcontext.dtd
@@ -24,3 +24,5 @@
 <!ENTITY spellNoSuggestions.label "(No Spelling Suggestions)">
 <!ENTITY spellDictionaries.label "Languages">
 <!ENTITY spellDictionaries.accesskey "l">
+
+<!ENTITY searchTextBox.clear.label "Clear">
diff --git a/toolkit/locales/en-US/chrome/global/videocontrols.dtd b/toolkit/locales/en-US/chrome/global/videocontrols.dtd
index d5608a9c5..0ea0ba316 100644
--- a/toolkit/locales/en-US/chrome/global/videocontrols.dtd
+++ b/toolkit/locales/en-US/chrome/global/videocontrols.dtd
@@ -8,6 +8,7 @@
 <!ENTITY muteButton.unmuteLabel "Unmute">
 <!ENTITY fullscreenButton.enterfullscreenlabel "Full Screen">
 <!ENTITY fullscreenButton.exitfullscreenlabel "Exit Full Screen">
+<!ENTITY castingButton.castingLabel "Cast to Screen">
 
 <!ENTITY stats.media "Media">
 <!ENTITY stats.size "Size">
@@ -17,8 +18,6 @@
 <!ENTITY stats.activityEnded "Ended">
 <!ENTITY stats.activitySeeking "(seeking)">
 <!ENTITY stats.volume "Volume">
-<!ENTITY stats.channels "Channels">
-<!ENTITY stats.sampleRate "Sample Rate">
 <!ENTITY stats.framesParsed "Frames parsed">
 <!ENTITY stats.framesDecoded "Frames decoded">
 <!ENTITY stats.framesPresented "Frames presented">
diff --git a/toolkit/locales/en-US/chrome/global/viewSource.dtd b/toolkit/locales/en-US/chrome/global/viewSource.dtd
index 4957c8814..1a294b877 100644
--- a/toolkit/locales/en-US/chrome/global/viewSource.dtd
+++ b/toolkit/locales/en-US/chrome/global/viewSource.dtd
@@ -71,6 +71,7 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 <!ENTITY findAgainCmd.accesskey "g">
 <!ENTITY findAgainCmd.commandkey "g">
 <!ENTITY findAgainCmd.commandkey2 "VK_F3">
+<!ENTITY findSelectionCmd.commandkey "e">
 
 <!ENTITY backCmd.label "Back">
 <!ENTITY backCmd.accesskey "B">
diff --git a/toolkit/locales/en-US/chrome/global/webapps.properties b/toolkit/locales/en-US/chrome/global/webapps.properties
index e1a5b806a..7bb57635e 100644
--- a/toolkit/locales/en-US/chrome/global/webapps.properties
+++ b/toolkit/locales/en-US/chrome/global/webapps.properties
@@ -1,7 +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 (webapps.uninstall.notification): %S will be replaced with the name of the uninstalled web app

-uninstall.notification = %S has been uninstalled from your computer.

-uninstall.label = Uninstall App

+# 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 (webapps.uninstall.notification): %S will be replaced with the name of the uninstalled web app
+uninstall.notification = %S has been uninstalled from your computer.
+uninstall.label = Uninstall App
diff --git a/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties b/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties
index 4abc9f901..be9def586 100644
--- a/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties
@@ -32,15 +32,14 @@ offlineCancelDownloadsAlertTitle=Cancel All Downloads?
 offlineCancelDownloadsAlertMsg=If you go offline now, 1 download will be canceled. Are you sure you want to go offline?
 offlineCancelDownloadsAlertMsgMultiple=If you go offline now, %S downloads will be canceled. Are you sure you want to go offline?
 leavePrivateBrowsingCancelDownloadsAlertTitle=Cancel All Downloads?
-leavePrivateBrowsingWindowsCancelDownloadsAlertMsg=If you close all Private Browsing windows now, 1 download will be canceled. Are you sure you want to leave the Private Browsing mode?
-leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple=If you close all Private Browsing windows now, %S downloads will be canceled. Are you sure you want to leave the Private Browsing mode?
+leavePrivateBrowsingWindowsCancelDownloadsAlertMsg2=If you close all Private Browsing windows now, 1 download will be canceled. Are you sure you want to leave Private Browsing?
+leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple2=If you close all Private Browsing windows now, %S downloads will be canceled. Are you sure you want to leave Private Browsing?
 cancelDownloadsOKText=Cancel 1 Download
 cancelDownloadsOKTextMultiple=Cancel %S Downloads
 dontQuitButtonWin=Don't Exit
 dontQuitButtonMac=Don't Quit
 dontGoOfflineButton=Stay Online
-dontEnterPrivateBrowsingButton=Don't Enter the Private Browsing Mode
-dontLeavePrivateBrowsingButton=Stay in Private Browsing Mode
+dontLeavePrivateBrowsingButton2=Stay in Private Browsing
 downloadsCompleteTitle=Downloads Complete
 downloadsCompleteMsg=All files have finished downloading. 
 
diff --git a/toolkit/locales/en-US/chrome/mozapps/downloads/unknownContentType.properties b/toolkit/locales/en-US/chrome/mozapps/downloads/unknownContentType.properties
index c607dcafe..332fc2e0e 100644
--- a/toolkit/locales/en-US/chrome/mozapps/downloads/unknownContentType.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/downloads/unknownContentType.properties
@@ -17,20 +17,3 @@ unknownCancel.label=Cancel
 fileType=%S file
 # LOCALIZATION NOTE (orderedFileSizeWithType): first %S is type, second %S is size, and third %S is unit  
 orderedFileSizeWithType=%1$S (%2$S %3$S)
-
-# LOCALIZATION NOTE (wpsDefaultOS2): OS/2 only, WPS refers to the Workplace Shell and should probably not be translated
-wpsDefaultOS2=WPS Default
-# LOCALIZATION NOTE (classViewerOS2): OS/2 only
-classViewerOS2=Viewer for Class %S
-# LOCALIZATION NOTE (mmImageViewerOS2): OS/2 only, default operation of image files with OS/2 multimedia support installed
-mmImageViewerOS2=Image Viewer
-# LOCALIZATION NOTE (mmAudioPlayerOS2): OS/2 only, default operation of audio files with OS/2 multimedia support installed
-mmAudioPlayerOS2=Audio Player
-# LOCALIZATION NOTE (mmVideoPlayerOS2): OS/2 only, default operation of video files with OS/2 multimedia support installed
-mmVideoPlayerOS2=Video Player
-# LOCALIZATION NOTE (mmMidiPlayerOS2): OS/2 only, default operation of MIDI files with OS/2 multimedia support installed
-mmMidiPlayerOS2=MIDI Player
-# LOCALIZATION NOTE (odZipFolderOS2): OS/2 only, refers to ZipFolder of Object Desktop
-odZipFolderOS2=ZipFolder
-# LOCALIZATION NOTE (odTextViewOS2): OS/2 only, refers to TextView of Object Desktop
-odTextViewOS2=TextView
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
index f2ae1274e..a87cd810e 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
@@ -4,6 +4,7 @@
 <!ENTITY addons.windowTitle                   "Add-ons Manager">
 
 <!ENTITY search.placeholder                   "Search all add-ons">
+<!ENTITY search.buttonlabel                   "Search">
 <!-- LOCALIZATION NOTE (search.commandKey):
      The search command key should match findOnCmd.commandkey from browser.dtd -->
 <!ENTITY search.commandkey                    "f">
@@ -101,6 +102,7 @@
 <!ENTITY cmd.installAddon.accesskey           "I">
 <!ENTITY cmd.uninstallAddon.label             "Remove">
 <!ENTITY cmd.uninstallAddon.accesskey         "R">
+<!ENTITY cmd.debugAddon.label                 "Debug">
 <!ENTITY cmd.showPreferencesWin.label         "Options">
 <!ENTITY cmd.showPreferencesWin.tooltip       "Change this add-on's options">
 <!ENTITY cmd.showPreferencesUnix.label        "Preferences">
@@ -216,3 +218,16 @@
 <!ENTITY eula.accept                          "Accept and Install…">
 
 <!ENTITY settings.path.button.label           "Browse…">
+
+<!-- LOCALIZATION NOTE (experiment.info.label): The strings related to
+     experiments are present on the "Experiments" tab of the add-ons manager.
+     This tab won't be displayed unless an Experiment add-on is installed.
+     Install https://people.mozilla.org/~gszorc/dummy-experiment-addon.xpi
+     to cause this tab to appear. -->
+<!ENTITY experiment.info.label "What's this? Telemetry may install and run experiments from time to time.">
+<!ENTITY experiment.info.learnmore "Learn More">
+<!ENTITY experiment.info.learnmore.accesskey "L">
+<!ENTITY experiment.info.changetelemetry "Telemetry Settings">
+<!ENTITY experiment.info.changetelemetry.accesskey "T">
+
+<!ENTITY setting.learnmore "Learn More…">
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
index 64a12a777..c4e2660ee 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
@@ -23,6 +23,7 @@ dateUpdated=Updated %S
 
 #LOCALIZATION NOTE (notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
 notification.incompatible=%1$S is incompatible with %2$S %3$S.
+notification.jetsdk=This is a Jetpack/SDK extension which are not supported in %1$S %2$S.
 #LOCALIZATION NOTE (notification.blocked) %1$S is the add-on name
 notification.blocked=%1$S has been disabled due to security or stability issues.
 notification.blocked.link=More Information
@@ -56,6 +57,8 @@ notification.downloadError.retry.tooltip=Try downloading this add-on again
 notification.installError=There was an error installing %1$S.
 notification.installError.retry=Try again
 notification.installError.retry.tooltip=Try downloading and installing this add-on again
+#LOCALIZATION NOTE (notification.gmpPending) %1$S is the add-on name.
+notification.gmpPending=%1$S will be installed shortly.
 
 #LOCALIZATION NOTE (contributionAmount2) %S is the currency amount recommended for contributions
 contributionAmount2=Suggested Contribution: %S
@@ -97,6 +100,46 @@ details.notification.install=%1$S will be installed after you restart %2$S.
 details.notification.uninstall=%1$S will be uninstalled after you restart %2$S.
 #LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name
 details.notification.upgrade=%1$S will be updated after you restart %2$S.
+#LOCALIZATION NOTE (details.notification.gmpPending) %1$S is the add-on name
+details.notification.gmpPending=%1$S will be installed shortly.
+
+# LOCALIZATION NOTE (details.experiment.time.daysRemaining):
+# Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of days from now that the experiment will remain active (detail view).
+details.experiment.time.daysRemaining=#1 day remaining;#1 days remaining
+#LOCALIZATION NOTE (details.experiment.time.endsToday) The experiment will end in less than a day (detail view).
+details.experiment.time.endsToday=Less than a day remaining
+# LOCALIZATION NOTE (details.experiment.time.daysPassed):
+# Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of days since the experiment ran (detail view).
+details.experiment.time.daysPassed=#1 day ago;#1 days ago
+#LOCALIZATION NOTE (details.experiment.time.endedToday) The experiment ended less than a day ago (detail view).
+details.experiment.time.endedToday=Less than a day ago
+#LOCALIZATION NOTE (details.experiment.state.active) This experiment is active (detail view).
+details.experiment.state.active=Active
+#LOCALIZATION NOTE (details.experiment.state.complete) This experiment is complete (it was previously active) (detail view).
+details.experiment.state.complete=Complete
+
+# LOCALIZATION NOTE (experiment.time.daysRemaining):
+# Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of days from now that the experiment will remain active (list view item).
+experiment.time.daysRemaining=#1 day remaining;#1 days remaining
+#LOCALIZATION NOTE (experiment.time.endsToday) The experiment will end in less than a day (list view item).
+experiment.time.endsToday=Less than a day remaining
+# LOCALIZATION NOTE (experiment.time.daysPassed):
+# Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of days since the experiment ran (list view item).
+experiment.time.daysPassed=#1 day ago;#1 days ago
+#LOCALIZATION NOTE (experiment.time.endedToday) The experiment ended less than a day ago (list view item).
+experiment.time.endedToday=Less than a day ago
+#LOCALIZATION NOTE (experiment.state.active) This experiment is active (list view item).
+experiment.state.active=Active
+#LOCALIZATION NOTE (experiment.state.complete) This experiment is complete (it was previously active) (list view item).
+experiment.state.complete=Complete
 
 installFromFile.dialogTitle=Select add-on to install
 installFromFile.filterName=Add-ons
@@ -131,3 +174,4 @@ type.locale.name=Languages
 type.plugin.name=Plugins
 type.dictionary.name=Dictionaries
 type.service.name=Services
+type.experiment.name=Experiments
diff --git a/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd b/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd
index 4df7598fa..02dff270c 100644
--- a/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd
@@ -18,6 +18,7 @@
 <!ENTITY checkForUpdates                                     "Check for updates…">
 <!ENTITY disabledPlugin                                      "This plugin is disabled.">
 <!ENTITY blockedPlugin.label                                 "This plugin has been blocked for your protection.">
+<!ENTITY hidePluginBtn.label                                 "Hide plugin">
 <!ENTITY managePlugins                                       "Manage plugins…">
 
 <!-- LOCALIZATION NOTE (reloadPlugin.pre): include a trailing space as needed -->
@@ -38,3 +39,4 @@
 
 <!ENTITY plugin.file                                         "File">
 <!ENTITY plugin.mimeTypes                                    "MIME Types">
+<!ENTITY plugin.flashProtectedMode.label                     "Enable Adobe Flash protected mode">
diff --git a/toolkit/locales/en-US/chrome/mozapps/preferences/ocsp.dtd b/toolkit/locales/en-US/chrome/mozapps/preferences/ocsp.dtd
deleted file mode 100644
index 55e367938..000000000
--- a/toolkit/locales/en-US/chrome/mozapps/preferences/ocsp.dtd
+++ /dev/null
@@ -1,9 +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 ocspDialog.title             "Certificate Validation">
-<!ENTITY enableOCSP.label             "Use the Online Certificate Status Protocol (OCSP) to confirm the current validity of certificates">
-<!ENTITY enableOCSP.accesskey         "U">
-<!ENTITY requireOCSP.label            "When an OCSP server connection fails, treat the certificate as invalid">
-<!ENTITY requireOCSP.accesskey        "W">
diff --git a/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.dtd b/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.dtd
index 66c3df742..87741a82e 100644
--- a/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.dtd
@@ -27,5 +27,5 @@
 <!ENTITY            offlineState.label    "Work offline">
 <!ENTITY            offlineState.accesskey "o">
 
-<!ENTITY            autoSelect.label       "Don't ask at startup">
-<!ENTITY            autoSelect.accesskey   "s">
+<!ENTITY            useSelected.label       "Use the selected profile without asking at startup">
+<!ENTITY            useSelected.accesskey   "s">
diff --git a/toolkit/locales/en-US/chrome/mozapps/update/updates.properties b/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
index 96051cf9e..97761ba29 100644
--- a/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/update/updates.properties
@@ -43,19 +43,19 @@ resumePausedAfterCloseMsg=You have paused downloading this update. Do you want t
 updaterIOErrorTitle=Software Update Failed
 updaterIOErrorMsg=The update could not be installed. Please make sure there are no other copies of %S running on your computer, and then restart %S to try again.
 okButton=OK
-okButton.accesskey=
+okButton.accesskey=O
 askLaterButton=Ask Later
-askLaterButton.accesskey=
+askLaterButton.accesskey=A
 noThanksButton=No Thanks
-noThanksButton.accesskey=
+noThanksButton.accesskey=N
 updateButton_minor=Update %S
-updateButton_minor.accesskey=
+updateButton_minor.accesskey=U
 updateButton_major=Get the New Version
-updateButton_major.accesskey=
+updateButton_major.accesskey=G
 backButton=Back
-backButton.accesskey=
+backButton.accesskey=B
 acceptTermsButton=Accept Terms
-acceptTermsButton.accesskey=
+acceptTermsButton.accesskey=A
 # NOTE: The restartLaterButton string is also used in
 # mozapps/extensions/content/blocklist.js
 restartLaterButton=Restart Later
diff --git a/toolkit/locales/en-US/chrome/passwordmgr/passwordManager.dtd b/toolkit/locales/en-US/chrome/passwordmgr/passwordManager.dtd
index 7dbf437a8..8a8e08bec 100644
--- a/toolkit/locales/en-US/chrome/passwordmgr/passwordManager.dtd
+++ b/toolkit/locales/en-US/chrome/passwordmgr/passwordManager.dtd
@@ -12,6 +12,11 @@
 <!ENTITY      treehead.site.label             "Site">
 <!ENTITY      treehead.username.label         "Username">
 <!ENTITY      treehead.password.label         "Password">
+<!ENTITY      treehead.timeCreated.label         "First Used">
+<!ENTITY      treehead.timeLastUsed.label        "Last Used">
+<!ENTITY      treehead.timePasswordChanged.label "Last Changed">
+<!ENTITY      treehead.timesUsed.label           "Times Used">
+
 <!ENTITY      remove.label                    "Remove">
 <!ENTITY      remove.accesskey                "R">
 <!ENTITY      removeall.label                 "Remove All">
@@ -28,3 +33,4 @@
 <!ENTITY      copyPasswordCmd.accesskey       "C">
 
 <!ENTITY      copyUsernameCmd.label           "Copy Username">
+<!ENTITY      copyUsernameCmd.accesskey       "U">
diff --git a/toolkit/locales/en-US/chrome/places/places.properties b/toolkit/locales/en-US/chrome/places/places.properties
index f7cf4f62d..8b543b8e4 100644
--- a/toolkit/locales/en-US/chrome/places/places.properties
+++ b/toolkit/locales/en-US/chrome/places/places.properties
@@ -24,9 +24,13 @@ finduri-MonthYear=%1$S %2$S
 # This is used to generate local files container when history is grouped by site
 localhost=(local files)
 
-# LOCALIZATION NOTE (bookmarksArchiveFilename):
-# Do not change this string! It's used only to
-# detect older localized bookmark archives from
-# before bug 445704 was fixed. It will be removed
-# in a subsequent release.
-bookmarksArchiveFilename=bookmarks-%S.json
+# LOCALIZATION NOTE
+# The string is used for showing file size of each backup in the "fileRestorePopup" popup
+# %1$S is the file size
+# %2$S is the file size unit
+backupFileSizeText=%1$S %2$S
+
+# 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
\ No newline at end of file