summaryrefslogtreecommitdiffstats
path: root/webapp/i18n
diff options
context:
space:
mode:
authorEric Sethna <eric@spinpunch.com>2017-09-01 11:03:38 -0600
committerJoram Wilander <jwawilander@gmail.com>2017-09-01 13:03:38 -0400
commit48763a00b9d1dee74c788d149bed3c669fa9afbf (patch)
treea25c4b0b2ca1156aa50b7365d8213c8e2dbcd886 /webapp/i18n
parent77f0f2289c1fe9666bcd189e451a02cd4b635d41 (diff)
downloadchat-48763a00b9d1dee74c788d149bed3c669fa9afbf.tar.gz
chat-48763a00b9d1dee74c788d149bed3c669fa9afbf.tar.bz2
chat-48763a00b9d1dee74c788d149bed3c669fa9afbf.zip
[PLT-7043] Update LDAP > Email help text (#7313)
* update help text * Update ldap_to_email.jsx * Update LDAP > email text
Diffstat (limited to 'webapp/i18n')
-rwxr-xr-xwebapp/i18n/en.json7
1 files changed, 3 insertions, 4 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index eb86f647e..9f6a3a850 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1312,15 +1312,14 @@
"claim.email_to_oauth.switchTo": "Switch account to {uiType}",
"claim.email_to_oauth.title": "Switch Email/Password Account to {uiType}",
"claim.ldap_to_email.confirm": "Confirm Password",
- "claim.ldap_to_email.email": "You will use the email {email} to login",
- "claim.ldap_to_email.enterLdapPwd": "Enter your {ldapPassword} for your {site} email account",
- "claim.ldap_to_email.enterPwd": "Enter a new password for your email account",
+ "claim.ldap_to_email.email": "After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.",
+ "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+ "claim.ldap_to_email.enterPwd": "New email login password:",
"claim.ldap_to_email.ldapPasswordError": "Please enter your AD/LDAP password.",
"claim.ldap_to_email.ldapPwd": "AD/LDAP Password",
"claim.ldap_to_email.pwd": "Password",
"claim.ldap_to_email.pwdError": "Please enter your password.",
"claim.ldap_to_email.pwdNotMatch": "Passwords do not match.",
- "claim.ldap_to_email.ssoType": "Upon claiming your account, you will only be able to login with your email and password",
"claim.ldap_to_email.switchTo": "Switch account to email/password",
"claim.ldap_to_email.title": "Switch AD/LDAP Account to Email/Password",
"claim.oauth_to_email.confirm": "Confirm Password",