summaryrefslogtreecommitdiffstats
path: root/i18n/es.json
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-03-23 16:26:37 -0400
committerChristopher Speller <crspeller@gmail.com>2016-03-23 16:26:37 -0400
commit07bf7c498d603d76741fee20f4090438a592a659 (patch)
tree68a5cdbe23babd7eb9510d287810ed6df434755a /i18n/es.json
parent6285ec44bbcafe41dbd47dfe9955982df4bab362 (diff)
parent934c7c7a7c8423d71fdc7d1586b9c03aedcc5129 (diff)
downloadchat-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/es.json')
-rw-r--r--i18n/es.json2
1 files changed, 1 insertions, 1 deletions
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"
},
{