diff options
| author | JoramWilander <jwawilander@gmail.com> | 2016-03-17 15:46:16 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2016-03-23 15:59:58 -0400 |
| commit | 463fd8c20b6e20d1cc669810c339770b9b1ede41 (patch) | |
| tree | 3bf857301e0a24a1a7ccd7c5d15834829e3d22e7 /i18n | |
| parent | 7af2e6f87a754312809aa044edd062930616401a (diff) | |
| download | chat-463fd8c20b6e20d1cc669810c339770b9b1ede41.tar.gz chat-463fd8c20b6e20d1cc669810c339770b9b1ede41.tar.bz2 chat-463fd8c20b6e20d1cc669810c339770b9b1ede41.zip | |
Add the ability to switch from email to ldap and back
Diffstat (limited to 'i18n')
| -rw-r--r-- | i18n/en.json | 14 | ||||
| -rw-r--r-- | i18n/es.json | 2 | ||||
| -rw-r--r-- | i18n/pt.json | 2 |
3 files changed, 15 insertions, 3 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" }, diff --git a/i18n/es.json b/i18n/es.json index 97471ee98..2c062dd00 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -1540,7 +1540,7 @@ "translation": "Falla al enviar el correo de bienvenida err=%v" }, { - "id": "api.user.switch_to_email.context.app_error", + "id": "api.user.oauth_to_email.context.app_error", "translation": "La actualización de la contraseña falló porque el user_id del contexto no coincide con el id de usuario provisto" }, { diff --git a/i18n/pt.json b/i18n/pt.json index 15bc42835..6bcf9e072 100644 --- a/i18n/pt.json +++ b/i18n/pt.json @@ -1540,7 +1540,7 @@ "translation": "Falha ao enviar com sucesso boas vindas por email err=%v" }, { - "id": "api.user.switch_to_email.context.app_error", + "id": "api.user.oauth_to_email.context.app_error", "translation": "Atualização de senha falhou devido ao contexto user_id não combinar com id de usuário fornecido" }, { |