From a90a5cba08fdf6c0ceb95101c275108a152a3aed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:35:37 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- browser/locales/en-US/browser/aboutLogins.ftl | 8 ++++++ browser/locales/en-US/browser/accounts.ftl | 2 +- browser/locales/en-US/browser/allTabsMenu.ftl | 3 ++ browser/locales/en-US/browser/appmenu.ftl | 14 +++------- browser/locales/en-US/browser/browser.ftl | 16 +++++++++++ .../locales/en-US/browser/confirmationHints.ftl | 7 +++++ browser/locales/en-US/browser/newtab/asrouter.ftl | 2 +- browser/locales/en-US/browser/newtab/newtab.ftl | 32 ++++++++++++++++++++++ .../browser/policies/policies-descriptions.ftl | 13 ++++++++- .../en-US/browser/preferences/preferences.ftl | 23 ++++++++++++---- browser/locales/en-US/browser/screenshots.ftl | 12 +++----- browser/locales/en-US/browser/tabContextMenu.ftl | 3 ++ browser/locales/en-US/browser/tabbrowser.ftl | 5 ++++ browser/locales/en-US/browser/translations.ftl | 16 +++++------ 14 files changed, 121 insertions(+), 35 deletions(-) (limited to 'browser/locales/en-US') diff --git a/browser/locales/en-US/browser/aboutLogins.ftl b/browser/locales/en-US/browser/aboutLogins.ftl index f18478c7a7..514dc05089 100644 --- a/browser/locales/en-US/browser/aboutLogins.ftl +++ b/browser/locales/en-US/browser/aboutLogins.ftl @@ -140,6 +140,14 @@ about-logins-os-auth-dialog-caption = { -brand-full-name } ## and includes subtitle of "Enter password for the user "xxx" to allow this." These ## notes are only valid for English. Please test in your respected locale. +# 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/browser/locales/en-US/browser/accounts.ftl b/browser/locales/en-US/browser/accounts.ftl index 21f95d0b14..47433ddea7 100644 --- a/browser/locales/en-US/browser/accounts.ftl +++ b/browser/locales/en-US/browser/accounts.ftl @@ -49,7 +49,7 @@ account-send-tab-to-device-verify = Verify Your Account… # The title shown in a notification when either this device or another device # has connected to, or disconnected from, a Firefox account. -account-connection-title = { -fxaccount-brand-name(capitalization: "title") } +account-connection-title-2 = Account # Variables: # $deviceName (String): the name of the new device diff --git a/browser/locales/en-US/browser/allTabsMenu.ftl b/browser/locales/en-US/browser/allTabsMenu.ftl index 019c22361b..92212fb55e 100644 --- a/browser/locales/en-US/browser/allTabsMenu.ftl +++ b/browser/locales/en-US/browser/allTabsMenu.ftl @@ -11,3 +11,6 @@ all-tabs-menu-new-user-context = all-tabs-menu-hidden-tabs = .label = Hidden tabs + +all-tabs-menu-close-duplicate-tabs = + .label = Close duplicate tabs diff --git a/browser/locales/en-US/browser/appmenu.ftl b/browser/locales/en-US/browser/appmenu.ftl index f9588a5053..d26566ebb7 100644 --- a/browser/locales/en-US/browser/appmenu.ftl +++ b/browser/locales/en-US/browser/appmenu.ftl @@ -84,16 +84,10 @@ appmenu-remote-tabs-showmore = .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 -# $count (Number) - The number of inactive tabs which are not being shown (at least 1) -appmenu-remote-tabs-showinactive = - .label = - { $count -> - [one] Show one inactive tab - *[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 diff --git a/browser/locales/en-US/browser/browser.ftl b/browser/locales/en-US/browser/browser.ftl index 02ba7bb1fa..9fbdcba15a 100644 --- a/browser/locales/en-US/browser/browser.ftl +++ b/browser/locales/en-US/browser/browser.ftl @@ -638,6 +638,12 @@ urlbar-result-action-copy-to-clipboard = Copy # $result (String): the string representation for a formula result urlbar-result-action-calculator-result = = { $result } +## Strings used for buttons in the urlbar + +# Label prompting user to search with a particular search engine. +# $engine (String): the name of a search engine that searches a specific site +urlbar-result-search-with = Search with { $engine } + ## Action text shown in urlbar results, usually appended after the search ## string or the url, like "result value - action text". ## In these actions "Search" is a verb, followed by where the search is performed. @@ -970,6 +976,16 @@ data-reporting-notification-button = # Label for the indicator shown in the private browsing window titlebar. private-browsing-indicator-label = Private browsing +# Tooltip for the indicator shown in the window titlebar when content analysis is active. +# Variables: +# $agentName (String): The name of the DLP agent that is connected +content-analysis-indicator-tooltip = + .tooltiptext = Data loss prevention (DLP) by { $agentName }. Click for more info. +content-analysis-panel-title = Data protection +# Variables: +# $agentName (String): The name of the DLP agent that is connected +content-analysis-panel-text = Your organization uses { $agentName } to protect against data loss. Learn more + ## Unified extensions (toolbar) button unified-extensions-button = diff --git a/browser/locales/en-US/browser/confirmationHints.ftl b/browser/locales/en-US/browser/confirmationHints.ftl index 2da1e317cd..3e03977a3b 100644 --- a/browser/locales/en-US/browser/confirmationHints.ftl +++ b/browser/locales/en-US/browser/confirmationHints.ftl @@ -18,3 +18,10 @@ confirmation-hint-send-to-device = Sent! confirmation-hint-firefox-relay-mask-created = New mask created! confirmation-hint-firefox-relay-mask-reused = Existing mask reused! confirmation-hint-screenshot-copied = Screenshot copied! +# Variables: +# $tabCount (Number): The number of duplicate tabs closed, at least 1. +confirmation-hint-duplicate-tabs-closed = + { $tabCount -> + [one] Closed { $tabCount } tab + *[other] Closed { $tabCount } tabs + } diff --git a/browser/locales/en-US/browser/newtab/asrouter.ftl b/browser/locales/en-US/browser/newtab/asrouter.ftl index c4c94c9c7d..2bfad6833d 100644 --- a/browser/locales/en-US/browser/newtab/asrouter.ftl +++ b/browser/locales/en-US/browser/newtab/asrouter.ftl @@ -69,7 +69,7 @@ cfr-doorhanger-extension-total-users = ## Firefox Accounts Message cfr-doorhanger-bookmark-fxa-header = Sync your bookmarks everywhere. -cfr-doorhanger-bookmark-fxa-body = Great find! Now don’t be left without this bookmark on your mobile devices. Get Started with a { -fxaccount-brand-name }. +cfr-doorhanger-bookmark-fxa-body-2 = Great find! Now don’t be left without this bookmark on your mobile devices. Get started with an account. cfr-doorhanger-bookmark-fxa-link-text = Sync bookmarks now… cfr-doorhanger-bookmark-fxa-close-btn-tooltip = .aria-label = Close button diff --git a/browser/locales/en-US/browser/newtab/newtab.ftl b/browser/locales/en-US/browser/newtab/newtab.ftl index 50bd34f717..7e99cf25c9 100644 --- a/browser/locales/en-US/browser/newtab/newtab.ftl +++ b/browser/locales/en-US/browser/newtab/newtab.ftl @@ -270,6 +270,9 @@ newtab-custom-pocket-show-recent-saves = Show recent saves 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 @@ -294,3 +297,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 { $author_string } on { $webpage_string } + +## 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/browser/locales/en-US/browser/policies/policies-descriptions.ftl b/browser/locales/en-US/browser/policies/policies-descriptions.ftl index fcecab699a..f846acc3d9 100644 --- a/browser/locales/en-US/browser/policies/policies-descriptions.ftl +++ b/browser/locales/en-US/browser/policies/policies-descriptions.ftl @@ -66,9 +66,12 @@ policy-DisableDefaultBrowserAgent = Prevent the default browser agent from takin policy-DisableDeveloperTools = Block access to the developer tools. +policy-DisableEncryptedClientHello = Disable use of the TLS feature Encrypted Client Hello (ECH). + policy-DisableFeedbackCommands = Disable commands to send feedback from the Help menu (Submit Feedback and Report Deceptive Site). -policy-DisableFirefoxAccounts = Disable { -fxaccount-brand-name } based services, including Sync. +# This string is in the process of being deprecated in favor of policy-DisableAccounts. +policy-DisableFirefoxAccounts1 = Disable account-based services, including sync. # Firefox Screenshots is the name of the feature, and should not be translated. policy-DisableFirefoxScreenshots = Disable the Firefox Screenshots feature. @@ -143,6 +146,10 @@ 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. @@ -183,6 +190,10 @@ 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 }. diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl index c25b299ae1..3a4e0766a7 100644 --- a/browser/locales/en-US/browser/preferences/preferences.ftl +++ b/browser/locales/en-US/browser/preferences/preferences.ftl @@ -734,6 +734,10 @@ home-prefs-highlights-option-saved-to-pocket = home-prefs-recent-activity-header = .label = Recent activity home-prefs-recent-activity-description = A selection of recent sites and content +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 @@ -1036,6 +1040,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 @@ -1072,6 +1079,13 @@ primary-password-os-auth-dialog-message-win = To create a Primary Password, ente 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 pane-privacy-autofill-header = Autofill @@ -1085,12 +1099,9 @@ autofill-payment-methods-checkbox-submessage = Includes credit and debit cards .accesskey = I autofill-saved-payment-methods-button = Saved payment methods .accesskey = v -autofill-reauth-checkbox = { PLATFORM() -> - [macos] Require macOS authentication to fill and edit payment methods. - [windows] Require Windows authentication to fill and edit payment methods. - [linux] Require Linux authentication to fill and edit payment methods. - *[other] Require authentication to fill and edit payment methods. - } + +# 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/browser/locales/en-US/browser/screenshots.ftl b/browser/locales/en-US/browser/screenshots.ftl index ea2e42191c..b7ecece63b 100644 --- a/browser/locales/en-US/browser/screenshots.ftl +++ b/browser/locales/en-US/browser/screenshots.ftl @@ -71,20 +71,16 @@ screenshots-component-cancel-button = # Variables # $shortcut (String) - A keyboard shortcut for copying the screenshot. -screenshots-component-copy-button = +screenshots-component-copy-button-2 = Copy .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 = +screenshots-component-download-button-2 = Download .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. @@ -94,8 +90,8 @@ screenshots-component-copy-key = C ## # This string represents the selection size area -# "x" here represents "by" (i.e 123 by 456) +# "×" 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 } +screenshots-overlay-selection-region-size-3 = { $width } × { $height } diff --git a/browser/locales/en-US/browser/tabContextMenu.ftl b/browser/locales/en-US/browser/tabContextMenu.ftl index df58df794c..5ace34fd8a 100644 --- a/browser/locales/en-US/browser/tabContextMenu.ftl +++ b/browser/locales/en-US/browser/tabContextMenu.ftl @@ -72,6 +72,9 @@ move-to-new-window = tab-context-close-multiple-tabs = .label = Close Multiple Tabs .accesskey = M +tab-context-close-duplicate-tabs = + .label = Close Duplicate Tabs + .accesskey = u tab-context-share-url = .label = Share .accesskey = h diff --git a/browser/locales/en-US/browser/tabbrowser.ftl b/browser/locales/en-US/browser/tabbrowser.ftl index 21e4897ac5..58f1a7c453 100644 --- a/browser/locales/en-US/browser/tabbrowser.ftl +++ b/browser/locales/en-US/browser/tabbrowser.ftl @@ -120,6 +120,11 @@ tabbrowser-confirm-caretbrowsing-title = Caret Browsing tabbrowser-confirm-caretbrowsing-message = Pressing F7 turns Caret Browsing on or off. This feature places a moveable 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/browser/locales/en-US/browser/translations.ftl b/browser/locales/en-US/browser/translations.ftl index 92f21220f1..efd9353d99 100644 --- a/browser/locales/en-US/browser/translations.ftl +++ b/browser/locales/en-US/browser/translations.ftl @@ -123,19 +123,19 @@ translations-manage-header = Translations translations-manage-settings-button = .label = Settings… .accesskey = t -translations-manage-intro = Set your language and site translation preferences and manage languages installed for offline translation. -translations-manage-install-description = Install languages for offline translation -translations-manage-language-install-button = - .label = Install -translations-manage-language-install-all-button = - .label = Install all - .accesskey = I +translations-manage-intro-2 = Set your language and site translation preferences and manage languages downloaded for offline translation. +translations-manage-download-description = Download languages for offline translation +translations-manage-language-download-button = + .label = Download +translations-manage-language-download-all-button = + .label = Download all + .accesskey = D translations-manage-language-remove-button = .label = Remove translations-manage-language-remove-all-button = .label = Remove all .accesskey = e -translations-manage-error-install = There was a problem installing the language files. Please try again. +translations-manage-error-download = There was a problem downloading the language files. Please try again. translations-manage-error-remove = There was an error removing the language files. Please try again. translations-manage-error-list = Failed to get the list of available languages for translation. Refresh the page to try again. -- cgit v1.2.3