Bug 1597994 - Update FxA menu manage account labels r=markh,flod

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

--HG--
extra : moz-landing-system : lando

browser/base/content/browser-sync.js

@@ -498,7 +498,9 @@ var gSync = {
       fxaMenuAccountButtonEl.setAttribute("closemenu", "none");
 
       headerTitle = state.email;
-      headerDescription = this.fxaStrings.GetStringFromName("account.settings");
+      headerDescription = this.fxaStrings.GetStringFromName(
+        "account.accountSettings"
+      );
 
       panelTitle = state.displayName ? state.displayName : panelTitle;
     }

browser/base/content/browser.js

@@ -641,10 +641,6 @@ function updateFxaToolbarMenu(enable, isInitialUpdate = false) {
     let hideSvcs = !gFxaSendLoginUrl && !gFxaMonitorLoginUrl;
     document.getElementById("fxa-menu-service-separator").hidden = hideSvcs;
     document.getElementById("fxa-menu-service-label").hidden = hideSvcs;
-
-    document.getElementById(
-      "fxa-menu-device-name-label"
-    ).value = gFxaDeviceName;
   } else {
     mainWindowEl.removeAttribute("fxatoolbarmenu");
   }

browser/base/content/test/sync/browser_sync.js

@@ -52,7 +52,7 @@ add_task(async function test_ui_state_signedin() {
   checkMenuBarItem("sync-syncnowitem");
   checkFxaToolbarButtonPanel({
     headerTitle: "foo@bar.com",
-    headerDescription: "Settings",
+    headerDescription: "Account Settings",
     enabledItems: [
       "PanelUI-fxa-menu-sendtab-button",
       "PanelUI-fxa-menu-connect-device-button",
@@ -63,7 +63,6 @@ add_task(async function test_ui_state_signedin() {
       "PanelUI-fxa-menu-monitor-button",
       "PanelUI-fxa-menu-send-button",
       "PanelUI-fxa-menu-account-settings-button",
-      "PanelUI-fxa-menu-account-devices-button",
       "PanelUI-fxa-menu-account-signout-button",
     ],
     disabledItems: [],
@@ -152,7 +151,7 @@ add_task(async function test_ui_state_syncdisabled() {
   checkMenuBarItem("sync-enable");
   checkFxaToolbarButtonPanel({
     headerTitle: "foo@bar.com",
-    headerDescription: "Settings",
+    headerDescription: "Account Settings",
     enabledItems: [
       "PanelUI-fxa-menu-sendtab-button",
       "PanelUI-fxa-menu-connect-device-button",
@@ -162,7 +161,6 @@ add_task(async function test_ui_state_syncdisabled() {
       "PanelUI-fxa-menu-monitor-button",
       "PanelUI-fxa-menu-send-button",
       "PanelUI-fxa-menu-account-settings-button",
-      "PanelUI-fxa-menu-account-devices-button",
       "PanelUI-fxa-menu-account-signout-button",
     ],
     disabledItems: [],

browser/components/customizableui/content/panelUI.inc.xhtml

@@ -810,20 +810,14 @@
       </vbox>
     </panelview>
 
-    <panelview id="PanelUI-fxa-menu-account-panel" flex="1" title="&fxa.menu.settings.label;" class="PanelUI-subView" descriptionheightworkaround="true">
+    <panelview id="PanelUI-fxa-menu-account-panel" flex="1" title="&fxa.menu.accountSettings.label;" class="PanelUI-subView" descriptionheightworkaround="true">
       <vbox class="panel-subview-body">
         <toolbarbutton id="PanelUI-fxa-menu-account-settings-button"
                       class="subviewbutton subviewbutton-iconic"
-                      label="&fxa.menu.accountSettings.label;"
+                      label="&fxa.menu.manageAccount2.label;"
                       type="open-to-new"
                       oncommand="gSync.openFxAManagePageFromFxaMenu(this)"/>
         <toolbarseparator/>
-        <label id="fxa-menu-device-name-label" class="subview-subheader"/>
-        <toolbarbutton id="PanelUI-fxa-menu-account-devices-button"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&fxa.menu.deviceSettings.label;"
-                       oncommand="gSync.openPrefsFromFxaMenu('sync_settings', this);"/>
-        <toolbarseparator/>
         <toolbarbutton id="PanelUI-fxa-menu-account-signout-button"
                 class="subviewbutton subviewbutton-iconic"
                 label="&fxa.menu.signOut.label;"

browser/locales/en-US/chrome/browser/accounts.properties

@@ -110,9 +110,9 @@ singleTabArrivingWithTruncatedURL.body = %S…
 # Used as a default header for the FxA toolbar menu.
 account.title = Account
 
-# LOCALIZATION NOTE (account.settings):
+# LOCALIZATION NOTE (account.accountSettings):
 # Used as the description below user's email in the FxA toolbar menu.
-account.settings = Settings
+account.accountSettings = Account Settings
 
 # LOCALIZATION NOTE (account.finishAccountSetup):
 # Used as the FxA toolbar menu item value when user has not

browser/locales/en-US/chrome/browser/browser.dtd

@@ -84,8 +84,8 @@ convenience of Safari and Chrome users on macOS. See bug 1398988. -->
 <!ENTITY fxa.menu.account.label "Account">
 <!ENTITY fxa.menu.settings.label "Settings">
 <!ENTITY fxa.menu.accountSettings.label "Account Settings">
+<!ENTITY fxa.menu.manageAccount2.label "Manage Account">
 <!ENTITY fxa.menu.signOut.label "Sign Out…">
-<!ENTITY fxa.menu.deviceSettings.label "Device Settings">
 <!ENTITY fxa.menu.setupSync.label "Set Up &syncBrand.shortName.label;…">
 
 <!-- LOCALIZATION NOTE (fxa.service) Used to define the different FxA services