Bug 564523 - passphrase can match password for new accounts, r=Mardak

--HG--
extra : rebase_source : bae8d44f67c0f836efa1a6f607e6605f3d30b33b

services/sync/locales/en-US/errors.properties

@@ -15,12 +15,12 @@ error.reason.unknown          = Unknown error
 
 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 the username
+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.pwSameAsPassphrase   = Your password cannot match your secret phrase
-change.password.pwSameAsPassword     = Your password cannot match your current password
-change.password.pwSameAsUsername     = Your password cannot match your username
+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

services/sync/modules/service.js

@@ -638,6 +638,8 @@ WeaveSvc.prototype = {
     // set lastversion pref
     Svc.Prefs.set("lastversion", WEAVE_VERSION);
     // Find weave logins and remove them.
+    this.password = "";
+    this.passphrase = "";
     Svc.Login.findLogins({}, PWDMGR_HOST, "", "").map(function(login) {
       Svc.Login.removeLogin(login);
     });