summaryrefslogtreecommitdiffstats
path: root/webapp/i18n
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-01-10 10:05:58 -0500
committerGeorge Goldberg <george@gberg.me>2017-01-10 15:05:58 +0000
commit99493bc5fa11d8e50d46c19e2678ddb2c99c0bbb (patch)
tree2cf7a8ea88c919940600531db911040f1c378a0c /webapp/i18n
parent0cba48d155ac0703d6c85e71327d29447c0c8e42 (diff)
downloadchat-99493bc5fa11d8e50d46c19e2678ddb2c99c0bbb.tar.gz
chat-99493bc5fa11d8e50d46c19e2678ddb2c99c0bbb.tar.bz2
chat-99493bc5fa11d8e50d46c19e2678ddb2c99c0bbb.zip
PLT-5212 Add password setting text for google and office365 (#5029)
Diffstat (limited to 'webapp/i18n')
-rw-r--r--webapp/i18n/en.json4
1 files changed, 4 insertions, 0 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index d3d9e0051..aae21a8e6 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -2132,6 +2132,8 @@
"user.settings.security.lastUpdated": "Last updated {date} at {time}",
"user.settings.security.ldap": "AD/LDAP",
"user.settings.security.loginGitlab": "Login done through GitLab",
+ "user.settings.security.loginGoogle": "Login done through Google Apps",
+ "user.settings.security.loginOffice365": "Login done through Office 365",
"user.settings.security.loginLdap": "Login done through AD/LDAP",
"user.settings.security.loginSaml": "Login done through SAML",
"user.settings.security.logoutActiveSessions": "View and Logout of Active Sessions",
@@ -2161,6 +2163,8 @@
"user.settings.security.passwordErrorUppercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
"user.settings.security.passwordErrorUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
"user.settings.security.passwordGitlabCantUpdate": "Login occurs through GitLab. Password cannot be updated.",
+ "user.settings.security.passwordGoogleCantUpdate": "Login occurs through Google Apps. Password cannot be updated.",
+ "user.settings.security.passwordOffice365CantUpdate": "Login occurs through Office 365. Password cannot be updated.",
"user.settings.security.passwordLdapCantUpdate": "Login occurs through AD/LDAP. Password cannot be updated.",
"user.settings.security.passwordMatchError": "The new passwords you entered do not match.",
"user.settings.security.passwordMinLength": "Invalid minimum length, cannot show preview.",