Merging upstream version 126.0.

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

3 files changed, 89 insertions, 5 deletions

diff --git a/l10n-en-CA/toolkit/toolkit/about/aboutReader.ftl b/l10n-en-CA/toolkit/toolkit/about/aboutReader.ftl
index 00154ab919..b24d297803 100644
--- a/l10n-en-CA/toolkit/toolkit/about/aboutReader.ftl
+++ b/l10n-en-CA/toolkit/toolkit/about/aboutReader.ftl
@@ -26,6 +26,18 @@ about-reader-color-theme-contrast = Contrast
     .title = Colour Theme Contrast
 about-reader-color-theme-custom = Custom colours
     .title = Colour 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.
 # Variables:
@@ -62,7 +74,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 = Colours
-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
 
@@ -85,3 +99,28 @@ about-reader-custom-colors-visited-links = Visited links
 about-reader-custom-colors-selection-highlight = Highlighter for read aloud
     .title = Edit colour
 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 centre
+about-reader-text-alignment-right =
+    .title = Align text right
diff --git a/l10n-en-CA/toolkit/toolkit/contentanalysis/contentanalysis.ftl b/l10n-en-CA/toolkit/toolkit/contentanalysis/contentanalysis.ftl
index 3579c9a394..0455c462d9 100644
--- a/l10n-en-CA/toolkit/toolkit/contentanalysis/contentanalysis.ftl
+++ b/l10n-en-CA/toolkit/toolkit/contentanalysis/contentanalysis.ftl
@@ -6,10 +6,6 @@ contentanalysis-alert-title = Content Analysis
 # Variables:
 #   $content - Description of the content being warned about, such as "clipboard" or "aFile.txt"
 contentanalysis-slow-agent-notification = The Content Analysis tool is taking a long time to respond for resource “{ $content }”
-contentanalysis-slow-agent-dialog-title = Content analysis in progress
-# Variables:
-#   $content - Description of the content being warned about, such as "clipboard" or "aFile.txt"
-contentanalysis-slow-agent-dialog-body = Content Analysis is analyzing resource “{ $content }”
 contentanalysis-slow-agent-dialog-header = Scan in progress
 # Variables:
 #   $agent - The name of the DLP agent doing the analysis
@@ -22,8 +18,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 }”
 contentanalysis-warndialogtitle = This content may be unsafe
@@ -55,6 +55,34 @@ contentanalysis-no-agent-connected-message = Unable to connect to { $agent }. Tr
 #   $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 }.
+# Variables:
+#   $agent - The name of the DLP agent doing the analysis
+#   $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 - 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 - 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.
 contentanalysis-inprogress-quit-yesbutton = Yes, quit
diff --git a/l10n-en-CA/toolkit/toolkit/global/arrowscrollbox.ftl b/l10n-en-CA/toolkit/toolkit/global/arrowscrollbox.ftl
index 3eb4fb8588..4fddb4e5e4 100644
--- a/l10n-en-CA/toolkit/toolkit/global/arrowscrollbox.ftl
+++ b/l10n-en-CA/toolkit/toolkit/global/arrowscrollbox.ftl
@@ -19,3 +19,20 @@ overflow-scroll-button-up =
 # would look like "v" and scroll the list of menuitems down.
 overflow-scroll-button-down =
     .tooltiptext = Scroll down
+
+### 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 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-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-forwards =
+    .tooltiptext = Scroll forwards