Merging upstream version 115.11.0esr.

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

14 files changed, 369 insertions, 24 deletions

diff --git a/l10n-en-GB/toolkit/chrome/global/narrate.properties b/l10n-en-GB/toolkit/chrome/global/narrate.properties
index 06d134b4d5..94a9dc3f04 100644
--- a/l10n-en-GB/toolkit/chrome/global/narrate.properties
+++ b/l10n-en-GB/toolkit/chrome/global/narrate.properties
@@ -8,6 +8,14 @@
 # %S is the keyboard shortcut for the listen command
 listen-label = Listen (%S)
 back = Backwards
+
+# "Listen, which allows users to listen to Firefox reading the text,
+# 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
+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
 start-label = Start (%S)
 # %S is the keyboard shortcut for the stop command
@@ -15,6 +23,8 @@ stop-label = Stop (%S)
 # Keyboard shortcut to toggle the narrate feature
 narrate-key-shortcut = N
 forward = Forwards
+# %S is the keyboard shortcut for the skip forward command
+next-label = Forward (%S)
 speed = Speed
 selectvoicelabel = Voice:
 # Default voice is determined by the language of the document.
diff --git a/l10n-en-GB/toolkit/crashreporter/crashreporter.ftl b/l10n-en-GB/toolkit/crashreporter/crashreporter.ftl
new file mode 100644
index 0000000000..2b919d2db3
--- /dev/null
+++ b/l10n-en-GB/toolkit/crashreporter/crashreporter.ftl
@@ -0,0 +1,48 @@
+# 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/l10n-en-GB/toolkit/toolkit/about/aboutAddons.ftl b/l10n-en-GB/toolkit/toolkit/about/aboutAddons.ftl
index 1034ab4512..ac779a10ad 100644
--- a/l10n-en-GB/toolkit/toolkit/about/aboutAddons.ftl
+++ b/l10n-en-GB/toolkit/toolkit/about/aboutAddons.ftl
@@ -220,6 +220,9 @@ shortcuts-no-addons = You don’t have any extensions enabled.
 shortcuts-no-commands = The following extensions do not have shortcuts:
 shortcuts-input =
     .placeholder = Type a shortcut
+# Accessible name for a trashcan icon button that removes an existent shortcut
+shortcuts-remove-button =
+    .aria-label = Remove shortcut
 shortcuts-browserAction2 = Activate toolbar button
 shortcuts-pageAction = Activate page action
 shortcuts-sidebarAction = Toggle the sidebar
diff --git a/l10n-en-GB/toolkit/toolkit/about/aboutReader.ftl b/l10n-en-GB/toolkit/toolkit/about/aboutReader.ftl
index bd0e4a5aad..05d060f7ba 100644
--- a/l10n-en-GB/toolkit/toolkit/about/aboutReader.ftl
+++ b/l10n-en-GB/toolkit/toolkit/about/aboutReader.ftl
@@ -4,7 +4,6 @@
 
 about-reader-loading = Loading…
 about-reader-load-error = Failed to load article from page
-
 about-reader-color-scheme-light = Light
     .title = Colour Scheme Light
 about-reader-color-scheme-dark = Dark
@@ -13,7 +12,32 @@ about-reader-color-scheme-sepia = Sepia
     .title = Colour Scheme Sepia
 about-reader-color-scheme-auto = Auto
     .title = Colour Scheme Auto
-
+about-reader-color-theme-light = Light
+    .title = Colour Theme Light
+about-reader-color-theme-dark = Dark
+    .title = Colour Theme Dark
+about-reader-color-theme-sepia = Sepia
+    .title = Colour Theme Sepia
+about-reader-color-theme-auto = Auto
+    .title = Colour Theme Auto
+about-reader-color-theme-gray = Gray
+    .title = Colour Theme Gray
+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:
@@ -49,4 +73,54 @@ 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-savetopocket = Save To { -pocket-brand-name }
+about-reader-toolbar-color-controls = Colours
+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
+
+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 colour
+about-reader-custom-colors-background = Background
+    .title = Edit colour
+about-reader-custom-colors-unvisited-links = Unvisited links
+    .title = Edit colour
+about-reader-custom-colors-visited-links = Visited links
+    .title = Edit colour
+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-GB/toolkit/toolkit/about/aboutSupport.ftl b/l10n-en-GB/toolkit/toolkit/about/aboutSupport.ftl
index 119c116266..1041e75e65 100644
--- a/l10n-en-GB/toolkit/toolkit/about/aboutSupport.ftl
+++ b/l10n-en-GB/toolkit/toolkit/about/aboutSupport.ftl
@@ -203,6 +203,9 @@ media-cdm-capabilities = Capabilities
 # are not encrypted. It allows playback to start without having to wait for
 # license response, improving video start time and user experience.
 media-cdm-clear-lead = Clear Lead
+# We choose 2.2 as this is the version which the video provider usually want to have in order to stream 4K video securely
+# HDCP version https://w3c.github.io/encrypted-media/#idl-def-hdcpversion
+media-hdcp-22-compatible = HDCP 2.2 Compatible
 
 ##
 
@@ -282,6 +285,7 @@ try-newer-driver = Blocked for your graphics driver version. Try updating your g
 # there are no good translations, these are only used in about:support
 clear-type-parameters = ClearType Parameters
 compositing = Compositing
+support-font-determination = Font Visibility Debug Info
 hardware-h264 = Hardware H264 Decoding
 main-thread-no-omtc = main thread, no OMTC
 yes = Yes
@@ -427,3 +431,15 @@ pointing-device-mouse = Mouse
 pointing-device-touchscreen = Touchscreen
 pointing-device-pen-digitizer = Pen Digitiser
 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/l10n-en-GB/toolkit/toolkit/about/aboutWebauthn.ftl b/l10n-en-GB/toolkit/toolkit/about/aboutWebauthn.ftl
index f91fff9b5e..0512b896db 100644
--- a/l10n-en-GB/toolkit/toolkit/about/aboutWebauthn.ftl
+++ b/l10n-en-GB/toolkit/toolkit/about/aboutWebauthn.ftl
@@ -18,6 +18,8 @@ about-webauthn-pin-section-title = PIN Management
 about-webauthn-credential-management-section-title = Manage credentials
 about-webauthn-pin-required-section-title = PIN required
 about-webauthn-confirm-deletion-section-title = Confirm deletion
+# Registered biometric features for authentication. Mostly, but not exclusively, fingerprints.
+about-webauthn-bio-enrollment-section-title = Biometric enrolments
 
 ## Info field texts
 
@@ -27,6 +29,8 @@ about-webauthn-text-select-device = Please select your desired security token by
 # CTAP2 refers to Client to Authenticator Protocol version 2
 about-webauthn-text-non-ctap2-device = Unable to manage options because your security token does not support CTAP2.
 about-webauthn-text-not-available = Not available on this platform.
+about-webauthn-bio-enrollment-list-subsection-title = Enrolments:
+about-webauthn-add-bio-enrollment-section-title = Add new enrolment
 
 ## Results label
 
@@ -41,6 +45,7 @@ about-webauthn-results-pin-invalid-error =
        *[other] Error: Incorrect PIN. Try again. You have { $retriesLeft } attempts left.
     }
 about-webauthn-results-pin-blocked-error = Error: There are no attempts left and your device has been locked, because the wrong PIN was provided too many times. The device needs a reset.
+about-webauthn-results-pin-not-set-error = Error: PIN not set. This operation needs PIN protection.
 about-webauthn-results-pin-too-short-error = Error: The given PIN is too short.
 about-webauthn-results-pin-too-long-error = Error: The given PIN is too long.
 about-webauthn-results-pin-auth-blocked-error = Error: There were too many failed attempts in a row and PIN authentication has been temporarily blocked. Your device needs a power cycle (unplug and re-insert).
@@ -53,6 +58,8 @@ about-webauthn-repeat-pin-label = Repeat new PIN:
 about-webauthn-current-pin-label = Current PIN:
 about-webauthn-pin-required-label = Please enter your PIN:
 about-webauthn-credential-list-subsection-title = Credentials:
+about-webauthn-enrollment-name-label = Enrolment name (optional):
+about-webauthn-enrollment-list-empty = No enrolments found on device.
 about-webauthn-credential-list-empty = No credentials found on device.
 about-webauthn-confirm-deletion-label = You are about to delete:
 
@@ -62,9 +69,14 @@ about-webauthn-current-set-pin-button = Set PIN
 about-webauthn-current-change-pin-button = Change PIN
 # List is a verb, as in "Show list of credentials"
 about-webauthn-list-credentials-button = List credentials
+# List is a verb, as in "Show list of all enrollments"
+about-webauthn-list-bio-enrollments-button = List enrolments
+about-webauthn-add-bio-enrollment-button = Add enrolment
 about-webauthn-cancel-button = Cancel
 about-webauthn-send-pin-button = OK
 about-webauthn-delete-button = Delete
+about-webauthn-start-enrollment-button = Start enrolment
+about-webauthn-update-button = Update
 
 ## Authenticator options fields
 ## Option fields correspond to the CTAP2 option IDs and definitions found in https://fidoalliance.org/specs/fido-v2.1-ps-20210615/fido-client-to-authenticator-protocol-v2.1-ps-20210615.html#option-id
@@ -128,3 +140,41 @@ about-webauthn-auth-info-true = True
 # Shows when boolean value for an info field is False. False should not be translated.
 about-webauthn-auth-info-false = False
 about-webauthn-auth-info-null = Not supported
+
+## Bio enrollment sample feedbacks
+
+# To register a new enrollment (e.g. fingerprint) usually
+# multiple scans of the same finger have to be sampled.
+# This shows how many the user still has to do.
+# Variables:
+#  $repeatCount (Number): number of tries left
+about-webauthn-samples-still-needed =
+    { $repeatCount ->
+        [one] { $repeatCount } sample still needed.
+       *[other] { $repeatCount } samples still needed.
+    }
+# Scan (e.g. of fingerprint) was successful.
+about-webauthn-ctap2-enroll-feedback-good = Sample was good.
+
+## Scan (e.g. of fingerprint) was off-center (e.g. too high, too left, etc.).
+
+about-webauthn-ctap2-enroll-feedback-too-high = Sample was too high.
+about-webauthn-ctap2-enroll-feedback-too-low = Sample was too low.
+about-webauthn-ctap2-enroll-feedback-too-left = Sample was too left.
+about-webauthn-ctap2-enroll-feedback-too-right = Sample was too right.
+
+##
+
+about-webauthn-ctap2-enroll-feedback-too-fast = Sample was too fast.
+about-webauthn-ctap2-enroll-feedback-too-slow = Sample was too slow.
+about-webauthn-ctap2-enroll-feedback-poor-quality = Sample had poor quality.
+# Skewed in the sense of fingerprint/iris scan was too distorted
+about-webauthn-ctap2-enroll-feedback-too-skewed = Sample was too skewed.
+about-webauthn-ctap2-enroll-feedback-too-short = Sample was too short.
+# Scan (e.g. of fingerprint) couldn't be merged with previous samples.
+about-webauthn-ctap2-enroll-feedback-merge-failure = Sample merge failure.
+# Scan (e.g. of fingerprint) is somehow identical to an existing sample.
+about-webauthn-ctap2-enroll-feedback-exists = Sample already exists.
+about-webauthn-ctap2-enroll-feedback-no-user-activity = No activity from user.
+about-webauthn-ctap2-enroll-feedback-no-user-presence-transition = User did not complete the sampling as expected.
+about-webauthn-ctap2-enroll-feedback-other = Sample error.
diff --git a/l10n-en-GB/toolkit/toolkit/branding/brandings.ftl b/l10n-en-GB/toolkit/toolkit/branding/brandings.ftl
index ef3b2fdedb..ea4ca6454d 100644
--- a/l10n-en-GB/toolkit/toolkit/branding/brandings.ftl
+++ b/l10n-en-GB/toolkit/toolkit/branding/brandings.ftl
@@ -20,6 +20,7 @@
 -lockwise-brand-short-name = Lockwise
 -monitor-brand-name = Firefox Monitor
 -monitor-brand-short-name = Monitor
+-mozmonitor-brand-name = Mozilla Monitor
 -pocket-brand-name = Pocket
 -send-brand-name = Firefox Send
 -screenshots-brand-name = Firefox Screenshots
diff --git a/l10n-en-GB/toolkit/toolkit/contentanalysis/contentanalysis.ftl b/l10n-en-GB/toolkit/toolkit/contentanalysis/contentanalysis.ftl
index b3c544e8c5..12a3e2562d 100644
--- a/l10n-en-GB/toolkit/toolkit/contentanalysis/contentanalysis.ftl
+++ b/l10n-en-GB/toolkit/toolkit/contentanalysis/contentanalysis.ftl
@@ -6,12 +6,26 @@ 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
+contentanalysis-slow-agent-dialog-header = Scan 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 analysing resource “{ $content }”
+#   $agent - The name of the DLP agent doing the analysis
+#   $filename - Name of the file being analyzed, such as "aFile.txt"
+contentanalysis-slow-agent-dialog-body-file = { $agent } is reviewing “{ $filename }” against your organisation’s data policies. This may take a moment.
+# Variables:
+#   $agent - The name of the DLP agent doing the analysis
+contentanalysis-slow-agent-dialog-body-clipboard = { $agent } is reviewing what you pasted against your organisation’s data policies. This may take a moment.
+# Note that this is shown when the user drag and drops text into the browser.
+# 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 organisation’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 organisation’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
 # Variables:
 #   $content - Description of the content being warned about, such as "clipboard" or "aFile.txt"
@@ -29,3 +43,46 @@ contentanalysis-block-message = Your organisation uses data-loss prevention soft
 # Variables:
 #   $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 }.
+# 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-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 organisation’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 organisation’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 organisation’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 organisation’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-GB/toolkit/toolkit/formautofill/formAutofill.ftl b/l10n-en-GB/toolkit/toolkit/formautofill/formAutofill.ftl
index 81f6b1e75e..468ed4d1f8 100644
--- a/l10n-en-GB/toolkit/toolkit/formautofill/formAutofill.ftl
+++ b/l10n-en-GB/toolkit/toolkit/formautofill/formAutofill.ftl
@@ -47,3 +47,37 @@ credit-card-capture-save-new-button =
 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
+# Used as a label for the button, displayed at the bottom of the dropdown suggestion, to open Form Autofill browser preferences.
+autofill-manage-payment-methods-label = Manage payment methods
+
+## These are brand names and should only be translated when a locale-specific name for that brand is in common use
+
+autofill-card-network-amex = American Express
+autofill-card-network-cartebancaire = Carte Bancaire
+autofill-card-network-diners = Diners Club
+autofill-card-network-discover = Discover
+autofill-card-network-jcb = JCB
+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 = organisation
+autofill-category-tel = phone
+autofill-category-email = email
diff --git a/l10n-en-GB/toolkit/toolkit/global/arrowscrollbox.ftl b/l10n-en-GB/toolkit/toolkit/global/arrowscrollbox.ftl
new file mode 100644
index 0000000000..4fddb4e5e4
--- /dev/null
+++ b/l10n-en-GB/toolkit/toolkit/global/arrowscrollbox.ftl
@@ -0,0 +1,38 @@
+# 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 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.
+
+# 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
+# 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
+
+### 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
diff --git a/l10n-en-GB/toolkit/toolkit/global/processTypes.ftl b/l10n-en-GB/toolkit/toolkit/global/processTypes.ftl
index be45ec8832..a50a9a3b76 100644
--- a/l10n-en-GB/toolkit/toolkit/global/processTypes.ftl
+++ b/l10n-en-GB/toolkit/toolkit/global/processTypes.ftl
@@ -8,28 +8,23 @@
 ##
 
 process-type-web = Web Content
-
 # process used to run privileged about pages,
 # such as about:home
 process-type-privilegedabout = Privileged About
-
 # process used to run privileged mozilla pages,
 # such as accounts.firefox.com
 process-type-privilegedmozilla = Privileged Mozilla Content
-
 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
-
 # process used to isolate a ServiceWorker to improve
 # performance
 process-type-webserviceworker = Isolated Service Worker
-
 # process preallocated; may change to other types
 process-type-prealloc = Preallocated
 
@@ -39,19 +34,22 @@ process-type-prealloc = Preallocated
 
 process-type-default = Main
 process-type-tab = Tab
-
 # process used to communicate with the GPU for
 # graphics acceleration
 process-type-gpu = GPU
-
 # process used to perform network operations
 process-type-socket = Socket
-
 # process used to decode media
 process-type-rdd = RDD
-
 # process used to run some IPC actor in their own sandbox
 process-type-utility = Sandboxed IPC Actor
+process-type-utility-actor-audio-decoder-generic = Utility Generic Audio Decoder
+process-type-utility-actor-audio-decoder-applemedia = Utility AppleMedia
+process-type-utility-actor-audio-decoder-wmf = Utility Windows Media Foundation
+process-type-utility-actor-mf-media-engine = Utility Media Foundation Engine
+process-type-utility-actor-js-oracle = Utility JavaScript Oracle
+process-type-utility-actor-windows-utils = Utility Windows Utils
+process-type-utility-actor-windows-file-dialog = Utility Windows File Dialogue
 
 ##
 ## Other
diff --git a/l10n-en-GB/toolkit/toolkit/global/textActions.ftl b/l10n-en-GB/toolkit/toolkit/global/textActions.ftl
index a8153024aa..78ebed1b73 100644
--- a/l10n-en-GB/toolkit/toolkit/global/textActions.ftl
+++ b/l10n-en-GB/toolkit/toolkit/global/textActions.ftl
@@ -62,3 +62,5 @@ text-action-spell-dictionaries =
     .accesskey = L
 text-action-search-text-box-clear =
     .title = Clear
+text-action-highlight-selection =
+    .label = Highlight Selection
diff --git a/l10n-en-GB/toolkit/toolkit/pdfviewer/viewer.ftl b/l10n-en-GB/toolkit/toolkit/pdfviewer/viewer.ftl
index b581d72378..3b141aee16 100644
--- a/l10n-en-GB/toolkit/toolkit/pdfviewer/viewer.ftl
+++ b/l10n-en-GB/toolkit/toolkit/pdfviewer/viewer.ftl
@@ -301,8 +301,15 @@ pdfjs-editor-ink-button-label = Draw
 pdfjs-editor-stamp-button =
     .title = Add or edit images
 pdfjs-editor-stamp-button-label = Add or edit images
-pdfjs-editor-remove-button =
-    .title = Remove
+pdfjs-editor-highlight-button =
+    .title = Highlight
+pdfjs-editor-highlight-button-label = Highlight
+pdfjs-highlight-floating-button =
+    .title = Highlight
+pdfjs-highlight-floating-button1 =
+    .title = Highlight
+    .aria-label = Highlight
+pdfjs-highlight-floating-button-label = Highlight
 
 ## Remove button for the various kind of editor.
 
@@ -326,6 +333,10 @@ pdfjs-editor-ink-opacity-input = Opacity
 pdfjs-editor-stamp-add-image-button =
     .title = Add image
 pdfjs-editor-stamp-add-image-button-label = Add image
+# This refers to the thickness of the line used for free highlighting (not bound to text)
+pdfjs-editor-free-highlight-thickness-input = Thickness
+pdfjs-editor-free-highlight-thickness-title =
+    .title = Change thickness when highlighting items other than text
 pdfjs-free-text =
     .aria-label = Text Editor
 pdfjs-free-text-default-content = Start typing…
@@ -382,3 +393,10 @@ pdfjs-editor-colorpicker-pink =
     .title = Pink
 pdfjs-editor-colorpicker-red =
     .title = Red
+
+## Show all highlights
+## This is a toggle button to show/hide all the highlights.
+
+pdfjs-editor-highlight-show-all-button-label = Show all
+pdfjs-editor-highlight-show-all-button =
+    .title = Show all
diff --git a/l10n-en-GB/toolkit/toolkit/preferences/preferences.ftl b/l10n-en-GB/toolkit/toolkit/preferences/preferences.ftl
index e9fec6800b..fca23a0704 100644
--- a/l10n-en-GB/toolkit/toolkit/preferences/preferences.ftl
+++ b/l10n-en-GB/toolkit/toolkit/preferences/preferences.ftl
@@ -4,20 +4,16 @@
 
 password-not-set =
     .value = (not set)
-
 failed-pp-change = Unable to change Primary Password.
 incorrect-pp = You did not enter the correct current Primary Password. Please try again.
 pp-change-ok = Primary Password successfully changed.
-
 settings-pp-erased-ok = You have deleted your Primary Password. Stored passwords and certificate private keys managed by { -brand-short-name } will not be protected.
 settings-pp-not-wanted = Warning! You have decided not to use a Primary Password. Stored passwords and certificate private keys managed by { -brand-short-name } will not be protected.
-
 pp-change2empty-in-fips-mode = You are currently in FIPS mode. FIPS requires a non-empty Primary Password.
 pw-change-success-title = Password Change Succeeded
 pw-change-failed-title = Password Change Failed
 pw-remove-button =
     .label = Remove
-
 primary-password-dialog =
     .title = Primary Password
 set-password-old-password = Current password:
@@ -26,9 +22,9 @@ set-password-reenter-password = Re-enter password:
 set-password-meter = Password quality meter
 set-password-meter-loading = Loading
 primary-password-admin = Your administrator requires that you have a Primary Password set in order to save logins and passwords.
+primary-password-required-by-policy = Your organisation requires that you have a Primary Password set in order to save logins and passwords.
 primary-password-description = A Primary Password is used to protect some sensitive information, like logins and passwords, on this device. If you create a Primary Password you will be asked to enter it once per session when { -brand-short-name } retrieves saved information protected by the password.
 primary-password-warning = Please make sure you remember the Primary Password you have set. If you forget your Primary Password, you will be unable to access any of the information protected by it on this device.
-
 remove-primary-password =
     .title = Remove Primary Password
 remove-info =