Bug 681519 - ID for change.synckey.acceptButton has not been changed. r=rnewman
authorPhilipp von Weitershausen <philipp@weitershausen.de>
Tue, 23 Aug 2011 18:34:23 -0700
changeset 77048 198c7de0699d3e2faed778968a519255d8b10e1e
parent 77047 fc9a011616cce0d0c77ec48f56bdbe1e1e2c2f98
child 77109 5d9989c3bff69691e88ea139b18bb72ec836c6dd
push id78
push userclegnitto@mozilla.com
push dateFri, 16 Dec 2011 17:32:24 +0000
treeherdermozilla-release@79d24e644fdd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrnewman
bugs681519
milestone9.0a1
first release with
nightly linux32
198c7de0699d / 9.0a1 / 20110824030813 / files
nightly linux64
198c7de0699d / 9.0a1 / 20110824030813 / files
nightly mac
198c7de0699d / 9.0a1 / 20110824030813 / files
nightly win32
198c7de0699d / 9.0a1 / 20110824030813 / files
nightly win64
198c7de0699d / 9.0a1 / 20110824030813 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 681519 - ID for change.synckey.acceptButton has not been changed. r=rnewman
browser/base/content/syncGenericChange.js
browser/locales/en-US/chrome/browser/syncGenericChange.properties
--- a/browser/base/content/syncGenericChange.js
+++ b/browser/base/content/syncGenericChange.js
@@ -110,17 +110,17 @@ let Change = {
           if (Weave.Utils.isPassphrase(pp))
              pp = Weave.Utils.hyphenatePassphrase(pp);
           this._passphraseBox.value = pp;
           this._passphraseBox.focus();
           document.title = this._str("change.recoverykey.title");
           introText.textContent = this._str("change.synckey.introText2");
           warningText.textContent = this._str("change.recoverykey.warningText");
           this._dialog.getButton("finish").label
-            = this._str("change.recovery.acceptButton");
+            = this._str("change.recoverykey.acceptButton");
           if (this._duringSetup) {
             this._dialog.getButton("finish").disabled = false;
           }
         }
         break;
       case "ChangePassword":
         document.getElementById("passphraseRow").hidden = true;
         let box1label = document.getElementById("textBox1Label");
--- a/browser/locales/en-US/chrome/browser/syncGenericChange.properties
+++ b/browser/locales/en-US/chrome/browser/syncGenericChange.properties
@@ -4,25 +4,24 @@ change.password.acceptButton = Change Pa
 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.password3.introText = Your password must be at least 8 characters long.  It cannot be the same as either your user name or your Recovery Key.
 change.password.warningText = Note: All of your other devices will be unable to connect to your account once you change this password.
 
 change.recoverykey.title = My Recovery Key
-change.synckey.acceptButton = Change Recovery Key
+change.recoverykey.acceptButton = Change Recovery Key
 change.recoverykey.label = Changing Recovery Key and uploading local data, please wait…
 change.recoverykey.error = There was an error while changing your Recovery Key!
 change.recoverykey.success = Your Recovery 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.recoverykey.warningText) "Sync" should match &syncBrand.shortName.label; from syncBrand.dtd
-change.recovery.warningText = Note: Changing this will erase all data stored on the Sync server and upload new data secured by this Recovery Key. Your other devices will not sync until the new Recovery Key is entered for that device.
+change.recoverykey.warningText = Note: Changing this will erase all data stored on the Sync server and upload new data secured by this Recovery Key. Your other devices will not sync until the new Recovery Key is entered for that device.
 
 new.recoverykey.label = Your Recovery Key
 
 # LOCALIZATION NOTE (new.password.title): This (and associated new.password/passphrase) are used on a second computer when it detects that your password or passphrase has been changed on a different device.
 new.password.title            = Update Password
 new.password.introText        = Your password was rejected by the server, please update your password.
 new.password.label            = Enter your new password
 new.password.confirm          = Confirm your new password