diff options
-rw-r--r-- | i18n/en.json | 32 | ||||
-rw-r--r-- | i18n/es.json | 20 | ||||
-rw-r--r-- | webapp/i18n/en.json | 49 | ||||
-rw-r--r-- | webapp/i18n/es.json | 26 |
4 files changed, 81 insertions, 46 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" }, diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 34e938e69..00f4f333d 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -633,6 +633,18 @@ "choose_auth_page.ldapCreate": "Create new team with LDAP Account", "choose_auth_page.noSignup": "No sign-up methods configured, please contact your system administrator.", "claim.account.noEmail": "No email specified", + "claim.email_to_ldap.enterLdapPwd": "Enter the ID and password for your LDAP account", + "claim.email_to_ldap.enterPwd": "Enter the password for your {team} {site} email account", + "claim.email_to_ldap.ldapId": "LDAP ID", + "claim.email_to_ldap.ldapIdError": "Please enter your LDAP ID.", + "claim.email_to_ldap.ldapPasswordError": "Please enter your LDAP password.", + "claim.email_to_ldap.ldapPwd": "LDAP Password", + "claim.email_to_ldap.pwd": "Password", + "claim.email_to_ldap.pwdError": "Please enter your password.", + "claim.email_to_ldap.ssoNote": "You must already have a valid LDAP account", + "claim.email_to_ldap.ssoType": "Upon claiming your account, you will only be able to login with LDAP", + "claim.email_to_ldap.switchTo": "Switch account to LDAP", + "claim.email_to_ldap.title": "Switch Email/Password Account to LDAP", "claim.email_to_oauth.enterPwd": "Enter the password for your {team} {site} account", "claim.email_to_oauth.pwd": "Password", "claim.email_to_oauth.pwdError": "Please enter your password.", @@ -640,6 +652,18 @@ "claim.email_to_oauth.ssoType": "Upon claiming your account, you will only be able to login with {type} SSO", "claim.email_to_oauth.switchTo": "Switch account to {uiType}", "claim.email_to_oauth.title": "Switch Email/Password Account to {uiType}", + "claim.ldap_to_email.confirm": "Confirm Password", + "claim.ldap_to_email.email": "You will use the email {email} to login", + "claim.ldap_to_email.enterLdapPwd": "Enter your LDAP password for your {team} {site} email account", + "claim.ldap_to_email.enterPwd": "Enter a new password for your email account", + "claim.ldap_to_email.ldapPasswordError": "Please enter your LDAP password.", + "claim.ldap_to_email.ldapPwd": "LDAP Password", + "claim.ldap_to_email.pwd": "Password", + "claim.ldap_to_email.pwdError": "Please enter your password.", + "claim.ldap_to_email.pwdNotMatch": "Passwords do not match.", + "claim.ldap_to_email.ssoType": "Upon claiming your account, you will only be able to login with your email and password", + "claim.ldap_to_email.switchTo": "Switch account to email/password", + "claim.ldap_to_email.title": "Switch LDAP Account to Email/Password", "claim.oauth_to_email.confirm": "Confirm Password", "claim.oauth_to_email.description": "Upon changing your account type, you will only be able to login with your email and password.", "claim.oauth_to_email.enterPwd": "Please enter a password.", @@ -647,31 +671,6 @@ "claim.oauth_to_email.pwdNotMatch": "Password do not match.", "claim.oauth_to_email.switchTo": "Switch {type} to email and password", "claim.oauth_to_email.title": "Switch {type} Account to Email", - "claim.oauth_to_email.newPwd": "Enter a new password for your {team} {site} account", - "claim.email_to_ldap.pwdError": "Please enter your password.", - "claim.email_to_ldap.ldapIdError": "Please enter your LDAP ID.", - "claim.email_to_ldap.ldapPasswordError": "Please enter your LDAP password.", - "claim.email_to_ldap.title": "Switch Email/Password Account to LDAP", - "claim.email_to_ldap.ssoType": "Upon claiming your account, you will only be able to login with LDAP", - "claim.email_to_ldap.ssoNote": "You must already have a valid LDAP account", - "claim.email_to_ldap.enterPwd": "Enter the password for your {team} {site} email account", - "claim.email_to_ldap.pwd": "Password", - "claim.email_to_ldap.enterLdapPwd": "Enter the ID and password for your LDAP account", - "claim.email_to_ldap.ldapId": "LDAP ID", - "claim.email_to_ldap.ldapPwd": "LDAP Password", - "claim.email_to_ldap.switchTo": "Switch account to LDAP", - "claim.ldap_to_email.pwdError": "Please enter your password.", - "claim.ldap_to_email.pwdNotMatch": "Passwords do not match.", - "claim.ldap_to_email.ldapPasswordError": "Please enter your LDAP password.", - "claim.ldap_to_email.title": "Switch LDAP Account to Email/Password", - "claim.ldap_to_email.ssoType": "Upon claiming your account, you will only be able to login with your email and password", - "claim.ldap_to_email.email": "You will use the email {email} to login", - "claim.ldap_to_email.enterLdapPwd": "Enter your LDAP password for your {team} {site} email account", - "claim.ldap_to_email.ldapPwd": "LDAP Password", - "claim.ldap_to_email.enterPwd": "Enter a new password for your email account", - "claim.ldap_to_email.pwd": "Password", - "claim.ldap_to_email.confirm": "Confirm Password", - "claim.ldap_to_email.switchTo": "Switch account to email/password", "confirm_modal.cancel": "Cancel", "create_comment.addComment": "Add a comment...", "create_comment.comment": "Add Comment", diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json index 9c1665c4e..20b79fc84 100644 --- a/webapp/i18n/es.json +++ b/webapp/i18n/es.json @@ -633,6 +633,18 @@ "choose_auth_page.ldapCreate": "Crea un nuevo equipo con tu cuenta de LDAP", "choose_auth_page.noSignup": "No hay métodos de inicio de sesión configurad, por favor contacte al administrador de sistemasos", "claim.account.noEmail": "No se especifico un correo electrónico.", + "claim.email_to_ldap.enterLdapPwd": "Ingresa el ID y la contraseña de tu cuenta LDAP", + "claim.email_to_ldap.enterPwd": "Ingresa la contraseña para tu cuenta de correo en {team} {site}", + "claim.email_to_ldap.ldapId": "LDAP ID", + "claim.email_to_ldap.ldapIdError": "Por favor ingresa tu ID de LDAP.", + "claim.email_to_ldap.ldapPasswordError": "Por favor ingresa tu contraseña de LDAP.", + "claim.email_to_ldap.ldapPwd": "Contraseña de LDAP", + "claim.email_to_ldap.pwd": "Contraseña", + "claim.email_to_ldap.pwdError": "Por favor ingresa tu contraseña.", + "claim.email_to_ldap.ssoNote": "Debes tener una cuenta de LDAP válida", + "claim.email_to_ldap.ssoType": "Al reclamar tu cuenta, sólo podrás iniciar sesión con LDAP", + "claim.email_to_ldap.switchTo": "Cambiar cuenta a LDAP", + "claim.email_to_ldap.title": "Cambiar Cuenta de Correo/Contraseña a LDAP", "claim.email_to_oauth.enterPwd": "Ingresa la contraseña para tu cuenta para {team} {site}", "claim.email_to_oauth.pwd": "Contraseña", "claim.email_to_oauth.pwdError": "Por favor introduce tu contraseña.", @@ -640,6 +652,18 @@ "claim.email_to_oauth.ssoType": "Al reclamar tu cuenta, sólo podrás iniciar sesión con {type} SSO", "claim.email_to_oauth.switchTo": "Cambiar cuenta a {uiType}", "claim.email_to_oauth.title": "Cambiar Cuenta de Correo/Contraseña a {uiType}", + "claim.ldap_to_email.confirm": "Confirmar Contraseña", + "claim.ldap_to_email.email": "Para iniciar sesión debes utilizar el correo electrónico {email}", + "claim.ldap_to_email.enterLdapPwd": "Ingresa tu contraseña de LDAP para tu cuenta de correo en {team} {site}", + "claim.ldap_to_email.enterPwd": "Ingresa una nueva contraseña para tu cuenta de correo", + "claim.ldap_to_email.ldapPasswordError": "Por favor ingresa tu contraseña LDAP.", + "claim.ldap_to_email.ldapPwd": "Contraseña LDAP", + "claim.ldap_to_email.pwd": "Contraseña", + "claim.ldap_to_email.pwdError": "Por favor ingresa tu contraseña.", + "claim.ldap_to_email.pwdNotMatch": "Las contraseñas no coinciden.", + "claim.ldap_to_email.ssoType": "Al cambiar el tipo de cuenta, sólo podrás iniciar sesión con tu correo electrónico y contraseña.", + "claim.ldap_to_email.switchTo": "Cambiar cuenta a correo/contraseña", + "claim.ldap_to_email.title": "Cambiar la cuenta de LDAP a Correo/Contraseña", "claim.oauth_to_email.confirm": "Confirmar Contraseña", "claim.oauth_to_email.description": "Al cambiar el tipo de cuenta, sólo podrás iniciar sesión con tu correo electrónico y contraseña.", "claim.oauth_to_email.enterPwd": "Por favor ingresa una contraseña.", @@ -647,7 +671,6 @@ "claim.oauth_to_email.pwdNotMatch": "Las contraseñas no coinciden.", "claim.oauth_to_email.switchTo": "Cambiar {type} a correo electrónico y contraseña", "claim.oauth_to_email.title": "Cambiar la cuenta de {type} a Correo Electrónico", - "claim.oauth_to_email.newPwd": "Ingresa una nueva contraseña para tu cuenta de {team} {site}", "confirm_modal.cancel": "Cancelar", "create_comment.addComment": "Agregar un comentario...", "create_comment.comment": "Agregar Comentario", @@ -1335,6 +1358,7 @@ "user.settings.security.switchEmail": "Cambiar para utilizar correo electrónico y contraseña", "user.settings.security.switchGitlab": "Cambiar para utilizar GitLab SSO", "user.settings.security.switchGoogle": "Cambiar para utilizar Google SSO", + "user.settings.security.switchLda": "Cambiar a utilizar LDAP", "user.settings.security.title": "Configuración de Seguridad", "user.settings.security.viewHistory": "Visualizar historial de acceso", "user_list.notFound": "No se encontraron usuarios :(", |