From 463fd8c20b6e20d1cc669810c339770b9b1ede41 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Thu, 17 Mar 2016 15:46:16 -0400 Subject: Add the ability to switch from email to ldap and back --- i18n/en.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index 3180e8dbc..6811d86e3 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1540,9 +1540,21 @@ "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" -- cgit v1.2.3-1-g7c22