summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorElias Nahum <nahumhbl@gmail.com>2016-02-02 19:39:56 -0300
committerElias Nahum <nahumhbl@gmail.com>2016-02-02 19:39:56 -0300
commitd424c9eaf12653332f15afa2cb9dfc6684fa95d8 (patch)
treecbec268ebd8df0f5ddeb1e9d7e177bcfc1644b65 /i18n
parent320fe1c39240644ce15fa2a436ac4a5591b95083 (diff)
downloadchat-d424c9eaf12653332f15afa2cb9dfc6684fa95d8.tar.gz
chat-d424c9eaf12653332f15afa2cb9dfc6684fa95d8.tar.bz2
chat-d424c9eaf12653332f15afa2cb9dfc6684fa95d8.zip
PLT-7: Refactoring frontend (chunk 10)
- Modals - Fix bug on msg_typing - Add missing translations in es.json for EE
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json66
-rw-r--r--i18n/es.json34
2 files changed, 66 insertions, 34 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 7b7ee344a..8cbdd4993 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1648,6 +1648,38 @@
"translation": "Inappropriate permissions to regenerate outcoming webhook token"
},
{
+ "id": "ent.ldap.do_login.bind_admin_user.app_error",
+ "translation": "Unable to bind to LDAP server. Check BindUsername and BindPassword."
+ },
+ {
+ "id": "ent.ldap.do_login.invalid_password.app_error",
+ "translation": "Invalid Password"
+ },
+ {
+ "id": "ent.ldap.do_login.licence_disable.app_error",
+ "translation": "LDAP functionality disabled by current license. Please contact your system administrator about upgrading your enterprise license."
+ },
+ {
+ "id": "ent.ldap.do_login.matched_to_many_users.app_error",
+ "translation": "Username given matches multiple users"
+ },
+ {
+ "id": "ent.ldap.do_login.search_ldap_server.app_error",
+ "translation": "Failed to search LDAP server"
+ },
+ {
+ "id": "ent.ldap.do_login.unable_to_connect.app_error",
+ "translation": "Unable to connect to LDAP server"
+ },
+ {
+ "id": "ent.ldap.do_login.unable_to_create_user.app_error",
+ "translation": "Credentials valid but unable to create user."
+ },
+ {
+ "id": "ent.ldap.do_login.user_not_registered.app_error",
+ "translation": "User not registered on LDAP server"
+ },
+ {
"id": "manaultesting.get_channel_id.no_found.debug",
"translation": "Could not find channel: %v, %v possibilites searched"
},
@@ -3406,37 +3438,5 @@
{
"id": "web.watcher_fail.error",
"translation": "Failed to add directory to watcher %v"
- },
- {
- "id": "ent.ldap.do_login.licence_disable.app_error",
- "translation": "LDAP functionality disabled by current license. Please contact your system administrator about upgrading your enterprise license."
- },
- {
- "id": "ent.ldap.do_login.unable_to_connect.app_error",
- "translation": "Unable to connect to LDAP server"
- },
- {
- "id": "ent.ldap.do_login.bind_admin_user.app_error",
- "translation": "Unable to bind to LDAP server. Check BindUsername and BindPassword."
- },
- {
- "id": "ent.ldap.do_login.search_ldap_server.app_error",
- "translation": "Failed to search LDAP server"
- },
- {
- "id": "ent.ldap.do_login.user_not_registered.app_error",
- "translation": "User not registered on LDAP server"
- },
- {
- "id": "ent.ldap.do_login.matched_to_many_users.app_error",
- "translation": "Username given matches multiple users"
- },
- {
- "id": "ent.ldap.do_login.invalid_password.app_error",
- "translation": "Invalid Password"
- },
- {
- "id": "ent.ldap.do_login.unable_to_create_user.app_error",
- "translation": "Credentials valid but unable to create user."
}
-]
+] \ No newline at end of file
diff --git a/i18n/es.json b/i18n/es.json
index f0f157474..bd29c9860 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -1648,6 +1648,38 @@
"translation": "Permisos inapropiados para regenerar un token para el Webhook saliente"
},
{
+ "id": "ent.ldap.do_login.bind_admin_user.app_error",
+ "translation": "No se pudo enlazar con el servidor LDAP. Revisa las opciones de BindUsername y BindPassword."
+ },
+ {
+ "id": "ent.ldap.do_login.invalid_password.app_error",
+ "translation": "Contraseña inválida"
+ },
+ {
+ "id": "ent.ldap.do_login.licence_disable.app_error",
+ "translation": "Las funcionalidades de LDAP están deshabilitadas con la licencia actual. Por favor contacta a un administrador del sistema acerca de mejorar la licencia enterprise."
+ },
+ {
+ "id": "ent.ldap.do_login.matched_to_many_users.app_error",
+ "translation": "Nombre de usuario dado coincide con varios usuarios"
+ },
+ {
+ "id": "ent.ldap.do_login.search_ldap_server.app_error",
+ "translation": "Falla al buscar en el servidor LDAP"
+ },
+ {
+ "id": "ent.ldap.do_login.unable_to_connect.app_error",
+ "translation": "No se pudo conectar con el servidor LDAP"
+ },
+ {
+ "id": "ent.ldap.do_login.unable_to_create_user.app_error",
+ "translation": "Credenciales válidas pero no se pudo crear el usuario."
+ },
+ {
+ "id": "ent.ldap.do_login.user_not_registered.app_error",
+ "translation": "Usuario no registrado en el servidor LDAP"
+ },
+ {
"id": "manaultesting.get_channel_id.no_found.debug",
"translation": "No pudimos encontrar el canal: %v, búsqueda realizada con estas posibilidades %v"
},
@@ -3407,4 +3439,4 @@
"id": "web.watcher_fail.error",
"translation": "Falla al agregar el directorio a ser vigilado %v"
}
-]
+] \ No newline at end of file