Bug 601019 - Sync UI: Always show "I have lost my Sync Key" and "Reset Password". r=mconnor a=blocking-betaN

browser/base/content/syncSetup.xul

@@ -312,14 +312,15 @@
             <spacer/>
             <hbox>
               <image class="statusIcon"/>
-              <vbox>
-                <label class="status" value=" "/>
-                <label class="text-link"
-                       value="&resetPassword.label;"
-                       onclick="gSyncUtils.resetPassword(); return false;"/>
-              </vbox>
+              <label class="status" value=" "/>
             </hbox>
           </row>
+          <row align="center">
+            <spacer/>
+            <label class="text-link"
+                   value="&resetPassword.label;"
+                   onclick="gSyncUtils.resetPassword(); return false;"/>
+	  </row>
           <row align="center">
             <label control="existingServer"
                    value="&server.label;"/>
@@ -360,12 +361,7 @@
       <vbox align="left" id="existingPassphraseFeedbackRow" hidden="true">
         <hbox>
           <image class="statusIcon"/>
-          <vbox>
-            <label class="status" value=" "/>
-            <label class="text-link"
-                   value="&lostSyncKey.label;"
-                   onclick="gSyncUtils.resetPassphrase(); return false;"/>
-          </vbox>
+          <label class="status" value=" "/>
         </hbox>
       </vbox>
     </groupbox>
@@ -376,6 +372,9 @@
         <label class="text-link"
                value="&addDevice.showMeHow.label;"
                href="https://services.mozilla.com/sync/help/manual-setup"/>
+        <label class="text-link"
+               value="&resetSyncKey.label;"
+               onclick="gSyncUtils.resetPassphrase(); return false;"/>
       </description>
     </vbox>
   </wizardpage>

browser/locales/en-US/chrome/browser/syncSetup.dtd

@@ -71,7 +71,7 @@
 <!ENTITY existingSyncKey.description "You can get a copy of your Sync Key by going to &syncBrand.shortName.label; Options on your other device, and selecting  &#x0022;My Sync Key&#x0022; under &#x0022;Manage Account&#x0022;.">
 <!ENTITY verifying.label              "Verifying…">
 <!ENTITY resetPassword.label          "Reset Password">
-<!ENTITY lostSyncKey.label            "I have lost my Sync Key">
+<!ENTITY resetSyncKey.label           "I have lost my other device.">
 
 <!-- Sync Options -->
 <!ENTITY setup.optionsPage.title      "Sync Options">