Merging upstream version 115.11.0esr.

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

24 files changed, 622 insertions, 34 deletions

diff --git a/l10n-en-CA/toolkit/chrome/global/narrate.properties b/l10n-en-CA/toolkit/chrome/global/narrate.properties
index 712cbcde51..215202241c 100644
--- a/l10n-en-CA/toolkit/chrome/global/narrate.properties
+++ b/l10n-en-CA/toolkit/chrome/global/narrate.properties
@@ -8,6 +8,14 @@
 # %S is the keyboard shortcut for the listen command
 listen-label = Listen (%S)
 back = Back
+
+# "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 = Forward
+# %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-CA/toolkit/chrome/passwordmgr/passwordmgr.properties b/l10n-en-CA/toolkit/chrome/passwordmgr/passwordmgr.properties
index 99843b6cd9..96fcd6d3d5 100644
--- a/l10n-en-CA/toolkit/chrome/passwordmgr/passwordmgr.properties
+++ b/l10n-en-CA/toolkit/chrome/passwordmgr/passwordmgr.properties
@@ -46,6 +46,7 @@ passwordChangeTitle = Confirm Password Change
 updatePasswordMsg = Would you like to update the saved password for “%S”?
 updatePasswordMsgNoUser = Would you like to update the saved password?
 userSelectText2 = Select which login to update:
+
 loginsDescriptionAll2=Logins for the following sites are stored on your computer
 
 # LOCALIZATION NOTE (useASecurelyGeneratedPassword):
@@ -73,3 +74,7 @@ insecureFieldWarningLearnMore = Learn More
 # LOCALIZATION NOTE (viewSavedLogins.label):
 # This label is used in the footer of login autocomplete menus.
 viewSavedLogins.label= View Saved Logins
+
+# LOCALIZATION NOTE (managePasswords.label):
+# This label is used in the footer of login autocomplete menus.
+managePasswords.label= Manage Passwords
diff --git a/l10n-en-CA/toolkit/crashreporter/crashreporter.ftl b/l10n-en-CA/toolkit/crashreporter/crashreporter.ftl
new file mode 100644
index 0000000000..8c73758d65
--- /dev/null
+++ b/l10n-en-CA/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-CA/toolkit/toolkit/about/aboutAddons.ftl b/l10n-en-CA/toolkit/toolkit/about/aboutAddons.ftl
index 2c20c8e668..4db97fd05f 100644
--- a/l10n-en-CA/toolkit/toolkit/about/aboutAddons.ftl
+++ b/l10n-en-CA/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-CA/toolkit/toolkit/about/aboutGlean.ftl b/l10n-en-CA/toolkit/toolkit/about/aboutGlean.ftl
index bf32952a67..7526e5b836 100644
--- a/l10n-en-CA/toolkit/toolkit/about/aboutGlean.ftl
+++ b/l10n-en-CA/toolkit/toolkit/about/aboutGlean.ftl
@@ -54,6 +54,8 @@ about-glean-manual-testing =
 about-glean-no-ping-label = (don’t submit any ping)
 # An in-line text input field precedes this string.
 about-glean-label-for-tag-pings = In the preceding field ensure there is a memorable debug tag so you can recognize your pings later.
+# An in-line text input field precedes this string.
+about-glean-label-for-tag-pings-with-requirements = Set a memorable debug tag <span>(20 characters or fewer, alphanumerics and - only)</span> so you can recognize your pings later.
 # An in-line drop down list precedes this string.
 # Do not translate strings between <code> </code> tags.
 about-glean-label-for-ping-names =
@@ -85,6 +87,19 @@ about-glean-adhoc-explanation =
     by opening a devtools console here on <code>about:glean</code>
     and using the <code>testGetValue()</code> API like
     <code>Glean.metricCategory.metricName.testGetValue()</code>.
+# Do not translate strings between <code> </code> tags.
+about-glean-adhoc-explanation2 =
+    For more <i>ad hoc</i> testing,
+    you can also determine the current value of a particular piece of instrumentation
+    by opening a devtools console here on <code>about:glean</code>
+    and using the <code>testGetValue()</code> API like
+    <code>Glean.metricCategory.metricName.testGetValue()</code>
+    for a metric named <code>metric.category.metric_name</code>.
+# Do not translate strings between <code> </code> tags.
+about-glean-adhoc-note =
+    Please note that you are using the Glean JS API by using the devtools console.
+    This means the metric category and metric name are formatted in
+    <code>camelCase</code> unlike in the Rust and C++ APIs.
 controls-button-label-verbose = Apply settings and submit ping
 about-glean-about-data-header = About Data
 about-glean-about-data-explanation =
diff --git a/l10n-en-CA/toolkit/toolkit/about/aboutLogging.ftl b/l10n-en-CA/toolkit/toolkit/about/aboutLogging.ftl
index 203c706431..a1ef858cbc 100644
--- a/l10n-en-CA/toolkit/toolkit/about/aboutLogging.ftl
+++ b/l10n-en-CA/toolkit/toolkit/about/aboutLogging.ftl
@@ -38,6 +38,8 @@ about-logging-preset-networking-websocket-label = WebSockets
 about-logging-preset-networking-websocket-description = Log modules to diagnose WebSocket issues
 about-logging-preset-networking-http3-label = HTTP/3
 about-logging-preset-networking-http3-description = Log modules to diagnose HTTP/3 and QUIC issues
+about-logging-preset-networking-http3-upload-speed-label = HTTP/3 upload speed
+about-logging-preset-networking-http3-upload-speed-description = Log modules to diagnose HTTP/3 upload speed issues
 about-logging-preset-media-playback-label = Media playback
 about-logging-preset-media-playback-description = Log modules to diagnose media playback issues (not video-conferencing issues)
 about-logging-preset-webrtc-label = WebRTC
@@ -46,6 +48,9 @@ about-logging-preset-webgpu-label = WebGPU
 about-logging-preset-webgpu-description = Log modules to diagnose WebGPU issues
 about-logging-preset-gfx-label = Graphics
 about-logging-preset-gfx-description = Log modules to diagnose graphics issues
+# This is specifically "Microsoft Windows". Microsoft normally doesn't localize it, and we should follow their convention here.
+about-logging-preset-windows-label = Windows
+about-logging-preset-windows-description = Log modules to diagnose issues specific to Microsoft Windows
 about-logging-preset-custom-label = Custom
 about-logging-preset-custom-description = Log modules manually selected
 # Error handling
diff --git a/l10n-en-CA/toolkit/toolkit/about/aboutProcesses.ftl b/l10n-en-CA/toolkit/toolkit/about/aboutProcesses.ftl
index ba0c69f924..d85d4bce47 100644
--- a/l10n-en-CA/toolkit/toolkit/about/aboutProcesses.ftl
+++ b/l10n-en-CA/toolkit/toolkit/about/aboutProcesses.ftl
@@ -4,7 +4,6 @@
 
 # Page title
 about-processes-title = Process Manager
-
 # The Actions column
 about-processes-column-action =
     .title = Actions
@@ -15,7 +14,6 @@ about-processes-shutdown-process =
     .title = Unload tabs and kill process
 about-processes-shutdown-tab =
     .title = Close tab
-
 # Profiler icons
 # Variables:
 #    $duration (Number) The time in seconds during which the profiler will be running.
@@ -53,7 +51,6 @@ about-processes-remote-sandbox-broker-process = Remote Sandbox Broker ({ $pid })
 about-processes-fork-server-process = Fork Server ({ $pid })
 about-processes-preallocated-process = Preallocated ({ $pid })
 about-processes-utility-process = Utility ({ $pid })
-
 # Unknown process names
 # Variables:
 #    $pid (String) The process id of this process, assigned by the OS.
@@ -88,7 +85,6 @@ about-processes-active-threads =
         [one] { $active } active thread out of { $number }: { $list }
        *[other] { $active } active threads out of { $number }: { $list }
     }
-
 # Single-line summary of threads (idle process)
 # Variables:
 #    $number (Number) The number of threads in the process. Typically larger
@@ -100,25 +96,21 @@ about-processes-inactive-threads =
         [one] { $number } inactive thread
        *[other] { $number } inactive threads
     }
-
 # Thread details
 # Variables:
 #   $name (String) The name assigned to the thread.
 #   $tid (String) The thread id of this thread, assigned by the OS.
 about-processes-thread-name-and-id = { $name }
     .title = Thread id: { $tid }
-
 # Tab
 # Variables:
 #   $name (String) The name of the tab (typically the title of the page, might be the url while the page is loading).
 about-processes-tab-name = Tab: { $name }
 about-processes-preloaded-tab = Preloaded New Tab
-
 # Single subframe
 # Variables:
 #   $url (String) The full url of this subframe.
 about-processes-frame-name-one = Subframe: { $url }
-
 # Group of subframes
 # Variables:
 #   $number (Number) The number of subframes in this group. Always ≥ 1.
@@ -135,6 +127,7 @@ about-processes-utility-actor-mf-media-engine = Windows Media Foundation Media E
 # "Oracle" refers to an internal Firefox process and should be kept in English
 about-processes-utility-actor-js-oracle = JavaScript Oracle
 about-processes-utility-actor-windows-utils = Windows Utils
+about-processes-utility-actor-windows-file-dialog = Windows File Dialog
 
 ## Displaying CPU (percentage and total)
 ## Variables:
@@ -148,15 +141,12 @@ about-processes-utility-actor-windows-utils = Windows Utils
 # Common case.
 about-processes-cpu = { NUMBER($percent, maximumSignificantDigits: 2, style: "percent") }
     .title = Total CPU time: { NUMBER($total, maximumFractionDigits: 0) }{ $unit }
-
 # Special case: data is not available yet.
 about-processes-cpu-user-and-kernel-not-ready = (measuring)
-
 # Special case: process or thread is almost idle (using less than 0.1% of a CPU core).
 # This case only occurs on Windows where the precision of the CPU times is low.
 about-processes-cpu-almost-idle = < 0.1%
     .title = Total CPU time: { NUMBER($total, maximumFractionDigits: 0) }{ $unit }
-
 # Special case: process or thread is currently idle.
 about-processes-cpu-fully-idle = idle
     .title = Total CPU time: { NUMBER($total, maximumFractionDigits: 0) }{ $unit }
@@ -175,7 +165,6 @@ about-processes-cpu-fully-idle = idle
 # Common case.
 about-processes-total-memory-size-changed = { NUMBER($total, maximumFractionDigits: 0) }{ $totalUnit }
     .title = Evolution: { $deltaSign }{ NUMBER($delta, maximumFractionDigits: 0) }{ $deltaUnit }
-
 # Special case: no change.
 about-processes-total-memory-size-no-change = { NUMBER($total, maximumFractionDigits: 0) }{ $totalUnit }
 
diff --git a/l10n-en-CA/toolkit/toolkit/about/aboutReader.ftl b/l10n-en-CA/toolkit/toolkit/about/aboutReader.ftl
index 38b0299c16..8fe9411af1 100644
--- a/l10n-en-CA/toolkit/toolkit/about/aboutReader.ftl
+++ b/l10n-en-CA/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,20 @@ about-reader-color-scheme-sepia = Sepia
     .title = Colour Scheme Sepia
 about-reader-color-scheme-auto = Auto
     .title = Color 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 = Grey
+    .title = Colour Theme Grey
+about-reader-color-theme-contrast = Contrast
+    .title = Colour Theme Contrast
+about-reader-color-theme-custom = Custom colours
+    .title = Colour Theme Custom
 # An estimate for how long it takes to read an article,
 # expressed as a range covering both slow and fast readers.
 # Variables:
@@ -49,4 +61,27 @@ 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-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
diff --git a/l10n-en-CA/toolkit/toolkit/about/aboutSupport.ftl b/l10n-en-CA/toolkit/toolkit/about/aboutSupport.ftl
index 626f95e3ad..0eb8a7ae9b 100644
--- a/l10n-en-CA/toolkit/toolkit/about/aboutSupport.ftl
+++ b/l10n-en-CA/toolkit/toolkit/about/aboutSupport.ftl
@@ -188,6 +188,24 @@ media-codec-support-codec-name = Codec Name
 media-codec-support-supported = Supported
 media-codec-support-unsupported = Unsupported
 media-codec-support-error = Codec support information unavailable. Try again after playing back a media file.
+media-codec-support-lack-of-extension = Install extension
+
+## Media Content Decryption Modules (CDM)
+## See EME Spec for more explanation for following technical terms
+## https://w3c.github.io/encrypted-media/
+
+media-content-decryption-modules-title = Content Decryption Modules Information
+media-key-system-name = Key System Name
+media-video-robustness = Video Robustness
+media-audio-robustness = Audio Robustness
+media-cdm-capabilities = Capabilities
+# Clear Lead isn't defined in the spec, which means the the first few seconds
+# 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
 
 ##
 
@@ -267,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
@@ -412,3 +431,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/l10n-en-CA/toolkit/toolkit/about/aboutWebauthn.ftl b/l10n-en-CA/toolkit/toolkit/about/aboutWebauthn.ftl
index 6fbe8159b2..0512b896db 100644
--- a/l10n-en-CA/toolkit/toolkit/about/aboutWebauthn.ftl
+++ b/l10n-en-CA/toolkit/toolkit/about/aboutWebauthn.ftl
@@ -1,3 +1,180 @@
 # 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 for about:webauthn, a security token management page
+
+# Page title
+# 'WebAuthn' is a protocol name and should not be translated
+about-webauthn-page-title = About WebAuthn
+
+## Section titles
+
+about-webauthn-info-section-title = Device info
+about-webauthn-info-subsection-title = Authenticator info
+about-webauthn-options-subsection-title = Authenticator options
+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
+
+about-webauthn-text-connect-device = Please connect a security token.
+# If multiple devices are plugged in, they will blink and we are asking the user to select one by touching the device they want.
+about-webauthn-text-select-device = Please select your desired security token by touching the device.
+# 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
+
+about-webauthn-results-success = Success!
+about-webauthn-results-general-error = Error!
+# Variables:
+#  $retriesLeft (Number): number of tries left
+about-webauthn-results-pin-invalid-error =
+    { $retriesLeft ->
+        [0] Error: Incorrect PIN. Try again.
+        [one] Error: Incorrect PIN. Try again. You have one attempt left.
+       *[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).
+about-webauthn-results-cancelled-by-user-error = Error: Operation has been cancelled by the user.
+
+## Labels
+
+about-webauthn-new-pin-label = New PIN:
+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:
+
+## Buttons
+
+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
+
+about-webauthn-auth-option-uv = User verification
+about-webauthn-auth-option-up = User presence
+about-webauthn-auth-option-clientpin = Client PIN
+about-webauthn-auth-option-rk = Resident key
+about-webauthn-auth-option-plat = Platform device
+# pinUvAuthToken should not be translated.
+about-webauthn-auth-option-pinuvauthtoken = Command permissions (pinUvAuthToken)
+# MakeCredential and GetAssertion should not be translated.
+about-webauthn-auth-option-nomcgapermissionswithclientpin = No MakeCredential / GetAssertion permissions with client PIN
+about-webauthn-auth-option-largeblobs = Large blobs
+about-webauthn-auth-option-ep = Enterprise attestation
+about-webauthn-auth-option-bioenroll = Biometric enrolment
+# FIDO_2_1_PRE should not be translated.
+about-webauthn-auth-option-userverificationmgmtpreview = Prototype of biometric enrolment (FIDO_2_1_PRE)
+about-webauthn-auth-option-uvbioenroll = Biometric enrolment permission
+about-webauthn-auth-option-authnrcfg = Authenticator config
+about-webauthn-auth-option-uvacfg = Authenticator config permission
+about-webauthn-auth-option-credmgmt = Credential management
+about-webauthn-auth-option-credentialmgmtpreview = Prototype credential management
+about-webauthn-auth-option-setminpinlength = Set minimum PIN length
+# MakeCredential should not be translated.
+about-webauthn-auth-option-makecreduvnotrqd = MakeCredential without user verification
+about-webauthn-auth-option-alwaysuv = Always require user verification
+# Shows when boolean value for an option is True. True should not be translated.
+about-webauthn-auth-option-true = True
+# Shows when boolean value of an option is False. False should not be translated.
+about-webauthn-auth-option-false = False
+# If the value is missing (null), it means a certain feature is not supported.
+about-webauthn-auth-option-null = Not supported
+
+## Authenticator info fields
+## Info fields correspond to the CTAP2 authenticatorGetInfo field member name and definitions found in https://fidoalliance.org/specs/fido-v2.1-ps-20210615/fido-client-to-authenticator-protocol-v2.1-ps-20210615.html#authenticatorGetInfo
+
+about-webauthn-auth-info-vendor-prototype-config-commands = Vendor prototype config commands
+about-webauthn-auth-info-remaining-discoverable-credentials = Remaining discoverable credentials
+about-webauthn-auth-info-certifications = Certifications
+about-webauthn-auth-info-uv-modality = User verification modality
+about-webauthn-auth-info-preferred-platform-uv-attempts = Preferred platform user verification attempts
+about-webauthn-auth-info-max-rpids-for-set-min-pin-length = Max relying party IDs for set minimum PIN length
+about-webauthn-auth-info-max-cred-blob-length = Max credential blob length
+about-webauthn-auth-info-firmware-version = Firmware version
+about-webauthn-auth-info-min-pin-length = Minimum PIN length
+about-webauthn-auth-info-force-pin-change = Force PIN change
+about-webauthn-auth-info-max-ser-large-blob-array = Max size of large blob array
+about-webauthn-auth-info-algorithms = Algorithms
+about-webauthn-auth-info-transports = Transports
+about-webauthn-auth-info-max-credential-id-length = Max credential ID length
+about-webauthn-auth-info-max-credential-count-in-list = Max credential count in list
+about-webauthn-auth-info-pin-protocols = PIN protocols
+about-webauthn-auth-info-max-msg-size = Max message size
+# AAGUID should not be translated.
+about-webauthn-auth-info-aaguid = AAGUID
+about-webauthn-auth-info-extensions = Extensions
+about-webauthn-auth-info-versions = Versions
+# Shows when boolean value for an info field is True. True should not be translated.
+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-CA/toolkit/toolkit/about/aboutWebrtc.ftl b/l10n-en-CA/toolkit/toolkit/about/aboutWebrtc.ftl
index b9c23aa974..9bfcecf30b 100644
--- a/l10n-en-CA/toolkit/toolkit/about/aboutWebrtc.ftl
+++ b/l10n-en-CA/toolkit/toolkit/about/aboutWebrtc.ftl
@@ -33,8 +33,6 @@ about-webrtc-aec-logging-toggled-off-state-msg = Captured log files can be found
 
 # The autorefresh checkbox causes a stats section to autorefresh its content when checked
 about-webrtc-auto-refresh-label = Auto Refresh
-# Determines the default state of the Auto Refresh check boxes
-about-webrtc-auto-refresh-default-label = Auto Refresh By Default
 # A button which forces a refresh of displayed statistics
 about-webrtc-force-refresh-button = Refresh
 # "PeerConnection" is a proper noun associated with the WebRTC module. "ID" is
@@ -98,8 +96,11 @@ about-webrtc-save-page-label = Save Page
 about-webrtc-debug-mode-msg-label = Debug Mode
 about-webrtc-debug-mode-off-state-label = Start Debug Mode
 about-webrtc-debug-mode-on-state-label = Stop Debug Mode
-about-webrtc-enable-logging-label = Enable WebRTC Log Preset
 about-webrtc-stats-heading = Session Statistics
+about-webrtc-enable-logging-label = Enable WebRTC Log Preset
+about-webrtc-peerconnections-section-heading = RTCPeerConnection Statistics
+about-webrtc-peerconnections-section-show-msg = Show RTCPeerConnection Statistics
+about-webrtc-peerconnections-section-hide-msg = Hide RTCPeerConnection Statistics
 about-webrtc-stats-clear = Clear History
 about-webrtc-log-heading = Connection Log
 about-webrtc-log-clear = Clear Log
@@ -194,6 +195,17 @@ about-webrtc-configuration-element-provided = Provided
 about-webrtc-configuration-element-not-provided = Not Provided
 # The options set by the user in about:config that could impact a WebRTC call
 about-webrtc-custom-webrtc-configuration-heading = User Set WebRTC Preferences
+# The options set by the user in about:config that could impact a WebRTC call
+about-webrtc-user-modified-configuration-heading = User Modified WebRTC Configuration
+
+## These are displayed on the button that shows or hides the
+## user modified configuration disclosure
+
+about-webrtc-user-modified-configuration-show-msg = Show User Modified Configuration
+about-webrtc-user-modified-configuration-hide-msg = Hide User Modified Configuration
+
+##
+
 # Section header for estimated bandwidths of WebRTC media flows
 about-webrtc-bandwidth-stats-heading = Estimated Bandwidth
 # The ID of the MediaStreamTrack
@@ -301,9 +313,6 @@ about-webrtc-sdp-set-timestamp = Timestamp { NUMBER($timestamp, useGrouping: "fa
 about-webrtc-show-msg-sdp = Show SDP
 about-webrtc-hide-msg-sdp = Hide SDP
 
-##
-
-
 ## These are displayed on the button that shows or hides the Media Context information disclosure.
 ## The Media Context is the set of preferences and detected capabilities that informs
 ## the negotiated CODEC settings.
diff --git a/l10n-en-CA/toolkit/toolkit/branding/brandings.ftl b/l10n-en-CA/toolkit/toolkit/branding/brandings.ftl
index ef3b2fdedb..ea4ca6454d 100644
--- a/l10n-en-CA/toolkit/toolkit/branding/brandings.ftl
+++ b/l10n-en-CA/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-CA/toolkit/toolkit/contentanalysis/contentanalysis.ftl b/l10n-en-CA/toolkit/toolkit/contentanalysis/contentanalysis.ftl
index 6fbe8159b2..3954c5c8fd 100644
--- a/l10n-en-CA/toolkit/toolkit/contentanalysis/contentanalysis.ftl
+++ b/l10n-en-CA/toolkit/toolkit/contentanalysis/contentanalysis.ftl
@@ -1,3 +1,70 @@
 # 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/.
+
+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-header = Scan in progress
+# Variables:
+#   $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 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-clipboard = { $agent } is reviewing what you pasted against your organization’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 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
+# Variables:
+#   $content - Description of the content being warned about, such as "clipboard" or "aFile.txt"
+contentanalysis-warndialogtext = Your organization uses data-loss prevention software that has flagged this content as unsafe: { $content }. Use it anyway?
+contentanalysis-warndialog-response-allow = Use content
+contentanalysis-warndialog-response-deny = Cancel
+contentanalysis-notification-title = Content Analysis
+# Variables:
+#   $content - Description of the content being reported, such as "clipboard" or "aFile.txt"
+#   $response - The response received from the content analysis agent, such as "REPORT_ONLY"
+contentanalysis-genericresponse-message = Content Analysis responded with { $response } for resource: { $content }
+# Variables:
+#   $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:
+#   $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 }.
+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/formautofill/formAutofill.ftl b/l10n-en-CA/toolkit/toolkit/formautofill/formAutofill.ftl
index a9f0c4783c..c3e6026b3d 100644
--- a/l10n-en-CA/toolkit/toolkit/formautofill/formAutofill.ftl
+++ b/l10n-en-CA/toolkit/toolkit/formautofill/formAutofill.ftl
@@ -5,12 +5,79 @@
 
 ## OS Prompt Dialog
 
+# The macos string is preceded by the operating system (macOS) with "Firefox is trying to ",
+# and has a period added to its end. Make sure to test in your locale.
+autofill-use-payment-method-os-prompt-macos = use stored payment method information
+autofill-use-payment-method-os-prompt-windows = { -brand-short-name } is trying to use stored payment method information. Confirm access to this Windows account below.
+autofill-use-payment-method-os-prompt-other = { -brand-short-name } is trying to use stored payment method information.
+# In macOS, this string is preceded by the operating system with "Firefox is trying to ",
+# and has a period added to its end. Make sure to test in your locale.
+autofill-edit-payment-method-os-prompt-macos = show stored payment method information
+autofill-edit-payment-method-os-prompt-windows = { -brand-short-name } is trying to show stored payment method information. Confirm access to this Windows account below.
+autofill-edit-payment-method-os-prompt-other = { -brand-short-name } is trying to show stored payment method information.
 # The links lead users to Form Autofill browser preferences.
 autofill-options-link = Form Autofill Options
 autofill-options-link-osx = Form Autofill Preferences
 
 ## The credit card capture doorhanger
 
+# If Sync is enabled and credit card sync is available,
+# this checkbox is displayed on the doorhanger shown when saving credit card.
+credit-card-doorhanger-credit-cards-sync-checkbox = Sync all saved cards across my devices
+# Used on the doorhanger when users submit payment with credit card.
+credit-card-save-doorhanger-header = Securely save this card?
+credit-card-save-doorhanger-description = { -brand-short-name } encrypts your card number. Your security code won’t be saved.
+credit-card-capture-save-button =
+    .label = Save
+    .accessKey = S
+credit-card-capture-cancel-button =
+    .label = Not now
+    .accessKey = W
+credit-card-capture-never-save-button =
+    .label = Never save cards
+    .accessKey = N
 
 # Used on the doorhanger when an credit card change is detected.
 
+credit-card-update-doorhanger-header = Update card?
+credit-card-update-doorhanger-description = Card to update:
+credit-card-capture-save-new-button =
+    .label = Save as new card
+    .accessKey = C
+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 = organization
+autofill-category-tel = phone
+autofill-category-email = email
diff --git a/l10n-en-CA/toolkit/toolkit/global/arrowscrollbox.ftl b/l10n-en-CA/toolkit/toolkit/global/arrowscrollbox.ftl
new file mode 100644
index 0000000000..3eb4fb8588
--- /dev/null
+++ b/l10n-en-CA/toolkit/toolkit/global/arrowscrollbox.ftl
@@ -0,0 +1,21 @@
+# 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
diff --git a/l10n-en-CA/toolkit/toolkit/global/commonDialog.ftl b/l10n-en-CA/toolkit/toolkit/global/commonDialog.ftl
index e7d4322820..4b7c32122c 100644
--- a/l10n-en-CA/toolkit/toolkit/global/commonDialog.ftl
+++ b/l10n-en-CA/toolkit/toolkit/global/commonDialog.ftl
@@ -6,12 +6,13 @@ common-dialog-title-null = This page says
 common-dialog-title-system = { -brand-short-name }
 # Title displayed when the origin of a web dialog is unknown.
 common-dialog-title-unknown = Unknown
-
+# An indicator showing that Firefox is waiting for an operation to finish
+common-dialog-spinner =
+    .alt = Busy
 common-dialog-username =
     .value = Username
 common-dialog-password =
     .value = Password
-
 common-dialog-copy-cmd =
     .label = Copy
     .accesskey = C
diff --git a/l10n-en-CA/toolkit/toolkit/global/cookieBannerHandling.ftl b/l10n-en-CA/toolkit/toolkit/global/cookieBannerHandling.ftl
index 6fbe8159b2..9e6ac1d039 100644
--- a/l10n-en-CA/toolkit/toolkit/global/cookieBannerHandling.ftl
+++ b/l10n-en-CA/toolkit/toolkit/global/cookieBannerHandling.ftl
@@ -1,3 +1,5 @@
 # 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/.
+
+cookie-banner-handled-webconsole = { -brand-shorter-name } handled a cookie banner on behalf of the user.
diff --git a/l10n-en-CA/toolkit/toolkit/global/handlerDialog.ftl b/l10n-en-CA/toolkit/toolkit/global/handlerDialog.ftl
index 606f5e54d0..20cc932f55 100644
--- a/l10n-en-CA/toolkit/toolkit/global/handlerDialog.ftl
+++ b/l10n-en-CA/toolkit/toolkit/global/handlerDialog.ftl
@@ -18,6 +18,8 @@ permission-dialog-description-app = Allow this site to open the { $scheme } link
 permission-dialog-description-host-app = Allow { $host } to open the { $scheme } link with { $appName }?
 permission-dialog-description-file-app = Allow this file to open the { $scheme } link with { $appName }?
 permission-dialog-description-extension-app = Allow the extension { $extension } to open the { $scheme } link with { $appName }?
+permission-dialog-description-system-app = Open the { $scheme } link with { $appName }?
+permission-dialog-description-system-noapp = Open the { $scheme } link?
 
 ## Please keep the emphasis around the hostname and scheme (ie the
 ## `<strong>` HTML tags). Please also keep the hostname as close to the start
diff --git a/l10n-en-CA/toolkit/toolkit/global/processTypes.ftl b/l10n-en-CA/toolkit/toolkit/global/processTypes.ftl
index be45ec8832..0d1a320969 100644
--- a/l10n-en-CA/toolkit/toolkit/global/processTypes.ftl
+++ b/l10n-en-CA/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 Dialog
 
 ##
 ## Other
diff --git a/l10n-en-CA/toolkit/toolkit/global/textActions.ftl b/l10n-en-CA/toolkit/toolkit/global/textActions.ftl
index a8153024aa..78ebed1b73 100644
--- a/l10n-en-CA/toolkit/toolkit/global/textActions.ftl
+++ b/l10n-en-CA/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-CA/toolkit/toolkit/neterror/netError.ftl b/l10n-en-CA/toolkit/toolkit/neterror/netError.ftl
index 8d300f3197..fd0575c704 100644
--- a/l10n-en-CA/toolkit/toolkit/neterror/netError.ftl
+++ b/l10n-en-CA/toolkit/toolkit/neterror/netError.ftl
@@ -56,6 +56,7 @@ neterror-dns-not-found-hint-firewall = Check that { -brand-short-name } has perm
 ##   $trrDomain (String) - Hostname of the DNS over HTTPS server that is currently in use.
 
 neterror-dns-not-found-trr-only-reason = { -brand-short-name } can’t protect your request for this site’s address through our trusted DNS resolver. Here’s why:
+neterror-dns-not-found-trr-only-reason2 = { -brand-short-name } can’t protect your request for this site’s address through our secure DNS provider. Here’s why:
 neterror-dns-not-found-trr-third-party-warning2 = You can continue with your default DNS resolver. However, a third-party might be able to see what websites you visit.
 neterror-dns-not-found-trr-only-could-not-connect = { -brand-short-name } wasn’t able to connect to { $trrDomain }.
 neterror-dns-not-found-trr-only-timeout = The connection to { $trrDomain } took longer than expected.
@@ -70,6 +71,7 @@ neterror-dns-not-found-trr-unknown-problem = Unexpected problem.
 ##   $trrDomain (String) - Hostname of the DNS over HTTPS server that is currently in use.
 
 neterror-dns-not-found-native-fallback-reason = { -brand-short-name } can’t protect your request for this site’s address through our trusted DNS resolver. Here’s why:
+neterror-dns-not-found-native-fallback-reason2 = { -brand-short-name } can’t protect your request for this site’s address through our secure DNS provider. Here’s why:
 neterror-dns-not-found-native-fallback-heuristic = DNS over HTTPS has been disabled on your network.
 neterror-dns-not-found-native-fallback-not-confirmed2 = { -brand-short-name } wasn’t able to connect to { $trrDomain }.
 
diff --git a/l10n-en-CA/toolkit/toolkit/passwordmgr/passwordmgr.ftl b/l10n-en-CA/toolkit/toolkit/passwordmgr/passwordmgr.ftl
index 04666aeeab..9b3074b3b7 100644
--- a/l10n-en-CA/toolkit/toolkit/passwordmgr/passwordmgr.ftl
+++ b/l10n-en-CA/toolkit/toolkit/passwordmgr/passwordmgr.ftl
@@ -8,6 +8,9 @@
 # Variables
 #   $host (String) - Hostname for which the password is saved for.
 password-manager-save-password-message = Save password for { $host }?
+password-manager-save-password-button-deny =
+    .label = Not now
+    .accesskey = N
 password-manager-save-password-button-allow =
     .label = Save
     .accesskey = S
@@ -17,6 +20,9 @@ password-manager-save-password-button-never =
 # Variables
 #   $host (String) - Hostname for which the password is updated for.
 password-manager-update-password-message = Update password for { $host }?
+password-manager-update-password-button-delete =
+    .label = Remove saved password
+    .accesskey = R
 password-manager-update-login-add-username = Add username to saved password?
 password-manager-password-password-button-allow =
     .label = Update
diff --git a/l10n-en-CA/toolkit/toolkit/pdfviewer/viewer.ftl b/l10n-en-CA/toolkit/toolkit/pdfviewer/viewer.ftl
index e95afe96ae..f87104e78d 100644
--- a/l10n-en-CA/toolkit/toolkit/pdfviewer/viewer.ftl
+++ b/l10n-en-CA/toolkit/toolkit/pdfviewer/viewer.ftl
@@ -226,6 +226,21 @@ pdfjs-find-match-diacritics-checkbox-label = Match Diacritics
 pdfjs-find-entire-word-checkbox-label = Whole Words
 pdfjs-find-reached-top = Reached top of document, continued from bottom
 pdfjs-find-reached-bottom = Reached end of document, continued from top
+# Variables:
+#   $current (Number) - the index of the currently active find result
+#   $total (Number) - the total number of matches in the document
+pdfjs-find-match-count =
+    { $total ->
+        [one] { $current } of { $total } match
+       *[other] { $current } of { $total } matches
+    }
+# Variables:
+#   $limit (Number) - the maximum number of matches
+pdfjs-find-match-count-limit =
+    { $limit ->
+        [one] More than { $limit } match
+       *[other] More than { $limit } matches
+    }
 pdfjs-find-not-found = Phrase not found
 
 ## Predefined zoom values
@@ -286,6 +301,29 @@ 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-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.
+
+pdfjs-editor-remove-ink-button =
+    .title = Remove drawing
+pdfjs-editor-remove-freetext-button =
+    .title = Remove text
+pdfjs-editor-remove-stamp-button =
+    .title = Remove image
+pdfjs-editor-remove-highlight-button =
+    .title = Remove highlight
+
+##
+
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Colour
 pdfjs-editor-free-text-size-input = Size
@@ -295,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…
@@ -305,7 +347,56 @@ pdfjs-ink-canvas =
 
 ## Alt-text dialog
 
+# Alternative text (alt text) helps when people can't see the image.
+pdfjs-editor-alt-text-button-label = Alt text
+pdfjs-editor-alt-text-edit-button-label = Edit alt text
+pdfjs-editor-alt-text-dialog-label = Choose an option
+pdfjs-editor-alt-text-dialog-description = Alt text (alternative text) helps when people can’t see the image or when it doesn’t load.
+pdfjs-editor-alt-text-add-description-label = Add a description
+pdfjs-editor-alt-text-add-description-description = Aim for 1-2 sentences that describe the subject, setting, or actions.
+pdfjs-editor-alt-text-mark-decorative-label = Mark as decorative
+pdfjs-editor-alt-text-mark-decorative-description = This is used for ornamental images, like borders or watermarks.
+pdfjs-editor-alt-text-cancel-button = Cancel
+pdfjs-editor-alt-text-save-button = Save
+pdfjs-editor-alt-text-decorative-tooltip = Marked as decorative
+# .placeholder: This is a placeholder for the alt text input area
+pdfjs-editor-alt-text-textarea =
+    .placeholder = For example, “A young man sits down at a table to eat a meal”
 
 ## Editor resizers
 ## This is used in an aria label to help to understand the role of the resizer.
 
+pdfjs-editor-resizer-label-top-left = Top left corner — resize
+pdfjs-editor-resizer-label-top-middle = Top middle — resize
+pdfjs-editor-resizer-label-top-right = Top right corner — resize
+pdfjs-editor-resizer-label-middle-right = Middle right — resize
+pdfjs-editor-resizer-label-bottom-right = Bottom right corner — resize
+pdfjs-editor-resizer-label-bottom-middle = Bottom middle — resize
+pdfjs-editor-resizer-label-bottom-left = Bottom left corner — resize
+pdfjs-editor-resizer-label-middle-left = Middle left — resize
+
+## Color picker
+
+# This means "Color used to highlight text"
+pdfjs-editor-highlight-colorpicker-label = Highlight colour
+pdfjs-editor-colorpicker-button =
+    .title = Change colour
+pdfjs-editor-colorpicker-dropdown =
+    .aria-label = Colour choices
+pdfjs-editor-colorpicker-yellow =
+    .title = Yellow
+pdfjs-editor-colorpicker-green =
+    .title = Green
+pdfjs-editor-colorpicker-blue =
+    .title = Blue
+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-CA/toolkit/toolkit/preferences/preferences.ftl b/l10n-en-CA/toolkit/toolkit/preferences/preferences.ftl
index 1c5f4c1739..a074b834b3 100644
--- a/l10n-en-CA/toolkit/toolkit/preferences/preferences.ftl
+++ b/l10n-en-CA/toolkit/toolkit/preferences/preferences.ftl
@@ -22,6 +22,7 @@ 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 organization 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 =