summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json32
-rw-r--r--i18n/es.json20
2 files changed, 32 insertions, 20 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 6811d86e3..935af52f9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1412,6 +1412,10 @@
"translation": "Failed to set email verified err=%v"
},
{
+ "id": "api.user.email_to_ldap.not_available.app_error",
+ "translation": "LDAP not available on this server"
+ },
+ {
"id": "api.user.get_authorization_code.unsupported.app_error",
"translation": "Unsupported OAuth service provider"
},
@@ -1424,6 +1428,14 @@
"translation": "Initializing user api routes"
},
{
+ "id": "api.user.ldap_to_email.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.login.blank_pwd.app_error",
"translation": "Password field must not be blank"
},
@@ -1472,6 +1484,10 @@
"translation": "LDAP not available on this server"
},
{
+ "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.permanent_delete_user.attempting.warn",
"translation": "Attempting to permanently delete account %v id=%v"
},
@@ -1540,22 +1556,6 @@
"translation": "Failed to send welcome email successfully err=%v"
},
{
- "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 2c062dd00..06a725e18 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -1412,6 +1412,10 @@
"translation": "Falla al asignar el correo como verificado err=%v"
},
{
+ "id": "api.user.email_to_ldap.not_available.app_error",
+ "translation": "LDAP no está disponible en este servidor"
+ },
+ {
"id": "api.user.get_authorization_code.unsupported.app_error",
"translation": "Proveedor de servicios de OAuth no es compatible"
},
@@ -1424,6 +1428,14 @@
"translation": "Inicializando rutas del API para los Usuarios"
},
{
+ "id": "api.user.ldap_to_email.not_available.app_error",
+ "translation": "LDAP no está disponible en este servidor"
+ },
+ {
+ "id": "api.user.ldap_to_email.not_ldap_account.app_error",
+ "translation": "La cuenta de este usuario utiliza LDAP"
+ },
+ {
"id": "api.user.login.blank_pwd.app_error",
"translation": "El campo de contraseña no debe quedar en blanco"
},
@@ -1472,6 +1484,10 @@
"translation": "LDAP no está disponible en este servidor"
},
{
+ "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"
+ },
+ {
"id": "api.user.permanent_delete_user.attempting.warn",
"translation": "Intentando eliminar permanentemente la cuenta %v id=%v"
},
@@ -1540,10 +1556,6 @@
"translation": "Falla al enviar el correo de bienvenida err=%v"
},
{
- "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"
- },
- {
"id": "api.user.update_active.permissions.app_error",
"translation": "No tienes los permisos apropiados"
},