summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--i18n/en.json16
-rw-r--r--i18n/es.json4
-rw-r--r--webapp/i18n/en.json4
-rw-r--r--webapp/i18n/es.json4
-rw-r--r--webapp/i18n/pt.json1
5 files changed, 17 insertions, 12 deletions
diff --git a/i18n/en.json b/i18n/en.json
index df8cf4c2b..9013dbea9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -380,6 +380,10 @@
"translation": "Logout of Mattermost"
},
{
+ "id": "api.command_logout.fail_message",
+ "translation": "Failed to log out"
+ },
+ {
"id": "api.command_logout.name",
"translation": "logout"
},
@@ -388,10 +392,6 @@
"translation": "Logging out..."
},
{
- "id": "api.command_logout.fail_message",
- "translation": "Failed to log out"
- },
- {
"id": "api.command_me.desc",
"translation": "Do an action"
},
@@ -2308,10 +2308,6 @@
"translation": "Invalid connection security for LDAP settings. Must be '', 'TLS', or 'STARTTLS'"
},
{
- "id": "model.config.is_valid.restrict_direct_message.app_error",
- "translation": "Invalid direct message restriction. Must be 'any', or 'team'"
- },
- {
"id": "model.config.is_valid.listen_address.app_error",
"translation": "Invalid listen address for service settings Must be set."
},
@@ -2332,6 +2328,10 @@
"translation": "Invalid per sec for rate limit settings. Must be a positive number"
},
{
+ "id": "model.config.is_valid.restrict_direct_message.app_error",
+ "translation": "Invalid direct message restriction. Must be 'any', or 'team'"
+ },
+ {
"id": "model.config.is_valid.sql_data_src.app_error",
"translation": "Invalid data source for SQL settings. Must be set."
},
diff --git a/i18n/es.json b/i18n/es.json
index 5836644d8..54438b879 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -380,6 +380,10 @@
"translation": "Salir de Mattermost"
},
{
+ "id": "api.command_logout.fail_message",
+ "translation": "Falla al cerrar la sesión"
+ },
+ {
"id": "api.command_logout.name",
"translation": "salir"
},
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index c7ff64689..cc440f5fb 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -965,9 +965,9 @@
"login.email": "Email",
"login.find": "Find your other teams",
"login.forgot": "I forgot my password",
- "login.invalidPassword": "Your password is incorrect.",
"login.gitlab": "GitLab",
"login.google": "Google Apps",
+ "login.invalidPassword": "Your password is incorrect.",
"login.ldapUsername": "LDAP Username",
"login.noAccount": "Don't have an account? ",
"login.on": "on {siteName}",
@@ -1143,9 +1143,9 @@
"sidebar_right_menu.help": "Help",
"sidebar_right_menu.inviteNew": "Invite New Member",
"sidebar_right_menu.logout": "Logout",
- "sidebar_right_menu.switch_team": "Switch Team",
"sidebar_right_menu.manageMembers": "Manage Members",
"sidebar_right_menu.report": "Report a Problem",
+ "sidebar_right_menu.switch_team": "Switch Team",
"sidebar_right_menu.teamLink": "Get Team Invite Link",
"sidebar_right_menu.teamSettings": "Team Settings",
"signup_team.choose": "Teams you are a member of: ",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index 8a2e716f4..380f6fe43 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -967,8 +967,8 @@
"login.forgot": "Olvide mi contraseña",
"login.gitlab": "GitLab",
"login.google": "Google Apps",
+ "login.invalidPassword": "La Contraseña es incorrecta.",
"login.ldapUsername": "Usuario LDAP",
- "login.loginIdRequired": "Se requiere un {type}",
"login.noAccount": "¿No tienes una cuenta? ",
"login.on": "en {siteName}",
"login.or": "o",
@@ -976,6 +976,7 @@
"login.passwordChanged": " La contraseña ha sido actualizada",
"login.session_expired": " Tu sesión ha expirado. Por favor inicia sesión nuevamente.",
"login.signIn": "Entrar",
+ "login.signInWith": "Iniciar sesión con:",
"login.userNotFound": "No pudimos encontrar una cuenta que coincida con tus credenciales.",
"login.username": "Nombre de usuario",
"login.verified": " Correo electrónico Verificado",
@@ -1144,6 +1145,7 @@
"sidebar_right_menu.logout": "Cerrar sesión",
"sidebar_right_menu.manageMembers": "Adminisrar Miembros",
"sidebar_right_menu.report": "Reporta un Problema",
+ "sidebar_right_menu.switch_team": "Cambiar Equipo",
"sidebar_right_menu.teamLink": "Enlace Invitación al Equipo",
"sidebar_right_menu.teamSettings": "Configurar Equipo",
"signup_team.choose": "Equipos a los que perteneces: ",
diff --git a/webapp/i18n/pt.json b/webapp/i18n/pt.json
index 6bd3d5724..bdcfd08db 100644
--- a/webapp/i18n/pt.json
+++ b/webapp/i18n/pt.json
@@ -956,7 +956,6 @@
"login.gitlab": "GitLab",
"login.google": "Google Apps",
"login.ldapUsername": "Usuário LDAP",
- "login.loginIdRequired": "Um {type} é necessário",
"login.noAccount": "Não tem uma conta? ",
"login.on": "no {siteName}",
"login.or": "ou",