Bug 589979 - Generate username from email address (part 3) [r=mconnor]

Consolidate email and username in the UI.

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

@@ -1,6 +1,8 @@
 error.login.reason.network    = Failed to connect to the server
 error.login.reason.synckey    = Wrong Sync Key
+# error.login.reason.password is deprecated.
 error.login.reason.password   = Incorrect username or password
+error.login.reason.account    = Incorrect account name or password
 error.login.reason.no_password= No saved password to use
 error.login.reason.no_synckey = No saved Sync Key to use
 error.login.reason.server     = Server incorrectly configured
@@ -16,10 +18,12 @@ 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.sameAsEmail      = The Sync Key cannot be the same as your email address
 change.synckey.tooShort         = The Sync Key entered is too short
 
 change.password.pwSameAsSyncKey      = Password can't match your Sync Key
 change.password.pwSameAsPassword     = Password can't match current password
 change.password.pwSameAsUsername     = Password can't match your user name
+change.password.pwSameAsEmail        = Password can't match your email address
 change.password.mismatch             = The passwords entered do not match
 change.password.tooShort             = The password entered is too short

services/sync/modules/constants.js

@@ -104,7 +104,7 @@ LOGIN_FAILED_NO_PASSPHRASE:            "error.login.reason.no_synckey",
 LOGIN_FAILED_NETWORK_ERROR:            "error.login.reason.network",
 LOGIN_FAILED_SERVER_ERROR:             "error.login.reason.server",
 LOGIN_FAILED_INVALID_PASSPHRASE:       "error.login.reason.synckey",
-LOGIN_FAILED_LOGIN_REJECTED:           "error.login.reason.password",
+LOGIN_FAILED_LOGIN_REJECTED:           "error.login.reason.account",
 
 // sync failure status codes
 METARECORD_DOWNLOAD_FAIL:              "error.sync.reason.metarecord_download_fail",