daily translations 20160606 (#3275)

5 files changed, 139 insertions, 47 deletions

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index f231ccac2..783aea863 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -180,9 +180,9 @@
   "admin.email.smtpUsernameTitle": "SMTP Username:",
   "admin.email.testing": "Testing...",
   "admin.false": "false",
-  "admin.general.localization.serverLocaleDescription": "Default language for system messages and logs. Changing this will require a server restart before taking effect.",
-  "admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.",
   "admin.general.localization.availableLocalesDescription": "Determines which languages are available for users in Account Settings.",
+  "admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.",
+  "admin.general.localization.serverLocaleDescription": "Default language for system messages and logs. Changing this will require a server restart before taking effect.",
   "admin.gitab.clientSecretDescription": "Obtain this value via the instructions above for logging into GitLab.",
   "admin.gitlab.EnableHtmlDesc": "<ol><li>Log in to your GitLab account and go to Profile Settings -> Applications.</li><li>Enter Redirect URIs \"<your-mattermost-url>/login/gitlab/complete\" (example: http://localhost:8065/login/gitlab/complete) and \"<your-mattermost-url>/signup/gitlab/complete\". </li><li>Then use \"Secret\" and \"Id\" fields from GitLab to complete the options below.</li><li>Complete the Endpoint URLs below. </li></ol>",
   "admin.gitlab.authDescription": "Enter https://<your-gitlab-url>/oauth/authorize (example https://example.com:3000/oauth/authorize).   Make sure you use HTTP or HTTPS in your URL depending on your server configuration.",
@@ -719,11 +719,11 @@
   "channel_notifications.sendDesktop": "Send desktop notifications",
   "channel_notifications.unreadInfo": "The channel name is bolded in the sidebar when there are unread messages. Selecting \"Only for mentions\" will bold the channel only when you are mentioned.",
   "channel_select.placeholder": "--- Select a channel ---",
+  "channel_switch_modal.dm": "(Direct Message)",
   "channel_switch_modal.help": "Type channel name. Use ↑↓ to browse, TAB to select, ↵ to confirm, ESC to dismiss",
   "channel_switch_modal.not_found": "No matches found.",
   "channel_switch_modal.submit": "Switch",
   "channel_switch_modal.title": "Switch Channels",
-  "channel_switch_modal.dm": "(Direct Message)",
   "choose_auth_page.emailCreate": "Create new team with email address",
   "choose_auth_page.find": "Find my teams",
   "choose_auth_page.gitlabCreate": "Create new team with GitLab Account",
@@ -840,15 +840,15 @@
   "email_verify.verified": "{siteName} Email Verified",
   "email_verify.verifiedBody": "<p>Your email has been verified! Click <a href={url}>here</a> to log in.</p>",
   "email_verify.verifyFailed": "Failed to verify your email.",
+  "error.not_found.link_message": "Back to Mattermost",
+  "error.not_found.message": "The page you were trying to reach does not exist",
+  "error.not_found.title": "Page not found",
+  "error.not_supported.message": "Private browsing is not supported",
+  "error.not_supported.title": "Browser not supported",
   "error_bar.expired": "Enterprise license has expired; you have 15 days from expiry to renew the license, please contact commercial@mattermost.com for details",
   "error_bar.expiring": "The Enterprise license is expiring on {date}. To renew your license, please contact commercial@mattermost.com",
   "error_bar.past_grace": "Enterprise license has expired, please contact your System Administrator for details",
   "error_bar.preview_mode": "Preview Mode: Email notifications have not been configured",
-  "error.not_found.title": "Page not found",
-  "error.not_found.message": "The page you were trying to reach does not exist",
-  "error.not_found.link_message": "Back to Mattermost",
-  "error.not_supported.title": "Browser not supported",
-  "error.not_supported.message": "Private browsing is not supported",
   "file_attachment.download": "Download",
   "file_info_preview.size": "Size ",
   "file_info_preview.type": "File type ",
@@ -968,13 +968,13 @@
   "login.ldapUsernameLower": "LDAP username",
   "login.noAccount": "Don't have an account? ",
   "login.noEmail": "Please enter your email",
-  "login.noUsername": "Please enter your username",
-  "login.noLdapUsername": "Please enter your {ldapUsername}",
-  "login.noEmailUsername": "Please enter your email or username",
   "login.noEmailLdapUsername": "Please enter your email or {ldapUsername}",
-  "login.noUsernameLdapUsername": "Please enter your username or {ldapUsername}",
+  "login.noEmailUsername": "Please enter your email or username",
   "login.noEmailUsernameLdapUsername": "Please enter your email, username or {ldapUsername}",
+  "login.noLdapUsername": "Please enter your {ldapUsername}",
   "login.noPassword": "Please enter your password",
+  "login.noUsername": "Please enter your username",
+  "login.noUsernameLdapUsername": "Please enter your username or {ldapUsername}",
   "login.on": "on {siteName}",
   "login.or": "or",
   "login.password": "Password",
@@ -1295,13 +1295,13 @@
   "user.settings.developer.register": "Register New Application",
   "user.settings.developer.thirdParty": "Open to register a new third-party application",
   "user.settings.developer.title": "Developer Settings",
-  "user.settings.display.collapseOn": "On",
-  "user.settings.display.collapseOff": "Off",
-  "user.settings.display.collapseDesc": "Toggle whether to automatically collapse all image previews.",
-  "user.settings.display.collapseDisplay": "Auto Collapse Previews",
   "user.settings.display.channelDisplayTitle": "Channel Display Mode",
   "user.settings.display.channeldisplaymode": "Select the width of the center channel.",
   "user.settings.display.clockDisplay": "Clock Display",
+  "user.settings.display.collapseDesc": "Toggle whether to automatically collapse all image previews.",
+  "user.settings.display.collapseDisplay": "Auto Collapse Previews",
+  "user.settings.display.collapseOff": "Off",
+  "user.settings.display.collapseOn": "On",
   "user.settings.display.fixedWidthCentered": "Fixed width, centered",
   "user.settings.display.fontDesc": "Select the font displayed in the Mattermost user interface.",
   "user.settings.display.fontTitle": "Display Font",
@@ -1410,11 +1410,11 @@
   "user.settings.notifications.usernameMention": "Your username mentioned \"@{username}\"",
   "user.settings.notifications.wordsTrigger": "Words that trigger mentions",
   "user.settings.push_notification.allActivity": "For all activity",
+  "user.settings.push_notification.disabled": "Disabled by system administrator",
+  "user.settings.push_notification.disabled_long": "Push notifications for mobile devices have been disabled by your System Administrator.",
   "user.settings.push_notification.info": "Notification alerts are pushed to your mobile device when there is activity in Mattermost.",
   "user.settings.push_notification.off": "Off",
   "user.settings.push_notification.onlyMentions": "For mentions and direct messages",
-  "user.settings.push_notification.disabled": "Disabled by system administrator",
-  "user.settings.push_notification.disabled_long": "Push notifications for mobile devices have been disabled by your System Administrator.",
   "user.settings.security.close": "Close",
   "user.settings.security.currentPassword": "Current Password",
   "user.settings.security.currentPasswordError": "Please enter your current password",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index 813be61f3..4e3b4d916 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -180,6 +180,9 @@
   "admin.email.smtpUsernameTitle": "Usuario SMTP:",
   "admin.email.testing": "Probando...",
   "admin.false": "falso",
+  "admin.general.localization.availableLocalesDescription": "Determina qué idiomas están disponibles para los usuarios en la Configuración de la Cuenta.",
+  "admin.general.localization.clientLocaleDescription": "Idioma predeterminado para nuevos usuarios y páginas donde el usuario no ha iniciado sesión.",
+  "admin.general.localization.serverLocaleDescription": "Idioma predeterminado para los mensajes del sistema y los registros. Cambiar esto requerirá un reinicio del servidor antes de tomar efecto.",
   "admin.gitab.clientSecretDescription": "Utilizar este valor vía instrucciones suministradas anteriormente para iniciar sesión en GitLab.",
   "admin.gitlab.EnableHtmlDesc": "<ol><li>Inicia sesión con tu cuenta en GitLab y dirigete a Profile Settings -> Applications.</li><li>Ingresa los URIs \"<your-mattermost-url>/login/gitlab/complete\" (ejemplo: http://localhost:8065/login/gitlab/complete) y \"<your-mattermost-url>/signup/gitlab/complete\". </li><li>Luego utiliza los valores de los campos \"Secret\" e \"Id\" de GitLab y completa las opciones que abajo se presentan.</li><li>Completa las dirección URLs abajo. </li></ol>",
   "admin.gitlab.authDescription": "Ingresar <tu-url-de-gitlab>/oauth/authorize (example http://localhost:3000/oauth/authorize).   Asegurate que si utilizas HTTPS o HTTPS tus URLS sean correctas.",
@@ -240,7 +243,6 @@
   "admin.image.thumbWidthDescription": "Ancho de imágen miniatura subida. Actualizando este valor la imagen miniatura cambia en el futuro, pero no cambia para imagenes creadas en el pasado.",
   "admin.image.thumbWidthExample": "Ej \"120\"",
   "admin.image.thumbWidthTitle": "Ancho de imágen miniatura:",
-  "admin.ldap.bannerDesc": "Si el atributo de un usuario cambia en el servidor LDAP será actualizado la próxima vez que el usuario ingrese sus credenciales para iniciar sesión en Mattermost. Esto incluye si un usuario se inactiva o se remueve en el servidor LDAP. Sincronización con servidores LDAP está planificado para futuras versiones.",
   "admin.ldap.baseDesc": "El DN Base es el Nombre Distinguido de la ubicación donde Mattermost debe comenzar a buscar a los usuarios en el árbol del LDAP.",
   "admin.ldap.baseEx": "Ej \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "DN Base:",
@@ -394,7 +396,7 @@
   "admin.service.overrideTitle": "Habilitar el cambio de nombres de usuario desde los Webhooks: ",
   "admin.service.securityDesc": "Cuando es verdadero, Los Administradores del Sistema serán notificados por correo electrónico se han anunciado alertas de seguridad relevantes en las últimas 12 horas. Requiere que los correos estén habilitados.",
   "admin.service.securityTitle": "Habilitar Alertas de Seguridad: ",
-  "admin.service.segmentDescription": "Para usuarios que corren en servicios SaaS, registarse en Segment.com para obtener su llave.",
+  "admin.service.segmentDescription": "Segment.com es un servicio en línea que puede ser utilizado opcionalmente para el seguimiento detallado de las estadísticas del sistema. Puedes obtener una clave de registro para obtener una cuenta gratuita en Segment.com.",
   "admin.service.segmentExample": "Ej \"g3fgGOXJAQ43QV7rAh6iwQCkV4cA1Gs\"",
   "admin.service.segmentTitle": "Llave de segmento para desarollador:",
   "admin.service.sessionCache": "Duración del Cache de la Sesión en Minutos:",
@@ -717,7 +719,8 @@
   "channel_notifications.sendDesktop": "Enviar notificaciones de escritorio",
   "channel_notifications.unreadInfo": "El nombre del canal está en negritas en la barra lateral cuando hay mensajes sin leer. Al elegir \"Sólo para menciones\" sólo lo dejará en negritas cuando seas mencionado.",
   "channel_select.placeholder": "--- Selecciona un canal ---",
-  "channel_switch_modal.help": "↑↓ para navegar, TAB para seleccionar, ↵ para confirmar, ESC para descartar",
+  "channel_switch_modal.dm": "(Mensaje Directo)",
+  "channel_switch_modal.help": "Escribe el nombre del canal. Utiliza ↑↓ para navegar, TAB para seleccionar, ↵ para confirmar, ESC para descartar",
   "channel_switch_modal.not_found": "No se encontró ninguna coincidencia.",
   "channel_switch_modal.submit": "Cambiar",
   "channel_switch_modal.title": "Cambiar Canales",
@@ -837,6 +840,11 @@
   "email_verify.verified": "{siteName} Correo electrónico verificado",
   "email_verify.verifiedBody": "<p>Tu correo electrónico ha sido verificado!! Pincha <a href={url}>aquí</a> para iniciar sesión.</p>",
   "email_verify.verifyFailed": "Falla al verificar tu correo electrónico.",
+  "error.not_found.link_message": "Volver a Mattermost",
+  "error.not_found.message": "La página que está intentando acceder no existe",
+  "error.not_found.title": "Página no encontrada",
+  "error.not_supported.message": "La navegación privada no es compatible",
+  "error.not_supported.title": "Navegador no compatible",
   "error_bar.expired": "La licencia Enterprise ha expirado; tienes 15 días desde la fecha de expiración para renovar la licencia, por favor contacta a commercial@mattermost.com para más detalles",
   "error_bar.expiring": "La licencia Enterprise expira el {date}. Para renovar tu licencia, por favor contacta a commercial@mattermost.com",
   "error_bar.past_grace": "La licencia Enterprise ha expirado, por favor contacta a un Administrador del Sistema para más detalles",
@@ -957,9 +965,16 @@
   "login.google": "Google Apps",
   "login.invalidPassword": "La Contraseña es incorrecta.",
   "login.ldapUsername": "Usuario LDAP",
+  "login.ldapUsernameLower": "Nombre de Usuario LDAP",
   "login.noAccount": "¿No tienes una cuenta? ",
-  "login.noLoginId": "Por favor ingresa tu {loginId}",
+  "login.noEmail": "Por favor, introduzca su correo electrónico",
+  "login.noEmailLdapUsername": "Por favor, introduzca su correo electrónico o {ldapUsername}",
+  "login.noEmailUsername": "Por favor, introduzca su correo electrónico o nombre de usuario",
+  "login.noEmailUsernameLdapUsername": "Por favor, introduzca su correo electrónico, nombre de usuario o {ldapUsername}",
+  "login.noLdapUsername": "Por favor, introduzca su {ldapUsername}",
   "login.noPassword": "Por favor ingresa tu contraseña.",
+  "login.noUsername": "Por favor, introduzca su nombre de usuario",
+  "login.noUsernameLdapUsername": "Por favor, introduzca su nombre de usuario o {ldapUsername}",
   "login.on": "en {siteName}",
   "login.or": "o",
   "login.password": "Contraseña",
@@ -1158,6 +1173,7 @@
   "signup_user_completed.expired": "Ya haz completado el proceso de registro para esta invitación, o esta invitación ya ha expirado.",
   "signup_user_completed.gitlab": "con GitLab",
   "signup_user_completed.google": "con Google",
+  "signup_user_completed.haveAccount": "Ya tienes una cuenta?",
   "signup_user_completed.invalid_invite": "El enlace de invitación es inválido.  Por favor habla con tu administrador para recibir una invitación.",
   "signup_user_completed.lets": "Vamos a crear tu cuenta",
   "signup_user_completed.no_open_server": "Este servidor no acepta registros abiertos.  Por favor habla con tu administrador para recibir una invitación.",
@@ -1167,6 +1183,7 @@
   "signup_user_completed.passwordLength": "Por favor ingresa al menos {min} caracteres",
   "signup_user_completed.required": "Este campo es obligatorio",
   "signup_user_completed.reserved": "Este nombre de usuario está reservado, por favor escoge uno nuevo.",
+  "signup_user_completed.signIn": "Haz clic aquí para iniciar sesión.",
   "signup_user_completed.userHelp": "El nombre de usuario debe empezar con una letra, y contener entre {min} a {max} caracteres en minúscula con números, letras, y los símbolos '.', '-' y '_'.",
   "signup_user_completed.usernameLength": "El nombre de usuario debe comenzar con una letra, y debe contener entre {min} y {max} caracteres en minúscula y confeccionado por numeros, letras y los simbolos '.', '-' and '_'.",
   "signup_user_completed.validEmail": "Por favor ingresa una dirección de correo electrónico válida",
@@ -1179,7 +1196,7 @@
   "sso_signup.length_error": "Name must be 3 or more characters up to a maximum of 15",
   "sso_signup.teamName": "Ingresa el nombre del nuevo equipo",
   "sso_signup.team_error": "Please enter a team name",
-  "suggestion.mention.all": "Notifica a todas las personas en el equipo",
+  "suggestion.mention.all": "Notifica a todos en el canal, utiliza en {townsquare} para notificar a todo el equipo",
   "suggestion.mention.channel": "Notifica a todas las personas en el canal",
   "suggestion.search.private": "Grupos Privados",
   "suggestion.search.public": "Canales Públicos",
@@ -1281,6 +1298,10 @@
   "user.settings.display.channelDisplayTitle": "Modo en que se muestra el Canal",
   "user.settings.display.channeldisplaymode": "Selecciona el ancho de la vista central.",
   "user.settings.display.clockDisplay": "Visualización del Reloj",
+  "user.settings.display.collapseDesc": "Cambia automáticamente el colapso de todas las vistas previas de imágenes.",
+  "user.settings.display.collapseDisplay": "Auto Colapso Vistas Previas",
+  "user.settings.display.collapseOff": "Apagado",
+  "user.settings.display.collapseOn": "Encendido",
   "user.settings.display.fixedWidthCentered": "De ancho fijo, centrado",
   "user.settings.display.fontDesc": "Selecciona la fuente con la que quieres ver la interfaz de Mattermost.",
   "user.settings.display.fontTitle": "Fuente de Visualización",
@@ -1367,7 +1388,7 @@
   "user.settings.notification.allActivity": "Para toda actividad",
   "user.settings.notification.push": "Notificaciones push a móviles",
   "user.settings.notification.soundConfig": "Por favor configura los sonidos de notificación en las configuraciones de tu navegador",
-  "user.settings.notifications.channelWide": "Menciones a todo el canal \"@channel\"",
+  "user.settings.notifications.channelWide": "Menciones a todo el canal \"@channel\", \"@all\"",
   "user.settings.notifications.close": "Cerrar",
   "user.settings.notifications.desktop": "Enviar notifiaciones de escritorio",
   "user.settings.notifications.desktopSounds": "Sonidos de notificación de escritorio",
@@ -1389,6 +1410,8 @@
   "user.settings.notifications.usernameMention": "Tu nombre de usuario mencionado \"@{username}\"",
   "user.settings.notifications.wordsTrigger": "Palabras que gatillan menciones",
   "user.settings.push_notification.allActivity": "Para toda actividad",
+  "user.settings.push_notification.disabled": "Deshabilitado por el administrador del sistema",
+  "user.settings.push_notification.disabled_long": "Las Notificaciones Push para dispositivos móviles han sido deshabilitadas por el Administrador del Sistema.",
   "user.settings.push_notification.info": "Se enviarán notificaciones a tu dispositivo móvil cuando haya actividad en Mattermost.",
   "user.settings.push_notification.off": "Apagado",
   "user.settings.push_notification.onlyMentions": "Sólo para menciones y mensajes directos",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index cd665649b..9021288fa 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -180,6 +180,9 @@
   "admin.email.smtpUsernameTitle": "Nom d'utilisateur SMTP :",
   "admin.email.testing": "Essai en cours...",
   "admin.false": "non",
+  "admin.general.localization.availableLocalesDescription": "Determines which languages are available for users in Account Settings.",
+  "admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.",
+  "admin.general.localization.serverLocaleDescription": "Default language for system messages and logs. Changing this will require a server restart before taking effect.",
   "admin.gitab.clientSecretDescription": "Récupérez cette information depuis les instructions ci-dessus pour vous connecter à GitLab.",
   "admin.gitlab.EnableHtmlDesc": "<ol><li>Connectez vous à votre compte GitLab et allez dans les réglages de votre profil, puis dans \"Applications\".</li><li>Saisissez les URLs de redirection \"<your-mattermost-url>/login/gitlab/complete\" (exemple: http://localhost:8065/login/gitlab/complete) et \"<your-mattermost-url>/signup/gitlab/complete\". </li><li>Puis utilisez les champs \"Secret\" et \"Id\" de GitLab pour compléter les options ci-dessous.</li><li>Complétez les URL de fin de parcours (Endpoint) ci-dessous. </li></ol>",
   "admin.gitlab.authDescription": "Saisissez https://<your-gitlab-url>/oauth/authorize (par exemple https://exemple.com:3000/oauth/authorize). Vérifiez si vous utilisez HTTP ou HTTPS que votre URL est correctement saisie.",
@@ -240,7 +243,6 @@
   "admin.image.thumbWidthDescription": "Largeur des vignettes générées pour les images. Changer cette valeur ne modifie pas les vignettes de l'historique.",
   "admin.image.thumbWidthExample": "Exemple : \"120\"",
   "admin.image.thumbWidthTitle": "Largeur des vignettes :",
-  "admin.ldap.bannerDesc": "Si une propriété de l'utilisateur est modifiée sur le serveur LDAP, elle sera mise à jour la prochaine fois que l'utilisateur se loguera à Mattermost. Cela concerne également le fait de désactiver ou supprimer un utilisateur du serveur LDAP. La synchronisation continue sera disponible ultérieurement.",
   "admin.ldap.baseDesc": "Le DN de base est le Distinguished Name à partir du quel Mattermost doit rechercher les utilisateurs dans l'arborescence LDAP.",
   "admin.ldap.baseEx": "Exemple : \"ou=Unit Name, dc=example, dc=com\"",
   "admin.ldap.baseTitle": "DN de base :",
@@ -394,7 +396,7 @@
   "admin.service.overrideTitle": "Autoriser les webhooks et commandes slash à changer leur nom d'utilisateur : ",
   "admin.service.securityDesc": "Si activé, les administrateurs système sont notifiés par courriel si une alerte de sécurité a été annoncée ces 12 dernières heures. La messagerie doit être activée.",
   "admin.service.securityTitle": "Activer les alertes de sécurité : ",
-  "admin.service.segmentDescription": "Pour les utilisateurs d'un service SaaS, inscrivez-vous sur segment.com pour analyser le trafic.",
+  "admin.service.segmentDescription": "Segment.com is an online service that can be optionally used to track detailed system statistics. You can obtain a key by signing-up for a free account at Segment.com.",
   "admin.service.segmentExample": "Exemple : \"g3fgGOXJAQ43QV7rAh6iwQCkV4cA1Gs\"",
   "admin.service.segmentTitle": "Clé développeur Segment.com :",
   "admin.service.sessionCache": "Cache de session en minutes :",
@@ -717,7 +719,8 @@
   "channel_notifications.sendDesktop": "Envoyer des notifications sur le bureau",
   "channel_notifications.unreadInfo": "Le nom du canal est en gras dans la barre latérale lorsqu'il y a des messages non-plus. Choisir \"Seulement pour les mentions\" mettra en gras le canal seulement si vous être mentionné.",
   "channel_select.placeholder": "--- Sélectionnez un canal ---",
-  "channel_switch_modal.help": "↑↓ to browse, TAB to select, ↵ to confirm, ESC to dismiss",
+  "channel_switch_modal.dm": "(Direct Message)",
+  "channel_switch_modal.help": "Type channel name. Use ↑↓ to browse, TAB to select, ↵ to confirm, ESC to dismiss",
   "channel_switch_modal.not_found": "No matches found.",
   "channel_switch_modal.submit": "Switch",
   "channel_switch_modal.title": "Switch Channels",
@@ -837,6 +840,11 @@
   "email_verify.verified": "L'adresse électronique de {siteName} a été vérifié",
   "email_verify.verifiedBody": "<p>Votre adresse électronique a été vérifiée ! <a href={url}>Cliquez ici</a> pour vous connecter.</p>",
   "email_verify.verifyFailed": "Impossible de vérifier votre adresse électronique.",
+  "error.not_found.link_message": "Back to Mattermost",
+  "error.not_found.message": "The page you were trying to reach does not exist",
+  "error.not_found.title": "Page not found",
+  "error.not_supported.message": "Private browsing is not supported",
+  "error.not_supported.title": "Browser not supported",
   "error_bar.expired": "Enterprise license has expired; you have 15 days from expiry to renew the license, please contact commercial@mattermost.com for details",
   "error_bar.expiring": "The Enterprise license is expiring on {date}. To renew your license, please contact commercial@mattermost.com",
   "error_bar.past_grace": "Enterprise license has expired, please contact your System Administrator for details",
@@ -957,9 +965,16 @@
   "login.google": "Google Apps",
   "login.invalidPassword": "Votre mot de passe est incorrect.",
   "login.ldapUsername": "Nom d’utilisateur LDAP",
+  "login.ldapUsernameLower": "Nom d’utilisateur LDAP",
   "login.noAccount": "Pas de compte utilisateur ? ",
-  "login.noLoginId": "Please enter your {loginId}",
+  "login.noEmail": "Please enter your email",
+  "login.noEmailLdapUsername": "Please enter your email or {ldapUsername}",
+  "login.noEmailUsername": "Please enter your email or username",
+  "login.noEmailUsernameLdapUsername": "Please enter your email, username or {ldapUsername}",
+  "login.noLdapUsername": "Please enter your {ldapUsername}",
   "login.noPassword": "Veuillez saisir votre mot de passe.",
+  "login.noUsername": "Please enter your username",
+  "login.noUsernameLdapUsername": "Please enter your username or {ldapUsername}",
   "login.on": "activé {siteName}",
   "login.or": "ou",
   "login.password": "Mot de passe",
@@ -1158,6 +1173,7 @@
   "signup_user_completed.expired": "Vous avez déjà utilisé cette invitation pour vous inscrire, ou bien l'invitation a expiré.",
   "signup_user_completed.gitlab": "avec GitLab",
   "signup_user_completed.google": "avec Google",
+  "signup_user_completed.haveAccount": "Already have an account?",
   "signup_user_completed.invalid_invite": "Le lien d'invitation était invalide. Aller voir avec votre administrateur pour recevoir une invitation ",
   "signup_user_completed.lets": "Créer votre compte",
   "signup_user_completed.no_open_server": "Ce serveur ne permet pas d'inscriptions ouvertes. Aller voir avec votre Administrateur pour recevoir une invitation",
@@ -1167,6 +1183,7 @@
   "signup_user_completed.passwordLength": "Veuillez entrer au moins {min} caractères",
   "signup_user_completed.required": "Champ obligatoire",
   "signup_user_completed.reserved": "Ce nom d'utilisateur est réservé, veuillez en choisir un autre.",
+  "signup_user_completed.signIn": "Click here to sign in.",
   "signup_user_completed.userHelp": "Les noms d'utilisateurs doivent commencer par une lettre et contenir entre {min} et {max} caractères composés de chiffres, lettres minuscules et des symboles '.', '-' et '_'",
   "signup_user_completed.usernameLength": "Les noms d'utilisateurs doivent commencer par une lettre et contenir entre {min} et {max} caractères composés de chiffres, lettres minuscules et des symboles '.', '-' et '_'",
   "signup_user_completed.validEmail": "Veuillez entrer une adresse électronique valide",
@@ -1179,7 +1196,7 @@
   "sso_signup.length_error": "Le nom doit contenir de 3 à 15 caractères",
   "sso_signup.teamName": "Entrez le nom de votre nouvelle équipe",
   "sso_signup.team_error": "Saisissez le nom de votre équipe",
-  "suggestion.mention.all": "Notifier tout le monde dans l'équipe",
+  "suggestion.mention.all": "Notifies everyone in the channel, use in {townsquare} to notify the whole team",
   "suggestion.mention.channel": "Notifier tout le monde dans le canal",
   "suggestion.search.private": "Groupes privés",
   "suggestion.search.public": "Canaux publics",
@@ -1281,6 +1298,10 @@
   "user.settings.display.channelDisplayTitle": "Mode d’affichage du canal",
   "user.settings.display.channeldisplaymode": "Sélectionner la largeur du canal central.",
   "user.settings.display.clockDisplay": "Affichage de l'horloge",
+  "user.settings.display.collapseDesc": "Toggle whether to automatically collapse all image previews.",
+  "user.settings.display.collapseDisplay": "Auto Collapse Previews",
+  "user.settings.display.collapseOff": "Off",
+  "user.settings.display.collapseOn": "On",
   "user.settings.display.fixedWidthCentered": "Largeur fixe, centrée",
   "user.settings.display.fontDesc": "Choisissez la police de caractères utilisée pour l'interface de Mattermost.",
   "user.settings.display.fontTitle": "Police d'affichage",
@@ -1389,6 +1410,8 @@
   "user.settings.notifications.usernameMention": "Votre nom d'utilisateur mentionné \"@{username}\"",
   "user.settings.notifications.wordsTrigger": "Mots qui déclenchent des mentions",
   "user.settings.push_notification.allActivity": "Pour toute l'activit",
+  "user.settings.push_notification.disabled": "Disabled by system administrator",
+  "user.settings.push_notification.disabled_long": "Push notifications for mobile devices have been disabled by your System Administrator.",
   "user.settings.push_notification.info": "Les alertes de notification sont envoyées à votre appareil mobile quand il y a  de l’activité dans Mattermost .",
   "user.settings.push_notification.off": "Désactivé",
   "user.settings.push_notification.onlyMentions": "Seulement pour les mentions et messages privés",
diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json
index 8970e9825..60950afee 100644
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -180,6 +180,9 @@
   "admin.email.smtpUsernameTitle": "SMTPユーザー名:",
   "admin.email.testing": "テストしています…",
   "admin.false": "無効",
+  "admin.general.localization.availableLocalesDescription": "Determines which languages are available for users in Account Settings.",
+  "admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.",
+  "admin.general.localization.serverLocaleDescription": "Default language for system messages and logs. Changing this will require a server restart before taking effect.",
   "admin.gitab.clientSecretDescription": "この値はGitLabにログインする際の説明で提供されています。",
   "admin.gitlab.EnableHtmlDesc": "<ol><li>GitLabのアカウントでログインし、Profile Settings - Applicationsを選択してください。</li><li>Redirect URIsに \"<your-mattermost-url>/login/gitlab/complete\" (example: http://localhost:8065/login/gitlab/complete)と\"<your-mattermost-utl>/signup/gitlab/complete\"を指定してください。</li><li>次にGitLabの\"Secret\"と\"Id\"欄を以下に入力してください。</li><li>以下のエンドポイントURLを入力してください。</li></ol>",
   "admin.gitlab.authDescription": "https://<your-gitlab-url>/oauth/authorize (例: https://example.com:3000/oauth/authorize)を入力してください。サーバーの設定によりHTTPかHTTPSかは異なりますので注意してください。",
@@ -240,7 +243,6 @@
   "admin.image.thumbWidthDescription": "アップロードされた画像から生成されるサムネイルの幅を指定します。この値を変更することで、設定以降のサムネイルサイズが変更されます。しかし設定以前の画像は変更されません。",
   "admin.image.thumbWidthExample": "例: \"120\"",
   "admin.image.thumbWidthTitle": "サムネイルの幅:",
-  "admin.ldap.bannerDesc": "LDAPサーバーの情報が変更された場合、次回Mattermostにログインし直した際に、その情報を参照します。これにはユーザーをLDAPサーバーで無効化したり削除したりした場合も含みます。LDAPサーバーとの同期機能は将来のリリースで実装予定です。",
   "admin.ldap.baseDesc": "ベースDNはMattermostがLDAPツリーでユーザー検索を始める場所の識別名です。",
   "admin.ldap.baseEx": "例: \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "ベースDN:",
@@ -394,7 +396,7 @@
   "admin.service.overrideTitle": "ウェブフックまたはスラッシュコマンドでのユーザー名を上書きする: ",
   "admin.service.securityDesc": "有効な場合、システム管理者は関係のあるセキュリティー修正が発生した場合、12時間以内に電子メールでお知らせを受信できあす。電子メールが有効になっている必要があります。",
   "admin.service.securityTitle": "セキュリティー通知を有効にする: ",
-  "admin.service.segmentDescription": "SaaSサービスを運用しているユーザーは、Segment.comのキーで入力することで、測定ができます。",
+  "admin.service.segmentDescription": "Segment.com is an online service that can be optionally used to track detailed system statistics. You can obtain a key by signing-up for a free account at Segment.com.",
   "admin.service.segmentExample": "例: \"g3fgGOXJAQ43QV7rAh6iwQCkV4cA1Gs\"",
   "admin.service.segmentTitle": "Segmentの開発者キー:",
   "admin.service.sessionCache": "セッションキャッシュの有効期間(分):",
@@ -717,10 +719,11 @@
   "channel_notifications.sendDesktop": "デスクトップ通知を送ります",
   "channel_notifications.unreadInfo": "チャンネル名は未読のメッセージがある場合、サイドバーで太字で表示されます。「あなたについての投稿のみ」を選択することで、あなたについての投稿がある場合のみ太字で表示されます。",
   "channel_select.placeholder": "--- チャンネルを選択してください ---",
-  "channel_switch_modal.help": "↑↓ to browse, TAB to select, ↵ to confirm, ESC to dismiss",
-  "channel_switch_modal.not_found": "No matches found.",
-  "channel_switch_modal.submit": "Switch",
-  "channel_switch_modal.title": "Switch Channels",
+  "channel_switch_modal.dm": "ダイレクトメッセージ",
+  "channel_switch_modal.help": "Type channel name. Use ↑↓ to browse, TAB to select, ↵ to confirm, ESC to dismiss",
+  "channel_switch_modal.not_found": "一致するものは見つかりませんでした。",
+  "channel_switch_modal.submit": "切り替える",
+  "channel_switch_modal.title": "チャンネルを切り替える",
   "choose_auth_page.emailCreate": "電子メールアドレスで新しいチームを作成する",
   "choose_auth_page.find": "参加しているチームを探す",
   "choose_auth_page.gitlabCreate": "GitLabアカウントで新しいチームを作成する",
@@ -837,6 +840,11 @@
   "email_verify.verified": "{siteName}電子メールが確認されました",
   "email_verify.verifiedBody": "<p>あなたの電子メールアドレスは確認されました! <a href={url}>here</a>をクロックしてログインしてください。</p>",
   "email_verify.verifyFailed": "電子メールアドレスが確認できませんでした。",
+  "error.not_found.link_message": "Back to Mattermost",
+  "error.not_found.message": "The page you were trying to reach does not exist",
+  "error.not_found.title": "Page not found",
+  "error.not_supported.message": "Private browsing is not supported",
+  "error.not_supported.title": "Browser not supported",
   "error_bar.expired": "エンタープライズライセンスは期限が切れました。期限切れの日から15日以内にライセンスを更新してください。問い合わせはcommercial@mattermost.comまでお願いします。",
   "error_bar.expiring": "エンタープライズライセンスは{date}に期限が切れます。ライセンスを更新するには、commercial@mattermost.comに問い合わせてください。",
   "error_bar.past_grace": "エンタープライズライセンスの期限が切れました。システム管理者に詳細を問い合わせてください。",
@@ -872,7 +880,7 @@
   "general_tab.includeDirDesc": "ホームページのチーム一覧にチーム名が表示され、サインインページへのリンクが提供されます。",
   "general_tab.includeDirTitle": "チーム一覧に追加する",
   "general_tab.no": "いいえ",
-  "general_tab.openInviteDesc": "許可された場合、このチームへのリンクは、このチームに誰もが参加できるようにするランディングページを含みます。",
+  "general_tab.openInviteDesc": "許可された場合、このチームへのリンクは、このチームに誰もが参加できるようにランディングページに含まれます。",
   "general_tab.openInviteTitle": "このチームに誰でも参加できるよう許可する",
   "general_tab.regenerate": "再生成する",
   "general_tab.required": "この項目は必須です",
@@ -957,9 +965,16 @@
   "login.google": "Google Appsでログインする",
   "login.invalidPassword": "パスワードが正しくありません。",
   "login.ldapUsername": "LDAPユーザー名",
+  "login.ldapUsernameLower": "LDAPユーザー名",
   "login.noAccount": "アカウントを持っていますか? ",
-  "login.noLoginId": "Please enter your {loginId}",
-  "login.noPassword": "Please enter your password",
+  "login.noEmail": "電子メールアドレスを入力してください",
+  "login.noEmailLdapUsername": "電子メールアドレスまたは{ldapUsername}を入力してください",
+  "login.noEmailUsername": "電子メールアドレスまたはユーザー名を入力してください",
+  "login.noEmailUsernameLdapUsername": "電子メールアドレスまたはユーザー名、{ldapUsername}を入力してください",
+  "login.noLdapUsername": "{ldapUsername}を入力してください",
+  "login.noPassword": "パスワードを入力してください",
+  "login.noUsername": "ユーザー名を入力してください",
+  "login.noUsernameLdapUsername": "ユーザー名または{ldapUsername}を入力してください",
   "login.on": "{siteName}にて",
   "login.or": "または",
   "login.password": "パスワード",
@@ -1035,8 +1050,8 @@
   "pending_post_actions.cancel": "キャンセル",
   "pending_post_actions.retry": "再試行",
   "permalink.error.access": "アクセスできないチャンネルのパーマリンクです",
-  "post_attachment.collapse": "Show less...",
-  "post_attachment.more": "Show more...",
+  "post_attachment.collapse": "表示を少なくする",
+  "post_attachment.more": "さらに表示",
   "post_body.commentedOn": "{name}{apostrophe}のメッセージにコメントしました: ",
   "post_body.deleted": "(メッセージは削除されています)",
   "post_body.plusMore": " {count}の他のファイルを追加する",
@@ -1158,6 +1173,7 @@
   "signup_user_completed.expired": "この招待について、既に手続きを完了しているか、有効期限が切れています。",
   "signup_user_completed.gitlab": "GitLabでログインする",
   "signup_user_completed.google": "Googleでログインする",
+  "signup_user_completed.haveAccount": "アカウントをお持ちですか?",
   "signup_user_completed.invalid_invite": "招待リンクが不正です。管理者に連絡してください。",
   "signup_user_completed.lets": "アカウントを作成しましょう",
   "signup_user_completed.no_open_server": "このサーバーは誰でも利用登録できるように設定されていません。管理者に招待してもらってください。",
@@ -1167,6 +1183,7 @@
   "signup_user_completed.passwordLength": "少なくとも{min}文字を入力してください。",
   "signup_user_completed.required": "この項目は必須です",
   "signup_user_completed.reserved": "このユーザー名は予約されています。他のユーザー名を使ってください。",
+  "signup_user_completed.signIn": "サインインするためにここをクリックしてください。",
   "signup_user_completed.userHelp": "ユーザー名は英小文字で始めてください。また{min}から{max} 文字の英数字と'.'、'-'、'_'の記号だけで構成してください。",
   "signup_user_completed.usernameLength": "ユーザー名は英小文字で始めてください。また{min}から{max} 文字の英数字と'.'、'-'、'_'の記号だけで構成してください。",
   "signup_user_completed.validEmail": "有効な電子メールアドレスを入力してください",
@@ -1179,7 +1196,7 @@
   "sso_signup.length_error": "名前は3から15文字にしてください",
   "sso_signup.teamName": "新しいチーム名を入力してください",
   "sso_signup.team_error": "チーム名を入力してください",
-  "suggestion.mention.all": "チームの全員に通知する",
+  "suggestion.mention.all": "Notifies everyone in the channel, use in {townsquare} to notify the whole team",
   "suggestion.mention.channel": "チャネルの全員に通知する",
   "suggestion.search.private": "非公開グループ",
   "suggestion.search.public": "公開チャンネル",
@@ -1281,12 +1298,16 @@
   "user.settings.display.channelDisplayTitle": "チャンネル表示",
   "user.settings.display.channeldisplaymode": "中央のチャンネルの幅を選択してください。",
   "user.settings.display.clockDisplay": "時計表示",
+  "user.settings.display.collapseDesc": "Toggle whether to automatically collapse all image previews.",
+  "user.settings.display.collapseDisplay": "Auto Collapse Previews",
+  "user.settings.display.collapseOff": "オフ",
+  "user.settings.display.collapseOn": "オン",
   "user.settings.display.fixedWidthCentered": "固定幅、中央寄せ",
   "user.settings.display.fontDesc": "Mattermostユーザーインターフェイスで使うフォントを選択してください。",
   "user.settings.display.fontTitle": "表示フォント",
   "user.settings.display.fullScreen": "全幅",
   "user.settings.display.language": "言語",
-  "user.settings.display.messageDisplayClean": "Standard",
+  "user.settings.display.messageDisplayClean": "標準",
   "user.settings.display.messageDisplayCompact": "コンパクト",
   "user.settings.display.messageDisplayDescription": "チャンネルでメッセージがどのように表示されるか選択してください。",
   "user.settings.display.messageDisplayTitle": "メッセージの表示",
@@ -1389,6 +1410,8 @@
   "user.settings.notifications.usernameMention": "あなたのユーザー名についての「@{username}」",
   "user.settings.notifications.wordsTrigger": "誰かについての投稿となる単語",
   "user.settings.push_notification.allActivity": "全てのアクティビティーについて",
+  "user.settings.push_notification.disabled": "Disabled by system administrator",
+  "user.settings.push_notification.disabled_long": "Push notifications for mobile devices have been disabled by your System Administrator.",
   "user.settings.push_notification.info": "Mattermostにアクティビティーがあると、あなたのモバイル端末に通知がプッシュされます。",
   "user.settings.push_notification.off": "オフ",
   "user.settings.push_notification.onlyMentions": "あなたについての投稿とダイレクトメッセージに関して",
diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json
index 17f1d96f7..82ef497f1 100644
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -180,6 +180,9 @@
   "admin.email.smtpUsernameTitle": "Usuário SMTP:",
   "admin.email.testing": "Testando...",
   "admin.false": "falso",
+  "admin.general.localization.availableLocalesDescription": "Determines which languages are available for users in Account Settings.",
+  "admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.",
+  "admin.general.localization.serverLocaleDescription": "Default language for system messages and logs. Changing this will require a server restart before taking effect.",
   "admin.gitab.clientSecretDescription": "Obter este valor de acordo com as instruções acima para logar no GitLab.",
   "admin.gitlab.EnableHtmlDesc": "<ol><li>Faça login na sua conta do GitLab e vá para Configurações do Perfil -> Aplicativos.</li><li>Digite redirecionamento URIs \"<your-mattermost-url>/login/gitlab/complete\" (exemplo: http://localhost:8065/login/gitlab/complete) e \"<your-mattermost-url>/signup/gitlab/complete\".</li><li>Em seguida use os campos \"Secret\" e \"Id\" do Gitlab para completar as opções abaixo.</li><li>Complete o Endpoint com as URLs abaixo. </li></ol>",
   "admin.gitlab.authDescription": "Entre https://<your-gitlab-url>/oauth/authorize (exemplo https://example.com:3000/oauth/authorize).   Tenha certeza de usar HTTP ou HTTPS na sua URL dependendo da configuração do seu servidor.",
@@ -240,7 +243,6 @@
   "admin.image.thumbWidthDescription": "Largura dos thumbnails gerados das imagens enviadas. Atualizando este valor muda como o thumbnail das imagens serão geradas no futuro, mas não muda as imagens já criadas no passado.",
   "admin.image.thumbWidthExample": "Ex \"120\"",
   "admin.image.thumbWidthTitle": "Largura do Thumbnail:",
-  "admin.ldap.bannerDesc": "Se um atributo de usuário de mudar no servidor LDAP, ele será atualizado na próxima vez que o usuário inserir suas credenciais para iniciar sessão no Mattermost. Isso inclui se um usuário estiver inativo ou removido de um servidor LDAP. Sincronização com servidores LDAP está prevista para um lançamento futuro.",
   "admin.ldap.baseDesc": "Base DN é o nome distinto do local onde Mattermost deve começar sua busca para os usuários na árvore LDAP.",
   "admin.ldap.baseEx": "Ex \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "BaseDN:",
@@ -394,7 +396,7 @@
   "admin.service.overrideTitle": "Ativar Sobrescrever os Nomes de usuário a partir de Webhooks e Comandos Slash: ",
   "admin.service.securityDesc": "Quando verdadeiro, os Administradores de Sistema são notificados por e-mail se uma relevante correção de segurança foi anunciado nos últimos 12 horas. Requer o e-mail para ser ativado.",
   "admin.service.securityTitle": "Ativar Alertas de Segurança: ",
-  "admin.service.segmentDescription": "Para usuários usando um serviço SaaS, inscrever-se para uma chave no Segment.com para acompanhar métricas.",
+  "admin.service.segmentDescription": "Segment.com is an online service that can be optionally used to track detailed system statistics. You can obtain a key by signing-up for a free account at Segment.com.",
   "admin.service.segmentExample": "Ex \"g3fgGOXJAQ43QV7rAh6iwQCkV4cA1Gs\"",
   "admin.service.segmentTitle": "Desenvolvedor Segmento Chave:",
   "admin.service.sessionCache": "Cache da Sessão em Minutos:",
@@ -717,7 +719,8 @@
   "channel_notifications.sendDesktop": "Enviar notificações de desktop",
   "channel_notifications.unreadInfo": "O nome do canal fica em negrito na barra lateral quando houver mensagens não lidas. Selecionando \"Apenas menções\" o canal vai ficar em negrito apenas quando você for mencionado.",
   "channel_select.placeholder": "--- Selecione um canal ---",
-  "channel_switch_modal.help": "↑↓ to browse, TAB to select, ↵ to confirm, ESC to dismiss",
+  "channel_switch_modal.dm": "Mensagem Direta",
+  "channel_switch_modal.help": "Type channel name. Use ↑↓ to browse, TAB to select, ↵ to confirm, ESC to dismiss",
   "channel_switch_modal.not_found": "No matches found.",
   "channel_switch_modal.submit": "Switch",
   "channel_switch_modal.title": "Switch Channels",
@@ -837,6 +840,11 @@
   "email_verify.verified": "{siteName} Email Verificado",
   "email_verify.verifiedBody": "<p>Seu email foi verificado! Clique <a href={url}>aqui</a> para login.</p>",
   "email_verify.verifyFailed": "Falha ao verificar seu email.",
+  "error.not_found.link_message": "Back to Mattermost",
+  "error.not_found.message": "The page you were trying to reach does not exist",
+  "error.not_found.title": "Page not found",
+  "error.not_supported.message": "Private browsing is not supported",
+  "error.not_supported.title": "Browser not supported",
   "error_bar.expired": "Enterprise license has expired; you have 15 days from expiry to renew the license, please contact commercial@mattermost.com for details",
   "error_bar.expiring": "The Enterprise license is expiring on {date}. To renew your license, please contact commercial@mattermost.com",
   "error_bar.past_grace": "Enterprise license has expired, please contact your System Administrator for details",
@@ -957,9 +965,16 @@
   "login.google": "Google Apps",
   "login.invalidPassword": "Sua senha está incorreta.",
   "login.ldapUsername": "Usuário LDAP",
+  "login.ldapUsernameLower": "Usuário LDAP",
   "login.noAccount": "Não tem uma conta? ",
-  "login.noLoginId": "Please enter your {loginId}",
+  "login.noEmail": "Please enter your email",
+  "login.noEmailLdapUsername": "Please enter your email or {ldapUsername}",
+  "login.noEmailUsername": "Please enter your email or username",
+  "login.noEmailUsernameLdapUsername": "Please enter your email, username or {ldapUsername}",
+  "login.noLdapUsername": "Please enter your {ldapUsername}",
   "login.noPassword": "Por favor digite a sua senha.",
+  "login.noUsername": "Please enter your username",
+  "login.noUsernameLdapUsername": "Please enter your username or {ldapUsername}",
   "login.on": "no {siteName}",
   "login.or": "ou",
   "login.password": "Senha",
@@ -1158,6 +1173,7 @@
   "signup_user_completed.expired": "Você já concluiu o processo de inscrição para este convite ou este convite expirou.",
   "signup_user_completed.gitlab": "com GitLab",
   "signup_user_completed.google": "com Google",
+  "signup_user_completed.haveAccount": "Already have an account?",
   "signup_user_completed.invalid_invite": "O link convite era inválido.  Por favor fale com seu Administrador para receber um convite.",
   "signup_user_completed.lets": "Vamos criar a sua conta",
   "signup_user_completed.no_open_server": "Este servidor não permite inscrições abertas.  Por favor fale com seu Administrador para receber um convite.",
@@ -1167,6 +1183,7 @@
   "signup_user_completed.passwordLength": "Por favor entre no mínimo {min} caracteres",
   "signup_user_completed.required": "Este campo é obrigatório",
   "signup_user_completed.reserved": "Este nome de usuário é reservado, por favor, escolha um novo.",
+  "signup_user_completed.signIn": "Click here to sign in.",
   "signup_user_completed.userHelp": "O nome de usuário precisa começar com uma letra, e conter entre {min} e {max} caracteres minúsculos contendo números, letras, e os símbolos '.', '-' e '_'",
   "signup_user_completed.usernameLength": "O nome de usuário precisa começar com uma letra, e conter entre {min} e {max} caracteres minúsculos contendo números, letras, e os símbolos '.', '-' e '_'.",
   "signup_user_completed.validEmail": "Por favor entre um endereço de e-mail válido",
@@ -1179,7 +1196,7 @@
   "sso_signup.length_error": "O nome deve ser de 3 ou mais caracteres até um máximo de 15",
   "sso_signup.teamName": "Entre o nome da nova equipe",
   "sso_signup.team_error": "Por favor entre o nome da equipe",
-  "suggestion.mention.all": "Notificar todo mundo na equipe",
+  "suggestion.mention.all": "Notifies everyone in the channel, use in {townsquare} to notify the whole team",
   "suggestion.mention.channel": "Notifica todos no canal",
   "suggestion.search.private": "Grupos Privados",
   "suggestion.search.public": "Canais Públicos",
@@ -1281,6 +1298,10 @@
   "user.settings.display.channelDisplayTitle": "Modo de Exibição do Canal",
   "user.settings.display.channeldisplaymode": "Selecione a largura do centro do canal.",
   "user.settings.display.clockDisplay": "Exibição do Relógio",
+  "user.settings.display.collapseDesc": "Toggle whether to automatically collapse all image previews.",
+  "user.settings.display.collapseDisplay": "Auto Collapse Previews",
+  "user.settings.display.collapseOff": "Desligado",
+  "user.settings.display.collapseOn": "On",
   "user.settings.display.fixedWidthCentered": "Largura fixa, centralizada",
   "user.settings.display.fontDesc": "Selecione a fonte mostrada na interface do usuário no Mattermost.",
   "user.settings.display.fontTitle": "Fonte Exibição",
@@ -1389,6 +1410,8 @@
   "user.settings.notifications.usernameMention": "Seu usuário mencionado \"@{username}\"",
   "user.settings.notifications.wordsTrigger": "Palavras que desencadeiam menções",
   "user.settings.push_notification.allActivity": "Para todas as atividades",
+  "user.settings.push_notification.disabled": "Disabled by system administrator",
+  "user.settings.push_notification.disabled_long": "Push notifications for mobile devices have been disabled by your System Administrator.",
   "user.settings.push_notification.info": "Alertas de notificação são enviados para o seu dispositivo móvel quando há atividade no Mattermost.",
   "user.settings.push_notification.off": "Desligado",
   "user.settings.push_notification.onlyMentions": "Somente para menções e mensagens diretas",