diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-03-23 16:26:37 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-03-23 16:26:37 -0400 |
| commit | 07bf7c498d603d76741fee20f4090438a592a659 (patch) | |
| tree | 68a5cdbe23babd7eb9510d287810ed6df434755a /i18n/en.json | |
| parent | 6285ec44bbcafe41dbd47dfe9955982df4bab362 (diff) | |
| parent | 934c7c7a7c8423d71fdc7d1586b9c03aedcc5129 (diff) | |
| download | chat-07bf7c498d603d76741fee20f4090438a592a659.tar.gz chat-07bf7c498d603d76741fee20f4090438a592a659.tar.bz2 chat-07bf7c498d603d76741fee20f4090438a592a659.zip | |
Merge pull request #2465 from mattermost/plt-2260
PLT-2260 Add the ability to switch from email to ldap and back
Diffstat (limited to 'i18n/en.json')
| -rw-r--r-- | i18n/en.json | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/i18n/en.json b/i18n/en.json index 3180e8dbc..6811d86e3 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1540,10 +1540,22 @@ "translation": "Failed to send welcome email successfully err=%v" }, { - "id": "api.user.switch_to_email.context.app_error", + "id": "api.user.oauth_to_email.context.app_error", "translation": "Update password failed because context user_id did not match provided user's id" }, { + "id": "api.user.email_to_ldap.not_available.app_error", + "translation": "LDAP not available on this server" + }, + { + "id": "api.user.ldap_to_email.not_ldap_account.app_error", + "translation": "This user account does use LDAP" + }, + { + "id": "api.user.ldap_to_email.not_available.app_error", + "translation": "LDAP not available on this server" + }, + { "id": "api.user.update_active.permissions.app_error", "translation": "You do not have the appropriate permissions" }, |