Bug 562183 - unify passphrase matching/validation code, r=Mardak

--HG--
extra : rebase_source : 8fcbccf159bcb92660fdd41c086c08073dc5e201

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

@@ -12,3 +12,15 @@ 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.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.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.mismatch             = The passwords entered do not match
+change.password.tooShort             = The password entered is too short

services/sync/locales/en-US/generic-change.properties

@@ -3,9 +3,6 @@ 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.password.status.pwSameAsPassphrase = The password cannot be the same as your secret phrase.
-change.password.status.pwSameAsPassword = The password cannot be the same as your current password.
-change.password.status.pwSameAsUsername = The password cannot be the same as the username.
 
 change.password.introText = Your password must be at least 8 characters long.  It cannot be the same as either your user name or your secret phrase.
 change.password.warningText = Note: All of your other devices will be unable to connect to your account once you change this password.
@@ -15,9 +12,6 @@ change.passphrase.acceptButton = Change Secret Phrase
 change.passphrase.label = Changing secret phrase and uploading local data, please wait…
 change.passphrase.error = There was an error while changing your secret phrase!
 change.passphrase.success = Your secret phrase was successfully changed!
-change.passphrase.status.ppSameAsPassphrase = The secret phrase cannot be the same as your current secret phrase.
-change.passphrase.status.ppSameAsPassword = The secret phrase cannot be the same as your password.
-change.passphrase.status.ppSameAsUsername = The secret phrase cannot be the same as the username.
 
 new.passphrase.label = New secret phrase
 new.passphrase.confirm = Confirm secret phrase