Bug 1879211: Move PXI toolbar strings into localization tree r=markh,flod

Differential Revision: https://phabricator.services.mozilla.com/D201025

browser/base/content/appmenu-viewcache.inc.xhtml

@@ -617,8 +617,8 @@
         <toolbarbutton id="PanelUI-fxa-menu-sync-button" class="subviewbutton subviewbutton-iconic"
           oncommand="gSync.openPrefsFromFxaMenu('sync_cta', this);">
           <vbox flex="1">
-            <label id="fxa-menu-header-title" crop="end" data-l10n-id="sync-menu-title" />
+            <label id="fxa-menu-header-title" crop="end" data-l10n-id="fxa-menu-sync-title" />
-            <label id="cta-menu-header-description" crop="end" data-l10n-id="sync-menu-description" />
+            <label id="cta-menu-header-description" crop="end" data-l10n-id="fxa-menu-sync-description" />
           </vbox>
           <toolbarseparator id="PanelUI-remote-tabs-separator" />
         </toolbarbutton>
@@ -628,9 +628,9 @@
           <vbox flex="1">
             <hbox align="center">
               <image class="PanelUI-fxa-menu-monitor-button ctaMenuLogo" role="presentation" />
-              <label id="fxa-menu-header-title" crop="end" data-l10n-id="pxi-menu-monitor-title" />
+              <label id="fxa-menu-header-title" crop="end" data-l10n-id="appmenuitem-monitor-title" />
             </hbox>
-            <label id="cta-menu-header-description" crop="end" data-l10n-id="pxi-menu-monitor-description" />
+            <label id="cta-menu-header-description" crop="end" data-l10n-id="appmenuitem-monitor-description" />
           </vbox>
         </toolbarbutton>
         <toolbarbutton id="PanelUI-fxa-menu-relay-button" class="subviewbutton subviewbutton-iconic"
@@ -638,9 +638,9 @@
           <vbox flex="1">
             <hbox align="center">
               <image class="PanelUI-fxa-menu-relay-button ctaMenuLogo" role="presentation" />
-              <label id="fxa-menu-header-title" crop="end" data-l10n-id="pxi-menu-relay-title" />
+              <label id="fxa-menu-header-title" crop="end" data-l10n-id="appmenuitem-relay-title" />
             </hbox>
-            <label id="cta-menu-header-description" crop="end" data-l10n-id="pxi-menu-relay-description" />
+            <label id="cta-menu-header-description" crop="end" data-l10n-id="appmenuitem-relay-description" />
           </vbox>
         </toolbarbutton>
         <toolbarbutton id="PanelUI-fxa-menu-vpn-button" class="subviewbutton subviewbutton-iconic"
@@ -648,9 +648,9 @@
           <vbox flex="1">
             <hbox align="center">
               <image class="PanelUI-fxa-menu-vpn-button ctaMenuLogo" role="presentation" />
-              <label id="fxa-menu-header-title" crop="end" data-l10n-id="pxi-menu-vpn-title" />
+              <label id="fxa-menu-header-title" crop="end" data-l10n-id="appmenuitem-vpn-title" />
             </hbox>
-            <label id="cta-menu-header-description" crop="end" data-l10n-id="pxi-menu-vpn-description" />
+            <label id="cta-menu-header-description" crop="end" data-l10n-id="appmenuitem-vpn-description" />
           </vbox>
         </toolbarbutton>
       </vbox>

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) {

browser/base/content/browser.xhtml

@@ -98,7 +98,6 @@
   <link rel="localization" href="preview/select-translations.ftl"/>
   <link rel="localization" href="browser/shopping.ftl"/>
   <link rel="localization" href="preview/shopping.ftl"/>
-  <link rel="localization" href="preview/appmenu.ftl" />
 
   <title data-l10n-id="browser-main-window-title"></title>
 

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();

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

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

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)

services/fxaccounts/content/appmenu.ftl

@@ -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