Bug 591118 - Generate Sync Key (part 2) [r=mconnor]
authorPhilipp von Weitershausen <philipp@weitershausen.de>
Tue, 07 Sep 2010 00:57:09 +0200
changeset 52163 ad3b17926d46e8c2647dbe60a26b41518a36159c
parent 52162 af16b2758c1ce2d28f4d54e7d402528cb3468e1f
child 52164 5041c0713ff6ff7f9ccdf11c3c38df8e07f3208b
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersmconnor
bugs591118
Bug 591118 - Generate Sync Key (part 2) [r=mconnor] Change the setup wizard to generate the Sync Key
services/sync/locales/en-US/errors.properties
--- a/services/sync/locales/en-US/errors.properties
+++ b/services/sync/locales/en-US/errors.properties
@@ -1,26 +1,36 @@
 error.login.reason.network    = Failed to connect to the server
 error.login.reason.passphrase = Wrong secret phrase
 error.login.reason.password   = Incorrect username or password
 error.login.reason.no_password= No saved password to use
+error.login.reason.no_synckey = No saved Sync Key to use
+# the following one is deprecated
 error.login.reason.no_passphrase= No saved secret phrase to use
 error.login.reason.server     = Server incorrectly configured
 
 error.sync.failed_partial     = One or more data types could not be synced
 
 invalid-captcha = Incorrect words, try again
 weak-password   = Use a stronger password
 
 # this is the fallback, if we hit an error we didn't bother to localize
 error.reason.unknown          = Unknown error
 
+change.synckey.sameAsSyncKey    = The new Sync Key cannot be the same as your Sync Key
+change.synckey.sameAsPassword   = The Sync Key cannot be the same as your password
+change.synckey.sameAsUsername   = The Sync Key cannot be the same as your user name
+change.synckey.tooShort         = The Sync Key entered is too short
+
+# these are all deprecated:
 change.passphrase.ppSameAsPassphrase = The secret phrase cannot be the same as your current secret phrase
 change.passphrase.ppSameAsPassword   = The secret phrase cannot be the same as your password
 change.passphrase.ppSameAsUsername   = The secret phrase cannot be the same as your user name
 change.passphrase.mismatch           = The phrases entered do not match
 change.passphrase.tooShort           = The secret phrase entered is too short
 
+change.password.pwSameAsSyncKey      = Password can't match your Sync Key
+# the following one is deprecated
 change.password.pwSameAsPassphrase   = Password can't match secret phrase
 change.password.pwSameAsPassword     = Password can't match current password
 change.password.pwSameAsUsername     = Password can't match your user name
 change.password.mismatch             = The passwords entered do not match
 change.password.tooShort             = The password entered is too short