diff --git a/browser/actors/EncryptedMediaParent.sys.mjs b/browser/actors/EncryptedMediaParent.sys.mjs index d9dcfcafdcff..4000d4c86044 100644 --- a/browser/actors/EncryptedMediaParent.sys.mjs +++ b/browser/actors/EncryptedMediaParent.sys.mjs @@ -204,12 +204,13 @@ export class EncryptedMediaParent extends JSWindowActorParent { return; } - let msgPrefix = "eme-notifications-drm-content-playing"; - let msgId = msgPrefix; - let manageLabelId = msgPrefix + "-manage"; - let manageAccessKeyId = msgPrefix + "-manage-accesskey"; - let dismissLabelId = msgPrefix + "-dismiss"; - let dismissAccessKeyId = msgPrefix + "-dismiss-accesskey"; + let msgId = "eme-notifications-drm-content-playing"; + let manageLabelId = "eme-notifications-drm-content-playing-manage"; + let manageAccessKeyId = + "eme-notifications-drm-content-playing-manage-accesskey"; + let dismissLabelId = "eme-notifications-drm-content-playing-dismiss"; + let dismissAccessKeyId = + "eme-notifications-drm-content-playing-dismiss-accesskey"; let [ message, diff --git a/browser/components/aboutwelcome/modules/AboutWelcomeDefaults.sys.mjs b/browser/components/aboutwelcome/modules/AboutWelcomeDefaults.sys.mjs index 9913e5f9d72f..66240063fd79 100644 --- a/browser/components/aboutwelcome/modules/AboutWelcomeDefaults.sys.mjs +++ b/browser/components/aboutwelcome/modules/AboutWelcomeDefaults.sys.mjs @@ -830,7 +830,12 @@ function getLocalizedUA(ua) { gSourceL10n = new Localization(["browser/migrationWizard.ftl"]); } if (allowedUAs.includes(ua)) { - return gSourceL10n.formatValue(`migration-source-name-${ua.toLowerCase()}`); + const messageIDs = { + chrome: "migration-source-name-chrome", + edge: "migration-source-name-edge", + ie: "migration-source-name-ie", + }; + return gSourceL10n.formatValue(messageIDs[ua]); } return null; } diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js index 010d0813557e..166c42111b05 100644 --- a/browser/components/customizableui/content/panelUI.js +++ b/browser/components/customizableui/content/panelUI.js @@ -1076,8 +1076,18 @@ const PanelUI = { this._panelBannerItem = this.mainView.querySelector(".panel-banner-item"); } - let l10nId = "appmenuitem-banner-" + notification.id; - document.l10n.setAttributes(this._panelBannerItem, l10nId); + const messageIDs = { + "update-downloading": "appmenuitem-banner-update-downloading", + "update-available": "appmenuitem-banner-update-available", + "update-manual": "appmenuitem-banner-update-manual", + "update-unsupported": "appmenuitem-banner-update-unsupported", + "update-restart": "appmenuitem-banner-update-restart", + }; + + document.l10n.setAttributes( + this._panelBannerItem, + messageIDs[notification.id] + ); this._panelBannerItem.setAttribute("notificationid", notification.id); this._panelBannerItem.hidden = false; diff --git a/browser/components/preferences/dialogs/blocklists.js b/browser/components/preferences/dialogs/blocklists.js index 89e21c476f4b..61f8891a86e3 100644 --- a/browser/components/preferences/dialogs/blocklists.js +++ b/browser/components/preferences/dialogs/blocklists.js @@ -141,10 +141,21 @@ var gBlocklistManager = { let branch = Services.prefs.getBranch(LISTS_PREF_BRANCH); let l10nKey = branch.getCharPref(id); + const messageIdsMap = { + std: { + name: "blocklist-item-moz-std-listName", + description: "blocklist-item-moz-std-description", + }, + full: { + name: "blocklist-item-moz-full-listName", + description: "blocklist-item-moz-full-description", + }, + }; + // eslint-disable-next-line mozilla/prefer-formatValues let [listName, description] = await document.l10n.formatValues([ - { id: `blocklist-item-${l10nKey}-listName` }, - { id: `blocklist-item-${l10nKey}-description` }, + { id: messageIdsMap[l10nKey].name }, + { id: messageIdsMap[l10nKey].description }, ]); // eslint-disable-next-line mozilla/prefer-formatValues diff --git a/browser/components/preferences/extensionControlled.js b/browser/components/preferences/extensionControlled.js index 8856b7de45e3..a6f9219a31a4 100644 --- a/browser/components/preferences/extensionControlled.js +++ b/browser/components/preferences/extensionControlled.js @@ -59,11 +59,12 @@ let extensionControlledContentIds = { }; const extensionControlledL10nKeys = { - webNotificationsDisabled: "web-notifications", - "services.passwordSavingEnabled": "password-saving", - "privacy.containers": "privacy-containers", - "websites.trackingProtectionMode": "websites-content-blocking-all-trackers", - "proxy.settings": "proxy-config", + webNotificationsDisabled: "extension-controlling-web-notifications", + "services.passwordSavingEnabled": "extension-controlling-password-saving", + "privacy.containers": "extension-controlling-privacy-containers", + "websites.trackingProtectionMode": + "extension-controlling-websites-content-blocking-all-trackers", + "proxy.settings": "extension-controlling-proxy-config", }; let extensionControlledIds = {}; @@ -129,7 +130,7 @@ function settingNameToL10nID(settingName) { `Unknown extension controlled setting name: ${settingName}` ); } - return `extension-controlling-${extensionControlledL10nKeys[settingName]}`; + return extensionControlledL10nKeys[settingName]; } /** diff --git a/browser/components/touchbar/docs/index.rst b/browser/components/touchbar/docs/index.rst index 3e740fced63e..090fbd8c7719 100644 --- a/browser/components/touchbar/docs/index.rst +++ b/browser/components/touchbar/docs/index.rst @@ -221,14 +221,6 @@ The search popover UrlbarTokenizer.RESTRICT.TAG ), }, - Titles: { - title: "search-titles", - type: kInputTypes.BUTTON, - callback: () => - gTouchBarHelper.insertRestrictionInUrlbar( - UrlbarTokenizer.RESTRICT.TITLE - ), - }, }, }, }, diff --git a/browser/locales/en-US/browser/aboutLogins.ftl b/browser/locales/en-US/browser/aboutLogins.ftl index 58dbda468b3e..5d8b8dc8f3a8 100644 --- a/browser/locales/en-US/browser/aboutLogins.ftl +++ b/browser/locales/en-US/browser/aboutLogins.ftl @@ -242,7 +242,6 @@ about-logins-confirm-export-dialog-message2 = When you export, your passwords ar When you’re done using the file, we recommend deleting it so others who use this device can’t see your passwords. about-logins-confirm-export-dialog-confirm-button2 = Continue with export -about-logins-alert-import-title = Import Complete about-logins-alert-import-message = View detailed Import Summary confirm-discard-changes-dialog-title = Discard unsaved changes? diff --git a/browser/locales/en-US/browser/aboutPrivateBrowsing.ftl b/browser/locales/en-US/browser/aboutPrivateBrowsing.ftl index 08851bce0ef1..5008883126ed 100644 --- a/browser/locales/en-US/browser/aboutPrivateBrowsing.ftl +++ b/browser/locales/en-US/browser/aboutPrivateBrowsing.ftl @@ -34,8 +34,6 @@ about-private-browsing-focus-promo-text = Our dedicated private browsing mobile ## The following strings will be used for experiments in Fx99 and Fx100 -about-private-browsing-focus-promo-header-b = Take private browsing to your phone -about-private-browsing-focus-promo-text-b = Use { -focus-brand-name } for those private searches you don’t want your main mobile browser to see. about-private-browsing-focus-promo-header-c = Next-level privacy on mobile about-private-browsing-focus-promo-text-c = { -focus-brand-name } clears your history every time while blocking ads and trackers. diff --git a/browser/locales/en-US/browser/addonNotifications.ftl b/browser/locales/en-US/browser/addonNotifications.ftl index dde981df2594..bb62fa924ac4 100644 --- a/browser/locales/en-US/browser/addonNotifications.ftl +++ b/browser/locales/en-US/browser/addonNotifications.ftl @@ -72,9 +72,6 @@ webext-imported-addons = Finalize installing extensions imported to { -brand-sho # Variables: # $name (String): The name of the add-on that will be removed. addon-removal-title = Remove { $name }? -# Variables: -# $name (String): the name of the extension which is about to be removed. -addon-removal-message = Remove { $name } from { -brand-shorter-name }? addon-removal-button = Remove addon-removal-abuse-report-checkbox = Report this extension to { -vendor-short-name } diff --git a/browser/locales/en-US/browser/appmenu.ftl b/browser/locales/en-US/browser/appmenu.ftl index a23f00a20366..0d05d40d6568 100644 --- a/browser/locales/en-US/browser/appmenu.ftl +++ b/browser/locales/en-US/browser/appmenu.ftl @@ -127,16 +127,6 @@ appmenuitem-save-page = appmenuitem-fxa-sync-off-title = Sync is off appmenuitem-fxa-sync-off-description = Protect and access your bookmarks, passwords, and more anywhere. -## What's New panel in App menu. - -whatsnew-panel-header = What’s New - -# Checkbox displayed at the bottom of the What's New panel, allowing users to -# enable/disable What's New notifications. -whatsnew-panel-footer-checkbox = - .label = Notify about new features - .accesskey = f - ## The Firefox Profiler – The popup is the UI to turn on the profiler, and record ## performance profiles. To enable it go to profiler.firefox.com and click ## "Enable Profiler Menu Button". diff --git a/browser/locales/en-US/browser/browser.ftl b/browser/locales/en-US/browser/browser.ftl index 716a072166fa..8935224b56ee 100644 --- a/browser/locales/en-US/browser/browser.ftl +++ b/browser/locales/en-US/browser/browser.ftl @@ -411,7 +411,6 @@ identity-custom-root = Connection verified by a certificate issuer that is not r identity-passive-loaded = Parts of this page are not secure (such as images). identity-active-loaded = You have disabled protection on this page. identity-weak-encryption = This page uses weak encryption. -identity-insecure-login-forms = Logins entered on this page could be compromised. identity-https-only-connection-upgraded = (upgraded to HTTPS) identity-https-only-label2 = Automatically upgrade this site to a secure connection @@ -440,7 +439,6 @@ identity-remove-cert-exception = .label = Remove Exception .accesskey = R identity-description-insecure = Your connection to this site is not private. Information you submit could be viewed by others (like passwords, messages, credit cards, etc.). -identity-description-insecure-login-forms = The login information you enter on this page is not secure and could be compromised. identity-description-weak-cipher-intro = Your connection to this website uses weak encryption and is not private. identity-description-weak-cipher-risk = Other people can view your information or modify the website’s behavior. identity-description-active-blocked2 = { -brand-short-name } has blocked parts of this page that are not secure. @@ -471,37 +469,9 @@ browser-window-close-button = ## Tab actions -# This label should be written in all capital letters if your locale supports them. -browser-tab-audio-playing2 = PLAYING -# This label should be written in all capital letters if your locale supports them. -browser-tab-audio-muted2 = MUTED -# This label should be written in all capital letters if your locale supports them. -browser-tab-audio-blocked = AUTOPLAY BLOCKED # This label should be written in all capital letters if your locale supports them. browser-tab-audio-pip = PICTURE-IN-PICTURE -## These labels should be written in all capital letters if your locale supports them. -## Variables: -## $count (number): number of affected tabs - -browser-tab-mute = - { $count -> - [1] MUTE TAB - *[other] MUTE { $count } TABS - } - -browser-tab-unmute = - { $count -> - [1] UNMUTE TAB - *[other] UNMUTE { $count } TABS - } - -browser-tab-unblock = - { $count -> - [1] PLAY TAB - *[other] PLAY { $count } TABS - } - ## Bookmarks toolbar items browser-import-button2 = @@ -868,11 +838,6 @@ bookmarks-tools-toolbar-visibility-panel = [true] Hide bookmarks toolbar *[other] Show bookmarks toolbar } -bookmarks-tools-menu-button-visibility = - .label = { $isVisible -> - [true] Remove bookmarks menu from toolbar - *[other] Add bookmarks menu to toolbar - } ## @@ -905,8 +870,6 @@ bookmarks-subview-bookmark-tab = library-bookmarks-menu = .label = Bookmarks -library-recent-activity-title = - .value = Recent Activity ## Pocket toolbar button diff --git a/browser/locales/en-US/browser/downloads.ftl b/browser/locales/en-US/browser/downloads.ftl index 4a41b3fbd879..cf491a13acd5 100644 --- a/browser/locales/en-US/browser/downloads.ftl +++ b/browser/locales/en-US/browser/downloads.ftl @@ -86,8 +86,6 @@ downloads-cmd-show-description-2 = *[other] Show in Folder } -downloads-cmd-show-downloads = - .label = Show downloads folder downloads-cmd-retry = .tooltiptext = Retry downloads-cmd-retry-panel = diff --git a/browser/locales/en-US/browser/firefoxView.ftl b/browser/locales/en-US/browser/firefoxView.ftl index 6de9c96e1348..2cc71acb274a 100644 --- a/browser/locales/en-US/browser/firefoxView.ftl +++ b/browser/locales/en-US/browser/firefoxView.ftl @@ -33,7 +33,6 @@ firefoxview-tabpickup-synctabs-primarybutton = Sync open tabs firefoxview-syncedtabs-synctabs-header = Update your sync settings firefoxview-syncedtabs-synctabs-description = To see tabs from other devices, you need to sync your open tabs. -firefoxview-syncedtabs-synctabs-checkbox = Allow open tabs to sync firefoxview-syncedtabs-loading-header = Sync in progress firefoxview-syncedtabs-loading-description = When it’s done, you’ll see any tabs you have open on other devices. Check back soon. diff --git a/browser/locales/en-US/browser/genai.ftl b/browser/locales/en-US/browser/genai.ftl index 9b0fcfce4e67..4644b88e4ad6 100644 --- a/browser/locales/en-US/browser/genai.ftl +++ b/browser/locales/en-US/browser/genai.ftl @@ -93,8 +93,6 @@ genai-header-close-button = genai-provider-view-details = .label = View chatbot details -genai-provider-about-chatbots = - .label = About these chatbots genai-options-reload-generic = .label = Reload AI chatbot # $provider (string) - name of the provider diff --git a/browser/locales/en-US/browser/pageInfo.ftl b/browser/locales/en-US/browser/pageInfo.ftl index ac8e9d2f97cb..88e8ac84a6f5 100644 --- a/browser/locales/en-US/browser/pageInfo.ftl +++ b/browser/locales/en-US/browser/pageInfo.ftl @@ -166,7 +166,6 @@ media-unknown-not-cached = .value = Unknown (not cached) permissions-use-default = .label = Use Default -security-no-visits = No # This string is used to display the number of meta tags # in the General Tab @@ -244,12 +243,6 @@ media-file-size = { $size } KB ## Variables: ## $website (string) — The url of the website pageInfo is getting info for -# This string is used to display the website name next to the -# "Block Images" checkbox in the media tab -media-block-image = - .label = Block Images from { $website } - .accesskey = B - # This string is used to display the URL of the website on top of the # pageInfo dialog box page-info-page = diff --git a/browser/locales/en-US/browser/preferences/connection.ftl b/browser/locales/en-US/browser/preferences/connection.ftl index 4ad380c9a441..8240f620bc86 100644 --- a/browser/locales/en-US/browser/preferences/connection.ftl +++ b/browser/locales/en-US/browser/preferences/connection.ftl @@ -97,5 +97,3 @@ connection-dns-over-https-url-custom = .label = Custom .accesskey = C .tooltiptext = Enter your preferred URL for resolving DNS over HTTPS - -connection-dns-over-https-custom-label = Custom diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl index 20d641ba2efc..14d079c307b3 100644 --- a/browser/locales/en-US/browser/preferences/preferences.ftl +++ b/browser/locales/en-US/browser/preferences/preferences.ftl @@ -3,7 +3,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. do-not-track-removal = We no longer support the “Do Not Track” signal -do-not-track-learn-more = Learn more global-privacy-control-description = .label = Tell websites not to sell or share my data @@ -156,9 +155,6 @@ windows-launch-on-login = windows-launch-on-login-disabled = This preference has been disabled in Windows. To change, visit Startup Apps in System settings. windows-launch-on-login-profile-disabled = Enable this preference by checking “{ profile-manager-use-selected.label }” in the “Choose User Profile” window. -startup-restore-warn-on-quit = - .label = Warn you when quitting the browser - disable-extension = .label = Disable Extension @@ -548,10 +544,6 @@ update-application-check-choose = .label = Check for updates but let you choose to install them .accesskey = C -update-application-manual = - .label = Never check for updates (not recommended) - .accesskey = N - update-application-background-enabled = .label = When { -brand-short-name } is not running .accesskey = W @@ -649,14 +641,10 @@ browsing-picture-in-picture-toggle-enabled = .label = Enable Picture-in-Picture video controls .accesskey = E -browsing-picture-in-picture-learn-more = Learn more - browsing-media-control = .label = Control media via keyboard, headset, or virtual interface .accesskey = v -browsing-media-control-learn-more = Learn more - browsing-cfr-recommendations = .label = Recommend extensions as you browse .accesskey = R @@ -664,8 +652,6 @@ browsing-cfr-features = .label = Recommend features as you browse .accesskey = f -browsing-cfr-recommendations-learn-more = Learn more - ## General Section - Proxy network-settings-title = Network Settings @@ -1195,19 +1181,6 @@ sitedata-delete-on-close = sitedata-delete-on-close-private-browsing2 = Based on your history settings, { -brand-short-name } deletes cookies and site data from your session when you close the browser. -sitedata-allow-cookies-option = - .label = Accept cookies and site data - .accesskey = A - -sitedata-disallow-cookies-option = - .label = Block cookies and site data - .accesskey = B - -# This label means 'type of content that is blocked', and is followed by a drop-down list with content types below. -# The list items are the strings named sitedata-block-*-option*. -sitedata-block-desc = Type blocked - .accesskey = T - sitedata-option-block-cross-site-trackers = .label = Cross-site trackers sitedata-option-block-cross-site-tracking-cookies = diff --git a/browser/locales/en-US/browser/reportBrokenSite.ftl b/browser/locales/en-US/browser/reportBrokenSite.ftl index 3c44110bc129..229ada7467bf 100644 --- a/browser/locales/en-US/browser/reportBrokenSite.ftl +++ b/browser/locales/en-US/browser/reportBrokenSite.ftl @@ -42,7 +42,6 @@ report-broken-site-panel-button-okay = report-broken-site-panel-button-send = .label = Send -report-broken-site-panel-unspecified = Unspecified report-broken-site-panel-report-sent-label = Your report has been sent report-broken-site-panel-report-sent-header = .label = Your report has been sent diff --git a/browser/locales/en-US/browser/shopping.ftl b/browser/locales/en-US/browser/shopping.ftl index af56bca978cd..e29573923b0d 100644 --- a/browser/locales/en-US/browser/shopping.ftl +++ b/browser/locales/en-US/browser/shopping.ftl @@ -64,7 +64,6 @@ shopping-message-bar-warning-product-not-available-reported = .heading = Info coming soon .message = We should have info about this product’s reviews within 24 hours. Please check back. -shopping-message-bar-analysis-in-progress-title2 = Checking review quality shopping-message-bar-analysis-in-progress-message2 = This could take about 60 seconds. # Variables: diff --git a/browser/locales/en-US/browser/sync.ftl b/browser/locales/en-US/browser/sync.ftl index 11212868b34e..3dadbe1f6eaf 100644 --- a/browser/locales/en-US/browser/sync.ftl +++ b/browser/locales/en-US/browser/sync.ftl @@ -41,16 +41,16 @@ fxa-menu-sign-out = .label = Sign out… -fxa-menu-sync-title = Sync fxa-menu-sync-description = Access your web anywhere - -# Dialog strings that we show the user when signing into Mozilla account/setting up sync +## Dialog strings that we show the user when signing into Mozilla account/setting up sync sync-setup-verify-continue = Continue sync-setup-verify-title = Merge Warning sync-setup-verify-heading = Are you sure you want to sign in to sync? +## + # The user was previously signed into sync. This dialog confirms to the user # that they will be merging the data from the previously signed in into the newly signed in one # Variables: diff --git a/browser/locales/en-US/browser/touchbar/touchbar.ftl b/browser/locales/en-US/browser/touchbar/touchbar.ftl index aee15423b8d6..43a66d7a311f 100644 --- a/browser/locales/en-US/browser/touchbar/touchbar.ftl +++ b/browser/locales/en-US/browser/touchbar/touchbar.ftl @@ -32,6 +32,5 @@ search-bookmarks = Bookmarks search-history = History search-opentabs = Open Tabs search-tags = Tags -search-titles = Titles ## diff --git a/browser/locales/en-US/chrome/browser/shellservice.properties b/browser/locales/en-US/chrome/browser/shellservice.properties index 111243c1fcf9..a4284561c051 100644 --- a/browser/locales/en-US/chrome/browser/shellservice.properties +++ b/browser/locales/en-US/chrome/browser/shellservice.properties @@ -2,15 +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/. -# LOCALIZATION NOTE (setDefaultBrowserTitle, setDefaultBrowserMessage, setDefaultBrowserDontAsk, setDefaultBrowserAlertConfirm.label, setDefaultBrowserAlertNotNow.label): -# These strings are used as an alternative to the ones above, in a modal dialog. -# %S will be replaced by brandShortName -setDefaultBrowserTitle=Default Browser -setDefaultBrowserMessage=%S is not currently set as your default browser. Would you like to make it your default browser? -setDefaultBrowserDontAsk=Always perform this check when starting %S. -setDefaultBrowserAlertConfirm.label=Use %S as my default browser -setDefaultBrowserAlertNotNow.label=Not now - desktopBackgroundLeafNameWin=Desktop Background.bmp DesktopBackgroundDownloading=Saving Picture… DesktopBackgroundSet=Set Desktop Background diff --git a/dom/l10n/tests/mochitest/document_l10n/test_connectRoot_webcomponent.html b/dom/l10n/tests/mochitest/document_l10n/test_connectRoot_webcomponent.html index 3f2def3547cc..891ab36bad7c 100644 --- a/dom/l10n/tests/mochitest/document_l10n/test_connectRoot_webcomponent.html +++ b/dom/l10n/tests/mochitest/document_l10n/test_connectRoot_webcomponent.html @@ -77,7 +77,7 @@ diff --git a/dom/l10n/tests/mochitest/document_l10n/test_connectRoot_webcomponent_lazy.html b/dom/l10n/tests/mochitest/document_l10n/test_connectRoot_webcomponent_lazy.html index b74bbc00c8e5..8b90f1186330 100644 --- a/dom/l10n/tests/mochitest/document_l10n/test_connectRoot_webcomponent_lazy.html +++ b/dom/l10n/tests/mochitest/document_l10n/test_connectRoot_webcomponent_lazy.html @@ -91,7 +91,7 @@