Bug 652483 - Sync UI: When printing or saving a sync key, the dialog prompts you to change it. r=philikon
authorMarina Samuel <msamuel@mozilla.com>
Mon, 02 May 2011 09:26:31 -0700
changeset 68928 f3eba0269bb2c5f094211d88b0be75255069028f
parent 68927 c01dba4456f9903f589df357ecd29ee54d27ee1a
child 68929 530f1035197234b28a7689dfff3d594cf99e26a2
push id19802
push userpweitershausen@mozilla.com
push dateTue, 03 May 2011 23:30:23 +0000
treeherdermozilla-central@dcdb0421464d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilikon
bugs652483
milestone6.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 652483 - Sync UI: When printing or saving a sync key, the dialog prompts you to change it. r=philikon
browser/base/content/syncGenericChange.js
browser/base/content/syncGenericChange.xul
browser/locales/en-US/chrome/browser/syncGenericChange.properties
browser/locales/en-US/chrome/browser/syncSetup.dtd
--- a/browser/base/content/syncGenericChange.js
+++ b/browser/base/content/syncGenericChange.js
@@ -106,17 +106,17 @@ let Change = {
           document.getElementById("generatePassphraseButton").hidden = false;
           document.getElementById("passphraseBackupButtons").hidden = false;
           this._passphraseBox.setAttribute("readonly", "true");
           let pp = Weave.Service.passphrase;
           if (Weave.Utils.isPassphrase(pp))
              pp = Weave.Utils.hyphenatePassphrase(pp);
           this._passphraseBox.value = pp;
           this._passphraseBox.focus();
-          document.title = this._str("change.synckey.title");
+          document.title = this._str("change.synckey2.title");
           introText.textContent = this._str("change.synckey.introText2");
           warningText.textContent = this._str("change.synckey2.warningText");
           this._dialog.getButton("finish").label
             = this._str("change.synckey.acceptButton");
           if (this._duringSetup) {
             this._dialog.getButton("finish").disabled = false;
           }
         }
--- a/browser/base/content/syncGenericChange.xul
+++ b/browser/base/content/syncGenericChange.xul
@@ -95,17 +95,17 @@
       </grid>
 
       <vbox id="passphraseRow">
         <hbox flex="1">
           <label id="passphraseLabel" control="passphraseBox"/>
           <spacer flex="1"/>
           <label id="generatePassphraseButton"
                  hidden="true"
-                 value="&syncKeyGenerate.label;"
+                 value="&syncGenerateNewKey.label;"
                  class="text-link inline-link"
                  onclick="event.stopPropagation();
                           Change.doGeneratePassphrase();"/>
         </hbox>
         <textbox id="passphraseBox"
                  flex="1"
                  onfocus="this.select()"
                  oninput="Change.validate()"/>
--- a/browser/locales/en-US/chrome/browser/syncGenericChange.properties
+++ b/browser/locales/en-US/chrome/browser/syncGenericChange.properties
@@ -3,17 +3,17 @@ change.password.title = Change your Pass
 change.password.acceptButton = Change Password
 change.password.status.active = Changing your password…
 change.password.status.success = Your password has been changed.
 change.password.status.error = There was an error changing your password.
 
 change.password2.introText = Your password must be at least 8 characters long.  It cannot be the same as either your user name or your Sync Key.
 change.password.warningText = Note: All of your other devices will be unable to connect to your account once you change this password.
 
-change.synckey.title = Change your Sync Key
+change.synckey2.title = My Sync Key
 change.synckey.acceptButton = Change Sync Key
 change.synckey.label = Changing Sync Key and uploading local data, please wait…
 change.synckey2.error = There was an error while changing your Sync Key!
 change.synckey2.success = Your Sync Key was successfully changed!
 
 change.synckey.introText = Firefox Cares About Your Privacy
 change.synckey.introText2 = To ensure your total privacy, all of your data is encrypted prior to being uploaded. The key to decrypt your data is not uploaded.
 # LOCALIZATION NOTE (change.synckey2.warningText) "Sync" should match &syncBrand.shortName.label; from syncBrand.dtd
--- a/browser/locales/en-US/chrome/browser/syncSetup.dtd
+++ b/browser/locales/en-US/chrome/browser/syncSetup.dtd
@@ -38,17 +38,17 @@
 <!ENTITY setup.tosAgree3.label      "">
 <!ENTITY setup.tosAgree2.accesskey  "">
 
 <!-- New Account Page 2: Sync Key -->
 <!ENTITY setup.newSyncKeyPage.title.label "&brandShortName; Cares About Your Privacy">
 <!ENTITY setup.newSyncKeyPage.description.label "To ensure your total privacy, all of your data is encrypted prior to being uploaded. The Sync Key which is necessary to decrypt your data is not uploaded.">
 <!ENTITY syncKeyEntry.label        "Your Sync Key">
 <!ENTITY syncKeyEntry.accesskey    "K">
-<!ENTITY syncKeyGenerate.label     "Generate">
+<!ENTITY syncGenerateNewKey.label  "Generate a new key">
 <!ENTITY syncKeyBackup.description "Your Sync Key is required to access &syncBrand.fullName.label; on other machines. Please create a backup copy. We cannot help you recover your Sync Key.">
 
 <!ENTITY button.syncKeyBackup.print.label     "Print…">
 <!ENTITY button.syncKeyBackup.print.accesskey "P">
 <!ENTITY button.syncKeyBackup.save.label      "Save…">
 <!ENTITY button.syncKeyBackup.save.accesskey  "S">
 
 <!-- New Account Page 3: Captcha -->