Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 70 insertions, 154 deletions

diff --git a/toolkit/locales/en-US/toolkit/about/aboutReader.ftl b/toolkit/locales/en-US/toolkit/about/aboutReader.ftl
index 8e0297573c..72e03869a7 100644
--- a/toolkit/locales/en-US/toolkit/about/aboutReader.ftl
+++ b/toolkit/locales/en-US/toolkit/about/aboutReader.ftl
@@ -5,20 +5,18 @@
 about-reader-loading = Loading…
 about-reader-load-error = Failed to load article from page
 
-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
+about-reader-color-light-theme = Light
+    .title = Light theme
+about-reader-color-dark-theme = Dark
+    .title = Dark theme
+about-reader-color-sepia-theme = Sepia
+    .title = Sepia theme
+about-reader-color-auto-theme = Auto
+    .title = Auto theme
+about-reader-color-gray-theme = Gray
+    .title = Gray theme
+about-reader-color-contrast-theme = Contrast
+    .title = Contrast theme
 
 # An estimate for how long it takes to read an article,
 # expressed as a range covering both slow and fast readers.
@@ -55,8 +53,9 @@ 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 }
+about-reader-toolbar-text-layout-controls = Text and layout
+about-reader-toolbar-theme-controls = Theme
+about-reader-toolbar-savetopocket = Save to { -pocket-brand-name }
 
 ## Reader View colors menu
 
@@ -83,3 +82,30 @@ about-reader-custom-colors-selection-highlight = Highlighter for read aloud
     .title = Edit color
 
 about-reader-custom-colors-reset-button = Reset defaults
+
+## Reader View improved text and layout menu
+
+about-reader-layout-header = Layout
+about-reader-advanced-layout-header = Advanced
+
+about-reader-slider-label-width-narrow = Narrow
+about-reader-slider-label-width-wide = Wide
+about-reader-slider-label-spacing-narrow = Narrow
+about-reader-slider-label-spacing-standard = Standard
+about-reader-slider-label-spacing-wide = Wide
+
+about-reader-content-width-label =
+  .label = Content width
+about-reader-line-spacing-label =
+  .label = Line spacing
+about-reader-character-spacing-label =
+  .label = Character spacing
+about-reader-word-spacing-label =
+  .label = Word spacing
+about-reader-text-alignment-label = Text alignment
+about-reader-text-alignment-left =
+    .title = Align text left
+about-reader-text-alignment-center =
+    .title = Align text center
+about-reader-text-alignment-right =
+    .title = Align text right
diff --git a/toolkit/locales/en-US/toolkit/about/abuseReports.ftl b/toolkit/locales/en-US/toolkit/about/abuseReports.ftl
deleted file mode 100644
index 2df311039d..0000000000
--- a/toolkit/locales/en-US/toolkit/about/abuseReports.ftl
+++ /dev/null
@@ -1,116 +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/.
-
-# Localized string used as the dialog window title.
-# "Report" is a noun in this case, "Report for AddonName".
-#
-# Variables:
-#   $addon-name (string) - Name of the add-on being reported
-abuse-report-dialog-title = Report for { $addon-name }
-
-abuse-report-title-extension = Report This Extension to { -vendor-short-name }
-abuse-report-title-sitepermission = Report This Site Permissions add-on to { -vendor-short-name }
-abuse-report-title-theme = Report This Theme to { -vendor-short-name }
-abuse-report-subtitle = What’s the issue?
-
-# Variables:
-#   $author-name (string) - Name of the add-on author
-abuse-report-addon-authored-by = by <a data-l10n-name="author-name">{ $author-name }</a>
-
-abuse-report-learnmore-intro = Unsure what issue to select?
-abuse-report-learnmore-link = Learn more about reporting extensions and themes
-
-abuse-report-submit-description = Describe the problem (optional)
-abuse-report-textarea =
-  .placeholder = It’s easier for us to address a problem if we have specifics. Please describe what you’re experiencing. Thank you for helping us keep the web healthy.
-abuse-report-submit-note =
-  Note: Don’t include personal information (such as name, email address, phone number, physical address).
-  { -vendor-short-name } keeps a permanent record of these reports.
-
-## Panel buttons.
-
-abuse-report-cancel-button = Cancel
-abuse-report-next-button = Next
-abuse-report-goback-button = Go back
-abuse-report-submit-button = Submit
-
-## Message bars descriptions.
-##
-## Variables:
-##   $addon-name (string) - Name of the add-on
-
-abuse-report-messagebar-aborted2 =
-  .message = Report for { $addon-name } canceled.
-abuse-report-messagebar-submitting2 =
-  .message = Sending report for { $addon-name }.
-abuse-report-messagebar-submitted2 =
-  .message = Thank you for submitting a report. Do you want to remove { $addon-name }?
-abuse-report-messagebar-submitted-noremove2 =
-  .message = Thank you for submitting a report.
-abuse-report-messagebar-removed-extension2 =
-  .message = Thank you for submitting a report. You’ve removed the extension { $addon-name }.
-abuse-report-messagebar-removed-sitepermission2 =
-  .message = Thank you for submitting a report. You’ve removed the Site Permissions add-on { $addon-name }.
-abuse-report-messagebar-removed-theme2 =
-  .message = Thank you for submitting a report. You’ve removed the theme { $addon-name }.
-abuse-report-messagebar-error2 =
-  .message = There was an error sending the report for { $addon-name }.
-abuse-report-messagebar-error-recent-submit2 =
-  .message = The report for { $addon-name } wasn’t sent because another report was submitted recently.
-
-## Message bars actions.
-
-abuse-report-messagebar-action-remove-extension = Yes, Remove It
-abuse-report-messagebar-action-keep-extension = No, I’ll Keep It
-abuse-report-messagebar-action-remove-sitepermission = Yes, Remove It
-abuse-report-messagebar-action-keep-sitepermission = No, I’ll Keep It
-abuse-report-messagebar-action-remove-theme = Yes, Remove It
-abuse-report-messagebar-action-keep-theme = No, I’ll Keep It
-abuse-report-messagebar-action-retry = Retry
-abuse-report-messagebar-action-cancel = Cancel
-
-## Abuse report reasons (optionally paired with related examples and/or suggestions)
-
-abuse-report-damage-reason-v2 = It damaged my computer or compromised my data
-abuse-report-damage-example = Example: Injected malware or stole data
-
-abuse-report-spam-reason-v2 = It contains spam or inserts unwanted advertising
-abuse-report-spam-example = Example: Insert ads on webpages
-
-abuse-report-settings-reason-v2 = It changed my search engine, homepage, or new tab without informing or asking me
-abuse-report-settings-suggestions = Before reporting the extension, you can try changing your settings:
-abuse-report-settings-suggestions-search = Change your default search settings
-abuse-report-settings-suggestions-homepage = Change your homepage and new tab
-
-abuse-report-deceptive-reason-v2 = It claims to be something it’s not
-abuse-report-deceptive-example = Example: Misleading description or imagery
-
-abuse-report-broken-reason-extension-v2 = It doesn’t work, breaks websites, or slows down { -brand-product-name }
-abuse-report-broken-reason-sitepermission-v2 = It doesn’t work, breaks websites, or slows down { -brand-product-name }
-abuse-report-broken-reason-theme-v2 = It doesn’t work or breaks browser display
-abuse-report-broken-example =
-  Example: Features are slow, hard to use, or don’t work; parts of websites won’t load or look unusual
-abuse-report-broken-suggestions-extension =
-  It sounds like you’ve identified a bug. In addition to submitting a report here, the best way
-  to get a functionality issue resolved is to contact the extension developer.
-  <a data-l10n-name="support-link">Visit the extension’s website</a> to get the developer information.
-abuse-report-broken-suggestions-sitepermission =
-  It sounds like you’ve identified a bug. In addition to submitting a report here, the best way
-  to get a functionality issue resolved is to contact the website developer.
-  <a data-l10n-name="support-link">Visit the website</a> to get the developer information.
-abuse-report-broken-suggestions-theme =
-  It sounds like you’ve identified a bug. In addition to submitting a report here, the best way
-  to get a functionality issue resolved is to contact the theme developer.
-  <a data-l10n-name="support-link">Visit the theme’s website</a> to get the developer information.
-
-abuse-report-policy-reason-v2 = It contains hateful, violent, or illegal content
-abuse-report-policy-suggestions =
-  Note: Copyright and trademark issues must be reported in a separate process.
-  <a data-l10n-name="report-infringement-link">Use these instructions</a> to
-  report the problem.
-
-abuse-report-unwanted-reason-v2 = I never wanted it and don’t know how to get rid of it
-abuse-report-unwanted-example = Example: An application installed it without my permission
-
-abuse-report-other-reason = Something else
diff --git a/toolkit/locales/en-US/toolkit/branding/accounts.ftl b/toolkit/locales/en-US/toolkit/branding/accounts.ftl
deleted file mode 100644
index d01a1e149f..0000000000
--- a/toolkit/locales/en-US/toolkit/branding/accounts.ftl
+++ /dev/null
@@ -1,11 +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/.
-
-# “Account” can be localized, “Firefox” must be treated as a brand,
-# and kept in English.
--fxaccount-brand-name =
-    { $capitalization ->
-        [sentence] Firefox account
-       *[title] Firefox Account
-    }
diff --git a/toolkit/locales/en-US/toolkit/contentanalysis/contentanalysis.ftl b/toolkit/locales/en-US/toolkit/contentanalysis/contentanalysis.ftl
index 41c18a48e3..aefc998730 100644
--- a/toolkit/locales/en-US/toolkit/contentanalysis/contentanalysis.ftl
+++ b/toolkit/locales/en-US/toolkit/contentanalysis/contentanalysis.ftl
@@ -47,16 +47,33 @@ contentanalysis-genericresponse-message = Content Analysis responded with { $res
 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 }.
+#   $content - Localized text describing the content being blocked, such as "Paste denied."
+contentanalysis-unspecified-error-message-content = An error occurred in communicating with { $agent }. { $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 }.
+#   $content - Localized text describing the content being blocked, such as "Paste denied."
+contentanalysis-no-agent-connected-message-content = Unable to connect to { $agent }. { $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-invalid-agent-signature-message = Failed signature verification for { $agent }. Transfer denied for resource: { $content }.
+#   $content - Localized text describing the content being blocked, such as "Paste denied."
+contentanalysis-invalid-agent-signature-message-content = Failed signature verification for { $agent }. { $content }
+# Variables:
+#   $filename - Name of the file that was blocked, such as "aFile.txt"
+contentanalysis-error-message-upload-file = Upload of “{ $filename }” denied.
+contentanalysis-error-message-dropped-text = Drag and drop denied.
+contentanalysis-error-message-clipboard = Paste denied.
+contentanalysis-error-message-print = Print denied.
+
+contentanalysis-block-dialog-title-upload-file = You’re not permitted to upload this file
+# Variables:
+#   $filename - Name of the file that was blocked, such as "aFile.txt"
+contentanalysis-block-dialog-body-upload-file = Under your organization’s data protection policies, you’re not permitted to upload the file “{ $filename }”. Contact your administrator for more info.
+contentanalysis-block-dialog-title-clipboard = You’re not permitted to paste this content
+contentanalysis-block-dialog-body-clipboard = Under your organization’s data protection policies, you’re not permitted to paste this content. Contact your administrator for more info.
+contentanalysis-block-dialog-title-dropped-text = You’re not permitted to drop this content
+contentanalysis-block-dialog-body-dropped-text = Under your organization’s data protection policies, you’re not permitted to drag and drop this content. Contact your administrator for more info.
+contentanalysis-block-dialog-title-print = You’re not permitted to print this document
+contentanalysis-block-dialog-body-print = Under your organization’s data protection policies, you’re not permitted to print this document. Contact your administrator for more info.
 
 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/global/arrowscrollbox.ftl b/toolkit/locales/en-US/toolkit/global/arrowscrollbox.ftl
index f1a1dad700..34dc9725ec 100644
--- a/toolkit/locales/en-US/toolkit/global/arrowscrollbox.ftl
+++ b/toolkit/locales/en-US/toolkit/global/arrowscrollbox.ftl
@@ -4,17 +4,17 @@
 
 ### This file contains the entities needed to use the Arrowscrollbox component.
 ### For example, Arrowscrollboxes are used in Tabs Toolbar when there are
-### multiple tabs opened and in the overflowing menus.
+### multiple tabs opened and in overflowing menus.
 
 # This button is shown at the beginning of the overflowing list of elements.
 # For example, in LTR language like English, on the Tabs Toolbar it would look
 # like "<" and scroll the tab list to the left, and in the overflowing menu it
 # would look like "^" and scroll the list of menuitems up.
-overflow-scroll-button-up =
-    .tooltiptext = Scroll up
+overflow-scroll-button-backwards =
+    .tooltiptext = Scroll backwards
 # This button is shown at the end of the overflowing list of elements. For
 # example, in LTR language like English, on the Tabs Toolbar it would look like
 # ">" and scroll the tab list to the right, and in the overflowing menu it
 # would look like "v" and scroll the list of menuitems down.
-overflow-scroll-button-down =
-    .tooltiptext = Scroll down
+overflow-scroll-button-forwards =
+    .tooltiptext = Scroll forwards