From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:33 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- .../locales/en-US/browser/confirmationHints.ftl | 1 - browser/locales/en-US/browser/firefoxView.ftl | 28 +++ browser/locales/en-US/browser/fxviewTabList.ftl | 26 ++- browser/locales/en-US/browser/newtab/newtab.ftl | 1 + .../browser/policies/policies-descriptions.ftl | 6 + .../en-US/browser/preferences/connection.ftl | 3 + .../en-US/browser/preferences/formAutofill.ftl | 12 -- .../en-US/browser/preferences/preferences.ftl | 5 +- browser/locales/en-US/browser/protectionsPanel.ftl | 44 ----- .../locales/en-US/browser/webProtocolHandler.ftl | 2 + .../chrome/browser/downloads/downloads.properties | 4 +- browser/locales/jar.mn | 1 + browser/locales/l10n-changesets.json | 204 ++++++++++----------- 13 files changed, 166 insertions(+), 171 deletions(-) (limited to 'browser/locales') diff --git a/browser/locales/en-US/browser/confirmationHints.ftl b/browser/locales/en-US/browser/confirmationHints.ftl index f9b9f0264e..2da1e317cd 100644 --- a/browser/locales/en-US/browser/confirmationHints.ftl +++ b/browser/locales/en-US/browser/confirmationHints.ftl @@ -4,7 +4,6 @@ ## Confirmation hints -confirmation-hint-breakage-report-sent = Report sent. Thank you! confirmation-hint-password-removed = Password removed! confirmation-hint-page-bookmarked = Saved to bookmarks confirmation-hint-password-created = Password saved diff --git a/browser/locales/en-US/browser/firefoxView.ftl b/browser/locales/en-US/browser/firefoxView.ftl index 2057066d49..a2a7f9aa73 100644 --- a/browser/locales/en-US/browser/firefoxView.ftl +++ b/browser/locales/en-US/browser/firefoxView.ftl @@ -12,6 +12,9 @@ menu-tools-firefox-view = firefoxview-page-title = { -firefoxview-brand-name } +firefoxview-page-heading = + .heading = { -firefoxview-brand-name } + firefoxview-page-label = .label = { -firefoxview-brand-name } @@ -292,3 +295,28 @@ firefoxview-recentlyclosed-empty-description-two = To find tabs from longer ago, firefoxview-syncedtabs-device-notabs = No tabs open on this device firefoxview-syncedtabs-connect-another-device = Connect another device + +firefoxview-pinned-tabs = + .title = Pinned Tabs + +firefoxview-tabs = + .title = Tabs + +## These tooltips will be displayed when hovering over a pinned tab on the Open Tabs page +## Variables: +## $tabTitle (string) - Title of pinned tab that will be opened when selected + +firefoxview-opentabs-pinned-tab = + .title = Switch to { $tabTitle } + +# This tooltip will be shown for a pinned tab whose URL is currently bookmarked. +firefoxview-opentabs-bookmarked-pinned-tab = + .title = Switch to (Bookmarked) { $tabTitle } + +## These tooltips will be displayed when hovering over an unpinned Open Tab +## Variables: +## $url (string) - URL of tab that will be opened when selected + +# This tooltip will be shown for an unpinned tab whose URL is currently bookmarked. +firefoxview-opentabs-bookmarked-tab = + .title = (Bookmarked) { $url } diff --git a/browser/locales/en-US/browser/fxviewTabList.ftl b/browser/locales/en-US/browser/fxviewTabList.ftl index 381234db50..73599c7a49 100644 --- a/browser/locales/en-US/browser/fxviewTabList.ftl +++ b/browser/locales/en-US/browser/fxviewTabList.ftl @@ -15,6 +15,11 @@ fxviewtabrow-time = { DATETIME($time, timeStyle: "short") } fxviewtabrow-tabs-list-tab = .title = Open { $targetURI } in a new tab +# Variables: +# $tabTitle (string) - Title of tab being closed +fxviewtabrow-close-tab-button = + .title = Close { $tabTitle } + # Variables: # $tabTitle (string) - Title of tab being dismissed fxviewtabrow-dismiss-tab-button = @@ -53,18 +58,23 @@ fxviewtabrow-move-tab-window = Move to New Window .accesskey = W fxviewtabrow-send-tab = Send Tab to Device .accesskey = n +fxviewtabrow-pin-tab = Pin Tab + .accesskey = P +fxviewtabrow-unpin-tab = Unpin Tab + .accesskey = p +fxviewtabrow-mute-tab = Mute Tab + .accesskey = M +fxviewtabrow-unmute-tab = Unmute Tab + .accesskey = m # Variables: # $tabTitle (string) - Title of the tab to which the context menu is associated fxviewtabrow-options-menu-button = .title = Options for { $tabTitle } -# Variables: -# $tabTitle (string) - Title of tab being muted -fxviewtabrow-mute-tab-button = - .title = Mute { $tabTitle } +## Strings below are to be used without context (tab title/URL) on mute/unmute buttons -# Variables: -# $tabTitle (string) - Title of tab being unmuted -fxviewtabrow-unmute-tab-button = - .title = Unmute { $tabTitle } +fxviewtabrow-mute-tab-button-no-context = + .title = Mute tab +fxviewtabrow-unmute-tab-button-no-context = + .title = Unmute tab diff --git a/browser/locales/en-US/browser/newtab/newtab.ftl b/browser/locales/en-US/browser/newtab/newtab.ftl index d4d72febda..256a8da576 100644 --- a/browser/locales/en-US/browser/newtab/newtab.ftl +++ b/browser/locales/en-US/browser/newtab/newtab.ftl @@ -46,6 +46,7 @@ newtab-topsites-add-search-engine-header = Add Search Engine newtab-topsites-add-shortcut-header = New Shortcut newtab-topsites-edit-topsites-header = Edit Top Site newtab-topsites-edit-shortcut-header = Edit Shortcut +newtab-topsites-add-shortcut-label = Add Shortcut newtab-topsites-title-label = Title newtab-topsites-title-input = .placeholder = Enter a title diff --git a/browser/locales/en-US/browser/policies/policies-descriptions.ftl b/browser/locales/en-US/browser/policies/policies-descriptions.ftl index 6908dd5f9d..22c881c261 100644 --- a/browser/locales/en-US/browser/policies/policies-descriptions.ftl +++ b/browser/locales/en-US/browser/policies/policies-descriptions.ftl @@ -23,6 +23,10 @@ policy-AppUpdateURL = Set custom app update URL. policy-Authentication = Configure integrated authentication for websites that support it. +policy-AutofillAddressEnabled = Enable autofill for addresses. + +policy-AutofillCreditCardEnabled = Enable autofill for payment methods. + policy-AutoLaunchProtocolsFromOrigins = Define a list of external protocols that can be used from listed origins without prompting the user. policy-BackgroundAppUpdate2 = Enable or disable the background updater. @@ -41,6 +45,8 @@ 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 websites to set cookies. # Containers in this context is referring to container tabs in Firefox. diff --git a/browser/locales/en-US/browser/preferences/connection.ftl b/browser/locales/en-US/browser/preferences/connection.ftl index cf66c983ac..236c252e4d 100644 --- a/browser/locales/en-US/browser/preferences/connection.ftl +++ b/browser/locales/en-US/browser/preferences/connection.ftl @@ -24,6 +24,9 @@ connection-proxy-option-no = connection-proxy-option-system = .label = Use system proxy settings .accesskey = U +connection-proxy-option-wpad = + .label = Use system Web Proxy Auto-Discovery setting + .accesskey = g connection-proxy-option-auto = .label = Auto-detect proxy settings for this network .accesskey = w diff --git a/browser/locales/en-US/browser/preferences/formAutofill.ftl b/browser/locales/en-US/browser/preferences/formAutofill.ftl index 2324a3f197..123fa9bbbe 100644 --- a/browser/locales/en-US/browser/preferences/formAutofill.ftl +++ b/browser/locales/en-US/browser/preferences/formAutofill.ftl @@ -132,15 +132,3 @@ autofill-card-expires-month = Exp. Month autofill-card-expires-year = Exp. Year autofill-card-billing-address = Billing Address autofill-card-network = Card Type - -## 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 diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl index f193689074..a3c382cac3 100644 --- a/browser/locales/en-US/browser/preferences/preferences.ftl +++ b/browser/locales/en-US/browser/preferences/preferences.ftl @@ -287,7 +287,8 @@ preferences-web-appearance-choice-input-dark = # This can appear when using windows HCM or "Override colors: always" without # system colors. -preferences-web-appearance-override-warning = Your color selections are overriding website appearance. Manage colors +preferences-web-appearance-override-warning2 = + .message = Your color selections are overriding website appearance. # This message contains one link. It can be moved within the sentence as needed # to adapt to your language, but should not be changed. @@ -1441,7 +1442,7 @@ addon-recommendations-link = Learn more # or builds with no Telemetry support available. 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 Learn more +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 diff --git a/browser/locales/en-US/browser/protectionsPanel.ftl b/browser/locales/en-US/browser/protectionsPanel.ftl index 94b461d49e..e81d31a4e2 100644 --- a/browser/locales/en-US/browser/protectionsPanel.ftl +++ b/browser/locales/en-US/browser/protectionsPanel.ftl @@ -2,11 +2,6 @@ # 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/. -protections-panel-sendreportview-error = There was an error sending the report. Please try again later. - -# A link shown when ETP is disabled for a site. Opens the breakage report subview when clicked. -protections-panel-sitefixedsendreport-label = Site fixed? Send report - ## These strings are used to define the different levels of ## Enhanced Tracking Protection. @@ -40,13 +35,6 @@ protections-panel-etp-toggle-off = .description = Off for this site .aria-label = Enhanced Tracking Protection: Off for { $host } -# The link to be clicked to open the sub-panel view -protections-panel-site-not-working = Site not working? - -# The heading/title of the sub-panel view -protections-panel-site-not-working-view = - .title = Site Not Working? - ## The "Allowed" header also includes a "Why?" link that, when hovered, shows ## a tooltip explaining why these items were not blocked in the page. @@ -81,24 +69,6 @@ protections-panel-not-found-label = None Detected protections-panel-settings-label = Protection settings protections-panel-protectionsdashboard-label = Protections dashboard -## In the Site Not Working? view, we suggest turning off protections if -## the user is experiencing issues with any of a variety of functionality. - -# The header of the list -protections-panel-site-not-working-view-header = Turn off protections if you’re having issues with: - -# The list items, shown in a