Bug 845096 - Clean up Metro sync strings [r=jimm]

browser/metro/base/content/browser.xul

@@ -404,10 +404,10 @@
         <button label="&sync.connect;" oncommand="WeaveGlue.tryConnect();" />
       </setting>
       <setting id="sync-connected" class="setting-group" title="&sync.connected;" type="control" collapsed="true">
-        <button id="sync-pairdevice" label="&sync.pair.title;" oncommand="SyncPairDevice.open();" />
+        <button id="sync-pairdevice" label="&sync.pair.button;" oncommand="SyncPairDevice.open();" />
       </setting>
       <setting id="sync-sync" class="setting-subgroup" type="control" collapsed="true">
-        <button id="sync-syncButton" label="&sync.syncNow;" oncommand="WeaveGlue.sync();"/>
+        <button id="sync-syncButton" label="&sync.syncNow2;" oncommand="WeaveGlue.sync();"/>
       </setting>
       <setting id="sync-device" class="setting-subgroup" type="string" title="&sync.deviceName;" onchange="WeaveGlue.changeName(this);" collapsed="true"/>
       <setting id="sync-disconnect" class="setting-subgroup" type="control" collapsed="true">
@@ -457,7 +457,7 @@
           </hbox>
           <vbox id="syncsetup-simple" class="syncsetup-page" flex="1">
             <scrollbox id="sync-message" class="prompt-message" orient="vertical" flex="1">
-              <description class="syncsetup-desc" flex="1">&sync.setup.pair;</description>
+              <description class="syncsetup-desc" flex="1">&sync.setup.pair2;</description>
               <description class="link" flex="1" onclick="WeaveGlue.openTutorial();">&sync.setup.tutorial;</description>
               <separator/>
               <vbox flex="1" pack="center" align="start">
@@ -514,7 +514,7 @@
           </hbox>
           <vbox id="syncpair-simple" class="syncsetup-page" flex="1">
             <scrollbox id="sync-message" class="prompt-message" orient="vertical" flex="1">
-              <description class="syncsetup-desc" flex="1">&sync.pair.description;</description>
+              <description class="syncsetup-desc" flex="1">&sync.pair.description2;</description>
               <description class="link" flex="1" onclick="SyncPairDevice.close(); WeaveGlue.openTutorial();">&sync.setup.tutorial;</description>
               <separator/>
               <vbox align="center" flex="1">

browser/metro/base/content/sync.js

@@ -515,7 +515,7 @@ let WeaveGlue = {
         message = message.replace("#1", brandName);
         message = message.replace("#2", Services.appinfo.version);
         let title = this._bundle.GetStringFromName("sync.update.title")
-        let button = this._bundle.GetStringFromName("sync.update.button")
+        let button = this._bundle.GetStringFromName("sync.update.learnmore")
         let close = this._bundle.GetStringFromName("sync.update.close")
 
         let flags = Services.prompt.BUTTON_POS_0 * Services.prompt.BUTTON_TITLE_IS_STRING +

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

@@ -9,10 +9,10 @@
 <!ENTITY sync.connected             "Connected">
 <!ENTITY sync.deviceName            "This device">
 <!ENTITY sync.disconnect            "Disconnect">
-<!ENTITY sync.syncNow               "Sync Now">
+<!ENTITY sync.syncNow2              "Sync now">
 
 <!ENTITY sync.setup.title           "Connect to Sync">
-<!ENTITY sync.setup.pair            "To activate, select &#x0022;Pair a Device&#x0022; on your other device.">
+<!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.setup.manual          "Enter your Sync account information">
 <!ENTITY sync.account               "Account Name">
@@ -26,6 +26,7 @@
 <!ENTITY sync.setup.waiting2        "Waiting for other device…">
 
 <!ENTITY sync.pair.title            "Pair a Device">
-<!ENTITY sync.pair.description      "To activate your new device, select &#x0022;Set Up Sync&#x0022; on the device.">
+<!ENTITY sync.pair.button           "Pair a device">
+<!ENTITY sync.pair.description2     "To activate your new device, select &#x0022;Set up sync&#x0022; on the device.">
 <!ENTITY sync.setup.close           "Close">
 <!ENTITY sync.setup.waitingdownload "Your data is now being downloaded in the background. You can close this window at any time.">

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

@@ -22,7 +22,7 @@ notificationDisconnect.button=Undo
 sync.update.client=#1 #2 is not compatible with the latest version of Firefox Sync. Please update to the latest version.
 sync.update.remote=#1 #2 is not compatible with older versions of Firefox Sync. Please update Firefox on your other computer(s).
 sync.update.title=Firefox Sync
-sync.update.button=Learn More
+sync.update.learnmore=Learn more
 sync.update.close=Close
 sync.setup.error.title=Cannot Setup Sync
 sync.setup.error.network=No internet connection available