Bug 868099 - Update sync language. r=mbrubeck

browser/metro/base/content/browser.xul

@@ -401,10 +401,11 @@
     </flyoutpanel>
 
     <flyoutpanel id="sync-flyoutpanel" headertext="&syncHeader.title;">
-      <setting id="sync-connect" title="&sync.notconnected;" type="control">
-        <button label="&sync.connect;" oncommand="Sync.tryConnect();" />
+      <description>&sync.setup.description;</description> 
+      <setting id="sync-connect" type="control">
+        <button label="&sync.setupbutton.label;" oncommand="Sync.tryConnect();" />
       </setting>
-      <setting id="sync-connected" class="setting-group" title="&sync.connected;" type="control" collapsed="true">
+      <setting id="sync-connected" class="setting-group" type="control" collapsed="true">
         <button id="sync-pairdevice" label="&sync.pair.button;" oncommand="SyncPairDevice.open();" />
       </setting>
       <setting id="sync-sync" class="setting-subgroup" type="control" collapsed="true">
@@ -412,7 +413,7 @@
       </setting>
       <setting id="sync-device" class="setting-subgroup" type="string" title="&sync.deviceName;" onchange="Sync.changeName(this);" collapsed="true"/>
       <setting id="sync-disconnect" class="setting-subgroup" type="control" collapsed="true">
-        <button label="&sync.disconnect;" oncommand="Sync.disconnect();" />
+        <button label="&sync.removebutton.label;" oncommand="Sync.disconnect();" />
       </setting>
     </flyoutpanel>
 
@@ -478,7 +479,7 @@
       <dialog id="syncsetup-dialog" class="content-dialog" flex="1">
         <vbox class="prompt-inner">
           <hbox class="prompt-title">
-            <description>&sync.setup.title;</description>
+            <description>&sync.setup2.title;</description>
           </hbox>
           <vbox id="syncsetup-simple" class="syncsetup-page" flex="1">
             <scrollbox id="sync-message" class="prompt-message" orient="vertical" flex="1">
@@ -524,7 +525,7 @@
             <hbox class="prompt-buttons">
               <button class="prompt-button" oncommand="Sync.close();">&sync.setup.cancel;</button>
               <separator/>
-              <button id="syncsetup-button-connect" class="prompt-button" oncommand="Sync.close(); Sync.connect();">&sync.setup.connect;</button>
+              <button id="syncsetup-button-connect" class="prompt-button" oncommand="Sync.close(); Sync.connect();">&sync.setup.connect2;</button>
             </hbox>
           </vbox>
         </vbox>
@@ -550,7 +551,7 @@
             </vbox>
             <hbox class="prompt-buttons" pack="center">
               <button class="prompt-button" oncommand="SyncPairDevice.close();">&sync.setup.cancel;</button>
-              <button id="syncpair-connectbutton" class="prompt-button" disabled="true" oncommand="SyncPairDevice.connect();">&sync.setup.connect;</button>
+              <button id="syncpair-connectbutton" class="prompt-button" disabled="true" oncommand="SyncPairDevice.connect();">&sync.setup.connect2;</button>
             </hbox>
           </vbox>
         </vbox>

browser/metro/base/content/sync.js

@@ -73,7 +73,6 @@ let Sync = {
     if (Weave.Status.checkSetup() != Weave.CLIENT_NOT_CONFIGURED) {
       // Put the settings UI into a state of "connecting..." if we are going to auto-connect
       this._elements.connect.firstChild.disabled = true;
-      this._elements.connect.setAttribute("title", this._bundle.GetStringFromName("connecting.label"));
 
       try {
         this._elements.device.value = Services.prefs.getCharPref("services.sync.client.name");
@@ -468,7 +467,6 @@ let Sync = {
     connected.collapsed = !isConfigured;
 
     if (!isConfigured) {
-      connect.setAttribute("title", this._bundle.GetStringFromName("notconnected.label"));
       connect.firstChild.disabled = false;
     }
 

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

@@ -3,24 +3,28 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 
+<!-- flyout header -->
 <!ENTITY syncHeader.title           "Sync">
-<!ENTITY sync.notconnected          "Not connected">
-<!ENTITY sync.connect               "Connect">
-<!ENTITY sync.connected             "Connected">
-<!ENTITY sync.deviceName            "This device">
-<!ENTITY sync.disconnect            "Disconnect">
+<!-- not connected yet -->
+<!ENTITY sync.setup.description     "Access your bookmarks, passwords, and open tabs across your devices">
+<!ENTITY sync.setupbutton.label     "Set up Sync">
+<!-- sync now button -->
 <!ENTITY sync.syncNow2              "Sync now">
+<!-- device name text edit -->
+<!ENTITY sync.deviceName            "This device">
+<!-- remove this device button -->
+<!ENTITY sync.removebutton.label    "Remove this device">
 
-<!ENTITY sync.setup.title           "Connect to Sync">
+<!ENTITY sync.setup2.title          "Set up Sync">
 <!ENTITY sync.setup.pair2           "To activate, select &#x0022;Pair a device&#x0022; on your other device.">
-<!ENTITY sync.fallback              "I'm not near my computer…">
+<!ENTITY sync.fallback              "Enter or edit account information…">
 <!ENTITY sync.setup.manual          "Enter your Sync account information">
 <!ENTITY sync.account               "Account Name">
 <!ENTITY sync.password              "Password">
 <!ENTITY sync.recoveryKey           "Recovery Key">
 <!ENTITY sync.customServer          "Use custom server">
 <!ENTITY sync.serverURL             "Server URL">
-<!ENTITY sync.setup.connect         "Connect">
+<!ENTITY sync.setup.connect2        "Add device">
 <!ENTITY sync.setup.cancel          "Cancel">
 <!ENTITY sync.setup.tutorial        "Show me how">
 <!ENTITY sync.setup.waiting2        "Waiting for other device…">

browser/metro/locales/en-US/chrome/sync.properties

@@ -13,7 +13,6 @@ lastSyncInProgress2.label=Last sync: in progress…
 
 # %S is the username logged in
 account.label=Account: %S
-notconnected.label=Not connected
 connecting.label=Connecting…
 
 notificationDisconnect.label=Your Firefox Sync account has been removed