Commit cbafe2ba authored by Molly Howell's avatar Molly Howell
Browse files

Bug 1727916 - Convert several customizable toolbar item names to sentence... 

Bug 1727916 - Convert several customizable toolbar item names to sentence case. r=fluent-reviewers,flod,emalysz

This required migrating several strings to Fluent, and the bulk of this patch
is those migrations. The rest of the items matched up with an entry in the app
menu, so those items were switched over to use the app menu strings, and one
had to be copied in order to avoid adding a tooltip to the app menu item.

Differential Revision: https://phabricator.services.mozilla.com/D124270
parent 90420e54

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

+3 −3
Original line number Diff line number Diff line
@@ -425,15 +425,15 @@ 
            <hbox flex="1">

              <image class="syncNowBtn"/>

              <label class="syncnow-label"

                     data-l10n-id="remote-tabs-sync-now"

                     sync-now-data-l10n-id="remote-tabs-sync-now"

                     data-l10n-id="appmenuitem-fxa-toolbar-sync-now2"

                     sync-now-data-l10n-id="appmenuitem-fxa-toolbar-sync-now2"

                     syncing-data-l10n-id="fxa-toolbar-sync-syncing2"

                     crop="end"/>

            </hbox>

          </toolbarbutton>

          <toolbarbutton id="PanelUI-remotetabs-view-managedevices"

                         class="subviewbutton"

                         data-l10n-id="remote-tabs-manage-account"

                         data-l10n-id="appmenuitem-fxa-manage-account"

                         oncommand="gSync.openDevicesManagementPage('syncedtabs-menupanel');">

                         <observes element="sidebar-box" attribute="positionend"/>

          </toolbarbutton>

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

+2 −2
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ 




    <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional"

                   label="&newNavigatorCmd.label;"

                   data-l10n-id="appmenuitem-new-window"

                   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"

                   label="&fullScreenCmd.label;"

                   data-l10n-id="appmenuitem-fullscreen"

                   tooltip="dynamic-shortcut-tooltip"/>



    <toolbarbutton id="bookmarks-menu-button"

browser/components/customizableui/CustomizableWidgets.jsm

+5 −5
Original line number Diff line number Diff line
@@ -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",

    tooltiptext: "email-link-button.tooltiptext3",

    l10nId: "toolbar-button-email-link",

    onCommand(aEvent) {

      let win = aEvent.view;

      win.MailIntegration.sendLinkForBrowser(win.gBrowser.selectedBrowser);
@@ -449,8 +449,7 @@ const CustomizableWidgets = [ 
if (Services.prefs.getBoolPref("identity.fxaccounts.enabled")) {

  CustomizableWidgets.push({

    id: "sync-button",

    label: "remotetabs-panelmenu.label",

    tooltiptext: "remotetabs-panelmenu.tooltiptext2",

    l10nId: "toolbar-button-synced-tabs",

    type: "view",

    viewId: "PanelUI-remotetabs",

    onViewShowing(aEvent) {
@@ -606,6 +605,7 @@ if (Services.prefs.getBoolPref("privacy.panicButton.enabled")) { 
if (PrivateBrowsingUtils.enabled) {

  CustomizableWidgets.push({

    id: "privatebrowsing-button",

    l10nId: "toolbar-button-new-private-window",

    shortcutId: "key_privatebrowsing",

    onCommand(e) {

      let win = e.target.ownerGlobal;

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

+26 −6
Original line number Diff line number Diff line
@@ -685,6 +685,32 @@ 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



# Variables

# $shortcut (string) - Keyboard shortcut to open a new private browsing window

toolbar-button-new-private-window =

  .label = New private window

  .tooltiptext = Open a new private browsing window ({ $shortcut })



## 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.
@@ -705,12 +731,6 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
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">



<!ENTITY printButton.label            "Print">

<!ENTITY printButton.tooltip          "Print this page">