Merging upstream version 127.0.

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

10 files changed, 87 insertions, 3 deletions

diff --git a/l10n-en-CA/browser/browser/aboutLogins.ftl b/l10n-en-CA/browser/browser/aboutLogins.ftl
index 38bdade2ba..fdc0535ae7 100644
--- a/l10n-en-CA/browser/browser/aboutLogins.ftl
+++ b/l10n-en-CA/browser/browser/aboutLogins.ftl
@@ -171,6 +171,13 @@ about-logins-edit-login-os-auth-dialog-message-win = To edit your login, enter y
 # This message can be seen when attempting to edit a login in about:logins
 # On MacOS, only provide the reason that account verification is needed. Do not put a complete sentence here.
 about-logins-edit-login-os-auth-dialog-message-macosx = edit the saved login
+# The macOS strings are preceded by the operating system with "Firefox is trying to ".
+# This message can be seen when attempting to disable osauth in about:preferences.
+about-logins-os-auth-dialog-message =
+    { PLATFORM() ->
+        [macos] change the settings for passwords
+       *[other] { -brand-short-name } is trying to change the settings for passwords. Use your device sign in to allow this.
+    }
 # This message can be seen when attempting to edit a login in about:logins on Windows.
 about-logins-edit-login-os-auth-dialog-message2-win = To edit your password, enter your Windows login credentials. This helps protect the security of your accounts.
 # This message can be seen when attempting to edit a login in about:logins
diff --git a/l10n-en-CA/browser/browser/allTabsMenu.ftl b/l10n-en-CA/browser/browser/allTabsMenu.ftl
index 056e8182fd..f9173e72d7 100644
--- a/l10n-en-CA/browser/browser/allTabsMenu.ftl
+++ b/l10n-en-CA/browser/browser/allTabsMenu.ftl
@@ -5,13 +5,12 @@
 # "Search" is a verb, as in "Search through tabs".
 all-tabs-menu-search-tabs =
     .label = Search tabs
-
 all-tabs-menu-new-user-context =
     .label = New container tab
-
 all-tabs-menu-hidden-tabs =
     .label = Hidden tabs
-
 all-tabs-menu-manage-user-context =
     .label = Manage containers
     .accesskey = O
+all-tabs-menu-close-duplicate-tabs =
+    .label = Close duplicate tabs
diff --git a/l10n-en-CA/browser/browser/appmenu.ftl b/l10n-en-CA/browser/browser/appmenu.ftl
index 5606168b3a..17e1068fa5 100644
--- a/l10n-en-CA/browser/browser/appmenu.ftl
+++ b/l10n-en-CA/browser/browser/appmenu.ftl
@@ -87,6 +87,10 @@ appmenu-remote-tabs-showinactive =
            *[other] Show { $count } inactive tabs
         }
     .tooltiptext = Show the inactive tabs on this device
+# This is shown as the label for an element to show inactive tabs from this device.
+appmenu-remote-tabs-show-inactive-tabs =
+    .label = Inactive tabs
+    .tooltiptext = See inactive tabs on this device
 # This is shown beneath the name of a device when that device has no open tabs
 appmenu-remote-tabs-notabs = No open tabs
 # This is shown when Sync is configured but syncing tabs is disabled.
diff --git a/l10n-en-CA/browser/browser/newtab/newtab.ftl b/l10n-en-CA/browser/browser/newtab/newtab.ftl
index 574765467d..7fadbe662f 100644
--- a/l10n-en-CA/browser/browser/newtab/newtab.ftl
+++ b/l10n-en-CA/browser/browser/newtab/newtab.ftl
@@ -272,6 +272,9 @@ newtab-custom-recent-subtitle = A selection of recent sites and content
 newtab-custom-recent-toggle =
     .label = Recent activity
     .description = A selection of recent sites and content
+newtab-custom-weather-toggle =
+    .label = Weather
+    .description = Today’s forecast at a glance
 newtab-custom-close-button = Close
 newtab-custom-settings = Manage more settings
 
@@ -295,3 +298,32 @@ newtab-wallpaper-dark-city = Purple city landscape
 #   $author_string (String) - The name of the creator of the photo.
 #   $webpage_string (String) - The name of the webpage where the photo is located.
 newtab-wallpaper-attribution = Photo by <a data-l10n-name="name-link">{ $author_string }</a> on <a data-l10n-name="webpage-link">{ $webpage_string }</a>
+
+## New Tab Weather
+
+# Variables:
+#   $provider (string) - Service provider for weather data
+newtab-weather-see-forecast =
+    .title = See forecast in { $provider }
+# Variables:
+#   $provider (string) - Service provider for weather data
+newtab-weather-sponsored = { $provider } ∙ Sponsored
+newtab-weather-menu-change-location = Change location
+newtab-weather-change-location-search-input = Search location
+newtab-weather-menu-weather-display = Weather display
+# Display options are:
+# - Simple: Displays a current weather condition icon and the current temperature
+# - Detailed: Include simple information plus a short text summary: e.g. "Mostly cloudy"
+newtab-weather-menu-weather-display-option-simple = Simple
+newtab-weather-menu-change-weather-display-simple = Switch to simple view
+newtab-weather-menu-weather-display-option-detailed = Detailed
+newtab-weather-menu-change-weather-display-detailed = Switch to detailed view
+newtab-weather-menu-temperature-units = Temperature units
+newtab-weather-menu-temperature-option-fahrenheit = Fahrenheit
+newtab-weather-menu-temperature-option-celsius = Celsius
+newtab-weather-menu-change-temperature-units-fahrenheit = Switch to Fahrenheit
+newtab-weather-menu-change-temperature-units-celsius = Switch to Celsius
+newtab-weather-menu-hide-weather = Hide weather on New Tab
+newtab-weather-menu-learn-more = Learn more
+# This message is shown if user is working offline
+newtab-weather-error-not-available = Weather data is not available right now.
diff --git a/l10n-en-CA/browser/browser/policies/policies-descriptions.ftl b/l10n-en-CA/browser/browser/policies/policies-descriptions.ftl
index bf4cc8b9fa..3805bdf989 100644
--- a/l10n-en-CA/browser/browser/policies/policies-descriptions.ftl
+++ b/l10n-en-CA/browser/browser/policies/policies-descriptions.ftl
@@ -84,6 +84,8 @@ policy-Handlers = Configure default application handlers.
 policy-HardwareAcceleration = If false, turn off hardware acceleration.
 # “lock” means that the user won’t be able to change this setting
 policy-Homepage = Set and optionally lock the homepage.
+policy-HttpAllowlist = Origins that will not be upgraded to HTTPS.
+policy-HttpsOnlyMode = Allow HTTPS-Only Mode to be enabled.
 policy-InstallAddonsPermission = Allow certain websites to install add-ons.
 policy-LegacyProfiles = Disable the feature enforcing a separate profile for each installation.
 
@@ -108,6 +110,9 @@ policy-OverrideFirstRunPage = Override the first run page. Set this policy to bl
 policy-OverridePostUpdatePage = Override the post-update “What’s New” page. Set this policy to blank if you want to disable the post-update page.
 policy-PasswordManagerEnabled = Enable saving passwords to the password manager.
 policy-PasswordManagerExceptions = Prevent { -brand-short-name } from saving passwords for specific sites.
+# Post-quantum refers to cryptography that is safe from attacks by quantum
+# computers. See https://en.wikipedia.org/wiki/Post-quantum_cryptography
+policy-PostQuantumKeyAgreementEnabled = Enable post-quantum key agreement for TLS.
 # PDF.js and PDF should not be translated
 policy-PDFjs = Disable or configure PDF.js, the built-in PDF viewer in { -brand-short-name }.
 policy-Permissions2 = Configure permissions for camera, microphone, location, notifications, and autoplay.
diff --git a/l10n-en-CA/browser/browser/preferences/preferences.ftl b/l10n-en-CA/browser/browser/preferences/preferences.ftl
index ddde59c359..39b72be5f9 100644
--- a/l10n-en-CA/browser/browser/preferences/preferences.ftl
+++ b/l10n-en-CA/browser/browser/preferences/preferences.ftl
@@ -599,6 +599,10 @@ home-prefs-recent-activity-description = A selection of recent sites and content
 home-prefs-snippets-header =
     .label = Snippets
 home-prefs-snippets-description-new = Tips and news from { -vendor-short-name } and { -brand-product-name }
+home-prefs-weather-header =
+    .label = Weather
+home-prefs-weather-description = Today’s forecast at a glance
+home-prefs-weather-learn-more-link = Learn more
 # Variables:
 #   $num (number) - Number of rows displayed
 home-prefs-sections-rows-option =
@@ -912,6 +916,9 @@ forms-saved-passwords =
 forms-primary-pw-use =
     .label = Use a Primary Password
     .accesskey = U
+# This operation requires the user to authenticate with the operating system (device sign-in)
+forms-os-reauth =
+    .label = Require device sign in to fill and manage passwords
 forms-primary-pw-learn-more-link = Learn more
 # This string uses the former name of the Primary Password feature
 # ("Master Password" in English) so that the preferences can be found
@@ -944,6 +951,13 @@ primary-password-os-auth-dialog-message-win = To create a Primary Password, ente
 # notes are only valid for English. Please test in your locale.
 primary-password-os-auth-dialog-message-macosx = create a Primary Password
 master-password-os-auth-dialog-caption = { -brand-full-name }
+# The macOS string is preceded by the operating system with "Firefox is trying to ".
+autofill-creditcard-os-dialog-message =
+    { PLATFORM() ->
+        [macos] change the settings for payment methods
+       *[other] { -brand-short-name } is trying to change the settings for payment methods. Use your device sign in to allow this.
+    }
+autofill-creditcard-os-auth-dialog-caption = { -brand-full-name }
 
 ## Privacy section - Autofill
 
@@ -966,6 +980,9 @@ autofill-reauth-checkbox =
        *[other] Require authentication to fill and edit payment methods.
     }
     .accesskey = o
+# This operation requires the user to authenticate with the operating system (device sign-in)
+autofill-reauth-payment-methods-checkbox = Require device sign in to fill and manage payment methods
+    .accesskey = o
 
 ## Privacy Section - History
 
diff --git a/l10n-en-CA/browser/browser/screenshots.ftl b/l10n-en-CA/browser/browser/screenshots.ftl
index 5f72f672a1..1e41c0c4b8 100644
--- a/l10n-en-CA/browser/browser/screenshots.ftl
+++ b/l10n-en-CA/browser/browser/screenshots.ftl
@@ -68,6 +68,16 @@ screenshots-component-download-button =
     .title = Download ({ $shortcut })
     .aria-label = Download
 screenshots-component-download-button-label = Download
+# Variables
+#   $shortcut (String) - A keyboard shortcut for copying the screenshot.
+screenshots-component-copy-button-2 = Copy
+    .title = Copy ({ $shortcut })
+    .aria-label = Copy
+# Variables
+#   $shortcut (String) - A keyboard shortcut for saving/downloading the screenshot.
+screenshots-component-download-button-2 = Download
+    .title = Download ({ $shortcut })
+    .aria-label = Download
 
 ## The below strings are used to capture keydown events so the strings should
 ## not be changed unless the keyboard layout in the locale requires it.
diff --git a/l10n-en-CA/browser/browser/tabbrowser.ftl b/l10n-en-CA/browser/browser/tabbrowser.ftl
index 8c20ce1c1c..e6db0e520f 100644
--- a/l10n-en-CA/browser/browser/tabbrowser.ftl
+++ b/l10n-en-CA/browser/browser/tabbrowser.ftl
@@ -111,6 +111,11 @@ tabbrowser-confirm-caretbrowsing-title = Caret Browsing
 tabbrowser-confirm-caretbrowsing-message = Pressing F7 turns Caret Browsing on or off. This feature places a movable cursor in web pages, allowing you to select text with the keyboard. Do you want to turn Caret Browsing on?
 tabbrowser-confirm-caretbrowsing-checkbox = Do not show me this dialog box again.
 
+## Confirmation dialog for closing all duplicate tabs
+
+tabbrowser-confirm-close-duplicate-tabs-title = Heads up
+tabbrowser-confirm-close-duplicate-tabs-text = We’ll keep open the last active tab
+
 ##
 
 # Variables:
diff --git a/l10n-en-CA/browser/browser/translations.ftl b/l10n-en-CA/browser/browser/translations.ftl
index ca7e4bb709..3b2c992e87 100644
--- a/l10n-en-CA/browser/browser/translations.ftl
+++ b/l10n-en-CA/browser/browser/translations.ftl
@@ -249,3 +249,5 @@ select-translations-panel-unsupported-language-message-unknown =
 # Text displayed on the menuitem that opens the Translation Settings page.
 select-translations-panel-open-translations-settings-menuitem =
     .label = Translation settings
+# An announcement made to assistive technology when the translation is complete
+select-translations-panel-translation-complete-announcement = Translation complete
diff --git a/l10n-en-CA/browser/browser/webrtcIndicator.ftl b/l10n-en-CA/browser/browser/webrtcIndicator.ftl
index 723d529f58..76eef37fba 100644
--- a/l10n-en-CA/browser/browser/webrtcIndicator.ftl
+++ b/l10n-en-CA/browser/browser/webrtcIndicator.ftl
@@ -219,6 +219,9 @@ webrtc-action-not-now =
 ##
 
 webrtc-remember-allow-checkbox = Remember this decision
+webrtc-remember-allow-checkbox-camera = Remember for all cameras
+webrtc-remember-allow-checkbox-microphone = Remember for all microphones
+webrtc-remember-allow-checkbox-camera-and-microphone = Remember for all cameras and microphones
 webrtc-mute-notifications-checkbox = Mute website notifications while sharing
 webrtc-reason-for-no-permanent-allow-screen = { -brand-short-name } can not allow permanent access to your screen.
 webrtc-reason-for-no-permanent-allow-audio = { -brand-short-name } can not allow permanent access to your tab’s audio without asking which tab to share.