summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-07-26 12:39:35 -0400
committerGitHub <noreply@github.com>2016-07-26 12:39:35 -0400
commit528890dba01d6835754c78bf7695621c828b6838 (patch)
tree2870cab02f121a69021aa1e9f2cde1a7287f4d05 /i18n
parent00291c652ed7dba4649d50243bbde1633722d3df (diff)
downloadchat-528890dba01d6835754c78bf7695621c828b6838.tar.gz
chat-528890dba01d6835754c78bf7695621c828b6838.tar.bz2
chat-528890dba01d6835754c78bf7695621c828b6838.zip
Changing LDAP behavour so users disabled in LDAP server are disabled in Mattermost. (#3669)
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json4
1 files changed, 4 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json
index ca59d541a..7ddb99b3d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1900,6 +1900,10 @@
"translation": "You do not have the appropriate permissions"
},
{
+ "id": "api.user.update_active.no_deactivate_ldap.app_error",
+ "translation": "You can not modify the activation status of LDAP accounts. Please modify through the LDAP server."
+ },
+ {
"id": "api.user.update_mfa.not_available.app_error",
"translation": "MFA not configured or available on this server"
},