summaryrefslogtreecommitdiffstats
path: root/webapp/i18n/en.json
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-05-06 08:08:11 -0400
committerChristopher Speller <crspeller@gmail.com>2016-05-06 08:08:11 -0400
commitfaf807d872498283455c2ca08401d10e48104843 (patch)
tree9768f66ef4f97e7d0bccaf925176ab2262c16409 /webapp/i18n/en.json
parentd75cb0294896e0e45f280cbccde8581376d501ce (diff)
downloadchat-faf807d872498283455c2ca08401d10e48104843.tar.gz
chat-faf807d872498283455c2ca08401d10e48104843.tar.bz2
chat-faf807d872498283455c2ca08401d10e48104843.zip
PLT-2809 Followups to login page redesign (#2901)
* Rearranged controls on the login page * Prevented login when username or password hasn't been entered * Updated login page error messages * Enabled sign in with username by default
Diffstat (limited to 'webapp/i18n/en.json')
-rw-r--r--webapp/i18n/en.json11
1 files changed, 5 insertions, 6 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index e3c1aac0f..79f3c5cbe 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -965,20 +965,19 @@
"login.email": "Email",
"login.find": "Find your other teams",
"login.forgot": "I forgot my password",
- "login.gitlab": "with GitLab",
- "login.google": "with Google Apps",
+ "login.invalidPassword": "Your password is incorrect.",
+ "login.gitlab": "GitLab",
+ "login.google": "Google Apps",
"login.ldapUsername": "LDAP Username",
- "login.loginIdRequired": "A {type} is required",
"login.noAccount": "Don't have an account? ",
"login.on": "on {siteName}",
"login.or": "or",
"login.password": "Password",
"login.passwordChanged": " Password updated successfully",
- "login.passwordRequired": "A password is required",
"login.session_expired": " Your session has expired. Please login again.",
"login.signIn": "Sign in",
- "login.signTo": "Sign in to:",
- "login.userNotFound": "We couldn't find an existing account matching your login credentials.",
+ "login.signInWith": "Sign in with:",
+ "login.userNotFound": "We couldn't find an account matching your login credentials.",
"login.username": "Username",
"login.verified": " Email Verified",
"login_mfa.enterToken": "To complete the sign in process, please enter a token from your smartphone's authenticator",