13 files changed, 164 insertions, 99 deletions
diff --git a/toolkit/locales/en-US/chrome/global/narrate.properties b/toolkit/locales/en-US/chrome/global/narrate.properties
index c622049a81..3df4f5515b 100644
--- a/toolkit/locales/en-US/chrome/global/narrate.properties
+++ b/toolkit/locales/en-US/chrome/global/narrate.properties
@@ -6,7 +6,7 @@
 # instead of having to read it themselves." This is the name
 # of the feature and it is the label for the popup button.
 # %S is the keyboard shortcut for the listen command
-listen-label = Listen (%S)
+read-aloud-label = Read aloud (%S)
 # %S is the keyboard shortcut for the skip back command
 previous-label = Back (%S)
 # %S is the keyboard shortcut for the start command
diff --git a/toolkit/locales/en-US/crashreporter/crashreporter.ftl b/toolkit/locales/en-US/crashreporter/crashreporter.ftl
new file mode 100644
index 0000000000..95099d7f7b
--- /dev/null
+++ b/toolkit/locales/en-US/crashreporter/crashreporter.ftl
@@ -0,0 +1,65 @@
+# 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/.
+
+crashreporter-branded-title = { -brand-short-name } Crash Reporter
+
+crashreporter-apology = We’re Sorry
+crashreporter-crashed-and-restore = { -brand-short-name } had a problem and crashed. We’ll try to restore your tabs and windows when it restarts.
+crashreporter-plea = To help us diagnose and fix the problem, you can send us a crash report.
+
+crashreporter-information = This application is run after a crash to report the problem to { -vendor-short-name }. It should not be run directly.
+
+crashreporter-error = { -brand-short-name } had a problem and crashed. Unfortunately, the crash reporter is unable to submit a report for this crash.
+# $details (String) - the reason that a crash report cannot be submitted
+crashreporter-error-details = Details: { $details }
+
+crashreporter-no-run-message = This application is run after a crash to report the problem to the application vendor. It should not be run directly.
+
+crashreporter-button-details = Details…
+crashreporter-loading-details = Loading…
+
+crashreporter-view-report-title = Report Contents
+
+crashreporter-comment-prompt = Add a comment (comments are publicly visible)
+
+crashreporter-report-info = This report also contains technical information about the state of the application when it crashed.
+
+crashreporter-send-report = Tell { -vendor-short-name } about this crash so they can fix it.
+
+crashreporter-include-url = Include the address of the page I was on.
+
+crashreporter-submit-status = Your crash report will be submitted before you quit or restart.
+crashreporter-submit-in-progress = Submitting your report…
+crashreporter-submit-success = Report submitted successfully!
+crashreporter-submit-failure = There was a problem submitting your report.
+
+crashreporter-resubmit-status = Resending reports that previously failed to send…
+
+crashreporter-button-quit = Quit { -brand-short-name }
+
+crashreporter-button-restart = Restart { -brand-short-name }
+
+crashreporter-button-ok = OK
+crashreporter-button-close = Close
+
+# $id (String) - the crash id from the server, typically a UUID
+crashreporter-crash-identifier = Crash ID: { $id }
+
+# $url (String) - the url which the user can use to view the submitted crash report
+crashreporter-crash-details = You can view details of this crash at { $url }.
+
+# Error strings
+
+crashreporter-error-minidump-analyzer = Failed to run minidump-analyzer
+# $path (String) - the file path
+crashreporter-error-opening-file = Failed to open file ({ $path })
+# $path (String) - the file path
+crashreporter-error-loading-file = Failed to load file ({ $path })
+# $path (String) - the path
+crashreporter-error-creating-dir = Failed to create directory ({ $path })
+crashreporter-error-no-home-dir = Missing home directory
+# $from (String) - the source path
+# $to (String) - the destination path
+crashreporter-error-moving-path = Failed to move { $from } to { $to }
+crashreporter-error-version-eol = Version end of life: crash reports are no longer accepted.
diff --git a/toolkit/locales/en-US/crashreporter/crashreporter.ini b/toolkit/locales/en-US/crashreporter/crashreporter.ini
deleted file mode 100644
index ce4622c228..0000000000
--- a/toolkit/locales/en-US/crashreporter/crashreporter.ini
+++ /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/.
-
-# This file is in the UTF-8 encoding
-[Strings]
-# LOCALIZATION NOTE (isRTL):
-# Leave this entry empty unless your language requires right-to-left layout,
-# for example like Arabic, Hebrew, Persian. If your language needs RTL, please
-# use the untranslated English word "yes" as value
-isRTL=
-CrashReporterTitle=Crash Reporter
-# LOCALIZATION NOTE (CrashReporterVendorTitle): %s is replaced with the vendor name.  (i.e. "Mozilla")
-CrashReporterVendorTitle=%s Crash Reporter
-# LOCALIZATION NOTE (CrashReporterErrorText): %s is replaced with another string containing detailed information.
-CrashReporterErrorText=The application had a problem and crashed.\n\nUnfortunately, the crash reporter is unable to submit a report for this crash.\n\nDetails: %s
-# LOCALIZATION NOTE (CrashReporterProductErrorText2): The first %s is replaced with the product name (i.e. "Firefox"), the second is replaced with another string containing detailed information.  These two substitutions can not be reordered!
-CrashReporterProductErrorText2=%s had a problem and crashed.\n\nUnfortunately, the crash reporter is unable to submit a crash report.\n\nDetails: %s
-CrashReporterSorry=We're Sorry
-# LOCALIZATION NOTE (CrashReporterDescriptionText2): The %s is replaced with the product name.
-CrashReporterDescriptionText2=%s had a problem and crashed.\n\nTo help us diagnose and fix the problem, you can send us a crash report.
-CrashReporterDefault=This application is run after a crash to report the problem to the application vendor.  It should not be run directly.
-Details=Details…
-ViewReportTitle=Report Contents
-CommentGrayText=Add a comment (comments are publicly visible)
-ExtraReportInfo=This report also contains technical information about the state of the application when it crashed.
-# LOCALIZATION NOTE (CheckSendReport): The %s is replaced with the vendor name.
-CheckSendReport=Tell %s about this crash so they can fix it
-CheckIncludeURL=Include the address of the page I was on
-ReportPreSubmit2=Your crash report will be submitted before you quit or restart.
-ReportDuringSubmit2=Submitting your report…
-ReportSubmitSuccess=Report submitted successfully!
-ReportSubmitFailed=There was a problem submitting your report.
-ReportResubmit=Resending reports that previously failed to send…
-# LOCALIZATION NOTE (Quit2): The %s is replaced with the product name.
-Quit2=Quit %s
-# LOCALIZATION NOTE (Restart): The %s is replaced with the product name.
-Restart=Restart %s
-Ok=OK
-Close=Close
-
-# LOCALIZATION NOTE (CrashID): The %s is replaced with the Crash ID from the server, which is a string like abc12345-6789-0abc-def1-23456abcdef1
-CrashID=Crash ID: %s
-# LOCALIZATION NOTE (CrashDetailsURL): The %s is replaced with a URL that the user can visit to view the crash details.
-CrashDetailsURL=You can view details of this crash at %s
-ErrorBadArguments=The application passed an invalid argument.
-ErrorExtraFileExists=The application didn't leave an application data file.
-ErrorExtraFileRead=Couldn't read the application data file.
-ErrorExtraFileMove=Couldn't move application data file.
-ErrorDumpFileExists=The application did not leave a crash dump file.
-ErrorDumpFileMove=Couldn't move crash dump.
-ErrorNoProductName=The application did not identify itself.
-ErrorNoServerURL=The application did not specify a crash reporting server.
-ErrorNoSettingsPath=Couldn't find the crash reporter's settings.
-ErrorCreateDumpDir=Couldn't create pending dump directory.
-# LOCALIZATION NOTE (ErrorEndOfLife): The %s is replaced with the product name.
-ErrorEndOfLife=The version of %s you are using is no longer supported. Crash reports are no longer being accepted for this version. Please consider upgrading to a supported version.
-
diff --git a/toolkit/locales/en-US/toolkit/about/aboutReader.ftl b/toolkit/locales/en-US/toolkit/about/aboutReader.ftl
index 8444f09288..8e0297573c 100644
--- a/toolkit/locales/en-US/toolkit/about/aboutReader.ftl
+++ b/toolkit/locales/en-US/toolkit/about/aboutReader.ftl
@@ -5,14 +5,20 @@
 about-reader-loading = Loading…
 about-reader-load-error = Failed to load article from page
 
-about-reader-color-scheme-light = Light
-    .title = Color Scheme Light
-about-reader-color-scheme-dark = Dark
-    .title = Color Scheme Dark
-about-reader-color-scheme-sepia = Sepia
-    .title = Color Scheme Sepia
-about-reader-color-scheme-auto = Auto
-    .title = Color Scheme Auto
+about-reader-color-theme-light = Light
+    .title = Color Theme Light
+about-reader-color-theme-dark = Dark
+    .title = Color Theme Dark
+about-reader-color-theme-sepia = Sepia
+    .title = Color Theme Sepia
+about-reader-color-theme-auto = Auto
+    .title = Color Theme Auto
+about-reader-color-theme-gray = Gray
+    .title = Color Theme Gray
+about-reader-color-theme-contrast = Contrast
+    .title = Color Theme Contrast
+about-reader-color-theme-custom = Custom colors
+    .title = Color Theme Custom
 
 # An estimate for how long it takes to read an article,
 # expressed as a range covering both slow and fast readers.
@@ -49,4 +55,31 @@ about-reader-font-type-sans-serif = Sans-serif
 
 about-reader-toolbar-close = Close Reader View
 about-reader-toolbar-type-controls = Type controls
+about-reader-toolbar-color-controls = Colors
 about-reader-toolbar-savetopocket = Save To { -pocket-brand-name }
+
+## Reader View colors menu
+
+about-reader-colors-menu-header = Theme
+
+about-reader-fxtheme-tab = Default
+about-reader-customtheme-tab = Custom
+
+## These are used as labels for the custom theme color pickers.
+## The .title element is used to make the editing functionality
+## clear and give context for screen reader users.
+
+about-reader-custom-colors-foreground = Text
+    .title = Edit color
+about-reader-custom-colors-background = Background
+    .title = Edit color
+
+about-reader-custom-colors-unvisited-links = Unvisited links
+    .title = Edit color
+about-reader-custom-colors-visited-links = Visited links
+    .title = Edit color
+
+about-reader-custom-colors-selection-highlight = Highlighter for read aloud
+    .title = Edit color
+
+about-reader-custom-colors-reset-button = Reset defaults
diff --git a/toolkit/locales/en-US/toolkit/about/aboutSupport.ftl b/toolkit/locales/en-US/toolkit/about/aboutSupport.ftl
index 71203540ba..f54f5e4014 100644
--- a/toolkit/locales/en-US/toolkit/about/aboutSupport.ftl
+++ b/toolkit/locales/en-US/toolkit/about/aboutSupport.ftl
@@ -452,3 +452,15 @@ pointing-device-mouse = Mouse
 pointing-device-touchscreen = Touchscreen
 pointing-device-pen-digitizer = Pen Digitizer
 pointing-device-none = No pointing devices
+
+## Content Analysis (DLP)
+
+# DLP stands for Data Loss Prevention, an industry term for external software
+# that enterprises can set up to prevent sensitive data from being transferred
+# to external websites.
+content-analysis-title = Content Analysis (DLP)
+content-analysis-active = Active
+content-analysis-connected-to-agent = Connected to Agent
+content-analysis-agent-path = Agent Path
+content-analysis-agent-failed-signature-verification = Agent Failed Signature Verification
+content-analysis-request-count = Request Count
diff --git a/toolkit/locales/en-US/toolkit/contentanalysis/contentanalysis.ftl b/toolkit/locales/en-US/toolkit/contentanalysis/contentanalysis.ftl
index fbd9cd2ff8..41c18a48e3 100644
--- a/toolkit/locales/en-US/toolkit/contentanalysis/contentanalysis.ftl
+++ b/toolkit/locales/en-US/toolkit/contentanalysis/contentanalysis.ftl
@@ -20,8 +20,12 @@ contentanalysis-slow-agent-dialog-body-clipboard = { $agent } is reviewing what
 # Variables:
 #   $agent - The name of the DLP agent doing the analysis
 contentanalysis-slow-agent-dialog-body-dropped-text = { $agent } is reviewing the text you dropped against your organization’s data policies. This may take a moment.
+# Variables:
+#   $agent - The name of the DLP agent doing the analysis
+contentanalysis-slow-agent-dialog-body-print = { $agent } is reviewing what you printed against your organization’s data policies. This may take a moment.
 contentanalysis-operationtype-clipboard = clipboard
 contentanalysis-operationtype-dropped-text = dropped text
+contentanalysis-operationtype-print = print
 #   $filename - The filename associated with the request, such as "aFile.txt"
 contentanalysis-customdisplaystring-description = upload of “{ $filename }”
 
@@ -42,8 +46,17 @@ contentanalysis-genericresponse-message = Content Analysis responded with { $res
 #   $content - Description of the content being blocked, such as "clipboard" or "aFile.txt"
 contentanalysis-block-message = Your organization uses data-loss prevention software that has blocked this content: { $content }.
 # Variables:
+#   $agent - The name of the DLP agent doing the analysis
+#   $content - Description of the content being blocked, such as "clipboard" or "aFile.txt"
+contentanalysis-unspecified-error-message = An error occurred in communicating with { $agent }. Transfer denied for resource: { $content }.
+# Variables:
+#   $agent - The name of the DLP agent doing the analysis
+#   $content - Description of the content being blocked, such as "clipboard" or "aFile.txt"
+contentanalysis-no-agent-connected-message = Unable to connect to { $agent }. Transfer denied for resource: { $content }.
+# Variables:
+#   $agent - The name of the DLP agent doing the analysis
 #   $content - Description of the content being blocked, such as "clipboard" or "aFile.txt"
-contentanalysis-error-message = An error occurred in communicating with the data-loss prevention software. Transfer denied for resource: { $content }.
+contentanalysis-invalid-agent-signature-message = Failed signature verification for { $agent }. Transfer denied for resource: { $content }.
 
 contentanalysis-inprogress-quit-title = Quit { -brand-shorter-name }?
 contentanalysis-inprogress-quit-message = Several actions are in progress. If you quit { -brand-shorter-name }, these actions will not be completed.
diff --git a/toolkit/locales/en-US/toolkit/formautofill/formAutofill.ftl b/toolkit/locales/en-US/toolkit/formautofill/formAutofill.ftl
index 34489e5b66..2a0e99274e 100644
--- a/toolkit/locales/en-US/toolkit/formautofill/formAutofill.ftl
+++ b/toolkit/locales/en-US/toolkit/formautofill/formAutofill.ftl
@@ -53,6 +53,9 @@ credit-card-capture-update-button =
     .label = Update existing card
     .accessKey = U
 
+# Label for the button in the dropdown menu used to clear the populated form.
+autofill-clear-form-label = Clear Autofill Form
+
 # Used as a label for the button, displayed at the bottom of the dropdown suggestion, to open Form Autofill browser preferences.
 autofill-manage-addresses-label = Manage addresses
 
@@ -70,3 +73,22 @@ autofill-card-network-mastercard = MasterCard
 autofill-card-network-mir = MIR
 autofill-card-network-unionpay = Union Pay
 autofill-card-network-visa = Visa
+
+# The warning text that is displayed for informing users what categories are
+# about to be filled.  The text would be, for example,
+#   Also autofills organization, phone, email.
+# Variables:
+#   $categories - one or more of the categories, see autofill-category-X below
+autofill-phishing-warningmessage-extracategory = Also autofills { $categories }
+
+# Variation when all are in the same category.
+# Variables:
+#   $categories - one or more of the categories
+autofill-phishing-warningmessage = Autofills { $categories }
+
+# Used in autofill drop down suggestion to indicate what other categories Form Autofill will attempt to fill.
+autofill-category-address = address
+autofill-category-name = name
+autofill-category-organization = organization
+autofill-category-tel = phone
+autofill-category-email = email
diff --git a/toolkit/locales/en-US/toolkit/global/processTypes.ftl b/toolkit/locales/en-US/toolkit/global/processTypes.ftl
index 0c37076410..05bfc1e94f 100644
--- a/toolkit/locales/en-US/toolkit/global/processTypes.ftl
+++ b/toolkit/locales/en-US/toolkit/global/processTypes.ftl
@@ -21,6 +21,9 @@ process-type-extension = Extension
 # process used to open file:// URLs
 process-type-file = Local File
 
+# process used to instantiate new child processes
+process-type-forkserver = Fork Server
+
 # process used to isolate a webpage from other web pages
 # to improve security
 process-type-webisolated = Isolated Web Content
diff --git a/toolkit/locales/en-US/toolkit/global/tabprompts.ftl b/toolkit/locales/en-US/toolkit/global/tabprompts.ftl
deleted file mode 100644
index 26eefa368b..0000000000
--- a/toolkit/locales/en-US/toolkit/global/tabprompts.ftl
+++ /dev/null
@@ -1,13 +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/.
-
-tabmodalprompt-username =
-    .value = User Name:
-tabmodalprompt-password =
-    .value = Password:
-
-tabmodalprompt-ok-button =
-    .label = OK
-tabmodalprompt-cancel-button =
-    .label = Cancel
diff --git a/toolkit/locales/en-US/toolkit/pdfviewer/viewer.ftl b/toolkit/locales/en-US/toolkit/pdfviewer/viewer.ftl
index 3804a3bd4d..8aea43959e 100644
--- a/toolkit/locales/en-US/toolkit/pdfviewer/viewer.ftl
+++ b/toolkit/locales/en-US/toolkit/pdfviewer/viewer.ftl
@@ -318,8 +318,10 @@ pdfjs-editor-stamp-button-label = Add or edit images
 pdfjs-editor-highlight-button =
     .title = Highlight
 pdfjs-editor-highlight-button-label = Highlight
-pdfjs-highlight-floating-button =
+pdfjs-highlight-floating-button1 =
     .title = Highlight
+    .aria-label = Highlight
+pdfjs-highlight-floating-button-label = Highlight
 
 ## Remove button for the various kind of editor.
 
diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn
index 5c82246137..cc22aed586 100644
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -11,6 +11,9 @@
 #ifdef MOZ_LAYOUT_DEBUGGER
   layoutdebug/layoutdebug.ftl                      (../../layout/tools/layout-debug/ui/content/layoutdebug.ftl)
 #endif
+#if defined(NIGHTLY_BUILD)
+  preview/megalist.ftl                             (../components/satchel/megalist/content/megalist.ftl)
+#endif
 
 @AB_CD@.jar:
 % locale global @AB_CD@ %locale/@AB_CD@/global/
diff --git a/toolkit/locales/l10n.mk b/toolkit/locales/l10n.mk
index a39e030231..81938cced4 100644
--- a/toolkit/locales/l10n.mk
+++ b/toolkit/locales/l10n.mk
@@ -119,14 +119,6 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 ifneq (en,$(LPROJ_ROOT))
 	mv '$(STAGEDIST)'/en.lproj '$(STAGEDIST)'/$(LPROJ_ROOT).lproj
 endif
-ifdef MOZ_CRASHREPORTER
-# On Mac OS X, the crashreporter.ini file needs to be moved from under the
-# application bundle's Resources directory where all other l10n files are
-# located to the crash reporter bundle's Resources directory.
-	mv '$(STAGEDIST)'/crashreporter.app/Contents/Resources/crashreporter.ini \
-	  '$(STAGEDIST)'/../MacOS/crashreporter.app/Contents/Resources/crashreporter.ini
-	$(RM) -rf '$(STAGEDIST)'/crashreporter.app
-endif
 endif
 ifeq (WINNT,$(OS_ARCH))
 	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen l10ngen/helper.exe
diff --git a/toolkit/locales/moz.build b/toolkit/locales/moz.build
index 8f334ce496..7a9cc3b2e5 100644
--- a/toolkit/locales/moz.build
+++ b/toolkit/locales/moz.build
@@ -20,15 +20,6 @@ FINAL_TARGET_FILES.res += [
     "!multilocale.txt",
 ]
 
-if CONFIG["MOZ_CRASHREPORTER"]:
-    if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
-        # TODO: fixing bug 1223748 should let us remove this special case
-        LOCALIZED_FILES["crashreporter.app"].Contents.Resources += [
-            "en-US/crashreporter/crashreporter.ini"
-        ]
-    else:
-        LOCALIZED_FILES += ["en-US/crashreporter/crashreporter.ini"]
-
 LOCALIZED_GENERATED_FILES += ["update.locale"]
 update_locale = LOCALIZED_GENERATED_FILES["update.locale"]
 update_locale.script = "generate_update_locale.py"