Merging upstream version 126.0.

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

14 files changed, 111 insertions, 43 deletions

diff --git a/browser/locales/en-US/browser/appmenu.ftl b/browser/locales/en-US/browser/appmenu.ftl
index 5ad2d75f62..f9588a5053 100644
--- a/browser/locales/en-US/browser/appmenu.ftl
+++ b/browser/locales/en-US/browser/appmenu.ftl
@@ -81,7 +81,7 @@ appmenu-remote-tabs-turn-on-sync =
 
 # This is shown after the tabs list if we can display more tabs by clicking on the button
 appmenu-remote-tabs-showmore =
-  .label = Show More Tabs
+  .label = Show more tabs
   .tooltiptext = Show more tabs from this device
 
 # This is shown when there are inactive tabs which are not being shown.
diff --git a/browser/locales/en-US/browser/defaultBrowserNotification.ftl b/browser/locales/en-US/browser/defaultBrowserNotification.ftl
index 67be2c55a9..90b6a07e08 100644
--- a/browser/locales/en-US/browser/defaultBrowserNotification.ftl
+++ b/browser/locales/en-US/browser/defaultBrowserNotification.ftl
@@ -21,3 +21,20 @@ default-browser-prompt-message-alt = Get speed, safety, and privacy every time y
 default-browser-prompt-button-primary-alt = Set as default browser
 default-browser-prompt-checkbox-not-again-label = Don’t show this message again
 default-browser-prompt-button-secondary = Not now
+
+## Strings for a Windows native guidance notification when the user is forced to
+## use Windows Settings to set the default browser. Instructions differ for
+## Windows 10 and 11.
+
+default-browser-guidance-notification-title = Finish making { -brand-short-name } your default
+# Quoted text are keywords to look for in the Windows Settings app.
+default-browser-guidance-notification-body-instruction-win10 =
+    Step 1: Go to Settings > Default apps
+    Step 2: Scroll down to “Web browser”
+    Step 3: Select and choose { -brand-short-name }
+# Quoted text are keywords to look for in the Windows Settings app.
+default-browser-guidance-notification-body-instruction-win11 =
+    Step 1: Go to Settings > Default apps
+    Step 2: Select “Set default” for { -brand-short-name }
+default-browser-guidance-notification-info-page = Show me
+default-browser-guidance-notification-dismiss = Done
diff --git a/browser/locales/en-US/browser/menubar.ftl b/browser/locales/en-US/browser/menubar.ftl
index 802996627b..f65a345d60 100644
--- a/browser/locales/en-US/browser/menubar.ftl
+++ b/browser/locales/en-US/browser/menubar.ftl
@@ -139,6 +139,8 @@ menu-view-history-button =
     .label = History
 menu-view-synced-tabs-sidebar =
     .label = Synced Tabs
+menu-view-megalist-sidebar =
+    .label = Passwords
 menu-view-full-zoom =
     .label = Zoom
     .accesskey = Z
diff --git a/browser/locales/en-US/browser/newtab/newtab.ftl b/browser/locales/en-US/browser/newtab/newtab.ftl
index 256a8da576..50bd34f717 100644
--- a/browser/locales/en-US/browser/newtab/newtab.ftl
+++ b/browser/locales/en-US/browser/newtab/newtab.ftl
@@ -272,3 +272,25 @@ newtab-custom-recent-toggle =
   .description = A selection of recent sites and content
 newtab-custom-close-button = Close
 newtab-custom-settings = Manage more settings
+
+## New Tab Wallpapers
+
+newtab-wallpaper-title = Wallpapers
+newtab-wallpaper-reset = Reset to default
+newtab-wallpaper-light-red-panda = Red panda
+newtab-wallpaper-light-mountain = White mountain
+newtab-wallpaper-light-sky = Sky with purple and pink clouds
+newtab-wallpaper-light-color = Blue, pink and yellow shapes
+newtab-wallpaper-light-landscape = Blue mist mountain landscape
+newtab-wallpaper-light-beach = Beach with palm tree
+newtab-wallpaper-dark-aurora = Aurora Borealis
+newtab-wallpaper-dark-color = Red and blue shapes
+newtab-wallpaper-dark-panda = Red panda hidden in forest
+newtab-wallpaper-dark-sky = City landscape with a night sky
+newtab-wallpaper-dark-mountain = Landscape mountain
+newtab-wallpaper-dark-city = Purple city landscape
+
+# Variables
+#   $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>
diff --git a/browser/locales/en-US/browser/newtab/onboarding.ftl b/browser/locales/en-US/browser/newtab/onboarding.ftl
index 00c5da9305..0c66671f8a 100644
--- a/browser/locales/en-US/browser/newtab/onboarding.ftl
+++ b/browser/locales/en-US/browser/newtab/onboarding.ftl
@@ -55,6 +55,10 @@ mr1-onboarding-theme-header = Make it your own
 mr1-onboarding-theme-subtitle = Personalize { -brand-short-name } with a theme.
 mr1-onboarding-theme-secondary-button-label = Not now
 
+newtab-wallpaper-onboarding-title = Try a splash of color
+newtab-wallpaper-onboarding-subtitle = Choose a wallpaper to give your New Tab a fresh look.
+newtab-wallpaper-onboarding-primary-button-label = Set wallpaper
+
 # System theme uses operating system color settings
 mr1-onboarding-theme-label-system = System theme
 
diff --git a/browser/locales/en-US/browser/policies/policies-descriptions.ftl b/browser/locales/en-US/browser/policies/policies-descriptions.ftl
index 22c881c261..fcecab699a 100644
--- a/browser/locales/en-US/browser/policies/policies-descriptions.ftl
+++ b/browser/locales/en-US/browser/policies/policies-descriptions.ftl
@@ -221,6 +221,8 @@ policy-StartDownloadsInTempDirectory = Force downloads to start off in a local,
 
 policy-SupportMenu = Add a custom support menu item to the help menu.
 
+policy-TranslateEnabled = Enable or disable webpage translation.
+
 policy-UserMessaging = Don’t show certain messages to the user.
 
 policy-UseSystemPrintDialog = Print using the system print dialog.
diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl
index a3c382cac3..c25b299ae1 100644
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
@@ -38,6 +38,8 @@ search-input-box2 =
     .placeholder = Find in Settings
 
 managed-notice = Your browser is being managed by your organization.
+managed-notice-info-icon =
+    .alt = Information
 
 category-list =
     .aria-label = Categories
@@ -853,8 +855,15 @@ sync-mobile-promo = Download Firefox for <img data-l10n-name="android-icon"/> <a
 
 ## Firefox account - Signed in
 
-sync-profile-picture =
+sync-profile-picture-with-alt =
     .tooltiptext = Change profile picture
+    .alt = Change profile picture
+
+sync-profile-picture-account-problem =
+    .alt = Account profile picture
+
+fxa-login-rejected-warning =
+    .alt = Warning
 
 sync-sign-out =
     .label = Sign Out…
@@ -1586,8 +1595,6 @@ preferences-doh-checkbox-warn =
 
 preferences-doh-select-resolver = Choose provider:
 
-preferences-doh-exceptions-description = { -brand-short-name } won’t use secure DNS on these sites
-
 preferences-doh-manage-exceptions =
     .label = Manage Exceptions…
     .accesskey = x
diff --git a/browser/locales/en-US/browser/reportBrokenSite.ftl b/browser/locales/en-US/browser/reportBrokenSite.ftl
index 428b6b15ee..3c44110bc1 100644
--- a/browser/locales/en-US/browser/reportBrokenSite.ftl
+++ b/browser/locales/en-US/browser/reportBrokenSite.ftl
@@ -21,7 +21,7 @@ report-broken-site-panel-reason-media =
 report-broken-site-panel-reason-content =
   .label = Buttons, links, and other content
 report-broken-site-panel-reason-account =
-  .label = Sign-in or Sign-out
+  .label = Sign-in or sign-out
 report-broken-site-panel-reason-adblockers =
   .label = Ad blockers
 report-broken-site-panel-reason-other =
diff --git a/browser/locales/en-US/browser/screenshots.ftl b/browser/locales/en-US/browser/screenshots.ftl
index 1ccf631ae1..ea2e42191c 100644
--- a/browser/locales/en-US/browser/screenshots.ftl
+++ b/browser/locales/en-US/browser/screenshots.ftl
@@ -23,8 +23,6 @@ screenshots-copy-button-title =
   .title = Copy screenshot to clipboard
 screenshots-cancel-button-title =
   .title = Cancel
-screenshots-retry-button-title =
-  .title = Retry screenshot
 
 screenshots-meta-key = {
   PLATFORM() ->
@@ -58,3 +56,46 @@ screenshots-generic-error-details = We’re not sure what just happened. Care to
 
 screenshots-too-large-error-title = Your screenshot was cropped because it was too large
 screenshots-too-large-error-details = Try selecting a region that’s smaller than 32,700 pixels on its longest side or 124,900,000 pixels total area.
+
+screenshots-component-retry-button =
+  .title = Retry screenshot
+  .aria-label = Retry screenshot
+
+screenshots-component-cancel-button =
+  .title =
+    { PLATFORM() ->
+      [macos] Cancel (esc)
+     *[other] Cancel (Esc)
+    }
+  .aria-label = Cancel
+
+# Variables
+#   $shortcut (String) - A keyboard shortcut for copying the screenshot.
+screenshots-component-copy-button =
+  .title = Copy ({ $shortcut })
+  .aria-label = Copy
+
+screenshots-component-copy-button-label = Copy
+
+# Variables
+#   $shortcut (String) - A keyboard shortcut for saving/downloading the screenshot.
+screenshots-component-download-button =
+  .title = Download ({ $shortcut })
+  .aria-label = Download
+
+screenshots-component-download-button-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.
+
+screenshots-component-download-key = S
+screenshots-component-copy-key = C
+
+##
+
+# This string represents the selection size area
+# "x" here represents "by" (i.e 123 by 456)
+# Variables:
+#   $width (Number) - The width of the selection region in pixels
+#   $height (Number) - The height of the selection region in pixels
+screenshots-overlay-selection-region-size-2 = { $width } x { $height }
diff --git a/browser/locales/en-US/browser/screenshotsOverlay.ftl b/browser/locales/en-US/browser/screenshotsOverlay.ftl
deleted file mode 100644
index ab8d8740a1..0000000000
--- a/browser/locales/en-US/browser/screenshotsOverlay.ftl
+++ /dev/null
@@ -1,15 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-screenshots-overlay-cancel-button = Cancel
-screenshots-overlay-instructions = Drag or click on the page to select a region. Press ESC to cancel.
-screenshots-overlay-download-button = Download
-screenshots-overlay-copy-button = Copy
-
-# This string represents the selection size area
-# "x" here represents "by" (i.e 123 by 456)
-# Variables:
-#   $width (Number) - The width of the selection region in pixels
-#   $height (Number) - The height of the selection region in pixels
-screenshots-overlay-selection-region-size = { $width } x { $height }
diff --git a/browser/locales/en-US/browser/sidebarMenu.ftl b/browser/locales/en-US/browser/sidebarMenu.ftl
index 746a2084df..e050a2302c 100644
--- a/browser/locales/en-US/browser/sidebarMenu.ftl
+++ b/browser/locales/en-US/browser/sidebarMenu.ftl
@@ -11,6 +11,9 @@ sidebar-menu-history =
 sidebar-menu-synced-tabs =
   .label = Synced Tabs
 
+sidebar-menu-megalist =
+  .label = Passwords
+
 sidebar-menu-close =
   .label = Close Sidebar
 
diff --git a/browser/locales/en-US/browser/webProtocolHandler.ftl b/browser/locales/en-US/browser/webProtocolHandler.ftl
index 848e5d469b..e11ec0deac 100644
--- a/browser/locales/en-US/browser/webProtocolHandler.ftl
+++ b/browser/locales/en-US/browser/webProtocolHandler.ftl
@@ -2,20 +2,13 @@
 # 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/.
 
-protocolhandler-mailto-os-handler-notificationbox = Always use { -brand-short-name } to open links that send email?
-protocolhandler-mailto-os-handler-yes-confirm = { -brand-short-name } is now your default application for opening links that send email.
 protocolhandler-mailto-os-handler-yes-button = Set as default
 protocolhandler-mailto-os-handler-no-button = Not now
 
 ## Variables:
 ##  $url (String): The url of a webmailer, but only its full domain name.
 
-protocolhandler-mailto-handler-notificationbox-always = Always open email links using { $url }?
-protocolhandler-mailto-handler-yes-confirm = { $url } is now your default site for opening links that send email.
-protocolhandler-mailto-handler-set-message = Use <strong>{ $url } in { -brand-short-name }</strong> every time you click a link that opens your email?
-protocolhandler-mailto-handler-confirm-message = <strong>{ $url } in { -brand-short-name }</strong> is now your computer’s default email handler.
+protocolhandler-mailto-handler-set = Use <strong>{ -brand-short-name } to open { $url }</strong> every time you click a link that opens your email?
+protocolhandler-mailto-handler-confirm = <strong>{ -brand-short-name } will open { $url }</strong> every time you click a link that sends email.
 
 ##
-
-protocolhandler-mailto-handler-yes-button = Set as default
-protocolhandler-mailto-handler-no-button = Not now
diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties
index c326f2843c..a1d25d093a 100644
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -150,9 +150,10 @@ webauthn.uvBlockedPrompt=User verification failed on %S. There were too many fai
 webauthn.alreadyRegisteredPrompt=This device is already registered. Try a different device.
 webauthn.cancel=Cancel
 webauthn.cancel.accesskey=c
-webauthn.proceed=Proceed
-webauthn.proceed.accesskey=p
-webauthn.anonymize=Anonymize anyway
+webauthn.allow=Allow
+webauthn.allow.accesskey=A
+webauthn.block=Block
+webauthn.block.accesskey=B
 
 # LOCALIZATION NOTE (identity.identified.verifier, identity.identified.state_and_country, identity.ev.contentOwner2):
 # %S is the hostname of the site that is being displayed.
diff --git a/browser/locales/en-US/crashreporter/crashreporter-override.ini b/browser/locales/en-US/crashreporter/crashreporter-override.ini
deleted file mode 100644
index f14b1c4f0d..0000000000
--- a/browser/locales/en-US/crashreporter/crashreporter-override.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# This file is in the UTF-8 encoding
-[Strings]
-# LOCALIZATION NOTE (CrashReporterProductErrorText2): The %s is replaced with a string containing detailed information.
-CrashReporterProductErrorText2=Firefox had a problem and crashed. We’ll try to restore your tabs and windows when it restarts.\n\nUnfortunately the crash reporter is unable to submit a crash report.\n\nDetails: %s
-CrashReporterDescriptionText2=Firefox had a problem and crashed. We’ll try to restore your tabs and windows when it restarts.\n\nTo help us diagnose and fix the problem, you can send us a crash report.