From 2c6a521a2f40a6573645a86b238fd3701b1d47b8 Mon Sep 17 00:00:00 2001
From: Philipp von Weitershausen <philipp@weitershausen.de>
Date: Mon, 30 May 2011 12:51:34 -0700
Subject: [PATCH] Bug 568653 - Change "Last Update" to "Last Sync" in tooltip.
 r=rnewman

---
 browser/base/content/browser-syncui.js      | 2 +-
 mobile/chrome/content/sync.js               | 4 ++--
 mobile/locales/en-US/chrome/sync.properties | 4 ++--
 services/sync/locales/en-US/sync.properties | 8 +-------
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/browser/base/content/browser-syncui.js b/browser/base/content/browser-syncui.js
index c29e93f0720..2545faf5928 100644
--- a/browser/base/content/browser-syncui.js
+++ b/browser/base/content/browser-syncui.js
@@ -328,7 +328,7 @@ let gSyncUI = {
     // Show the day-of-week and time (HH:MM) of last sync
     let lastSyncDate = new Date(lastSync).toLocaleFormat("%a %H:%M");
     let lastSyncLabel =
-      this._stringBundle.formatStringFromName("lastSync.label", [lastSyncDate], 1);
+      this._stringBundle.formatStringFromName("lastSync2.label", [lastSyncDate], 1);
 
     syncButton.setAttribute("tooltiptext", lastSyncLabel);
   },
diff --git a/mobile/chrome/content/sync.js b/mobile/chrome/content/sync.js
index 11ee8167272..9d4a031194c 100644
--- a/mobile/chrome/content/sync.js
+++ b/mobile/chrome/content/sync.js
@@ -437,7 +437,7 @@ let WeaveGlue = {
           connect.setAttribute("title", self._bundle.GetStringFromName("connecting.label"));
 
         if (aTopic == "weave:service:sync:start")
-          sync.setAttribute("title", self._bundle.GetStringFromName("lastSyncInProgress.label"));
+          sync.setAttribute("title", self._bundle.GetStringFromName("lastSyncInProgress2.label"));
       } else {
         connect.firstChild.disabled = false;
         sync.firstChild.disabled = false;
@@ -452,7 +452,7 @@ let WeaveGlue = {
     let lastSync = Weave.Svc.Prefs.get("lastSync");
     if (lastSync != null) {
       let syncDate = new Date(lastSync).toLocaleFormat("%a %R");
-      let dateStr = this._bundle.formatStringFromName("lastSync.label", [syncDate], 1);
+      let dateStr = this._bundle.formatStringFromName("lastSync2.label", [syncDate], 1);
       sync.setAttribute("title", dateStr);
     }
 
diff --git a/mobile/locales/en-US/chrome/sync.properties b/mobile/locales/en-US/chrome/sync.properties
index 25b597e4bf4..b7201ad0dc0 100644
--- a/mobile/locales/en-US/chrome/sync.properties
+++ b/mobile/locales/en-US/chrome/sync.properties
@@ -1,8 +1,8 @@
 # Mobile Sync
 
 # %S is the date and time at which the last sync successfully completed
-lastSync.label=Last update: %S
-lastSyncInProgress.label=Last update: in progress…
+lastSync2.label=Last sync: %S
+lastSyncInProgress2.label=Last sync: in progress…
 
 # %S is the username logged in
 account.label=Account: %S
diff --git a/services/sync/locales/en-US/sync.properties b/services/sync/locales/en-US/sync.properties
index 734d1438f49..0f8dc578bdc 100644
--- a/services/sync/locales/en-US/sync.properties
+++ b/services/sync/locales/en-US/sync.properties
@@ -2,13 +2,7 @@
 client.name2 = %1$S's %2$S on %3$S
 
 # %S is the date and time at which the last sync successfully completed
-lastSync.label = Last Update: %S
-lastSyncInProgress.label = Last Update: in progress…
-
-# %S is the username logged in
-connected.label = Connected: %S
-disconnected.label = Disconnected
-connecting.label = Connecting…
+lastSync2.label = Last sync: %S
 
 mobile.label = Mobile Bookmarks