Backed out changeset 63c10baf1578 (bug 1727916) for causing browser-chrome failures in en-US/appmenuitem.

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

@@ -55,7 +55,7 @@
                      command="cmd_newNavigator"/>
       <toolbarbutton id="appMenu-new-private-window-button2"
                      class="subviewbutton"
-                     data-l10n-id="appmenuitem-new-private-window2"
+                     data-l10n-id="appmenuitem-new-private-window"
                      key="key_privatebrowsing"
                      command="Tools:PrivateBrowsing"/>
       <toolbarseparator/>
@@ -425,15 +425,15 @@
             <hbox flex="1">
               <image class="syncNowBtn"/>
               <label class="syncnow-label"
-                     data-l10n-id="appmenuitem-fxa-toolbar-sync-now2"
+                     data-l10n-id="remote-tabs-sync-now"
-                     sync-now-data-l10n-id="appmenuitem-fxa-toolbar-sync-now2"
+                     sync-now-data-l10n-id="remote-tabs-sync-now"
                      syncing-data-l10n-id="fxa-toolbar-sync-syncing2"
                      crop="end"/>
             </hbox>
           </toolbarbutton>
           <toolbarbutton id="PanelUI-remotetabs-view-managedevices"
                          class="subviewbutton"
-                         data-l10n-id="appmenuitem-fxa-manage-account"
+                         data-l10n-id="remote-tabs-manage-account"
                          oncommand="gSync.openDevicesManagementPage('syncedtabs-menupanel');">
                          <observes element="sidebar-box" attribute="positionend"/>
           </toolbarbutton>

browser/base/content/navigator-toolbox.inc.xhtml

@@ -563,7 +563,7 @@
 
 
     <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                   data-l10n-id="appmenuitem-new-window"
+                   label="&newNavigatorCmd.label;"
                    command="cmd_newNavigator"
                    tooltip="dynamic-shortcut-tooltip"
                    ondrop="newWindowButtonObserver.onDrop(event)"
@@ -573,7 +573,7 @@
     <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                    observes="View:FullScreen"
                    type="checkbox"
-                   data-l10n-id="appmenuitem-fullscreen"
+                   label="&fullScreenCmd.label;"
                    tooltip="dynamic-shortcut-tooltip"/>
 
     <toolbarbutton id="bookmarks-menu-button"

browser/components/customizableui/CustomizableWidgets.jsm

@@ -233,8 +233,8 @@ const CustomizableWidgets = [
   },
   {
     id: "save-page-button",
-    l10nId: "toolbar-button-save-page",
     shortcutId: "key_savePage",
+    tooltiptext: "save-page-button.tooltiptext3",
     onCommand(aEvent) {
       let win = aEvent.target.ownerGlobal;
       win.saveBrowser(win.gBrowser.selectedBrowser);
@@ -253,8 +253,8 @@ const CustomizableWidgets = [
   },
   {
     id: "open-file-button",
-    l10nId: "toolbar-button-open-file",
     shortcutId: "openFileKb",
+    tooltiptext: "open-file-button.tooltiptext3",
     onCommand(aEvent) {
       let win = aEvent.target.ownerGlobal;
       win.BrowserOpenFileWindow();
@@ -438,7 +438,7 @@ const CustomizableWidgets = [
   },
   {
     id: "email-link-button",
-    l10nId: "toolbar-button-email-link",
+    tooltiptext: "email-link-button.tooltiptext3",
     onCommand(aEvent) {
       let win = aEvent.view;
       win.MailIntegration.sendLinkForBrowser(win.gBrowser.selectedBrowser);
@@ -449,7 +449,8 @@ const CustomizableWidgets = [
 if (Services.prefs.getBoolPref("identity.fxaccounts.enabled")) {
   CustomizableWidgets.push({
     id: "sync-button",
-    l10nId: "toolbar-button-synced-tabs",
+    label: "remotetabs-panelmenu.label",
+    tooltiptext: "remotetabs-panelmenu.tooltiptext2",
     type: "view",
     viewId: "PanelUI-remotetabs",
     onViewShowing(aEvent) {
@@ -605,7 +606,6 @@ if (Services.prefs.getBoolPref("privacy.panicButton.enabled")) {
 if (PrivateBrowsingUtils.enabled) {
   CustomizableWidgets.push({
     id: "privatebrowsing-button",
-    l10nId: "appmenuitem-new-private-window2",
     shortcutId: "key_privatebrowsing",
     onCommand(e) {
       let win = e.target.ownerGlobal;

browser/locales/en-US/browser/appmenu.ftl

@@ -15,11 +15,8 @@ appmenuitem-new-tab =
     .label = New tab
 appmenuitem-new-window =
     .label = New window
-# Variables
+appmenuitem-new-private-window =
-# $shortcut (string) - Keyboard shortcut to open a new private browsing window
-appmenuitem-new-private-window2 =
     .label = New private window
-    .tooltiptext = Open a new private browsing window ({ $shortcut })
 appmenuitem-passwords =
     .label = Passwords
 appmenuitem-addons-and-themes =

browser/locales/en-US/browser/browser.ftl

@@ -685,26 +685,6 @@ toolbar-overflow-customize-button =
   .label = Customize toolbar…
   .accesskey = C
 
-toolbar-button-email-link =
-  .label = Email link
-  .tooltiptext = Email a link to this page
-
-# Variables:
-#  $shortcut (String): keyboard shortcut to save a copy of the page
-toolbar-button-save-page =
-  .label = Save page
-  .tooltiptext = Save this page ({ $shortcut })
-
-# Variables:
-#  $shortcut (String): keyboard shortcut to open a local file
-toolbar-button-open-file =
-  .label = Open file
-  .tooltiptext = Open a file ({ $shortcut })
-
-toolbar-button-synced-tabs =
-  .label = Synced tabs
-  .tooltiptext = Show tabs from other devices
-
 ## EME notification panel
 
 eme-notifications-drm-content-playing = Some audio or video on this site uses DRM software, which may limit what { -brand-short-name } can let you do with it.
@@ -725,6 +705,12 @@ panel-save-update-password = Password
 addon-removal-title = Remove { $name }?
 addon-removal-abuse-report-checkbox = Report this extension to { -vendor-short-name }
 
+## Remote / Synced tabs
+
+remote-tabs-manage-account =
+  .label = Manage Account
+remote-tabs-sync-now = Sync Now
+
 ##
 
 # "More" item in macOS share menu

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

@@ -20,6 +20,7 @@
 include the word "toolbar" or such, because screen readers already know that
 this container is a toolbar. This avoids double-speaking. -->
 <!ENTITY navbar.accessibleLabel "Navigation">
+<!ENTITY fullScreenCmd.label "Full Screen">
 
 
 <!-- LOCALIZATION NOTE (fxa.menu) Used to define the different labels

browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties

@@ -6,10 +6,25 @@ history-panelmenu.label = History
 # LOCALIZATION NOTE(history-panelmenu.tooltiptext2): %S is the keyboard shortcut
 history-panelmenu.tooltiptext2 = Show your history (%S)
 
+remotetabs-panelmenu.label = Synced Tabs
+remotetabs-panelmenu.tooltiptext2 = Show tabs from other devices
+
+privatebrowsing-button.label = New Private Window
+# LOCALIZATION NOTE(privatebrowsing-button.tooltiptext): %S is the keyboard shortcut
+privatebrowsing-button.tooltiptext = Open a new Private Browsing window (%S)
+
+save-page-button.label = Save Page
+# LOCALIZATION NOTE(save-page-button.tooltiptext3): %S is the keyboard shortcut
+save-page-button.tooltiptext3 = Save this page (%S)
+
 find-button.label = Find
 # LOCALIZATION NOTE(find-button.tooltiptext3): %S is the keyboard shortcut.
 find-button.tooltiptext3 = Find in this page (%S)
 
+open-file-button.label = Open File
+# LOCALIZATION NOTE (open-file-button.tooltiptext3): %S is the keyboard shortcut.
+open-file-button.tooltiptext3 = Open a file (%S)
+
 developer-button.label = Developer
 # LOCALIZATION NOTE(developer-button.tooltiptext): %S is the keyboard shortcut
 developer-button.tooltiptext2 = Open Web developer tools (%S)
@@ -49,6 +64,9 @@ paste-button.label = Paste
 # LOCALIZATION NOTE(paste-button.tooltiptext2): %S is the keyboard shortcut.
 paste-button.tooltiptext2 = Paste (%S)
 
+email-link-button.label = Email Link
+email-link-button.tooltiptext3 = Email a link to this page
+
 panic-button.label = Forget
 panic-button.tooltiptext = Forget about some browsing history
 

python/l10n/fluent_migrations/bug_1727916_customizable_toolbar_widgets.py

@@ -1,103 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate.helpers import transforms_from, VARIABLE_REFERENCE
-from fluent.migrate import COPY, COPY_PATTERN, REPLACE
-
-
-def migrate(ctx):
-    """Bug 1727916 - Switch several customizable toolbar item names to sentence case, part {index}"""
-
-    ctx.add_transforms(
-        "browser/browser/browser.ftl",
-        "browser/browser/browser.ftl",
-        transforms_from(
-            """
-toolbar-button-email-link =
-    .label = { COPY(from_path, "email-link-button.label") }
-    .tooltiptext = { COPY(from_path, "email-link-button.tooltiptext3") }
-toolbar-button-synced-tabs =
-    .label = { COPY(from_path, "remotetabs-panelmenu.label") }
-    .tooltiptext = { COPY(from_path, "remotetabs-panelmenu.tooltiptext2") }
-""",
-            from_path="browser/chrome/browser/customizableui/customizableWidgets.properties",
-        ),
-    )
-
-    ctx.add_transforms(
-        "browser/browser/browser.ftl",
-        "browser/browser/browser.ftl",
-        [
-            FTL.Message(
-                id=FTL.Identifier("toolbar-button-save-page"),
-                attributes=[
-                    FTL.Attribute(
-                        id=FTL.Identifier("label"),
-                        value=COPY(
-                            "browser/chrome/browser/customizableui/customizableWidgets.properties",
-                            "save-page-button.label",
-                        ),
-                    ),
-                    FTL.Attribute(
-                        id=FTL.Identifier("tooltiptext"),
-                        value=REPLACE(
-                            "browser/chrome/browser/customizableui/customizableWidgets.properties",
-                            "save-page-button.tooltiptext3",
-                            {"%1$S": VARIABLE_REFERENCE("shortcut")},
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier("toolbar-button-open-file"),
-                attributes=[
-                    FTL.Attribute(
-                        id=FTL.Identifier("label"),
-                        value=COPY(
-                            "browser/chrome/browser/customizableui/customizableWidgets.properties",
-                            "open-file-button.label",
-                        ),
-                    ),
-                    FTL.Attribute(
-                        id=FTL.Identifier("tooltiptext"),
-                        value=REPLACE(
-                            "browser/chrome/browser/customizableui/customizableWidgets.properties",
-                            "open-file-button.tooltiptext3",
-                            {"%1$S": VARIABLE_REFERENCE("shortcut")},
-                        ),
-                    ),
-                ],
-            ),
-        ],
-    )
-
-    ctx.add_transforms(
-        "browser/browser/appmenu.ftl",
-        "browser/browser/appmenu.ftl",
-        [
-            FTL.Message(
-                id=FTL.Identifier("appmenuitem-new-private-window2"),
-                attributes=[
-                    FTL.Attribute(
-                        id=FTL.Identifier("label"),
-                        value=COPY_PATTERN(
-                            "browser/browser/appmenu.ftl",
-                            "appmenuitem-new-private-window.label",
-                        ),
-                    ),
-                    FTL.Attribute(
-                        id=FTL.Identifier("tooltiptext"),
-                        value=REPLACE(
-                            "browser/chrome/browser/customizableui/customizableWidgets.properties",
-                            "privatebrowsing-button.tooltiptext",
-                            {"%1$S": VARIABLE_REFERENCE("shortcut")},
-                        ),
-                    ),
-                ],
-            ),
-        ],
-    )