From 51f7139dc56bed104f3b1b08e7757ef7da162f2e Mon Sep 17 00:00:00 2001
From: Steve Armand <stevea1@mac.com>
Date: Mon, 28 Aug 2017 21:38:49 -0400
Subject: [PATCH] =?UTF-8?q?Bug=201390644=20-=20Change=20the=20mid-sync=20s?=
 =?UTF-8?q?tate=20of=20"Syncing=E2=80=A6"=20to=20"Syncing=20Tabs=E2=80=A6"?=
 =?UTF-8?q?.=20r=3Deoger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

MozReview-Commit-ID: Ef1aWhWEnZh

--HG--
extra : rebase_source : 458685d94d16acfb21d080287484869c93d7a091
---
 browser/base/content/browser-sync.js           | 2 +-
 browser/base/content/test/sync/browser_sync.js | 2 +-
 services/sync/locales/en-US/sync.properties    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/base/content/browser-sync.js b/browser/base/content/browser-sync.js
index 9d47af568a10..6297533b67f9 100644
--- a/browser/base/content/browser-sync.js
+++ b/browser/base/content/browser-sync.js
@@ -492,7 +492,7 @@ var gSync = {
 
     let broadcaster = document.getElementById("sync-status");
     broadcaster.setAttribute("syncstatus", "active");
-    broadcaster.setAttribute("label", this.syncStrings.GetStringFromName("syncing2.label"));
+    broadcaster.setAttribute("label", this.syncStrings.GetStringFromName("syncingtabs.label"));
     broadcaster.setAttribute("disabled", "true");
   },
 
diff --git a/browser/base/content/test/sync/browser_sync.js b/browser/base/content/test/sync/browser_sync.js
index 86ebd458e845..bba60ea7fda9 100644
--- a/browser/base/content/test/sync/browser_sync.js
+++ b/browser/base/content/test/sync/browser_sync.js
@@ -198,7 +198,7 @@ function checkSyncNowButton(buttonId, syncing, tooltip = null) {
 
   is(remoteTabsButton.hasAttribute("disabled"), syncing, "disabled has the right value");
   if (syncing) {
-    is(remoteTabsButton.getAttribute("label"), gSync.syncStrings.GetStringFromName("syncing2.label"), "label is set to the right value");
+    is(remoteTabsButton.getAttribute("label"), gSync.syncStrings.GetStringFromName("syncingtabs.label"), "label is set to the right value");
   } else {
     is(remoteTabsButton.getAttribute("label"), gSync.syncStrings.GetStringFromName("syncnow.label"), "label is set to the right value");
   }
diff --git a/services/sync/locales/en-US/sync.properties b/services/sync/locales/en-US/sync.properties
index aa5affe96b4f..518861d21577 100644
--- a/services/sync/locales/en-US/sync.properties
+++ b/services/sync/locales/en-US/sync.properties
@@ -13,4 +13,4 @@ lastSync2.label = Last sync: %S
 signInToSync.description = Sign In To Sync
 
 syncnow.label = Sync Now
-syncing2.label = Syncing…
+syncingtabs.label = Syncing Tabs…