summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-05-27 11:36:53 -0400
committerCorey Hulen <corey@hulen.com>2016-05-27 08:36:53 -0700
commitd2aacdbb07c0c0b97c0f45c99cfbbd2f28c56e7b (patch)
treeedf41e49c0d099d852eeda0c38e775e29fb6a144 /i18n
parent0d0734ac9845ef32c55ebf4c3185ba85065c5940 (diff)
downloadchat-d2aacdbb07c0c0b97c0f45c99cfbbd2f28c56e7b.tar.gz
chat-d2aacdbb07c0c0b97c0f45c99cfbbd2f28c56e7b.tar.bz2
chat-d2aacdbb07c0c0b97c0f45c99cfbbd2f28c56e7b.zip
Don't allow gitlab users to activate mfa (#3125)
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 35a9a3102..8d576fa8f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1736,6 +1736,10 @@
"translation": "MFA not configured or available on this server"
},
{
+ "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
+ "translation": "MFA is not available for this account type"
+ },
+ {
"id": "api.user.update_password.context.app_error",
"translation": "Update password failed because context user_id did not match props user_id"
},