Merging upstream version 125.0.1.

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

6 files changed, 24 insertions, 12 deletions

diff --git a/l10n-en-GB/browser/browser/appmenu.ftl b/l10n-en-GB/browser/browser/appmenu.ftl
index f900f1f43b..f2acf78b31 100644
--- a/l10n-en-GB/browser/browser/appmenu.ftl
+++ b/l10n-en-GB/browser/browser/appmenu.ftl
@@ -75,7 +75,7 @@ appmenu-remote-tabs-turn-on-sync =
     .label = 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.
 # Variables
diff --git a/l10n-en-GB/browser/browser/menubar.ftl b/l10n-en-GB/browser/browser/menubar.ftl
index 2225f6d092..13e29e847d 100644
--- a/l10n-en-GB/browser/browser/menubar.ftl
+++ b/l10n-en-GB/browser/browser/menubar.ftl
@@ -145,6 +145,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/l10n-en-GB/browser/browser/policies/policies-descriptions.ftl b/l10n-en-GB/browser/browser/policies/policies-descriptions.ftl
index 2a6fd6b28c..4a49ccc028 100644
--- a/l10n-en-GB/browser/browser/policies/policies-descriptions.ftl
+++ b/l10n-en-GB/browser/browser/policies/policies-descriptions.ftl
@@ -28,6 +28,7 @@ policy-BlockAboutSupport = Block access to the about:support page.
 policy-Bookmarks = Create bookmarks in the Bookmarks toolbar, Bookmarks menu, or a specified folder inside them.
 policy-CaptivePortal = Enable or disable captive portal support.
 policy-CertificatesDescription = Add certificates or use built-in certificates.
+policy-ContentAnalysis = Enable or disable connection to data-loss-prevention agent.
 policy-Cookies = Allow or deny web sites to set cookies.
 # Containers in this context is referring to container tabs in Firefox.
 policy-Containers = Set policies related to containers.
@@ -124,6 +125,7 @@ policy-SSLVersionMax = Set the maximum SSL version.
 policy-SSLVersionMin = Set the minimum SSL version.
 policy-StartDownloadsInTempDirectory = Force downloads to start off in a local, temporary location rather than the default download directory.
 policy-SupportMenu = Add a custom support menu item to the help menu.
+policy-TranslateEnabled = Enable or disable web page translation.
 policy-UserMessaging = Don’t show certain messages to the user.
 policy-UseSystemPrintDialog = Print using the system print dialogue.
 # “format” refers to the format used for the value of this policy.
diff --git a/l10n-en-GB/browser/browser/preferences/preferences.ftl b/l10n-en-GB/browser/browser/preferences/preferences.ftl
index 9282f751ae..c363ce3f82 100644
--- a/l10n-en-GB/browser/browser/preferences/preferences.ftl
+++ b/l10n-en-GB/browser/browser/preferences/preferences.ftl
@@ -32,6 +32,8 @@ search-input-box2 =
     .style = width: 15.4em
     .placeholder = Find in Settings
 managed-notice = Your browser is being managed by your organisation.
+managed-notice-info-icon =
+    .alt = Information
 category-list =
     .aria-label = Categories
 pane-general-title = General
@@ -576,17 +578,17 @@ home-prefs-recommended-by-description-generic = Exceptional content curated by t
 
 home-prefs-recommended-by-learn-more = How it works
 home-prefs-recommended-by-option-sponsored-stories =
-    .label = Sponsored Stories
+    .label = Sponsored stories
 home-prefs-recommended-by-option-recent-saves =
     .label = Show Recent Saves
 home-prefs-highlights-option-visited-pages =
-    .label = Visited Pages
+    .label = Visited pages
 home-prefs-highlights-options-bookmarks =
     .label = Bookmarks
 home-prefs-highlights-option-most-recent-download =
-    .label = Most Recent Download
+    .label = Most recent download
 home-prefs-highlights-option-saved-to-pocket =
-    .label = Pages Saved to { -pocket-brand-name }
+    .label = Pages saved to { -pocket-brand-name }
 home-prefs-recent-activity-header =
     .label = Recent activity
 home-prefs-recent-activity-description = A selection of recent sites and content
@@ -708,6 +710,13 @@ sync-mobile-promo = Download Firefox for <img data-l10n-name="android-icon"/> <a
 
 sync-profile-picture =
     .tooltiptext = Change 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…
     .accesskey = g
@@ -1275,6 +1284,8 @@ addon-recommendations-link = Learn more
 collection-health-report-disabled = Data reporting is disabled for this build configuration
 collection-backlogged-crash-reports-with-link = Allow { -brand-short-name } to send backlogged crash reports on your behalf <a data-l10n-name="crash-reports-link">Learn more</a>
     .accesskey = c
+collection-backlogged-crash-reports = Allow { -brand-short-name } to send backlogged crash reports on your behalf
+    .accesskey = c
 privacy-segmentation-section-header = New features that enhance your browsing
 privacy-segmentation-section-description = When we offer features that use your data to give you a more personal experience:
 privacy-segmentation-radio-off =
diff --git a/l10n-en-GB/browser/browser/sidebarMenu.ftl b/l10n-en-GB/browser/browser/sidebarMenu.ftl
index dbff817b28..6332a17cfa 100644
--- a/l10n-en-GB/browser/browser/sidebarMenu.ftl
+++ b/l10n-en-GB/browser/browser/sidebarMenu.ftl
@@ -4,15 +4,13 @@
 
 sidebar-menu-bookmarks =
     .label = Bookmarks
-
 sidebar-menu-history =
     .label = History
-
 sidebar-menu-synced-tabs =
     .label = Synced Tabs
-
+sidebar-menu-megalist =
+    .label = Passwords
 sidebar-menu-close =
     .label = Close Sidebar
-
 sidebar-close-button =
     .tooltiptext = Close sidebar
diff --git a/l10n-en-GB/browser/browser/webProtocolHandler.ftl b/l10n-en-GB/browser/browser/webProtocolHandler.ftl
index db046b55ce..848e5d469b 100644
--- a/l10n-en-GB/browser/browser/webProtocolHandler.ftl
+++ b/l10n-en-GB/browser/browser/webProtocolHandler.ftl
@@ -6,15 +6,14 @@ protocolhandler-mailto-os-handler-notificationbox = Always use { -brand-short-na
 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 = Open email links using { $url }?
 
 ## 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.
 
 ##