diff --git a/browser/base/content/appmenu-viewcache.inc.xhtml b/browser/base/content/appmenu-viewcache.inc.xhtml index 171758cc3c91..e1e039ada0af 100644 --- a/browser/base/content/appmenu-viewcache.inc.xhtml +++ b/browser/base/content/appmenu-viewcache.inc.xhtml @@ -617,8 +617,8 @@ - @@ -628,9 +628,9 @@ - - - - - - diff --git a/browser/base/content/browser-sync.js b/browser/base/content/browser-sync.js index 665d7505e2ca..50e326879176 100644 --- a/browser/base/content/browser-sync.js +++ b/browser/base/content/browser-sync.js @@ -385,8 +385,6 @@ var gSync = { "browser/appmenu.ftl", "browser/sync.ftl", "toolkit/branding/accounts.ftl", - // untranslated FTL - "preview/appmenu.ftl", ], true )); @@ -925,7 +923,7 @@ var gSync = { syncSetupButtonEl.removeAttribute("hidden"); let headerTitleL10nId = this.PXI_TOOLBAR_ENABLED - ? "appmenuitem-moz-accounts-sign-in" + ? "appmenuitem-sign-in-account" : "appmenuitem-fxa-sign-in"; let headerDescription; if (state.status === UIState.STATUS_NOT_CONFIGURED) { diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml index 9719727d559f..b4886fb5f745 100644 --- a/browser/base/content/browser.xhtml +++ b/browser/base/content/browser.xhtml @@ -98,7 +98,6 @@ - diff --git a/browser/base/content/test/sync/browser_sync.js b/browser/base/content/test/sync/browser_sync.js index 7b773f5a155c..a91da6de0987 100644 --- a/browser/base/content/test/sync/browser_sync.js +++ b/browser/base/content/test/sync/browser_sync.js @@ -607,7 +607,7 @@ add_task(async function test_experiment_ui_state_unconfigured() { checkFxAAvatar("not_configured"); let expectedLabel = gSync.fluentStrings.formatValueSync( - "appmenuitem-moz-accounts-sign-in" + "appmenuitem-sign-in-account" ); await openMainPanel(); diff --git a/browser/locales/en-US/browser/appmenu.ftl b/browser/locales/en-US/browser/appmenu.ftl index 1040491824cc..5ad2d75f6215 100644 --- a/browser/locales/en-US/browser/appmenu.ftl +++ b/browser/locales/en-US/browser/appmenu.ftl @@ -303,3 +303,14 @@ appmenu-developer-tools-extensions = .label = Extensions for developers appmenuitem-report-broken-site = .label = Report broken site + +## Panel for privacy and security products + +appmenuitem-sign-in-account = Sign in to your account + +appmenuitem-monitor-title = { -monitor-brand-short-name } +appmenuitem-monitor-description = Get data breach alerts +appmenuitem-relay-title = { -relay-brand-short-name } +appmenuitem-relay-description = Mask your real email and phone +appmenuitem-vpn-title = { -mozilla-vpn-brand-name } +appmenuitem-vpn-description = Protect your online activity diff --git a/browser/locales/en-US/browser/sync.ftl b/browser/locales/en-US/browser/sync.ftl index 17a36133dd60..90416a581b22 100644 --- a/browser/locales/en-US/browser/sync.ftl +++ b/browser/locales/en-US/browser/sync.ftl @@ -39,3 +39,7 @@ fxa-menu-send-tab-to-device-description = Send a tab instantly to any device you fxa-menu-sign-out = .label = Sign out… + + +fxa-menu-sync-title = Sync +fxa-menu-sync-description = Access your web anywhere diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn index 6d3b8d1f4318..781c6677d90a 100644 --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -14,7 +14,6 @@ preview/enUS-searchFeatures.ftl (../components/urlbar/content/enUS-searchFeatures.ftl) preview/shopping.ftl (../components/shopping/content/shopping.ftl) preview/onboarding.ftl (../components/aboutwelcome/content/onboarding.ftl) - preview/appmenu.ftl (../../services/fxaccounts/content/appmenu.ftl) preview/select-translations.ftl (../locales-preview/select-translations.ftl) preview/translations.ftl (../locales-preview/translations.ftl) browser (%browser/**/*.ftl) diff --git a/services/fxaccounts/content/appmenu.ftl b/services/fxaccounts/content/appmenu.ftl deleted file mode 100644 index 0aee22d83cde..000000000000 --- a/services/fxaccounts/content/appmenu.ftl +++ /dev/null @@ -1,19 +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 not in a locales directory to prevent it from -### being translated as the feature is still in heavy development -### and strings are likely to change often. - --mozaccount-brand-name = Mozilla account -appmenuitem-moz-accounts-sign-in = Sign in to your { -mozaccount-brand-name } - -sync-menu-title = Sync -sync-menu-description = Access your web anywhere -pxi-menu-monitor-title = { -monitor-brand-short-name } -pxi-menu-monitor-description = Get data breach alerts -pxi-menu-relay-title = { -relay-brand-short-name } -pxi-menu-relay-description = Mask your real email and phone -pxi-menu-vpn-title = { -mozilla-vpn-brand-name } -pxi-menu-vpn-description = Protect your online activity