From addc3026953e1dfd70f8c10c8d7dd568a4f90b1a Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Tue, 13 Jun 2017 19:03:52 +0200 Subject: [PATCH] Backed out changeset cbd4339e2ca1 (bug 1368145) for failing browser-chrome test browser_contextmenu_sendpage.js. r=backout --- browser/base/content/browser-sync.js | 4 ++-- .../base/content/test/urlbar/browser_page_action_menu.js | 2 +- browser/locales/en-US/chrome/browser/accounts.properties | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/base/content/browser-sync.js b/browser/base/content/browser-sync.js index 0af5ec83cea0..6412cd637df9 100644 --- a/browser/base/content/browser-sync.js +++ b/browser/base/content/browser-sync.js @@ -326,12 +326,12 @@ var gSync = { addTargetDevice(client.id, client.name, client.type); } - // "Send to All Devices" menu item + // "All devices" menu item if (clients.length > 1) { const separator = createDeviceNodeFn(); separator.classList.add("sync-menuitem"); fragment.appendChild(separator); - const allDevicesLabel = this.fxaStrings.GetStringFromName("sendToAllDevices.menuitem"); + const allDevicesLabel = this.fxaStrings.GetStringFromName("sendTabToAllDevices.menuitem"); addTargetDevice("", allDevicesLabel, ""); } } diff --git a/browser/base/content/test/urlbar/browser_page_action_menu.js b/browser/base/content/test/urlbar/browser_page_action_menu.js index 222e1f973e08..69963f7ead5a 100644 --- a/browser/base/content/test/urlbar/browser_page_action_menu.js +++ b/browser/base/content/test/urlbar/browser_page_action_menu.js @@ -393,7 +393,7 @@ add_task(async function sendToDevice_devices() { expectedItems.push( null, { - label: "Send to All Devices", + label: "All Devices", } ); checkSendToDeviceItems(expectedItems); diff --git a/browser/locales/en-US/chrome/browser/accounts.properties b/browser/locales/en-US/chrome/browser/accounts.properties index 27aa4efa192b..f98ccb525ad8 100644 --- a/browser/locales/en-US/chrome/browser/accounts.properties +++ b/browser/locales/en-US/chrome/browser/accounts.properties @@ -35,9 +35,9 @@ syncStartNotification.body2 = %S will begin syncing momentarily. deviceDisconnectedNotification.title = Sync disconnected deviceDisconnectedNotification.body = This computer has been successfully disconnected from Firefox Sync. -# LOCALIZATION NOTE (sendToAllDevices.menuitem) -# Displayed in the Send Tab/Page/Link to Device context menu when right clicking a tab, a page or a link. -sendToAllDevices.menuitem = Send to All Devices +# LOCALIZATION NOTE (sendTabToAllDevices.menuitem) +# Displayed in the Send Tabs context menu when right clicking a tab, a page or a link. +sendTabToAllDevices.menuitem = All Devices # LOCALIZATION NOTE (tabArrivingNotification.title, tabArrivingNotificationWithDevice.title, # tabsArrivingNotification.title, unnamedTabsArrivingNotification2.body,