Spanish locs and sort files by id (#2913)

i18n/en.json

@@ -379,6 +379,10 @@
     "id": "api.command_logout.desc",
     "translation": "Logout of Mattermost"
   },
+  {
+    "id": "api.command_logout.fail_message",
+    "translation": "Failed to log out"
+  },
   {
     "id": "api.command_logout.name",
     "translation": "logout"
@@ -387,10 +391,6 @@
     "id": "api.command_logout.success_message",
     "translation": "Logging out..."
   },
-  {
-    "id": "api.command_logout.fail_message",
-    "translation": "Failed to log out"
-  },
   {
     "id": "api.command_me.desc",
     "translation": "Do an action"
@@ -2307,10 +2307,6 @@
     "id": "model.config.is_valid.ldap_security.app_error",
     "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."
@@ -2331,6 +2327,10 @@
     "id": "model.config.is_valid.rate_sec.app_error",
     "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."

i18n/es.json

@@ -379,6 +379,10 @@
     "id": "api.command_logout.desc",
     "translation": "Salir de Mattermost"
   },
+  {
+    "id": "api.command_logout.fail_message",
+    "translation": "Falla al cerrar la sesión"
+  },
   {
     "id": "api.command_logout.name",
     "translation": "salir"

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: ",

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: ",

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",