daily translations 20160908 (#3994)

10 files changed, 2683 insertions, 2593 deletions

diff --git a/webapp/i18n/de.json b/webapp/i18n/de.json
index f7bd731a3..1a7e7b1b7 100644
--- a/webapp/i18n/de.json
+++ b/webapp/i18n/de.json
@@ -229,7 +229,7 @@
   "admin.email.agreeHPNS": " Ich verstehe und akzeptiere <a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">die Bedingungen</a> des Mattermost Hosted Push Notification Service Terms of Service und die <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Datenschutzerklärung</a>.",
   "admin.email.allowEmailSignInDescription": "Wenn wahr, Mattermost erlaubt Nutzern sich mit E-Mail und Passwort anzumelden.",
   "admin.email.allowEmailSignInTitle": "Erlaube Login mit E-Mail: ",
-  "admin.email.allowSignupDescription": "Wenn wahr erlaubt Mattermost Teamerstellung und Registrierung via E-Mail und Passwort.  Dieser Wert sollte nur Falsch sein, wenn Sie Anmeldungen nur via SSO Dienste wie OAuth oder LDAP zulassen möchten.",
+  "admin.email.allowSignupDescription": "Wenn wahr erlaubt Mattermost Teamerstellung und Registrierung via E-Mail und Passwort.  Dieser Wert sollte nur Falsch sein, wenn Sie Anmeldungen nur via SSO Dienste wie OAuth oder AD/LDAP zulassen möchten.",
   "admin.email.allowSignupTitle": "Erlaube die Erstellen einen Accounts mit der E-Mail: ",
   "admin.email.allowUsernameSignInDescription": "Wenn wahr erlaubt Mattermost Nutzern sich mit Benutzername und Passwort anzumelden.  Diese Einstellungen wird typischerweise nur genutzt, wenn E-Mail Bestätigung deaktiviert ist.",
   "admin.email.allowUsernameSignInTitle": "Erlaube Login mit Benutzernamen: ",
@@ -392,57 +392,59 @@
   "admin.image.thumbWidthTitle": "Breite des Vorschaubildes:",
   "admin.integrations.custom": "Benutzerdefinierte Integrationen",
   "admin.integrations.external": "Externe Dienste",
-  "admin.ldap.baseDesc": "Die Basisdomäne ist der ausgezeichnete Name, mit dem Mattermost mit der Suche nach Nutzern im LDAP Baum beginnen soll.",
+  "admin.ldap.baseDesc": "Die Basisdomäne ist der ausgezeichnete Name, mit dem Mattermost mit der Suche nach Nutzern im AD/LDAP Baum beginnen soll.",
   "admin.ldap.baseEx": "z.B.: \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "Basisdomäne:",
   "admin.ldap.bindPwdDesc": "Passwort des Nutzers gegeben durch \"LDAP Nutzername\".",
   "admin.ldap.bindPwdTitle": "LDAP Nutzername:",
-  "admin.ldap.bindUserDesc": "Der Nutzername, welcher für die LDAP Suche benutzt wird. Dies sollte an Konto sein, welches speziell für Mattermost angelegt wurde. Es sollte begrenzten Lesezugriff auf den Bereich im LDAP Baum erhalten, welcher im Basisdomäne Feld angegeben wurde.",
+  "admin.ldap.bindUserDesc": "Der Nutzername, welcher für die AD/LDAP Suche benutzt wird. Dies sollte an Konto sein, welches speziell für Mattermost angelegt wurde. Es sollte begrenzten Lesezugriff auf den Bereich im AD/LDAP Baum erhalten, welcher im Basisdomäne Feld angegeben wurde.",
   "admin.ldap.bindUserTitle": "LDAP Nutzername:",
-  "admin.ldap.emailAttrDesc": "Das Attribut des LDAP Servers, welches benutzt wird um die E-Mailadressen der Nutzer in Mattermost auszfüllen.",
+  "admin.ldap.emailAttrDesc": "Das Attribut des AD/LDAP Servers, welches benutzt wird um die E-Mail-Adressen der Nutzer in Mattermost auszufüllen.",
   "admin.ldap.emailAttrEx": "Ex \"mail\" oder \"userPrincipalName\"",
   "admin.ldap.emailAttrTitle": "E-Mail Attribut:",
-  "admin.ldap.enableDesc": "Wenn wahr, erlaubt Mattermost den Login mit LDAP",
-  "admin.ldap.enableTitle": "Erlaube Login mit LDAP:",
-  "admin.ldap.firstnameAttrDesc": "(Optional) Das Attribut des LDAP Servers, welches benutzt wird um den Vornamen des Nutzers in Mattermost auszufüllen.",
+  "admin.ldap.enableDesc": "Wenn wahr, erlaubt Mattermost den Login mit AD/LDAP",
+  "admin.ldap.enableTitle": "Erlaube Login mit AD/LDAP:",
+  "admin.ldap.firstnameAttrDesc": "(Optional) Das Attribut des AD/LDAP Servers, welches benutzt wird um den Vornamen des Nutzers in Mattermost auszufüllen.",
   "admin.ldap.firstnameAttrEx": "z.B.: \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "Attribut Vorname",
-  "admin.ldap.idAttrDesc": "Das Attribut des LDAP Server, welches von Mattermost als eindeutiger Identifikator benutzt wird. Es sollte ein LDAP Attribut sein, dessen Wert sich nicht ändert, z.B. Nutzername oder UID. Wenn die ID eines Nutzer sich ändert, wird Mattermost einen neues Konto erstellen, welches nicht mit dem Alten verbunden ist. Dieser Wert wird für den Login in Mattermost als \"LDAP Nutzername\" auf der Anmeldeseite verwendet. Normalerweise ist das Attribut dasselbe wie das vorherige Feld \"Attribut Benutzername\". Wenn ihr Team, zur Anmeldung an andere Dienste mittels LDAP, die Formulierung Domäne\\Benutzername verwendet, wählen Sie Domäne\\Benutzername in diesem Feld, um die Konsistenz zwischen den Seiten beizubehalten.",
+  "admin.ldap.idAttrDesc": "Das Attribut des AD/LDAP Server, welches von Mattermost als eindeutiger Identifikator benutzt wird. Es sollte ein AD/LDAP Attribut sein, dessen Wert sich nicht ändert, z.B. Nutzername oder UID. Wenn die ID eines Nutzer sich ändert, wird Mattermost einen neues Konto erstellen, welches nicht mit dem Alten verbunden ist. Dieser Wert wird für den Login in Mattermost als \"AD/LDAP Nutzername\" auf der Anmeldeseite verwendet. Normalerweise ist das Attribut dasselbe wie das vorherige Feld \"Attribut Benutzername\". Wenn ihr Team, zur Anmeldung an andere Dienste mittels AD/LDAP, die Formulierung Domäne\\Benutzername verwendet, wählen Sie Domäne\\Benutzername in diesem Feld, um die Konsistenz zwischen den Seiten beizubehalten.",
   "admin.ldap.idAttrEx": "z.B.: \"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "Attribut ID: ",
-  "admin.ldap.lastnameAttrDesc": "(Optional) Das Attribut des LDAP Servers, welches benutzt wird um den Nachname des Nutzers in Mattermost auszufüllen.",
+  "admin.ldap.lastnameAttrDesc": "(Optional) Das Attribut des AD/LDAP Servers, welches benutzt wird um den Nachname des Nutzers in Mattermost auszufüllen.",
   "admin.ldap.lastnameAttrEx": "z.B.: \"sn\"",
   "admin.ldap.lastnameAttrTitle": "Attibut Nachname:",
-  "admin.ldap.loginNameDesc": "Der Platzhalter der im Loginfeld der Loginseite angezeigt wird. Standart ist \"LDAP Benutzername\".",
-  "admin.ldap.loginNameEx": "z.B.: \"LDAP Benutzername\"",
+  "admin.ldap.ldap_test_button": "AD/LDAP Test",
+  "admin.ldap.loginNameDesc": "Der Platzhalter der im Loginfeld der Loginseite angezeigt wird. Standart ist \"AD/LDAP Benutzername\".",
+  "admin.ldap.loginNameEx": "z.B.: \"AD/LDAP Benutzername\"",
   "admin.ldap.loginNameTitle": "Login Feld Name:",
   "admin.ldap.maxPageSizeEx": "z.B.: \"2000\"",
   "admin.ldap.maxPageSizeHelpText": "Die maximale Anzahl von Benutzern, die der Mattermost Server vom LDAP Server auf einmal anfordern wird. 0 ist unendlich.",
   "admin.ldap.maxPageSizeTitle": "Maximale Seitengröße:",
-  "admin.ldap.nicknameAttrDesc": "(Optional) Das Attribut des LDAP Servers, welches benutzt wird um den Nachname des Nutzers in Mattermost auszufüllen.",
+  "admin.ldap.nicknameAttrDesc": "(Optional) Das Attribut des AD/LDAP Servers, welches benutzt wird um den Nachname des Nutzers in Mattermost auszufüllen.",
   "admin.ldap.nicknameAttrEx": "z.B.: \"Spitzname\"",
   "admin.ldap.nicknameAttrTitle": "Spitznamen Attribut:",
-  "admin.ldap.noLicense": "<h4 class=\"banner__heading\">Hinweis:</h4><p>LDAP-Funktionen sind Bestandteil der Enterprise Edition. Ihre derzeitige Lizenz unterstützt LDAP nicht. Besuchen Sie unsere <a href=\"http://mattermost.com\" target=\"_blank\">Webseite</a> für Information und Preise der Enterprise Lizenzen.</p>",
-  "admin.ldap.portDesc": "Der Port den Mattermost für die Verbindung mit dem LDAP Server verwendet. Standard ist 389.",
+  "admin.ldap.noLicense": "<h4 class=\"banner__heading\">Hinweis:</h4><p>AD/LDAP-Funktionen sind Bestandteil der Enterprise Edition. Ihre derzeitige Lizenz unterstützt AD/LDAP nicht. Besuchen Sie unsere <a href=\"http://mattermost.com\" target=\"_blank\">Webseite</a> für Information und Preise der Enterprise Lizenzen.</p>",
+  "admin.ldap.portDesc": "Der Port den Mattermost für die Verbindung mit dem AD/LDAP Server verwendet. Standard ist 389.",
   "admin.ldap.portEx": "z.B.: \"389\"",
-  "admin.ldap.portTitle": "LDAP-Port:",
-  "admin.ldap.queryDesc": "Wert für Anfragen-Time-out an den LDAP Server. Erhöhen Sie diesen, wenn Sie Ablauffehler aufgrund eines langsamen LDAP Servers bekommen.",
+  "admin.ldap.portTitle": "AD/LDAP-Port:",
+  "admin.ldap.queryDesc": "Wert für Anfragen-Time-out an den AD/LDAP Server. Erhöhen Sie diesen, wenn Sie Ablauffehler aufgrund eines langsamen AD/LDAP Servers bekommen.",
   "admin.ldap.queryEx": "z.B.: \"60\"",
   "admin.ldap.queryTitle": "Wert für Time-out (in Sekunden):",
-  "admin.ldap.serverDesc": "Die Domäne oder IP-Adresse des LDAP Server.",
+  "admin.ldap.serverDesc": "Die Domäne oder IP-Adresse des AD/LDAP Server.",
   "admin.ldap.serverEx": "z.B.: \"10.0.0.23\"",
-  "admin.ldap.serverTitle": "LDAP Server:",
+  "admin.ldap.serverTitle": "AD/LDAP Server:",
   "admin.ldap.skipCertificateVerification": "Zertifikatsprüfung überspringen:",
   "admin.ldap.skipCertificateVerificationDesc": "Zertifikatsprüfung für TLS oder STARTTLS Verbindungen überspringen. Nicht empfohlen bei Produktiv-Umgebungen bei denen TLS benötigt wird. Nur zum Test gedacht.",
   "admin.ldap.syncFailure": "Sync Fehler: {error}",
-  "admin.ldap.syncIntervalHelpText": "Die LDAP Synchronisation aktualisiert die Mattermost Benutzerinformationen um die Änderungen auf dem LDAP Server zu spiegeln. Wenn zum Beispiel der Name eines Benutzers auf dem LDAP Server geändert wird, wird die Änderung in Mattermost bei der nächsten Synchronisierung durchgeführt. Gelöschte oder deaktivierte Accounts auf dem LDAP Server setzen die Benutzer als \"Inaktiv\" und die Benutzersessions werden entfernt. Mattermost führt die Synchronisation im hier spezifizierten Intervall durch. Wenn zum Beispiel 60 eingegeben wird, synchronisiert Mattermost alle 60 Minuten.",
+  "admin.ldap.syncIntervalHelpText": "Die AD/LDAP Synchronisation aktualisiert die Mattermost Benutzerinformationen um die Änderungen auf dem AD/LDAP Server zu spiegeln. Wenn zum Beispiel der Name eines Benutzers auf dem AD/LDAP Server geändert wird, wird die Änderung in Mattermost bei der nächsten Synchronisierung durchgeführt. Gelöschte oder deaktivierte Accounts auf dem AD/LDAP Server setzen die Benutzer als \"Inaktiv\" und die Benutzersessions werden entfernt. Mattermost führt die Synchronisation im hier spezifizierten Intervall durch. Wenn zum Beispiel 60 eingegeben wird, synchronisiert Mattermost alle 60 Minuten.",
   "admin.ldap.syncIntervalTitle": "Synchronisationsintervall (in Minuten):",
-  "admin.ldap.syncNowHelpText": "Initiiert eine sofortige LDAP Synchronisation.",
-  "admin.ldap.sync_button": "LDAP jetzt abgleichen",
-  "admin.ldap.testFailure": "LDAP Test Fehler: {error}",
-  "admin.ldap.testHelpText": "Überprüft ob der Mattermost sich mit dem angegebenen LDAP Server verbinden kann. Schauen Sie im Log für detailliertere Fehlermeldungen nach.",
-  "admin.ldap.uernameAttrDesc": "Das Attribut des LDAP-Servers das zum Befüllen des Benutzernamens in Mattermost verwendet wird. Das kann auch dem des ID-Attributes entsprechen.",
-  "admin.ldap.userFilterDisc": "(Optional)Geben Sie einen LDAP-Filters zur Begrenzung bei der Suche nach Benutzer-Objekten ein. Nur die zurückgegebenen Benutzer dieser Abfrage werden Zugriff auf Mattermost erhalten. Für Active-Directory lautet die Abfrage zum Ausschluss von deaktivierten Benutzern (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
+  "admin.ldap.syncNowHelpText": "Initiiert eine sofortige AD/LDAP Synchronisation.",
+  "admin.ldap.sync_button": "AD/LDAP jetzt abgleichen",
+  "admin.ldap.testFailure": "AD/LDAP Test Fehler: {error}",
+  "admin.ldap.testHelpText": "Überprüft ob der Mattermost sich mit dem angegebenen AD/LDAP Server verbinden kann. Schauen Sie im Log für detailliertere Fehlermeldungen nach.",
+  "admin.ldap.testSuccess": "AD/LDAP Test Successful",
+  "admin.ldap.uernameAttrDesc": "Das Attribut des AD/LDAP-Servers das zum Befüllen des Benutzernamens in Mattermost verwendet wird. Das kann auch dem des ID-Attributes entsprechen.",
+  "admin.ldap.userFilterDisc": "(Optional)Geben Sie einen AD/LDAP-Filters zur Begrenzung bei der Suche nach Benutzer-Objekten ein. Nur die zurückgegebenen Benutzer dieser Abfrage werden Zugriff auf Mattermost erhalten. Für Active-Directory lautet die Abfrage zum Ausschluss von deaktivierten Benutzern (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "z.B.: \"(objectClass=user)\"",
   "admin.ldap.userFilterTitle": "Benutzerfilter:",
   "admin.ldap.usernameAttrEx": "z.B.: \"sAMAccountName\"",
@@ -461,6 +463,8 @@
   "admin.license.uploading": "Lizenz wird hochgeladen...",
   "admin.log.consoleDescription": "Üblicherweise Falsch bei Produktiv-Umgebungen. Entwickler können dieses auf Wahr stellen um Logmeldungen auf der Konsole anhand der Konsolen-Level Option zu erhalten.  Wenn Wahr, schreibt der Server die Meldungen in den Standard-Ausgabe-Stream (stdout).",
   "admin.log.consoleTitle": "Log auf der Konsole ausgeben:",
+  "admin.log.enableDiagnostics": "Aktiviere Diagnose und Fehlerübermittlung:",
+  "admin.log.enableDiagnosticsDescription": "Durch aktivieren dieses Features kann die Qualität und Performance von Mattermost verbessert werden indem Diagnose und Fehler an Mattermost, Inc übermittelt werden. Lesen Sie unsere <a href=\"https://about.mattermost.com/default-privacy-policy/\" target=\"_blank\">Datenschutzbestimmungen</a> um mehr darüber zu erfahren.",
   "admin.log.enableWebhookDebugging": "Aktiviere Webhook Debugging:",
   "admin.log.enableWebhookDebuggingDescription": "Sie können dies auf falsch setzen, um das Debuglogging von eingehenden Webhook Anfragen zu deaktivieren.",
   "admin.log.fileDescription": "In Produktionsumgebungen normalerweise wahr.   Wenn wahr werden Logdateien im Speicherort abgelegt, welcher im unteren Feld spezifiziert wird.",
@@ -636,8 +640,8 @@
   "admin.service.iconTitle": "Erlaube Integrationen das Profilbild zu ändern:",
   "admin.service.insecureTlsDesc": "Wenn Wahr werden alle ausgehenden HTTPS Anfragen von selbst-signierten Zertifikaten ungeprüft angenommen. Zum Beispiel werden ausgehende Webhooks an einen Server mit einem selbst-signiertem TLS Zertifikat an eine beliebige Domäne zugelassen. Hinweis: das macht diese Verbindungen anfällig für \"Man-In-The-Middle\" Attacken.",
   "admin.service.insecureTlsTitle": "Erlaube unsichere ausgehende Verbindungen: ",
-  "admin.service.integrationAdmin": "Begrenze die Erstellung von Integrationen auf Team- und Systemadministratoren: ",
-  "admin.service.integrationAdminDesc": "Sofern Wahr, können vom Benutzer erstellte Integrationen nur von Admins erstellt werden.",
+  "admin.service.integrationAdmin": "Verwaltung der Integrationen auf Admins beschränken:",
+  "admin.service.integrationAdminDesc": "Wenn wahr, können Webhooks und Slash Befehle nur durch Team- und Systemadministratoren erstellt, bearbeitet oder betrachtet werden. OAuth 2.0 Anwendungen nur durch Systemadministratoren. Integrationen stehen allen Benutzern zur Verfügung nachdem ein Admin sie erstellt hat.",
   "admin.service.listenAddress": "Empfangs-Adresse:",
   "admin.service.listenDescription": "Die Adresse auf die gebunden und gehört werden soll. Die Eingabe von \":8065\" bindet alle Schnittstellen, \"127.0.0.1:8065\" bindet an die angegebene Schnittstelle.  Änderung dieses Wertes erfordert einen Serverneustart bevor er gültig wird.",
   "admin.service.listenExample": "z.B.: \":8065\"",
@@ -658,13 +662,13 @@
   "admin.service.sessionCacheDesc": "Die Anzahl von Minuten in denen der Sitzungs-Cache im Speicher gehalten wird.",
   "admin.service.sessionDaysEx": "z.B.: \"30\"",
   "admin.service.siteURL": "URL der Seite:",
-  "admin.service.siteURLDescription": "Die URL, inklusive Port und Protokoll, mit der Benutzer auf Mattermost zugreifen können. Leer lassen um automatisch basierend von eingehendem Verkehr zu ermitteln.",
+  "admin.service.siteURLDescription": "Die URL, inklusive Port und Protokoll, welche Benutzer zum Zugriff auf Mattermost verwenden werden. Dieses Feld kann leer gelassen werden sofern Sie E-Mail Stapelung in <b>Benachrichtigungen > E-Mail</b> nicht verwenden. Wenn leer wird die URL basierend auf eingehenden Verkehr ermittelt.",
   "admin.service.siteURLExample": "z.B.: \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "Sessiondauer für SSO Anwendungen (Tage):",
   "admin.service.ssoSessionDaysDesc": "Die Anzahl der Tage seit der letzten Anmeldung des Benutzers bis zum Ablauf der Sitzung. Wenn die Authentifizierungsmethode SAML oder GitLab ist, wird der Benutzer automatisch wieder angemeldet sofern er noch bei SAML oder GitLab angemeldet ist. Bei Änderung dieser Einstellung tritt die neue Sitzungsdauer in Kraft nachdem der Benutzer sich das nächste Mal anmeldet.",
   "admin.service.testingDescription": "Wenn wahr wird der /loadtest Slash Befehl aktiviert um Testaccounts, -daten und -Textformatierungen zu laden. Änderung erfordern einen Server Neustart.",
   "admin.service.testingTitle": "Aktiviere Testkommandos: ",
-  "admin.service.webSessionDays": "Sitzungsdauer LDAP und E-Mail (in Tagen):",
+  "admin.service.webSessionDays": "Sitzungsdauer AD/LDAP und E-Mail (in Tagen):",
   "admin.service.webSessionDaysDesc": "Die Anzahl der Tage seit der letzten Anmeldung des Benutzers bis zum Ablauf der Sitzung. Bei Änderung dieser Einstellung tritt die neue Sitzungsdauer in Kraft nachdem der Benutzer sich das nächste Mal anmeldet.",
   "admin.service.webhooksDescription": "Wenn wahr werden eingehende Webhooks erlaubt. Um Phishing Attacken vorzubeugen werden alle Posts von Webhooks mit dem BOT Tag versehen. <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>Dokumentation</a> für mehr Details.",
   "admin.service.webhooksTitle": "Aktiviere eingehende Webhooks: ",
@@ -1012,18 +1016,18 @@
   "channel_switch_modal.submit": "Wechseln",
   "channel_switch_modal.title": "Kanal wechseln",
   "claim.account.noEmail": "Keine E-Mail-Adresse angegeben",
-  "claim.email_to_ldap.enterLdapPwd": "Geben Sie eine ID und ein Passwort für Ihren LDAP Account ein",
+  "claim.email_to_ldap.enterLdapPwd": "Geben Sie eine ID und ein Passwort für Ihren AD/LDAP Account ein",
   "claim.email_to_ldap.enterPwd": "Geben Sie das Passwort für den {site} E-Mail-Account ein",
-  "claim.email_to_ldap.ldapId": "LDAP ID",
-  "claim.email_to_ldap.ldapIdError": "Bitte geben Sie Ihre LDAP ID ein.",
-  "claim.email_to_ldap.ldapPasswordError": "Bitte geben Sie Ihr LDAP Passwort ein.",
-  "claim.email_to_ldap.ldapPwd": "LDAP Passwort",
+  "claim.email_to_ldap.ldapId": "AD/LDAP ID",
+  "claim.email_to_ldap.ldapIdError": "Bitte geben Sie Ihre AD/LDAP ID ein.",
+  "claim.email_to_ldap.ldapPasswordError": "Bitte geben Sie Ihr AD/LDAP Passwort ein.",
+  "claim.email_to_ldap.ldapPwd": "AD/LDAP Passwort",
   "claim.email_to_ldap.pwd": "Passwort",
   "claim.email_to_ldap.pwdError": "Bitte geben Sie Ihr aktuelles Passwort ein.",
-  "claim.email_to_ldap.ssoNote": "Sie müssen bereits einen gültigen LDAP Account besitzen",
-  "claim.email_to_ldap.ssoType": "Sobald Sie Ihren Account in Anspruch nehmen, können Sie sich nur noch mit Ihrem LDAP Account anmelden",
-  "claim.email_to_ldap.switchTo": "Account zu LDAP wechseln",
-  "claim.email_to_ldap.title": "Account von E-Mail/Passwort auf LDAP wechseln",
+  "claim.email_to_ldap.ssoNote": "Sie müssen bereits einen gültigen AD/LDAP Account besitzen",
+  "claim.email_to_ldap.ssoType": "Sobald Sie Ihren Account in Anspruch nehmen, können Sie sich nur noch mit Ihrem AD/LDAP Account anmelden",
+  "claim.email_to_ldap.switchTo": "Account zu AD/LDAP wechseln",
+  "claim.email_to_ldap.title": "Account von E-Mail/Passwort auf AD/LDAP wechseln",
   "claim.email_to_oauth.enterPwd": "Geben Sie das Passwort für den {site} Zugang ein",
   "claim.email_to_oauth.pwd": "Passwort",
   "claim.email_to_oauth.pwdError": "Bitte geben Sie Ihr aktuelles Passwort ein.",
@@ -1035,14 +1039,14 @@
   "claim.ldap_to_email.email": "Sie werden die E-Mail-Adresse {email} zum Login verwenden",
   "claim.ldap_to_email.enterLdapPwd": "Geben Sie Ihr {ldapPassword} für den {site} E-Mail-Account ein",
   "claim.ldap_to_email.enterPwd": "Geben Sie ein neues Passwort für Ihren E-Mail-Account ein",
-  "claim.ldap_to_email.ldapPasswordError": "Bitte geben Sie Ihr LDAP Passwort ein.",
-  "claim.ldap_to_email.ldapPwd": "LDAP Passwort",
+  "claim.ldap_to_email.ldapPasswordError": "Bitte geben Sie Ihr AD/LDAP Passwort ein.",
+  "claim.ldap_to_email.ldapPwd": "AD/LDAP Passwort",
   "claim.ldap_to_email.pwd": "Passwort",
   "claim.ldap_to_email.pwdError": "Bitte geben Sie Ihr Passwort ein.",
   "claim.ldap_to_email.pwdNotMatch": "Die Passwörter stimmen nicht überein.",
   "claim.ldap_to_email.ssoType": "Sobald Sie Ihren Account in Anspruch nehmen, können Sie sich nur noch mit Ihrer E-Mail-Adresse und Ihrem Passwort anmelden",
   "claim.ldap_to_email.switchTo": "Zugang auf E-Mail-Adresse/Passwort umstellen",
-  "claim.ldap_to_email.title": "LDAP Zugang auf E-Mail-Adresse/Passwort umstellen",
+  "claim.ldap_to_email.title": "AD/LDAP Zugang auf E-Mail-Adresse/Passwort umstellen",
   "claim.oauth_to_email.confirm": "Passwort bestätigen",
   "claim.oauth_to_email.description": "Sobald Sie Ihren Accounttyp wechseln, können Sie sich nur noch mit Ihrer E-Mail-Adresse und Ihrem Passwort anmelden.",
   "claim.oauth_to_email.enterNewPwd": "Geben Sie ein neues Passwort für Ihren {site} E-Mail-Account ein",
@@ -1204,53 +1208,53 @@
   "get_team_invite_link_modal.help": "Senden Sie Teammitgliedern den unten stehenden Link damit diese sich für dieses Team registrieren können. Der Team Einladungslink kann mit mehreren Teammitgliedern geteilt werden da er sich nicht ändert, sofern er nicht in den Teameinstellungen durch den Team Admin geändert wird.",
   "get_team_invite_link_modal.helpDisabled": "Erstellung von Benutzern wurde für Ihr Team deaktiviert. Für Details, fragen Sie bitte Ihren Administrator.",
   "get_team_invite_link_modal.title": "Team Einladungslink",
-  "help.attaching.downloading": "#### Dateien herunterladen\nLaden Sie eine angehängte Datei herunter indem dem Sie das Herunterladen-Icon neben der Vorschau anklicken oder durch öffnen in der Dateivorschau und auf **Herunterladen** klicken.",
-  "help.attaching.dragdrop": "#### Drag and Drop\nLaden Sie eine oder mehrere Dateien hoch indem Sie die Datei(en) vom Ihrem Computer in die rechte oder mittige Fläche ziehen. Wenn Sie die Datei(en) in die Nachrichtenbox ziehen können Sie optional eine Nachricht dazu verfassen und durch **ENTER** absenden.",
+  "help.attaching.downloading": "#### Dateien herunterladen\nLaden Sie eine angehängte Datei herunter indem dem Sie das Herunterladen-Icon neben dem Miniaturbild anklicken oder durch öffnen in der Dateivorschau und auf **Herunterladen** klicken.",
+  "help.attaching.dragdrop": "#### Drag und Drop\nLaden Sie eine oder mehrere Dateien hoch indem Sie die Datei(en) vom Ihrem Computer in die rechte oder mittige Fläche ziehen. Wenn Sie die Datei(en) in die Nachrichtenbox ziehen können Sie optional eine Nachricht dazu verfassen und durch **ENTER** absenden.",
   "help.attaching.icon": "#### Anhänge Icon\nAlternativ können Sie Dateien über einen Klick auf die graue Büroklammer in der Nachrichtenbox hochladen. Dies öffnet den Systemdatei Dialog in dem Sie zu den gewünschten Dateien navigieren können und durch einen Klick auf **Öffnen** hochladen können. Optional können Sie noch eine Nachricht verfassen und mit **ENTER** absenden.",
-  "help.attaching.limitations": "## File Size Limitations\nMattermost supports a maximum of five attached files per post, each with a maximum file size of 50Mb.",
-  "help.attaching.methods": "## Attachment Methods\nAttach a file by drag and drop or by clicking the attachment icon in the message input box.",
-  "help.attaching.notSupported": "Document preview (Word, Excel, PPT) is not yet supported.",
-  "help.attaching.pasting": "#### Pasting Images\nOn Chrome and Edge browsers, it is also possible to upload files by pasting them from the clipboard. This is not yet supported on other browsers.",
-  "help.attaching.previewer": "## File Previewer\nMattermost has a built in file previewer that is used to view media, download files and share public links. Click the thumbnail of an attached file to open it in the file previewer.",
-  "help.attaching.publicLinks": "#### Sharing Public Links\nPublic links allow you to share file attachments with people outside your Mattermost team. Open the file previewer by clicking on the thumbnail of an attachment, then click **Get Public Link**. This opens a dialog box with a link to copy. When the link is shared and opened by another user, the file will automatically download.",
-  "help.attaching.publicLinks2": "If **Get Public Link** is not visible in the file previewer and you prefer the feature enabled, you can request that your System Admin enable the feature from the System Console under **Security** > **Public Links**.",
-  "help.attaching.supported": "#### Supported Media Types\nIf you are trying to preview a media type that is not supported, the file previewer will open a standard media attachment icon. Supported media formats depend heavily on your browser and operating system, but the following formats are supported by Mattermost on most browsers:",
-  "help.attaching.supportedList": "- Images: BMP, GIF, JPG, JPEG, PNG\n- Video: MP4\n- Audio: MP3, M4A\n- Documents: PDF",
-  "help.attaching.title": "# Attaching Files\n_____",
-  "help.commands.builtin": "## Built-in Commands\nThe following slash commands are available on all Mattermost installations:",
-  "help.commands.builtin2": "Begin by typing `/` and a list of slash command options appears above the text input box. The autocomplete suggestions help by providing a format example in black text and a short description of the slash command in grey text.",
-  "help.commands.custom": "## Custom Commands\nCustom slash commands integrate with external applications. For example, a team might configure a custom slash command to check internal health records with `/patient joe smith` or check the weekly weather forcast in a city with `/weather toronto week`. Check with your System Admin or open the autocomplete list by typing `/` to determine if your team configured any custom slash commands.",
-  "help.commands.custom2": "Custom slash commands are disabled by default and can be enabled by the System Admin in the **System Console** > **Integrations** > **Webhooks and Commands**. Learn about configuring custom slash commands on the [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
-  "help.commands.intro": "Slash commands perform operations in Mattermost by typing into the text input box. Enter a `/` followed by a command and some arguments to perform actions.\n\nBuilt-in slash commands come with all Mattermost installations and custom slash commands are configurable to interact with external applications. Learn about configuring custom slash commands on the [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
-  "help.commands.title": "# Executing Commands\n___",
-  "help.composing.deleting": "## Deleting a message\nDelete a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Delete**. System and Team Admins can delete any message on their system or team.",
-  "help.composing.editing": "## Editing a Message\nEdit a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Edit**. After making modifications to the message text, press **ENTER** to save the modifications. Message edits do not trigger new @mention notifications, desktop notifications or notification sounds.",
-  "help.composing.linking": "## Linking to a message\nThe **Permalink** feature creates a link to any message. Sharing this link with other users in the channel lets them view the linked message in the Message Archives. Users who are not a member of the channel where the message was posted cannot view the permalink. Get the permalink to any message by clicking the **[...]** icon next to the message text  > **Permalink** > **Copy Link**.",
-  "help.composing.posting": "## Posting a Message\nWrite a message by typing into the text input box, then press **ENTER** to send it. Use **Shift + ENTER** to create a new line without sending a message. To send messages by pressing **Ctrl+Enter** go to **Main Menu > Account Settings > Send messages on Ctrl + Enter**.",
-  "help.composing.posts": "#### Posts\nPosts can be considered parent messages. They are the messages that often start a thread of replies. Posts are composed and sent from the text input box at the bottom of the center pane.",
-  "help.composing.replies": "#### Replies\nReply to a message by clicking the reply icon next to any message text. This action opens the right-hand-side (RHS) where you can see the message thread, then compose and send your reply. Replies are indented slightly in the center pane to indicate that they are child messages of a parent post.\n\nWhen composing a reply in the right-hand side, click the expand/collapse icon with two arrows at the top of the sidebar to make things easier to read.",
-  "help.composing.title": "# Sending Messages\n_____",
-  "help.composing.types": "## Message Types\nReply to posts to keep conversations organized in threads.",
-  "help.formatting.checklist": "Make a task list by including square brackets:",
-  "help.formatting.checklistExample": "- [ ] Item one\n- [ ] Item two\n- [x] Completed item",
-  "help.formatting.code": "## Code Block\n\nCreate a code block by indenting each line by four spaces, or by placing ``` on the line above and below your code.",
-  "help.formatting.codeBlock": "code block",
+  "help.attaching.limitations": "## Dateigrößenbeschränkung\nMattermost unterstützt ein Maximum an fünf angehängten Dateien pro Nachricht, jede mit einer maximalen Dateigröße von 50 MB.",
+  "help.attaching.methods": "## Anhängmethoden\nHängen Sie eine Datei durch Drag und Drop oder durch klicken des Anhänge Icons in der Nachrichtenbox an.",
+  "help.attaching.notSupported": "Dateivorschau (Word, Excel, PowerPoint) wird noch nicht unterstützt.",
+  "help.attaching.pasting": "#### Bilder einfügen\nIn Chrome und Edge Browsern können Bilder auch hochgeladen werden in dem sie von der Zwischenablage eingefügt werden. Dies wird noch nicht in anderen Browsern unterstützt.",
+  "help.attaching.previewer": "## Dateivorschau\nMattermost hat eine eingebaute Dateivorschau mit der Medien angeschaut, heruntergeladen und öffentlich geteilt werden können. Klicken Sie auf das Miniaturbild einer angehängten Datei um die Dateivorschau zu öffnen.",
+  "help.attaching.publicLinks": "#### Links öffentlich teilen\nÖffentliche Links erlaubt Ihnen Dateianhänge an Personen außerhalb Ihre Mattermost Teams zu senden. Öffnen Sie die Dateivorschau durch Klick auf das Miniaturbild eines Anhanges und klicken auf **Öffentlichen Link abrufen**. Dies öffnet einen Dialog mit einem Link zum kopieren. Wenn der Link geteilt und durch einen anderen Benutzer geöffnet wird, wird die Datei automatisch heruntergeladen.",
+  "help.attaching.publicLinks2": "Wenn **Öffentlichen Link abrufen** nicht in der Dateivorschau sichtbar ist und dieses Feature gerne aktiviert haben möchten, bitten Sie Ihren Systemadministrator das Feature in der Systemkonsole unter **Sicherheit** > **Öffentliche Links** zu aktivieren.",
+  "help.attaching.supported": "#### Unterstützte Dateitypen\nWenn Sie versuchen eine Datei anzusehen welche nicht unterstützt wird, wird die Dateivorschau ein Standard Anhang Icon anzeigen. Unterstützte Dateitypen hängen stark von Ihrem Browser und Betriebssystem ab, aber folgende Formate werden in den meisten Browsern unterstützt:",
+  "help.attaching.supportedList": "- Bilder: BMP, GIF, JPG, JPEG, PNG\n- Video: MP4\n- Audio: MP3, M4A\n- Dokumente: PDF",
+  "help.attaching.title": "# Dateien Anhängen\n_____",
+  "help.commands.builtin": "## Eingebaute Befehle\nDie folgenden Slash Befehle sind in allen Mattermost Installationen verfügbar:",
+  "help.commands.builtin2": "Starten Sie durch tippen von `/` und eine Liste aller Slash Befehloptionen erscheint über dem Eingabefeld. Die Autovervollständigungsvoschläge helfen durch ein Formatierungsbeispiel in schwarzem Text und eine kurze Beschreibung des Slash Befehls in grauem Text.",
+  "help.commands.custom": "## Benutzerdefinierte Befehle\nBenutzerdefinierte Slash Befehle integrieren externe Anwendungen. Zum Beispiel könnte ein Team einen Slash Befehl zum Abrufen interner Patientenakten mit `/patient joe smith` einbinden oder die wöchentliche Wettervorhersage einer Stadt mit `/wetter toronto woche` abrufen. Fragen Sie Ihren Systemadministrator oder öffnen Sie die Liste der Autovervollständigung durch Eingabe von `/`um zu prüfen ob für Ihr Team benutzerdefinierte Slash Befehle konfiguriert wurden.",
+  "help.commands.custom2": "Benutzerdefinierte Slash Befehle sind per Standard deaktiviert und können durch den Systemadministrator in der **Systemkonsole** > **Integrationen** > **Webhooks und Befehle** aktiviert werden. Lernen Sie mehr über benutzerdefinierte Befehle auf der der [Entwickler Slash Befehl Dokumentation](http://docs.mattermost.com/developer/slash-commands.html).",
+  "help.commands.intro": "Slash Befehle führen Vorgänge in Mattermost durch Eingabe im Eingabefeld aus. Geben Sie ein `/`gefolgt von einem Befehl und einigen Argumenten ein um Aktionen auszulösen.\n\nEingebaute Slash Befehle sind in jeder Mattermost Installation und benutzerdefinierte Slash Befehle werden zur Interaktion mit externen Anwendungen eingerichtet. Lernen Sie mehr über das Einrichten benutzerdefinierter Slash Befehle in der [Entwickler Slash Befehl Dokumentation](http://docs.mattermost.com/developer/slash-commands.html).",
+  "help.commands.title": "# Befehle ausführen\n___",
+  "help.composing.deleting": "## Eine Nachricht löschen\nSie können eine Nachricht durch einen Klick auf das **[...]** Icon neben jeder Ihrer Mitteilungen und anschließendem Klick auf **Löschen** entfernen. System- und Teamadministratoren können jede Nachricht Ihres Systems oder Teams löschen.",
+  "help.composing.editing": "## Eine Nachricht bearbeiten\nSie können eine Nachricht durch einen Klick auf das **[...]** Icon neben jeder Ihrer Mitteilungen und anschließendem Klick auf **Bearbeiten** editieren, drücken Sie **Enter** um die Änderungen zu speichern. Bearbeitete Nachrichten lösen keine neuen @Nennungen, Desktop Benachrichtigungen oder Töne aus.",
+  "help.composing.linking": "## Eine Nachricht verlinken\nDer **dauerhafte Link** Feature erstellt einen Link für jede Mitteilung. Den Link mit anderen Kanalmitgliedern zu teilen ermöglicht ihnen die verknüpfte Nachricht im Archiv zu betrachten. Benutzer die nicht Mitglied des originären Kanals können den Link nicht betrachten. Um den dauerhaften Link zu einer Nachricht zu erhalten klicken Sie auf das **[...]** Icon neben einer Nachricht  > **Dauerhafter Link** > **Link kopieren**.",
+  "help.composing.posting": "## Eine Nachricht senden\nSchreiben Sie eine Nachricht indem Sie diesen in das Eingabefeld eingeben und drücken anschließend **Enter** um ihn zu senden. Verwenden Sie **Shift + Enter** um einen Zeilenumbruch zu erzeugen ohne die Nachricht zu versenden. Um Nachrichten durch **Strg + Enter** zu senden wechseln Sie zu **Hauptmenü > Kontoeinstellungen > Erweitert > Sende Nachrichten mit Strg + Enter**.",
+  "help.composing.posts": "#### Nachrichten\nNachrichten können als übergeordnete Mitteilungen verstanden werden. Sie sind häufig die Nachrichten die den Start für Antworten sind. Nachrichten werden über das Eingabefeld am Ende des mittleren Feldes erzeugt und versendet.",
+  "help.composing.replies": "#### Antworten\nAntworten Sie auf eine Nachricht in dem Sie auf das Antworten Icon neben einer Nachricht klicken. Diese Aktion öffnet die rechte Seitenleiste in der Sie den Nachrichtenverlauf sehen, und Sie Ihre Antwort schreiben und versenden können. Antworten werden etwas eingerückt im mittleren Feld dargestellt um zu signalisieren das es sich um eine Antwort einer übergeordneten Nachricht handelt.\n\nWenn Sie eine Antwort in der rechten Seitenleiste erstellen, klicken Sie auf das erweitern/verkleinern Icon mit den zwei Pfeilen in der oberen Ecke der Seitenleiste um leichter lesen zu können.",
+  "help.composing.title": "# Senden von Nachrichten\n_____",
+  "help.composing.types": "## Nachrichtentypen\nAntworten Sie auf Nachrichten um Unterhaltungen strukturiert zu halten.",
+  "help.formatting.checklist": "Erstellen Sie eine Aufgabenliste durch die Verwendung von eckigen Klammern:",
+  "help.formatting.checklistExample": "- [ ] Eintrag eins\n- [ ] Eintrag zwei\n- [x] Erledigter Eintrag",
+  "help.formatting.code": "## Code Block\n\nErstellen Sie einen Code Block durch einrücken jeder Zeile durch vier Leerzeichen, oder indem Sie ``` in der Zeile über und unter Ihrem Code eingeben.",
+  "help.formatting.codeBlock": "Code Block",
   "help.formatting.emojiExample": ":smile: :+1: :sheep:",
-  "help.formatting.emojis": "## Emojis\n\nOpen the emoji autocomplete by typing `:`. A full list of emojis can be found [here](http://www.emoji-cheat-sheet.com/). It is also possible to create your own [Custom Emoji](http://docs.mattermost.com/help/settings/custom-emoji.html) if the emoji you want to use doesn't exist.",
-  "help.formatting.example": "Example:",
+  "help.formatting.emojis": "## Emojis\n\nÖffnen Sie die Emoji Autovervollständigung durch Eingabe von `:`. Eine komplette Liste aller Emojis finden Sie [hier](http://www.emoji-cheat-sheet.com/). Es ist außerdem möglich dass Sie Ihre [eigenen Emojis](http://docs.mattermost.com/help/settings/custom-emoji.html) erstellen können, sollte das benötigte Emoji fehlen.",
+  "help.formatting.example": "Beispiel:",
   "help.formatting.githubTheme": "**GitHub Theme**",
-  "help.formatting.headings": "## Headings\n\nMake a heading by typing # and a space before your title. For smaller headings, use more #’s.",
-  "help.formatting.headings2": "Alternatively, you can underline the text using `===` or `---` to create headings.",
-  "help.formatting.headings2Example": "Large Heading\n-------------",
-  "help.formatting.headingsExample": "## Large Heading\n### Smaller Heading\n#### Even Smaller Heading",
-  "help.formatting.images": "## In-line Images\n\nCreate in-line images using an `!` followed by the alt text in square brackets and the link in normal brackets. Add hover text by placing it in quotes after the link.",
-  "help.formatting.imagesExample": "![alt text](link \"hover text\")\n\nand\n\n[![Build Status](https://travis-ci.org/mattermost/platform.svg?branch=master)](https://travis-ci.org/mattermost/platform) [![Github](https://assets-cdn.github.com/favicon.ico)](https://github.com/mattermost/platform)",
-  "help.formatting.inline": "## In-line Code\n\nCreate in-line monospaced font by surrounding it with backticks.",
-  "help.formatting.intro": "Markdown makes it easy to format messages. Type a message as you normally would, and use these rules to render it with special formatting.",
-  "help.formatting.lines": "## Lines\n\nCreate a line by using three `*`, `_`, or `-`.",
+  "help.formatting.headings": "## Überschriften\n\nErstellen Sie eine Überschrift durch Eingabe von # und einem Leerzeichen vor Ihrem Titel. Für kleinere Überschriften verwenden Sie mehrere #.",
+  "help.formatting.headings2": "Alternativ können Sie Überschriften durch schreiben von `===` oder `---` unter dem Text erstellen.",
+  "help.formatting.headings2Example": "Große Überschrift\n--------------",
+  "help.formatting.headingsExample": "## Große Überschrift\n### Kleinere Überschrift\n#### Noch kleinere Überschrift",
+  "help.formatting.images": "## Eingebettete Bilder\n\nErstellen Sie eingebettete Bilder durch `!`gefolgt vom alternativen Text in eckigen Klammern und einem Link in normalen Klammern. Fügen Sie einen Hover Text hinzu, indem Sie diesen in Anführungszeichen nach dem Link schreiben.",
+  "help.formatting.imagesExample": "![Alternativer Text](Link \"Hover Text\")\n\nund\n\n[![Build Status](https://travis-ci.org/mattermost/platform.svg?branch=master)](https://travis-ci.org/mattermost/platform) [![Github](https://assets-cdn.github.com/favicon.ico)](https://github.com/mattermost/platform)",
+  "help.formatting.inline": "## Eingebetteter Code\n\nErstellen Sie eingebetteten Monospaced Font durch die Verwendung von Backticks vor und nach dem Code.",
+  "help.formatting.intro": "Markdown macht es einfach Nachrichten zu formatieren. Schreiben Sie Nachrichten wie Sie es normalerweise Tun würden und verwenden diese Regeln um ihn zu formatieren.",
+  "help.formatting.lines": "## Linien\n\nErstellen Sie eine Linie durch drei `*`, `_`oder `-`.",
   "help.formatting.linkEx": "[Check out Mattermost!](https://about.mattermost.com/)",
   "help.formatting.links": "## Links\n\nCreate labeled links by putting the desired text in square brackets and the associated link in normal brackets.",
-  "help.formatting.listExample": "* list item one\n* list item two\n    * item two sub-point')",
+  "help.formatting.listExample": "* list item one\n* list item two\n    * item two sub-point",
   "help.formatting.lists": "## Lists\n\nCreate a list by using `*` or `-` as bullets. Indent a bullet point by adding two spaces in front of it.",
   "help.formatting.monokaiTheme": "**Monokai Theme**",
   "help.formatting.ordered": "Make it an ordered list by using numbers instead:",
@@ -1262,7 +1266,7 @@
   "help.formatting.solirizedDarkTheme": "**Solarized Dark Theme**",
   "help.formatting.solirizedLightTheme": "**Solarized Light Theme**",
   "help.formatting.style": "## Text Style\n\nYou can use either `_` or `*` around a word to make it italic. Use two to make it bold.\n\n* `_italics_` renders as _italics_\n* `**bold**` renders as **bold**\n* `**_bold-italic_**` renders as **_bold-italics_**\n* `~~strikethrough~~` renders as ~~strikethrough~~",
-  "help.formatting.supportedSyntax": "Supported languages are:\n`as`, `applescript`, `osascript`, `scpt`, `bash`, `sh`, `zsh`, `clj`, `boot`, `cl2`, `cljc`, `cljs`, `cljs.hl`, `cljscm`, `cljx`, `hic`, `coffee`, `_coffee`, `cake`, `cjsx`, `cson`, `iced`, `cpp`, `c`, `cc`, `h`, `c++`, `h++`, `hpp`, `cs`, `csharp`, `css`, `d`, `di`, `dart`, `delphi`, `dpr`, `dfm`, `pas`, `pascal`, `freepascal`, `lazarus`, `lpr`, `lfm`, `diff`, `django`, `jinja`, `dockerfile`, `docker`, `erl`, `f90`, `f95`, `fsharp`, `fs`, `gcode`, `nc`, `go`, `groovy`, `handlebars`, `hbs`, `html.hbs`, `html.handlebars`, `hs`, `hx`, `java`, `jsp`, `js`, `jsx`, `json`, `jl`, `kt`, `ktm`, `kts`, `less`, `lisp`, `lua`, `mk`, `mak`, `md`, `mkdown`, `mkd`, `matlab`, `m`, `mm`, `objc`, `obj-c`, `ml`, `perl`, `pl`, `php`, `php3`, `php4`, `php5`, `php6`, `ps`, `ps1`, `pp`, `py`, `gyp`, `r`, `ruby`, `rb`, `gemspec`, `podspec`, `thor`, `irb`, `rs`, `scala`, `scm`, `sld`, `scss`, `st`, `sql`, `swift`, `tex`, `vbnet`, `vb`, `bas`, `vbs`, `v`, `veo`, `xml`, `html`, `xhtml`, `rss`, `atom`, `xsl`, `plist`, `yaml`",
+  "help.formatting.supportedSyntax": "Unterstützte Sprachen:\n`as`, `applescript`, `osascript`, `scpt`, `bash`, `sh`, `zsh`, `clj`, `boot`, `cl2`, `cljc`, `cljs`, `cljs.hl`, `cljscm`, `cljx`, `hic`, `coffee`, `_coffee`, `cake`, `cjsx`, `cson`, `iced`, `cpp`, `c`, `cc`, `h`, `c++`, `h++`, `hpp`, `cs`, `csharp`, `css`, `d`, `di`, `dart`, `delphi`, `dpr`, `dfm`, `pas`, `pascal`, `freepascal`, `lazarus`, `lpr`, `lfm`, `diff`, `django`, `jinja`, `dockerfile`, `docker`, `erl`, `f90`, `f95`, `fsharp`, `fs`, `gcode`, `nc`, `go`, `groovy`, `handlebars`, `hbs`, `html.hbs`, `html.handlebars`, `hs`, `hx`, `java`, `jsp`, `js`, `jsx`, `json`, `jl`, `kt`, `ktm`, `kts`, `less`, `lisp`, `lua`, `mk`, `mak`, `md`, `mkdown`, `mkd`, `matlab`, `m`, `mm`, `objc`, `obj-c`, `ml`, `perl`, `pl`, `php`, `php3`, `php4`, `php5`, `php6`, `ps`, `ps1`, `pp`, `py`, `gyp`, `r`, `ruby`, `rb`, `gemspec`, `podspec`, `thor`, `irb`, `rs`, `scala`, `scm`, `sld`, `scss`, `st`, `sql`, `swift`, `tex`, `vbnet`, `vb`, `bas`, `vbs`, `v`, `veo`, `xml`, `html`, `xhtml`, `rss`, `atom`, `xsl`, `plist`, `yaml`",
   "help.formatting.syntax": "### Syntax Highlighting\n\nTo add syntax highlighting, type the language to be highlighted after the ``` at the beginning of the code block. Mattermost also offers four different code themes (GitHub, Solarized Dark, Solarized Light, Monokai) that can be changed in **Account Settings** > **Display** > **Theme** > **Custom Theme** > **Center Channel Styles**",
   "help.formatting.syntaxEx": "    package main\n    import \"fmt\"\n    func main() {\n        fmt.Println(\"Hello, 世界\")\n    }",
   "help.formatting.tableExample": "| Left-Aligned  | Center Aligned  | Right Aligned |\n| :------------ |:---------------:| -----:|\n| Left column 1 | this text       |  $100 |\n| Left column 2 | is              |   $10 |\n| Left column 3 | centered        |    $1 |",
@@ -1270,7 +1274,7 @@
   "help.formatting.title": "# Formatting Text\n_____",
   "help.learnMore": "Learn more about:",
   "help.link.attaching": "Attaching Files",
-  "help.link.commands": "Executing Commands",
+  "help.link.commands": "# Befehle ausführen\n___",
   "help.link.composing": "Composing Messages and Replies",
   "help.link.formatting": "Formatting Messages using Markdown",
   "help.link.mentioning": "Mentioning Teammates",
@@ -1313,7 +1317,7 @@
   "installed_integrations.creation": "Erstellt durch {creator} am {createAt, date, full}",
   "installed_integrations.delete": "Löschen",
   "installed_integrations.hideSecret": "Secret ausblenden",
-  "installed_integrations.regenSecret": "Regenerate Secret",
+  "installed_integrations.regenSecret": "Secret erneuern",
   "installed_integrations.regenToken": "Token neu generieren",
   "installed_integrations.showSecret": "Secret einblenden",
   "installed_integrations.token": "Token: {token}",
@@ -1355,6 +1359,7 @@
   "integrations.oauthApps.title": "OAuth 2.0 Applikationen",
   "integrations.outgoingWebhook.description": "Ausgehende Webhooks erlauben ext. Integrationen Nachrichten zu erhalten und zu antworten",
   "integrations.outgoingWebhook.title": "Ausgehende Webhooks",
+  "integrations.successful": "Einrichtung erfolgreich",
   "intro_messages.DM": "Dies ist der Start der Privatnachrichten mit {teammate}.<br /> Privatenachrichten oder versendete Dateien sind außerhalb dieses Bereichs nicht für andere sichtbar.",
   "intro_messages.anyMember": " Jedes Mitglied kann diesem Kanal beitreten und folgen.",
   "intro_messages.beginning": "Start von {name}",
@@ -1387,13 +1392,13 @@
   "invite_member.sending": " Sende",
   "invite_member.teamInviteLink": "Sie können außerdem Personen über den {link} einladen.",
   "ldap_signup.find": "Finde meine Teams",
-  "ldap_signup.ldap": "Erstelle neues Team mit LDAP Account",
+  "ldap_signup.ldap": "Erstelle neues Team mit AD/LDAP Account",
   "ldap_signup.length_error": "Der Name muss 3 bis 15 Zeichen enthalten",
   "ldap_signup.teamName": "Name für neues Team eingeben",
   "ldap_signup.team_error": "Bitte geben Sie einen Team Namen ein",
-  "leave_team_modal.desc": "You will be removed from all public channels and private groups.  If the team is private you will not be able to rejoin the team.  Are you sure?",
+  "leave_team_modal.desc": "Sie werden von allen öffentlichen Kanälen und privaten Gruppen entfernt.  Wenn das Team privat ist können Sie diesem nicht wieder beitreten.  Sind Sie sich sicher?",
   "leave_team_modal.no": "Nein",
-  "leave_team_modal.title": "Leave the team?",
+  "leave_team_modal.title": "Team verlassen?",
   "leave_team_modal.yes": "Ja",
   "loading_screen.loading": "Laden",
   "login.changed": " Anmeldemethode erfolgreich geändert",
@@ -1406,15 +1411,15 @@
   "login.gitlab": "GitLab",
   "login.google": "Google Apps",
   "login.invalidPassword": "Ihr Passwort ist falsch.",
-  "login.ldapUsername": "LDAP Benutzername",
-  "login.ldapUsernameLower": "LDAP Benutzername",
+  "login.ldapUsername": "AD/LDAP Benutzername",
+  "login.ldapUsernameLower": "AD/LDAP Benutzername",
   "login.noAccount": "Sie haben keinen Zugang? ",
   "login.noEmail": "Bitte geben Sie Ihre E-Mail-Adresse ein",
   "login.noEmailLdapUsername": "Bitte geben Sie Ihre E-Mail-Adresse oder {ldapUsername} ein",
   "login.noEmailUsername": "Bitte geben Sie Ihre E-Mail-Adresse oder Benutzernamen ein",
   "login.noEmailUsernameLdapUsername": "Bitte geben Sie Ihre E-Mail-Adresse, Benutzername oder {ldapUsername} ein",
   "login.noLdapUsername": "Bitte geben Sie Ihren {ldapUsername} ein",
-  "login.noMethods": "Keine Registrierungsmethoden konfiguriert, bitte kontaktieren Sie Ihren Systemadministrator.",
+  "login.noMethods": "Keine Anmeldemethoden konfiguriert, bitte kontaktieren Sie Ihren Systemadministrator.",
   "login.noPassword": "Bitte geben Sie Ihr Passwort ein",
   "login.noUsername": "Bitte geben Sie Ihren Benutzernamen ein",
   "login.noUsernameLdapUsername": "Bitte geben Sie Ihren Benutzernamen oder {ldapUsername} ein",
@@ -1474,7 +1479,7 @@
   "navbar_dropdown.leave": "Team verlassen",
   "navbar_dropdown.logout": "Abmelden",
   "navbar_dropdown.manageMembers": "Mitglieder verwalten",
-  "navbar_dropdown.nativeApps": "Download Mattermost Apps",
+  "navbar_dropdown.nativeApps": "Apps herunterladen",
   "navbar_dropdown.report": "Fehler melden",
   "navbar_dropdown.switchTeam": "Wechsel zu {team}",
   "navbar_dropdown.switchTo": "Wechsel zu ",
@@ -1496,7 +1501,7 @@
   "password_send.link": "<p>Ein Link zum Zurücksetzen des Passwortes wurde an <b>{email}</b> geschickt</p>",
   "password_send.reset": "Mein Passwort zurücksetzen",
   "password_send.title": "Passwort zurücksetzen",
-  "pdf_preview.max_pages": "PDF previews only show the first five pages.",
+  "pdf_preview.max_pages": "Herunterladen um mehr Seiten zu lesen.",
   "pending_post_actions.cancel": "Abbrechen",
   "pending_post_actions.retry": "Erneut versuchen",
   "permalink.error.access": "Der dauerhafte Link verweist auf eine gelöschte Nachricht oder einen Kanal auf den Sie keinen Zugriff haben.",
@@ -1563,6 +1568,10 @@
   "search_results.because": "<ul><li>Wenn Sie nach einem Textteil suchen(z.b. suche nach \"rea\", wenn Sie \"Realität\" oder \"Reaktion\" finden möchten), hängen Sie ein * an Ihren Suchbegriff</li><li>Wegen zu vieler Treffer werden Suchen mit nur zwei Buchstaben oder häufigen Wörtern wie \"this\", \"a\" und \"is\" im Suchergebnis nicht angezeigt.</li></ul>",
   "search_results.noResults": "Keine Ergebnisse gefunden. Nochmal versuchen?",
   "search_results.usage": "<ul><li>Verwenden Sie <b>\"Anführungszeichen\"</b> zur Suche nach Phrasen</li><li>Verwenden Sie <b>from:</b> um nach Nachrichten eines bestimmten Absenders zu suchen und <b>in:</b> für Nachrichten in einem bestimmten Kanal</li></ul>",
+  "search_results.usageFlag1": "Sie haben bisher keine Nachrichten markiert.",
+  "search_results.usageFlag2": "Sie können eine Markierung zu einer Nachricht oder einem Kommentar hinzufügen indem Sie das ",
+  "search_results.usageFlag3": " Icon neben dem Zeitstempel klicken.",
+  "search_results.usageFlag4": "Markierungen dienen als Möglichkeit Nachrichten für eine Wiedervorlage zu markieren. Ihre Markierungen sind persönlich und können nicht von anderen Benutzern gesehen werden.",
   "setting_item_max.cancel": "Abbrechen",
   "setting_item_max.save": "Speichern",
   "setting_item_min.edit": "Bearbeiten",
@@ -1595,7 +1604,7 @@
   "sidebar_right_menu.inviteNew": "Neues Mitglied einladen",
   "sidebar_right_menu.logout": "Abmelden",
   "sidebar_right_menu.manageMembers": "Mitglieder verwalten",
-  "sidebar_right_menu.nativeApps": "Download Mattermost Apps",
+  "sidebar_right_menu.nativeApps": "Apps herunterladen",
   "sidebar_right_menu.recentMentions": "Kürzliche Erwähnungen",
   "sidebar_right_menu.report": "Fehler melden",
   "sidebar_right_menu.switch_team": "Teamauswahl",
@@ -1605,9 +1614,9 @@
   "signup.email": "E-Mail-Adresse und Passwort",
   "signup.gitlab": "GitLab Single-Sign-On",
   "signup.google": "Google Account",
-  "signup.ldap": "LDAP Credentials",
+  "signup.ldap": "AD/LDAP Zugangsdaten",
   "signup.office365": "Office 365",
-  "signup.title": "Create an account with:",
+  "signup.title": "Erstelle einen Account mit:",
   "signup_team.choose": "Ihre Teams: ",
   "signup_team.createTeam": "Oder erstellen Sie ein Team",
   "signup_team.disabled": "Teamerstellung wurde deaktiviert.  Bitte kontaktieren Sie einen Administrator.",
@@ -1647,7 +1656,7 @@
   "signup_user_completed.validEmail": "Bitte geben Sie eine gültige E-Mail-Adresse ein",
   "signup_user_completed.welcome": "Willkommen bei:",
   "signup_user_completed.whatis": "Wie lautet Ihre E-Mail-Adresse?",
-  "signup_user_completed.withLdap": "Mit Ihren LDAP Zugangsdaten",
+  "signup_user_completed.withLdap": "Mit Ihren AD/LDAP Zugangsdaten",
   "sso_signup.find": "Finde meine Teams",
   "sso_signup.gitlab": "Erstelle Team mit GitLab Account",
   "sso_signup.google": "Erstelle Team mit Google Apps Account",
@@ -1670,7 +1679,7 @@
   "team_export_tab.unable": " Fehler beim Export: {error}",
   "team_import_tab.failure": " Fehler beim Import: ",
   "team_import_tab.import": "Importieren",
-  "team_import_tab.importHelp": "<p>Um ein Team von Slack zu Importieren gehen Sie zu Slack > Team Settings > Import/Export Data > Export > Start Export. Slack erlaubt nicht das exportieren von Dateien, Bildern, privaten Gruppen und Direktnachrichten. Daher unterstützt der Slack Import zu Mattermost nur die Textnachrichten in Slacks öffentlichen Teamkanälen.</p><p>Der Slack Import zu Mattermost ist 'Beta'. Slack Bot Nachrichten werden nicht importiert und Slack @Nennungen werden momentan nicht unterstützt.</p>",
+  "team_import_tab.importHelp": "<p>Um ein Team von Slack zu Importieren gehen Sie zu Slack > Team Settings > Import/Export Data > Export > Start Export. Slack erlaubt nicht das exportieren von Dateien, Bildern, privaten Gruppen und Direktnachrichten. Daher unterstützt der Slack Import zu Mattermost nur die Textnachrichten in Slacks öffentlichen Teamkanälen.</p><p>Der Slack Import zu Mattermost ist 'Beta'. Slack Bot Nachrichten werden noch nicht importiert.</p>",
   "team_import_tab.importSlack": "Import von Slack (Beta)",
   "team_import_tab.importing": " Importiere...",
   "team_import_tab.successful": " Import erfolgreich: ",
@@ -1726,7 +1735,7 @@
   "user.settings.advance.formattingDesc": "Wenn aktiviert werden Nachrichten formatiert, sodass Links erstellt, Emojis angezeigt, Text formatiert und Zeilenumbrüche hinzugefügt werden. Standardmäßig ist dies aktiviert. Ändern der Einstellung erfordert ein Neuladen der Seite.",
   "user.settings.advance.formattingTitle": "Formatierung von Nachrichten aktivieren",
   "user.settings.advance.joinLeaveDesc": "When \"On\", System Messages saying a user has joined or left a channel will be visible. When \"Off\", the System Messages about joining or leaving a channel will be hidden. A message will still show up when you are added to a channel, so you can receive a notification.",
-  "user.settings.advance.joinLeaveTitle": "Enable Join/Leave Messages",
+  "user.settings.advance.joinLeaveTitle": "Aktiviere Betreten/Verlassen Nachrichten",
   "user.settings.advance.markdown_preview": "Zeige Markdown Vorschauoption im der Nachrichten Eingabefeld",
   "user.settings.advance.off": "Aus",
   "user.settings.advance.on": "Ein",
@@ -1805,7 +1814,7 @@
   "user.settings.general.emailHelp2": "E-Mails wurden durch Ihren Systemadministrator deaktiviert. Es werden keine Benachrichtigungen versendet bis dies aktiviert wird.",
   "user.settings.general.emailHelp3": "Die E-Mail Adresse wird für den Login, die Benachrichtigungen und das Zurücksetzen des Passworts verwendet.",
   "user.settings.general.emailHelp4": "Es wurde eine E-Mail zur Bestätigung an {email} gesendet.",
-  "user.settings.general.emailLdapCantUpdate": "Anmeldung erfolgt durch LDAP. E-Mail-Adresse kann nicht aktualisiert werden. Die E-Mail-Adresse zum Versand von Hinweisen lautet {email}.",
+  "user.settings.general.emailLdapCantUpdate": "Anmeldung erfolgt durch AD/LDAP. E-Mail-Adresse kann nicht aktualisiert werden. Die E-Mail-Adresse zum Versand von Hinweisen lautet {email}.",
   "user.settings.general.emailMatch": "Die von Ihnen eingegebenen E-Mail-Adressen stimmen nicht überein.",
   "user.settings.general.emailOffice365CantUpdate": "Anmeldung erfolgt durch Office 365. E-Mail-Adresse kann nicht aktualisiert werden. Die E-Mail-Adresse zum Versand von Hinweisen lautet {email}.",
   "user.settings.general.emailSamlCantUpdate": "Anmeldung erfolgt durch SAML. E-Mail-Adresse kann nicht aktualisiert werden. Die E-Mail-Adresse zum Versand von Hinweisen lautet {email}.",
@@ -1820,7 +1829,7 @@
   "user.settings.general.lastName": "Nachname",
   "user.settings.general.loginGitlab": "Anmeldung erfolgt durch GitLab ({email})",
   "user.settings.general.loginGoogle": "Anmeldung erfolgt durch Google ({email})",
-  "user.settings.general.loginLdap": "Anmeldung erfolgt durch LDAP ({email})",
+  "user.settings.general.loginLdap": "Anmeldung erfolgt durch AD/LDAP ({email})",
   "user.settings.general.loginOffice365": "Anmeldung erfolgt durch Office 365 ({email})",
   "user.settings.general.loginSaml": "Anmeldung erfolgt durch SAML ({email})",
   "user.settings.general.newAddress": "Neue Adresse: {email}<br />Überprüfen Sie Ihr Postfach um die obige Adresse zu verifizieren.",
@@ -1885,20 +1894,21 @@
   "user.settings.notifications.desktop.mentionsNoSoundTimed": "For mentions and direct messages, without sound, shown for {seconds} seconds",
   "user.settings.notifications.desktop.mentionsSoundForever": "For mentions and direct messages, with sound, shown indefinitely",
   "user.settings.notifications.desktop.mentionsSoundTimed": "For mentions and direct messages, with sound, shown for {seconds} seconds",
-  "user.settings.notifications.desktop.seconds": "{seconds} seconds",
-  "user.settings.notifications.desktop.sound": "Notification sound",
-  "user.settings.notifications.desktop.title": "Töne der Desktopbenachrichtigungen",
-  "user.settings.notifications.desktop.unlimited": "Unlimited",
+  "user.settings.notifications.desktop.seconds": "{seconds} Sekunden",
+  "user.settings.notifications.desktop.sound": "Benachrichtigungston",
+  "user.settings.notifications.desktop.title": "Desktopbenachrichtigungen",
+  "user.settings.notifications.desktop.unlimited": "Unbegrenzt",
   "user.settings.notifications.desktopSounds": "Töne der Desktopbenachrichtigungen",
+  "user.settings.notifications.email.everyHour": "Jede Stunde",
+  "user.settings.notifications.email.everyXMinutes": "{count, plural, one {Jede Minute} other {Alle {count, number} Minuten}}",
+  "user.settings.notifications.email.immediately": "Sofort",
+  "user.settings.notifications.email.never": "Nie",
+  "user.settings.notifications.email.send": "E-Mail Benachrichtigungen senden",
   "user.settings.notifications.emailBatchingInfo": "Notifications received over the time period selected are combined and sent in a single email.",
   "user.settings.notifications.emailInfo": "E-Mail Benachrichtigungen werden bei Nennungen und Direktnachrichten gesendet, sobald Sie von {siteName} mehr als 5 Minuten offline oder abwesend waren.",
   "user.settings.notifications.emailNotifications": "E-Mail Benachrichtigung",
-  "user.settings.notifications.everyHour": "Jede Stunde",
-  "user.settings.notifications.everyXMinutes": "{count, plural, one {Jede Minute} other {Alle {count, number} Minuten}}",
   "user.settings.notifications.header": "Benachrichtigungen",
-  "user.settings.notifications.immediately": "Sofort",
   "user.settings.notifications.info": "Desktop notifications are available on Firefox, Safari, and Chrome.",
-  "user.settings.notifications.never": "Nie",
   "user.settings.notifications.noWords": "Keine Wörter konfiguriert",
   "user.settings.notifications.off": "Aus",
   "user.settings.notifications.on": "Ein",
@@ -1937,9 +1947,9 @@
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "Google",
   "user.settings.security.lastUpdated": "Zuletzt aktualisiert am {date} um {time}",
-  "user.settings.security.ldap": "LDAP",
+  "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "Anmeldung via GitLab",
-  "user.settings.security.loginLdap": "Anmeldung via LDAP",
+  "user.settings.security.loginLdap": "Anmeldung via AD/LDAP",
   "user.settings.security.logoutActiveSessions": "Zeigen und beenden von aktiven Sitzungen",
   "user.settings.security.method": "Anmeldemethode",
   "user.settings.security.newPassword": "Neues Passwort",
@@ -1967,7 +1977,7 @@
   "user.settings.security.passwordErrorUppercaseNumberSymbol": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen und mindestens einen Großbuchstaben, eine Ziffer und ein Symbol (wie \"~!@#$%^&*()\") enthalten.",
   "user.settings.security.passwordErrorUppercaseSymbol": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen und mindestens einen Großbuchstaben und ein Symbol (wie \"~!@#$%^&*()\") enthalten.",
   "user.settings.security.passwordGitlabCantUpdate": "Einloggen findet über GitLab statt. Die Adresse kann nicht aktualisiert werden.",
-  "user.settings.security.passwordLdapCantUpdate": "Einloggen findet über LDAP statt. Die Adresse kann nicht aktualisiert werden.",
+  "user.settings.security.passwordLdapCantUpdate": "Einloggen findet über AD/LDAP statt. Die Adresse kann nicht aktualisiert werden.",
   "user.settings.security.passwordMatchError": "Die eingegebenen neuen Passwörter stimmen nicht überein.",
   "user.settings.security.passwordMinLength": "Ungültige minimale Länge, kann keine Vorschau anzeigen.",
   "user.settings.security.retypePassword": "Passwort erneut eingeben",
@@ -1975,7 +1985,7 @@
   "user.settings.security.switchEmail": "Wechsel auf E-Mail-Adresse und Passwort",
   "user.settings.security.switchGitlab": "Wechsel auf GitLab SSO",
   "user.settings.security.switchGoogle": "Wechsel auf Google SSO",
-  "user.settings.security.switchLdap": "Wechsel auf LDAP",
+  "user.settings.security.switchLdap": "Wechsel auf AD/LDAP",
   "user.settings.security.switchOffice365": "Wechseln auf Office 365 SSO",
   "user.settings.security.switchSaml": "Wechsel auf SAML SSO",
   "user.settings.security.title": "Sicherheitseinstellungen",
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index a90d2949a..45afbd184 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -413,6 +413,7 @@
   "admin.ldap.lastnameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the last name of users in Mattermost.",
   "admin.ldap.lastnameAttrEx": "Ex \"sn\"",
   "admin.ldap.lastnameAttrTitle": "Last Name Attribute:",
+  "admin.ldap.ldap_test_button": "AD/LDAP Test",
   "admin.ldap.loginNameDesc": "The placeholder text that appears in the login field on the login page. Defaults to \"AD/LDAP Username\".",
   "admin.ldap.loginNameEx": "Ex \"AD/LDAP Username\"",
   "admin.ldap.loginNameTitle": "Login Field Name:",
@@ -440,9 +441,8 @@
   "admin.ldap.syncNowHelpText": "Initiates an AD/LDAP synchronization immediately.",
   "admin.ldap.sync_button": "AD/LDAP Synchronize Now",
   "admin.ldap.testFailure": "AD/LDAP Test Failure: {error}",
-  "admin.ldap.testSuccess": "AD/LDAP Test Successful",
   "admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the AD/LDAP server specified. See log file for more detailed error messages.",
-  "admin.ldap.ldap_test_button": "AD/LDAP Test",
+  "admin.ldap.testSuccess": "AD/LDAP Test Successful",
   "admin.ldap.uernameAttrDesc": "The attribute in the AD/LDAP server that will be used to populate the username field in Mattermost. This may be the same as the ID Attribute.",
   "admin.ldap.userFilterDisc": "(Optional) Enter an AD/LDAP Filter to use when searching for user objects. Only the users selected by the query will be able to access Mattermost. For Active Directory, the query to filter out disabled users is (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "Ex. \"(objectClass=user)\"",
@@ -463,10 +463,10 @@
   "admin.license.uploading": "Uploading License...",
   "admin.log.consoleDescription": "Typically set to false in production. Developers may set this field to true to output log messages to console based on the console level option.  If true, server writes messages to the standard output stream (stdout).",
   "admin.log.consoleTitle": "Output logs to console: ",
-  "admin.log.enableWebhookDebugging": "Enable Webhook Debugging:",
-  "admin.log.enableWebhookDebuggingDescription": "You can set this to false to disable the debug logging of all incoming webhook request bodies.",
   "admin.log.enableDiagnostics": "Enable Diagnostics and Error Reporting:",
   "admin.log.enableDiagnosticsDescription": "Enable this feature to improve the quality and performance of Mattermost by sending error reporting and diagnostic information to Mattermost, Inc. Read our <a href=\"https://about.mattermost.com/default-privacy-policy/\" target=\"_blank\">privacy policy</a> to learn more.",
+  "admin.log.enableWebhookDebugging": "Enable Webhook Debugging:",
+  "admin.log.enableWebhookDebuggingDescription": "You can set this to false to disable the debug logging of all incoming webhook request bodies.",
   "admin.log.fileDescription": "Typically set to true in production.  When true, log files are written to the log file specified in file location field below.",
   "admin.log.fileLevelDescription": "This setting determines the level of detail at which log events are written to the log file. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues.",
   "admin.log.fileLevelTitle": "File Log Level:",
@@ -1349,7 +1349,6 @@
   "installed_outgoing_webhooks.search": "Search Outgoing Webhooks",
   "installed_outgoing_webhooks.unknown_channel": "A Private Webhook",
   "integrations.add": "Add",
-  "integrations.successful": "Setup Successful",
   "integrations.command.description": "Slash commands send events to external integrations",
   "integrations.command.title": "Slash Command",
   "integrations.done": "Done",
@@ -1360,6 +1359,7 @@
   "integrations.oauthApps.title": "OAuth 2.0 Applications",
   "integrations.outgoingWebhook.description": "Outgoing webhooks allow external integrations to receive and respond to messages",
   "integrations.outgoingWebhook.title": "Outgoing Webhook",
+  "integrations.successful": "Setup Successful",
   "intro_messages.DM": "This is the start of your direct message history with {teammate}.<br />Direct messages and files shared here are not shown to people outside this area.",
   "intro_messages.anyMember": " Any member can join and read this channel.",
   "intro_messages.beginning": "Beginning of {name}",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index 281b4ee94..985c109ba 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -171,7 +171,7 @@
   "admin.compliance.enableDesc": "Cuando es verdadedo, Mattermost permite la creación de informes de cumplimiento desde la ficha <strong>Cumplimiento y Auditoría</strong>. Ver la <a href=\"https://docs.mattermost.com/administration/compliance.html\" target=\"_blank\">documentación</a> para obtener más información.",
   "admin.compliance.enableTitle": "Habilitar Los Informes De Cumplimiento:",
   "admin.compliance.false": "falso",
-  "admin.compliance.noLicense": "<h4 class=\"banner__heading\">Nota:</h4><p>El Cumplimiento es una característica de la edición enterprise. Tu licencia actual no soporta Cumplimiento. Pincha <a href=\"http://mattermost.com\" target=\"_blank\">aquí</a> para información y precio de las licencias enterprise.</p>",
+  "admin.compliance.noLicense": "<h4 class=\"banner__heading\">Nota:</h4><p>El Cumplimiento es una característica de la edición enterprise. Tu licencia actual no soporta Cumplimiento. Haz clic <a href=\"http://mattermost.com\" target=\"_blank\">aquí</a> para información y precio de las licencias enterprise.</p>",
   "admin.compliance.save": "Guardar",
   "admin.compliance.saving": "Guardando...",
   "admin.compliance.title": "Configuración de Cumplimiento",
@@ -229,7 +229,7 @@
   "admin.email.agreeHPNS": " Comprendo y acepto los <a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">Términos de Servicio</a> y <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Políticas de Privacidad</a> del Servicio Alojado de Notificaciones Push de Mattermost.",
   "admin.email.allowEmailSignInDescription": "Cuando es verdadero, Mattermost permite a los usuarios iniciar sesión utilizando el correo electrónico y contraseña.",
   "admin.email.allowEmailSignInTitle": "Habilitar el inicio de sesión con el correo electrónico: ",
-  "admin.email.allowSignupDescription": "Cuando está en verdadero, Mattermost permite la creación de equipos y cuentas utilizando el correo electrónico y contraseña.  Este valor debe estar en falso sólo cuando quieres limitar el inicio de sesión a través de servicios tipo OAuth o LDAP.",
+  "admin.email.allowSignupDescription": "Cuando está en verdadero, Mattermost permite la creación de equipos y cuentas utilizando el correo electrónico y contraseña.  Este valor debe estar en falso sólo cuando quieres limitar el inicio de sesión a través de servicios tipo OAuth o AD/LDAP.",
   "admin.email.allowSignupTitle": "Habilitar la creación de la cuenta con el correo electrónico: ",
   "admin.email.allowUsernameSignInDescription": "Cuando es verdadero, Mattermost permite a los usuarios iniciar sesión con el nombre de usuario y contraseña.  Esta opción normalmente se utiliza cuando la verificación de correo electrónico está deshabilitada.",
   "admin.email.allowUsernameSignInTitle": "Habilitar el inicio de sesión con nombre de usuario: ",
@@ -261,7 +261,7 @@
   "admin.email.notificationOrganizationDescription": "Nombre de la organización y dirección que se muestra en las notificaciones de correo electrónico enviadas desde Mattermost, como \"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\". Si este campo se deja en blanco, el nombre dela organización y su dirección no serán mostrados.",
   "admin.email.notificationsDescription": "Normalmente se asigna como verdadero en producción. Cuando es verdadero, Mattermost intenta enviar las notificaciones por correo electrónico. Los desarrolladores puede que quieran dejar esta opción en falso para saltarse la configuración de correos para desarrollar más rápido.<br/>Asignar está opción como verdadero remueve la notificación de Modo de Prueba (requiere cerrar la sesión y abrirla nuevamente para que los cambios surjan efecto).",
   "admin.email.notificationsTitle": "Habilitar Notificaciones por Correo Electrónico: ",
-  "admin.email.passwordSaltDescription": "Un salt de 32-caracteres es añadido a la firma de correos para restablecer la contraseña. Aleatoriamente generado en la instalación. Pincha \"Regenerar\" para crear un nuevo salt.",
+  "admin.email.passwordSaltDescription": "Un salt de 32-caracteres es añadido a la firma de correos para restablecer la contraseña. Aleatoriamente generado en la instalación. Haz clic en \"Regenerar\" para crear un nuevo salt.",
   "admin.email.passwordSaltExample": "Ej \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "Resetear el Salt para las contraseñas:",
   "admin.email.pushContentDesc": "Al seleccionar \"Enviar descripción generica con nombres de usuario y canal\" las notificaciones se enviarán con mensajes genericos, incluyendo el nombre del usuario y el canal pero obviando el texto del mensaje.<br /><br /> Al seleccionar \"Enviar el mensaje completo\" envía los mensajes desencadenados por las notificaciones con características específicas y puede incluir información confidencial enviada en los mensajes. En el caso de que tu servidor de Envío de Notificaciones se encuentre fuera del alcance de tu cortafuego,, es ALTAMENTE RECOMENDABLE utilizar está opción junto con el protocolo \"https\" para cifrar las notificaciones enviadas por el servidor.",
@@ -335,7 +335,7 @@
   "admin.gitlab.userDescription": "Ingresar <tu-url-de-gitlab>/api/v3/user.   Asegurate que si utilizas HTTPS o HTTPS tus URLS sean correctas.",
   "admin.gitlab.userExample": "Ej \"https://<tu-url-de-gitlab>/api/v3/user\"",
   "admin.gitlab.userTitle": "URL para obtener datos de usuario:",
-  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>Inicia sesión</a> con tu cuenta de Google.</li><li>Dirigete a <a href='https://console.developers.google.com'>https://console.developers.google.com</a>, pincha <strong>Credenciales</strong> el la barra lateral izquierda e ingresa \"Mattermost - el-nombre-de-tu-empresa\" como el <strong>Nombre del Proyecto</strong>, luego pincha <strong>Crear</strong>.</li><li>Pincha el encabezado de <strong>Pantalla de autorización de OAuth</strong> e ingresa \"Mattermost\" como el <strong>Nombre de producto mostrado a los usuarios</strong>, luego pincha <strong>Guardar</strong>.</li><li>En el encabezado de <strong>Credenciales</strong>, pincha <strong>Crear credenciales</strong>, escoge <strong>ID de cliente de OAuth</strong> y selecciona <strong>Web</strong>.</li><li>En <strong>Restricciones</strong> y <strong>URIs de redireccionamiento autorizados</strong> ingresa <strong>tu-url-de-mattermost/signup/google/complete</strong> (ejemplo: http://localhost:8065/signup/google/complete). Pincha <strong>Crear</strong>.</li><li>Pega el <strong>ID de Cliente</strong> y el <strong>Secreto de Cliente</strong> en los campos que se encuentran en la parte inferior, luego pincha <strong>Guardar</strong>.</li><li>Finalmente, dirigete a <a href='https://console.developers.google.com/apis/plus/overview'>Google+ API</a> y pincha <strong>Habilitar</strong>. Puede que esta acción tome unos minutos en propagarse por los sistemas de Google.</li></ol>",
+  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>Inicia sesión</a> con tu cuenta de Google.</li><li>Dirigete a <a href='https://console.developers.google.com'>https://console.developers.google.com</a>, haz clic en <strong>Credenciales</strong> en la barra lateral izquierda e ingresa \"Mattermost - el-nombre-de-tu-empresa\" como el <strong>Nombre del Proyecto</strong>, luego haz clic en <strong>Crear</strong>.</li><li>Haz clic en el encabezado de <strong>Pantalla de autorización de OAuth</strong> e ingresa \"Mattermost\" como el <strong>Nombre de producto mostrado a los usuarios</strong>, luego haz clic en <strong>Guardar</strong>.</li><li>En el encabezado de <strong>Credenciales</strong>, haz clic en <strong>Crear credenciales</strong>, escoge <strong>ID de cliente de OAuth</strong> y selecciona <strong>Web</strong>.</li><li>En <strong>Restricciones</strong> y <strong>URIs de redireccionamiento autorizados</strong> ingresa <strong>tu-url-de-mattermost/signup/google/complete</strong> (ejemplo: http://localhost:8065/signup/google/complete). Haz clic en <strong>Crear</strong>.</li><li>Pega el <strong>ID de Cliente</strong> y el <strong>Secreto de Cliente</strong> en los campos que se encuentran en la parte inferior, luego haz clic en <strong>Guardar</strong>.</li><li>Finalmente, dirigete a <a href='https://console.developers.google.com/apis/plus/overview'>Google+ API</a> y haz clic en <strong>Habilitar</strong>. Puede que esta acción tome unos minutos en propagarse por los sistemas de Google.</li></ol>",
   "admin.google.authTitle": "URL para autentificación:",
   "admin.google.clientIdDescription": "El ID de Cliente que recibiste al registrar la aplicación con Google.",
   "admin.google.clientIdExample": "Ej \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -375,7 +375,7 @@
   "admin.image.profileWidthDescription": "Ancho de la imagen de perfil.",
   "admin.image.profileWidthExample": "Ej \"1024\"",
   "admin.image.profileWidthTitle": "Ancho del la Imagen de Perfil:",
-  "admin.image.publicLinkDescription": "Salt de 32-characteres agregado para firmar los enlaces para las imágenes públicas. Aleatoriamente generados en la instalación. Pincha \"Regenerar\" para crear un nuevo salt.",
+  "admin.image.publicLinkDescription": "Salt de 32-characteres agregado para firmar los enlaces para las imágenes públicas. Aleatoriamente generados en la instalación. Haz clic en \"Regenerar\" para crear un nuevo salt.",
   "admin.image.publicLinkExample": "Ej \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "Título del enlace público:",
   "admin.image.shareDescription": "Permitir a los usuarios compartir enlaces públicos para archivos e imágenes.",
@@ -392,57 +392,59 @@
   "admin.image.thumbWidthTitle": "Ancho de las Miniaturas de los Adjuntos:",
   "admin.integrations.custom": "Integraciones Personalizadas",
   "admin.integrations.external": "Servicios Externos",
-  "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.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 AD/LDAP.",
   "admin.ldap.baseEx": "Ej \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "DN Base:",
   "admin.ldap.bindPwdDesc": "Contraseña del usuario asignado en \"Usuario de Enlace\".",
   "admin.ldap.bindPwdTitle": "Contraseña de Enlace:",
-  "admin.ldap.bindUserDesc": "El usuario que realizará las busquedas LDAP. Normalmente este debería ser una cuenta específicamente creada para ser utilizada por Mattermost. Debería contat con acceso limitado para leer la porción del árbol LDAP especificada en el campo DN Base.",
+  "admin.ldap.bindUserDesc": "El usuario que realizará las búsquedas AD/LDAP. Normalmente este debería ser una cuenta específicamente creada para ser utilizada por Mattermost. Debería contar con acceso limitado para leer la porción del árbol AD/LDAP especificada en el campo DN Base.",
   "admin.ldap.bindUserTitle": "Usuario de Enlace:",
-  "admin.ldap.emailAttrDesc": "El atributo en el servidor LDAP que será utilizado para poblar la dirección de correo electrónico de los usuarios en Mattermost.",
+  "admin.ldap.emailAttrDesc": "El atributo en el servidor AD/LDAP que será utilizado para poblar la dirección de correo electrónico de los usuarios en Mattermost.",
   "admin.ldap.emailAttrEx": "Ej \"mail\" o \"userPrincipalName\"",
   "admin.ldap.emailAttrTitle": "Atributo de Correo Electrónico:",
-  "admin.ldap.enableDesc": "Cuando es verdadero, Mattermost permite realizar inicio de sesión utilizando LDAP",
-  "admin.ldap.enableTitle": "Habilitar el inicio de sesión con LDAP:",
-  "admin.ldap.firstnameAttrDesc": "(Opcional) El atributo en el servidor LDAP que será utilizado para poblar el nombre de los usuarios en Mattermost.",
+  "admin.ldap.enableDesc": "Cuando es verdadero, Mattermost permite realizar inicio de sesión utilizando AD/LDAP",
+  "admin.ldap.enableTitle": "Habilitar el inicio de sesión con AD/LDAP:",
+  "admin.ldap.firstnameAttrDesc": "(Opcional) El atributo en el servidor AD/LDAP que será utilizado para poblar el nombre de los usuarios en Mattermost.",
   "admin.ldap.firstnameAttrEx": "Ej \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "Atributo del Nombre",
-  "admin.ldap.idAttrDesc": "El atributo en el servidor LDAP que será utilizado para poblar el identificador único en Mattermost. Debe ser un atributo de LDAP que no cambie con el tiempo, como el nombre de usuario o el uid. Si el atributo del identificador cambia, se creará una nueva cuenta en Mattermost que no está asociada a la anterior. Este valor es utilizado para iniciar sesión en Mattermost en el campo \"Usuario LDAP\" en la página de inicio de sesión. Normalmente este atributo es el mismo que el campo “Atributo Usuario”. Si el equipo normalmente utiliza dominio\\usuario para iniciar sesión en otros servicios con LDAP, puedes elegir llenar este campo como dominio\\usuario para mantener consistencia entre los servicios.",
+  "admin.ldap.idAttrDesc": "El atributo en el servidor AD/LDAP que será utilizado para poblar el identificador único en Mattermost. Debe ser un atributo de AD/LDAP que no cambie con el tiempo, como el nombre de usuario o el uid. Si el atributo del identificador cambia, se creará una nueva cuenta en Mattermost que no está asociada a la anterior. Este valor es utilizado para iniciar sesión en Mattermost en el campo \"Usuario AD/LDAP\" en la página de inicio de sesión. Normalmente este atributo es el mismo que el campo “Atributo Usuario”. Si el equipo normalmente utiliza dominio\\usuario para iniciar sesión en otros servicios con AD/LDAP, puedes elegir llenar este campo como dominio\\usuario para mantener consistencia entre los servicios.",
   "admin.ldap.idAttrEx": "Ej \"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "Atributo ID:  ",
-  "admin.ldap.lastnameAttrDesc": "(Opcional) El atributo en el servidor LDAP que será utilizado para poblar el apellido de los usuarios en Mattermost.",
+  "admin.ldap.lastnameAttrDesc": "(Opcional) El atributo en el servidor AD/LDAP que será utilizado para poblar el apellido de los usuarios en Mattermost.",
   "admin.ldap.lastnameAttrEx": "Ej \"sn\"",
   "admin.ldap.lastnameAttrTitle": "Atributo Apellido:",
-  "admin.ldap.loginNameDesc": "El texto que aparece en el campo de inicio de sesión en la página para iniciar sesión. Predeterminado a \"Nombre de usuario LDAP\".",
-  "admin.ldap.loginNameEx": "Ej \"Nombre de usuario LDAP\"",
+  "admin.ldap.ldap_test_button": "AD/LDAP Test",
+  "admin.ldap.loginNameDesc": "El texto que aparece en el campo de inicio de sesión en la página para iniciar sesión. Predeterminado a \"Nombre de usuario AD/LDAP\".",
+  "admin.ldap.loginNameEx": "Ej \"Nombre de usuario AD/LDAP\"",
   "admin.ldap.loginNameTitle": "Nombre del campo de inicio de sesión:",
   "admin.ldap.maxPageSizeEx": "Ej \"2000\"",
   "admin.ldap.maxPageSizeHelpText": "El número máximo de usuarios que el servidor Mattermost solicitará al servidor LDAP a la vez. 0 es sin límites.",
   "admin.ldap.maxPageSizeTitle": "Tamaño Máximo de Página",
-  "admin.ldap.nicknameAttrDesc": "(Opcional) El atributo en el servidor LDAP que será utilizado para poblar el sobrenombre de los usuarios en Mattermost.",
+  "admin.ldap.nicknameAttrDesc": "(Opcional) El atributo en el servidor AD/LDAP que será utilizado para poblar el sobrenombre de los usuarios en Mattermost.",
   "admin.ldap.nicknameAttrEx": "Ej \"sobrenombre\"",
   "admin.ldap.nicknameAttrTitle": "Atributo del Sobrenombre:",
-  "admin.ldap.noLicense": "<h4 class=\"banner__heading\">Nota:</h4><p>LDAP es una característica de la edición enterprise. Tu licencia actual no soporta LDAP. Pincha <a href=\"http://mattermost.com\" target=\"_blank\">aquí</a> para obtener información y precios de las licencias enterprise.</p>",
-  "admin.ldap.portDesc": "El puerto que Mattermost utilizará para conectarse al servidor LDAP. El predeterminado es 389.",
+  "admin.ldap.noLicense": "<h4 class=\"banner__heading\">Nota:</h4><p>AD/LDAP es una característica de la edición enterprise. Tu licencia actual no soporta AD/LDAP. Haz clic <a href=\"http://mattermost.com\" target=\"_blank\">aquí</a> para obtener información y precios de las licencias enterprise.</p>",
+  "admin.ldap.portDesc": "El puerto que Mattermost utilizará para conectarse al servidor AD/LDAP. El predeterminado es 389.",
   "admin.ldap.portEx": "Ej \"389\"",
-  "admin.ldap.portTitle": "Puerto LDAP:",
-  "admin.ldap.queryDesc": "El tiempo de espera para las consultas en el servidor LDAP. Aumenta este valor si estás obteniendo errores por falta de tiempo debido a un servidor de LDAP lento.",
+  "admin.ldap.portTitle": "Puerto AD/LDAP:",
+  "admin.ldap.queryDesc": "El tiempo de espera para las consultas en el servidor AD/LDAP. Aumenta este valor si estás obteniendo errores por falta de tiempo debido a un servidor de AD/LDAP lento.",
   "admin.ldap.queryEx": "Ej \"60\"",
   "admin.ldap.queryTitle": "Tiempo de espera para las Consultas (segundos):",
-  "admin.ldap.serverDesc": "El dominio o dirección IP del servidor LDAP.",
+  "admin.ldap.serverDesc": "El dominio o dirección IP del servidor AD/LDAP.",
   "admin.ldap.serverEx": "Ej \"10.0.0.23\"",
-  "admin.ldap.serverTitle": "Servidor LDAP:",
+  "admin.ldap.serverTitle": "Servidor AD/LDAP:",
   "admin.ldap.skipCertificateVerification": "Omitir la Verificación del Certificado:",
   "admin.ldap.skipCertificateVerificationDesc": "Omite la verificación del certificado para las conexiones TLS o STARTTLS. No recomendado para ambientes de producción donde TLS es requerido. Utilizalo sólamente para pruebas.",
   "admin.ldap.syncFailure": "Error de Sincronización: {error}",
-  "admin.ldap.syncIntervalHelpText": "La Sincronización LDAP actualiza la información de usuarios en Mattermost para reflejar las actualizaciones en el servidor LDAP. Por ejemplo, cuando un el nombre de usuario cambia en el servidor LDAP, el cambio es reflejado en Mattermost cuando se realiza la sincronización. Las cuentas eliminadas o deshabilitadas en el servidor LDAP tendrán sus cuentas en Mattermost como \"Inactiva\" y las sesiones revocadas. Mattermost realiza la sincronización en el intervalo de ingresado. Por ejemplo, si se introduce 60, Mattermost sincroniza cada 60 minutos.",
+  "admin.ldap.syncIntervalHelpText": "La Sincronización AD/LDAP actualiza la información de usuarios en Mattermost para reflejar las actualizaciones en el servidor AD/LDAP. Por ejemplo, cuando un el nombre de usuario cambia en el servidor AD/LDAP, el cambio es reflejado en Mattermost cuando se realiza la sincronización. Las cuentas eliminadas o deshabilitadas en el servidor AD/LDAP tendrán sus cuentas en Mattermost como \"Inactiva\" y las sesiones revocadas. Mattermost realiza la sincronización en el intervalo de ingresado. Por ejemplo, si se introduce 60, Mattermost sincroniza cada 60 minutos.",
   "admin.ldap.syncIntervalTitle": "Intervalo de Sincronización (minutos):",
-  "admin.ldap.syncNowHelpText": "Inicia una sincronización LDAP inmediatamente.",
-  "admin.ldap.sync_button": "LDAP Sincronizar Ahora",
-  "admin.ldap.testFailure": "Falla de la Prueba LDAP: {error}",
-  "admin.ldap.testHelpText": "Comprueba si el servidor Mattermost puede conectar con el servidor LDAP especificado. Consulta el archivo de registro de mensajes de error para más detalles.",
-  "admin.ldap.uernameAttrDesc": "El atributo en el servidor LDAP que se utilizará para poblar el nombre de usuario en Mattermost. Este puede ser igual al Attributo Id.",
-  "admin.ldap.userFilterDisc": "(Opcional) Introduce un Filtro LDAP a utilizar para buscar los objetos de usuario. Sólo los usuarios seleccionados por la consulta será capaz de acceder a Mattermost. Para Active Directory, la consulta para filtrar a los usuarios con deshabilitados es (&(objectCategory=Persona)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
+  "admin.ldap.syncNowHelpText": "Inicia una sincronización AD/LDAP inmediatamente.",
+  "admin.ldap.sync_button": "Sincronizar AD/LDAP Ahora",
+  "admin.ldap.testFailure": "Falla de la Prueba AD/LDAP: {error}",
+  "admin.ldap.testHelpText": "Comprueba si el servidor Mattermost puede conectar con el servidor AD/LDAP especificado. Consulta el archivo de registro de mensajes de error para más detalles.",
+  "admin.ldap.testSuccess": "AD/LDAP Test Successful",
+  "admin.ldap.uernameAttrDesc": "El atributo en el servidor AD/LDAP que se utilizará para poblar el nombre de usuario en Mattermost. Este puede ser igual al Atributo Id.",
+  "admin.ldap.userFilterDisc": "(Opcional) Introduce un Filtro AD/LDAP a utilizar para buscar los objetos de usuario. Sólo los usuarios seleccionados por la consulta será capaz de acceder a Mattermost. Para Active Directory, la consulta para filtrar a los usuarios con deshabilitados es (&(objectCategory=Persona)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "Ej. \"(objectClass=user)\"",
   "admin.ldap.userFilterTitle": "Filtro de Usuario:",
   "admin.ldap.usernameAttrEx": "Ej \"sAMAccountName\"",
@@ -461,6 +463,8 @@
   "admin.license.uploading": "Subiendo Licencia...",
   "admin.log.consoleDescription": "Normalmente asignado en falso en producción. Los desarolladores pueden configurar este campo en verdadero para ver de mensajes de consola basado en las opciones de nivel configuradas. Si es verdadera, el servidor escribirá los mensajes en una salida estandar (stdout).",
   "admin.log.consoleTitle": "Imprimir registros en la consola: ",
+  "admin.log.enableDiagnostics": "Habilitar Diagnósticos e Informes de error:",
+  "admin.log.enableDiagnosticsDescription": "Activa esta función para mejorar la calidad y el rendimiento de Mattermost mediante el envío de informes de error y la información de diagnóstico a Mattermost, Inc. Lee nuestra <a href=\"https://about.mattermost.com/default-privacy-policy/\" target=\"_blank\">política de privacidad</a> para obtener más información.",
   "admin.log.enableWebhookDebugging": "Habilitar Depuración de Webhook",
   "admin.log.enableWebhookDebuggingDescription": "Puedes establecer a falso para desactivar el registro de depuración del cuerpo de todas las solicitudes de webhooks de entrada.",
   "admin.log.fileDescription": "Normalmente asignado en verdadero en producción. Cueando es verdadero, los archivos de registro son escritos en la ubicación especificada a continuación.",
@@ -498,7 +502,7 @@
   "admin.oauth.providerDescription": "Cuando es verdadero, Mattermost puede actuar como proveedor de servicios de OAuth 2.0 permitiendo que Mattermost autorize solicitudes a las API por aplicaciones externas.",
   "admin.oauth.providerTitle": "Habilitar el Proveedor de Servicios de OAuth 2.0: ",
   "admin.oauth.select": "Selecciona un proveedor de servicio de OAuth 2.0",
-  "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>Inicia sesión</a> con tu cuenta de Microsoft u Office 365. Asegurate que la cuenta sea un <a href='https://msdn.microsoft.com/es-es/library/azure/jj573650.aspx#Anchor_0'>inquilino de Azure AD</a> para que los usuarios puedan iniciar sesión.</li><li>Dirigete a <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>. pincha <strong>Ir a la lista de aplicaciones</strong> > <strong>Agregar una aplicación</strong> y utiliza \"Mattermost - el-nombre-de-tu-empresa\" como el <strong>Nombre de la aplicación</strong>.</li><li>Bajo <strong>Secretos de aplicación</strong>, pincha <strong>Generar nueva contraseña</strong> y pegala en el campo inferior <strong>Contraseña Secreta de la Aplicación</strong>.</li><li>Bajo <strong>Plataformas</strong>, pincha <strong>Agregar plataforma</strong>, selecciona <strong>Web</strong> e ingresa <strong>url-de-tu-mattermost/signup/office365/complete</strong> (ejemplo: http://localhost:8065/signup/office365/complete) en <strong>URI de redireccionamiento</strong>. Tambíen desmarca <strong>Permitir flujo implícito</strong>.</li><li>Finalmente, pincha <strong>Guardar</strong> y pega el <strong>ID de aplicación</strong> en el campo inferior.</li></ol>",
+  "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>Inicia sesión</a> con tu cuenta de Microsoft u Office 365. Asegura que la cuenta sea un <a href='https://msdn.microsoft.com/es-es/library/azure/jj573650.aspx#Anchor_0'>inquilino de Azure AD</a> para que los usuarios puedan iniciar sesión.</li><li>Dirígete a <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>. haz clic en <strong>Ir a la lista de aplicaciones</strong> > <strong>Agregar una aplicación</strong> y utiliza \"Mattermost - el-nombre-de-tu-empresa\" como el <strong>Nombre de la aplicación</strong>.</li><li>Bajo <strong>Secretos de aplicación</strong>, haz clic en <strong>Generar nueva contraseña</strong> y pegala en el campo inferior <strong>Contraseña Secreta de la Aplicación</strong>.</li><li>Bajo <strong>Plataformas</strong>, haz clic en <strong>Agregar plataforma</strong>, selecciona <strong>Web</strong> e ingresa <strong>url-de-tu-mattermost/signup/office365/complete</strong> (ejemplo: http://localhost:8065/signup/office365/complete) en <strong>URI de redireccionamiento</strong>. Tambíen desmarca <strong>Permitir flujo implícito</strong>.</li><li>Finalmente, haz clic en <strong>Guardar</strong> y pega el <strong>ID de aplicación</strong> en el campo inferior.</li></ol>",
   "admin.office365.authTitle": "URL para autentificación:",
   "admin.office365.clientIdDescription": "El ID de Aplicación/Cliente que recibiste al registrar la aplicación con Microsoft.",
   "admin.office365.clientIdExample": "Ej \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
@@ -636,8 +640,8 @@
   "admin.service.iconTitle": "Permitir a las integraciones reescribir imágenes de perfil:",
   "admin.service.insecureTlsDesc": "Cuando es verdadero, cualquier solicitud de salida por HTTPS será aceptada incluso si posee certificados no verificados o autofirmados. Por ejemplo, webhooks de salida a un servidor con un certificado TLS autofirmado, utilizando cualquier dominio, será permitido. Tenga en cuenta que esto hace que estas conexiones susceptibles a los ataques hombre-en-el-medio.",
   "admin.service.insecureTlsTitle": "Habilitar Conexiones de Salida Inseguras: ",
-  "admin.service.integrationAdmin": "Restringir la creación de integraciones al Administradores de Sistema y Equipo: ",
-  "admin.service.integrationAdminDesc": "Cuando es verdadero, las integraciones creadas por usuarios solo pueden ser creadas por administradores.",
+  "admin.service.integrationAdmin": "Restringir la gestión de las integraciones a los Administradores:",
+  "admin.service.integrationAdminDesc": "Cuando es verdadero, los webhooks y comandos de barra sólo se pueden crear, editar y visualizar por los Administradores de Equipo y Sistema, y las aplicaciones de OAuth 2.0 por Administradores de sistemas. Las integraciones están disponibles para todos los usuarios después de haber sido creadas por el Administrador.",
   "admin.service.listenAddress": "Dirección de escucha:",
   "admin.service.listenDescription": "La dirección a la que se unirá y escuchará. Ingresar \":8065\" se podrá unir a todas las interfaces o podrá seleccionar una como ej: \"127.0.0.1:8065\".  Cambiando este valor es necesario reiniciar el servidor.",
   "admin.service.listenExample": "Ej \":8065\"",
@@ -658,13 +662,13 @@
   "admin.service.sessionCacheDesc": "La cantidad de minutes que el cache de la sesión se guardará en memoria.",
   "admin.service.sessionDaysEx": "Ej \"30\"",
   "admin.service.siteURL": "URL del Sitio:",
-  "admin.service.siteURLDescription": "La dirección URL, incluyendo el número de puerto y protocolo, a partir de la cual los usuarios tendrán acceso a Mattermost. Dejar en blanco para configurar automáticamente basado en el tráfico entrante.",
+  "admin.service.siteURLDescription": "La dirección URL, incluyendo el número de puerto y protocolo, que los usuarios utilizan para acceder a Mattermost. Este campo puede dejarse en blanco a menos que estés configurando el correo electrónico de lotes en <b>Notificaciones > Correo electrónico</b>. Cuando está en blanco, la dirección URL se configura automáticamente basado en el tráfico entrante.",
   "admin.service.siteURLExample": "Ej \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "Duración de la sesión para SSO (días):",
   "admin.service.ssoSessionDaysDesc": "El número de días desde la última vez que un usuario ingreso sus credenciales para que la sesión del usuario expire. Si el método de autenticación es SAML o GitLab, el usuario puede iniciar su sesión automáticamente en Mattermost si ya cuenta con una sesión activa en SAML o GitLab.  Luego de cambiar esta configuración, la nueva duración de la sesión tendrá efecto luego de la próxima vez que el usuario ingrese sus credenciales.",
   "admin.service.testingDescription": "Cuando es verdadero, el comando de barra /loadtest es habilitado para cargar cuentas de prueba, datos y formato de texto. Al cambiar este parámetro se requiere un reinicio del servidor para que el cambio tengan efecto.",
   "admin.service.testingTitle": "Habilitar Comandos de Prueba: ",
-  "admin.service.webSessionDays": "Duración de la sesión para LDAP y correo electrónico (días):",
+  "admin.service.webSessionDays": "Duración de la sesión para AD/LDAP y correo electrónico (días):",
   "admin.service.webSessionDaysDesc": "El número de días desde la última vez que un usuario ingreso sus credenciales para que la sesión del usuario expire. Luego de cambiar esta configuración, la nueva duración de la sesión tendrá efecto luego de la próxima vez que el usuario ingrese sus credenciales.",
   "admin.service.webhooksDescription": "Cuando es verdadero, los webhooks de entrada serán permitidos. Para ayudar el combate contra los ataques de phishing, todos los mensajes provenientes de webhooks serán marcados con una etiqueta BOT. Revisa la <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>documentación</a> para obtener más información.",
   "admin.service.webhooksTitle": "Habilitar Webhooks de Entrada: ",
@@ -923,7 +927,7 @@
   "backstage_sidebar.integrations.incoming_webhooks": "Webhooks de Entrada",
   "backstage_sidebar.integrations.oauthApps": "Aplicaciones OAuth 2.0",
   "backstage_sidebar.integrations.outgoing_webhooks": "Webhooks de Salida",
-  "center_panel.recent": "Pincha aquí para ir a los mensajes más recientes. ",
+  "center_panel.recent": "Clic aquí para ir a los mensajes más recientes. ",
   "chanel_header.addMembers": "Agregar Miembros",
   "change_url.close": "Cerrar",
   "change_url.endWithLetter": "Debe terminar con una letra o número",
@@ -1012,18 +1016,18 @@
   "channel_switch_modal.submit": "Cambiar",
   "channel_switch_modal.title": "Cambiar Canales",
   "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.enterLdapPwd": "Ingresa el ID y la contraseña de tu cuenta AD/LDAP",
   "claim.email_to_ldap.enterPwd": "Ingresa la contraseña para tu cuenta de correo en {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.ldapId": "AD/LDAP ID",
+  "claim.email_to_ldap.ldapIdError": "Por favor ingresa tu ID de AD/LDAP.",
+  "claim.email_to_ldap.ldapPasswordError": "Por favor ingresa tu contraseña de AD/LDAP.",
+  "claim.email_to_ldap.ldapPwd": "Contraseña de AD/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_ldap.ssoNote": "Debes tener una cuenta de AD/LDAP válida",
+  "claim.email_to_ldap.ssoType": "Al reclamar tu cuenta, sólo podrás iniciar sesión con AD/LDAP",
+  "claim.email_to_ldap.switchTo": "Cambiar cuenta a AD/LDAP",
+  "claim.email_to_ldap.title": "Cambiar Cuenta de Correo/Contraseña a AD/LDAP",
   "claim.email_to_oauth.enterPwd": "Ingresa la contraseña para tu cuenta en {site}",
   "claim.email_to_oauth.pwd": "Contraseña",
   "claim.email_to_oauth.pwdError": "Por favor introduce tu contraseña.",
@@ -1035,14 +1039,14 @@
   "claim.ldap_to_email.email": "Para iniciar sesión debes utilizar el correo electrónico {email}",
   "claim.ldap_to_email.enterLdapPwd": "Ingresa tu {ldapPassword} para tu cuenta de correo electrónico en {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.ldapPasswordError": "Por favor ingresa tu contraseña de AD/LDAP.",
+  "claim.ldap_to_email.ldapPwd": "Contraseña de AD/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.ldap_to_email.title": "Cambiar la cuenta de AD/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.enterNewPwd": "Ingresa una nueva contraseña para tu cuenta de correo en {site}",
@@ -1061,7 +1065,7 @@
   "create_post.comment": "Comentario",
   "create_post.post": "Mensaje",
   "create_post.shortcutsNotSupported": "Los Accesos rápidos de teclado no son compatibles con su dispositivo.",
-  "create_post.tutorialTip": "<h4>Enviar Mensajes</h4> <p>Escribe aquí para redactar un mensaje y presiona <strong>Retorno</strong> para enviarlo.</p><p>Pincha el botón de <strong>Adjuntar</strong> para subir una imagen o archivo.</p>",
+  "create_post.tutorialTip": "<h4>Enviar Mensajes</h4><p>Escribe aquí para redactar un mensaje y presiona <strong>RETORNO</strong> para enviarlo.</p><p>Haz clic en el botón de <strong>Adjuntar</strong> para subir una imagen o archivo.</p>",
   "create_post.write": "Escribe un mensaje...",
   "create_team.agreement": "Al proceder con la creación de tu cuenta y utilizar {siteName}, estás de acuerdo con nuestros <a href='/static/help/terms.html'>Términos de Servicio</a> y <a href='/static/help/privacy.html'>Políticas de Privacidad</a>. Si no estás de acuerdo, no puedes utilizar {siteName}.",
   "create_team.display_name.back": "Volver al paso anterior",
@@ -1125,7 +1129,7 @@
   "email_verify.resend": "Reenviar Correo",
   "email_verify.sent": " Correo de verificación enviado.",
   "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.verifiedBody": "<p>Tu correo electrónico ha sido verificado! Haz clic <a href={url}>aquí</a> para iniciar sesión.</p>",
   "email_verify.verifyFailed": "Falla al verificar tu correo electrónico.",
   "emoji_list.actions": "Acciones",
   "emoji_list.add": "Agregar Emoticon Personalizado",
@@ -1171,7 +1175,7 @@
   "flag_post.flag": "Indicador de seguimiento",
   "flag_post.unflag": "Desmarcar",
   "general_tab.chooseName": "Por favor escoge otro nombre para tu equipo",
-  "general_tab.codeDesc": "Pincha 'Editar' para regenerar el código de Invitación.",
+  "general_tab.codeDesc": "Haz clic en 'Editar' para regenerar el código de Invitación.",
   "general_tab.codeLongDesc": "El Código de Invitación es utilizado como parte del URL del enlace creado por la opción <strong>Obtener Enlace de invitación</strong> en el menú principal. Regenerar este código crea un nuevo enlace e invalida los enlaces anteriores.",
   "general_tab.codeTitle": "Código de Invitación",
   "general_tab.dirDisabled": "El directorio de Equipos ha sido deshabilitado.  Por favor solicita a un Administrador de Sistema que habilite la opción de Directorio de Equipos en la Consola del Sistema.",
@@ -1226,7 +1230,7 @@
   "help.composing.deleting": "## Eliminar un mensaje\nElimina un mensaje haciendo clic en el icono **[...]** junto a cualquier mensaje de texto que has compuesto, a continuación, haz clic en **Borrar**. Los Administradores de Sistema y Equipo pueden borrar cualquier mensaje en su sistema o equipo.",
   "help.composing.editing": "## Editar un Mensaje\nEdita un mensaje haciendo clic en el icono **[...]** junto a cualquier mensaje de texto que has compuesto, a continuación, haz clic en **Editar**. Después de realizar modificaciones en el texto del mensaje, pulse la tecla **RETORNO** para guardar las modificaciones. La edición del mensaje no desencadenan nuevas notificaciones a @menciones, notificaciones de escritorio o sonidos.",
   "help.composing.linking": "## Enlace a un mensaje\nLa característica de **Enlace Permanente** crea un vínculo de cualquier mensaje. Al compartir este enlace con otros usuarios en el canal les permite ver el mensaje vinculado en los Archivos de Mensajes. Los usuarios que no son miembros del canal de donde se envió el mensaje no podrán ver el enlace permanente. Obtén el enlace permanente a cualquier mensaje haciendo clic en el icono **[...]** al lado del mensaje de texto  > **Enlace Permanente** > **Copiar Enlace**.",
-  "help.composing.posting": "## Publicar un Mensaje\nPublica un mensaje escribiendo en el campo de texto, a continuación, pulsa **RETORNO** para enviar. Usa **Mayus + RETORNO** para crear una nueva línea sin necesidad de enviar el mensaje. Para enviar mensajes pulsando **Ctrl+Retorno** ve al **Menú Principal > Configuración de la Cuenta > Enviar mensajes en Ctrl + Retorno**.",
+  "help.composing.posting": "## Publicar un Mensaje\nPublica un mensaje escribiendo en el campo de texto, a continuación, pulsa **RETORNO** para enviar. Usa **Mayus + RETORNO** para crear una nueva línea sin necesidad de enviar el mensaje. Para enviar mensajes pulsando **Ctrl+RETORNO** ve al **Menú Principal > Configuración de la Cuenta > Enviar mensajes en Ctrl + RETORNO**.",
   "help.composing.posts": "#### Mensajes\nLos mensajes pueden ser considerados mensajes padre. Son los mensajes que a menudo comienzan con un hilo de respuestas. Los mensajes son compuestos y enviados desde el campo de texto en la parte inferior del panel central.",
   "help.composing.replies": "#### Respuestas\nResponde a un mensaje haciendo clic en el icono responder junto a cualquier mensaje de texto. Esta acción abre la barra lateral derecha (RHS), donde se puede ver el hilo de mensajes, a continuación, redacta y envía tu respuesta. Las respuestas tienen una ligera sangría en el centro del panel para indicar que ellos son hijos de los mensajes de los padres.\n\nA la hora de componer una respuesta en la barra lateral derecha, haz clic en el icono de expandir/contraer el cual es dos flechas en la parte superior de la barra lateral para que sea más fácil de leer.",
   "help.composing.title": "# Enviar Mensajes\n_____",
@@ -1355,6 +1359,7 @@
   "integrations.oauthApps.title": "Aplicaciones OAuth 2.0",
   "integrations.outgoingWebhook.description": "Webhooks de salida permiten a las integraciones externas recibir mensajes y responder a ellos",
   "integrations.outgoingWebhook.title": "Webhook de Salida",
+  "integrations.successful": "Integración creada con éxito",
   "intro_messages.DM": "Este es el inicio de tu historial de mensajes directos con {teammate}.<br />Los mensajes directos y archivos que se comparten aquí no son mostrados a personas fuera de esta área.",
   "intro_messages.anyMember": " Cualquier miembro se puede unir y leer este canal.",
   "intro_messages.beginning": "Inicio de {name}",
@@ -1387,7 +1392,7 @@
   "invite_member.sending": " Enviando",
   "invite_member.teamInviteLink": "También puedes invitar personas usando el {link}.",
   "ldap_signup.find": "Encontrar mis equipos",
-  "ldap_signup.ldap": "Crea un equipo con tu cuenta de LDAP",
+  "ldap_signup.ldap": "Crea un equipo con tu cuenta de AD/LDAP",
   "ldap_signup.length_error": "El nombre debe tener entre 3 y 15 caracteres",
   "ldap_signup.teamName": "Ingresa el nombre del nuevo equipo",
   "ldap_signup.team_error": "Por favor ingresa el nombre del equipo",
@@ -1406,8 +1411,8 @@
   "login.gitlab": "GitLab",
   "login.google": "Google Apps",
   "login.invalidPassword": "La Contraseña es incorrecta.",
-  "login.ldapUsername": "Usuario LDAP",
-  "login.ldapUsernameLower": "Nombre de Usuario LDAP",
+  "login.ldapUsername": "Usuario AD/LDAP",
+  "login.ldapUsernameLower": "Nombre de Usuario AD/LDAP",
   "login.noAccount": "¿No tienes una cuenta? ",
   "login.noEmail": "Por favor, introduzca su correo electrónico",
   "login.noEmailLdapUsername": "Por favor, introduzca su correo electrónico o {ldapUsername}",
@@ -1440,7 +1445,7 @@
   "members_popover.title": "Miembros",
   "more_channels.close": "Cerrar",
   "more_channels.create": "Crear Nuevo Canal",
-  "more_channels.createClick": "Pincha 'Crear Nuevo Canal' para crear uno nuevo",
+  "more_channels.createClick": "Haz clic en 'Crear Nuevo Canal' para crear uno nuevo",
   "more_channels.join": "Unirme",
   "more_channels.noMore": "No hay más canales para unirse",
   "more_channels.title": "Más Canales",
@@ -1451,7 +1456,7 @@
   "msg_typing.isTyping": "{user} está escribiendo...",
   "msg_typing.someone": "Alguien",
   "navbar.addMembers": "Agregar Miembros",
-  "navbar.click": "Pincha aquí",
+  "navbar.click": "Clic aquí",
   "navbar.delete": "Borrar Canal...",
   "navbar.leave": "Abandonar Canal",
   "navbar.manageMembers": "Administrar Miembros",
@@ -1474,7 +1479,7 @@
   "navbar_dropdown.leave": "Abandonar Equipo",
   "navbar_dropdown.logout": "Cerrar sesión",
   "navbar_dropdown.manageMembers": "Administrar Miembros",
-  "navbar_dropdown.nativeApps": "Descargar Apps de Mattermost",
+  "navbar_dropdown.nativeApps": "Descargar Apps",
   "navbar_dropdown.report": "Reportar un Problema",
   "navbar_dropdown.switchTeam": "Cambiar a {team}",
   "navbar_dropdown.switchTo": "Cambiar a ",
@@ -1483,7 +1488,7 @@
   "navbar_dropdown.viewMembers": "Ver Miembros",
   "notification.dm": "Mensaje Directo",
   "password_form.change": "Cambiar mi contraseña",
-  "password_form.click": " Pincha <a href={url}>aquí</a> para iniciar sesión.",
+  "password_form.click": " Clic <a href={url}>aquí</a> para iniciar sesión.",
   "password_form.enter": "Ingresa una nueva contraseña para tu cuenta en {siteName}.",
   "password_form.error": "Por favor ingresa al menos {chars} caracteres.",
   "password_form.pwd": "Contraseña",
@@ -1496,7 +1501,7 @@
   "password_send.link": "<p>Se ha enviado un enlace para restablecer la contraseña a <b>{email}</b></p>",
   "password_send.reset": "Restablecer mi contraseña",
   "password_send.title": "Restablecer Contraseña",
-  "pdf_preview.max_pages": " Sólo se muestran las primeras cinco páginas en la vista previa de archivos PDF.",
+  "pdf_preview.max_pages": "Descargar para leer más páginas",
   "pending_post_actions.cancel": "Cancelar",
   "pending_post_actions.retry": "Reintentar",
   "permalink.error.access": "El Enlace permanente pertenece a un mensaje eliminado o a un canal al cual no tienes acceso.",
@@ -1563,6 +1568,10 @@
   "search_results.because": "<ul><li>Si estás buscando un frase parcial (ej. buscando \"aud\", tratando de encontrar \"audible\" o \"audifonos\"), agrega un * a la palabra que estás buscando</li><li>Debido a la cantidad de resultados, la búsqueda con dos letras y palabras comunes como \"this\", \"a\" and \"es\" no aparecerán en los resultados debido a la cantidad excesiva de resultados retornados.</li></ul>",
   "search_results.noResults": "No se encontraron resultados. ¿Inténtalo de nuevo?",
   "search_results.usage": "<ul><li>Utiliza <b>\"comillas\"</b> para buscar frases</li><li>Utiliza <b>from:</b> para encontrar mensajes de usuarios en específico e <b>in:</b> para encontrar mensajes de canales específicos</li></ul>",
+  "search_results.usageFlag1": "Todavía no haz marcado ningún mensaje.",
+  "search_results.usageFlag2": "Puedes marcar los mensajes y comentarios haciendo clic en el icono ",
+  "search_results.usageFlag3": " junto a la marca de hora.",
+  "search_results.usageFlag4": "Las banderas son una forma de marcar los mensajes para hacerles seguimiento. Tus banderas son personales, y no puede ser vistas por otros usuarios.",
   "setting_item_max.cancel": "Cancelar",
   "setting_item_max.save": "Guardar",
   "setting_item_min.edit": "Editar",
@@ -1584,7 +1593,7 @@
   "sidebar.removeList": "Remover de la lista",
   "sidebar.tutorialScreen1": "<h4>Canales</h4><p><strong>Canales</strong> organizan las conversaciones en diferentes tópicos. Son abiertos para cualquier persona de tu equipo. Para enviar comunicaciones privadas con una sola persona utiliza <strong>Mensajes Directos</strong> o con multiples personas utilizando <strong>Grupos Privados</strong>.</p>",
   "sidebar.tutorialScreen2": "<h4>Los canal \"{townsquare}\" y \"{offtopic}\"</h4><p>Estos son dos canales para comenzar:</p><p><strong>{townsquare}</strong> es el lugar para tener comunicación con todo el equipo. Todos los integrantes de tu equipo son miembros de este canal.</p><p><strong>{offtopic}</strong> es un lugar para diversión y humor fuera de los canales relacionados con el trabajo. Tu y tu equipo pueden decidir que otros canales crear.</p>",
-  "sidebar.tutorialScreen3": "<h4>Creando y Uniendose a Canales</h4><p>Pincha en <strong>\"Más...\"</strong> para crear un nuevo canal o unirte a uno existente.</p><p>También puedes crear un nuevo canal o grupo privado al pinchar el simbolo de <strong>\"+\"</strong> que se encuentra al lado del encabezado de Canales o Grupos Privados.</p>",
+  "sidebar.tutorialScreen3": "<h4>Creando y Uniéndose a Canales</h4><p>Haz clic en <strong>\"Más...\"</strong> para crear un nuevo canal o unirte a uno existente.</p><p>También puedes crear un nuevo canal o grupo privado al hacer clic en el símbolo de <strong>\"+\"</strong> que se encuentra al lado del encabezado de Canales o Grupos Privados.</p>",
   "sidebar.unreadAbove": "Mensaje(s) sin leer ▲",
   "sidebar.unreadBelow": "Mensaje(s) sin leer ▼",
   "sidebar_header.tutorial": "<h4>Menú Principal</h4><p>El <strong>Menú Principal</strong> es donde puedes <strong>Invitar a nuevos miembros</strong>, podrás <strong>Configurar tu Cuenta</strong> y seleccionar un <strong>Tema</strong> para personalizar la apariencia.</p><p>Los administradores del Equipo podrán <strong>Configurar el Equipo</strong> desde este menú.</p><p>Los administradores del Sistema encontrarán una opción para ir a la <strong>Consola de Sistema</strong> para administrar el sistema completo.</p>",
@@ -1595,7 +1604,7 @@
   "sidebar_right_menu.inviteNew": "Invitar Nuevo Miembro",
   "sidebar_right_menu.logout": "Cerrar sesión",
   "sidebar_right_menu.manageMembers": "Adminisrar Miembros",
-  "sidebar_right_menu.nativeApps": "Descargar Apps de Mattermost",
+  "sidebar_right_menu.nativeApps": "Descargar Apps",
   "sidebar_right_menu.recentMentions": "Menciones recientes",
   "sidebar_right_menu.report": "Reporta un Problema",
   "sidebar_right_menu.switch_team": "Seleccionar Equipo",
@@ -1605,7 +1614,7 @@
   "signup.email": "Correo electrónico y Contraseña",
   "signup.gitlab": "GitLab Single-Sign-On",
   "signup.google": "Cuenta de Google",
-  "signup.ldap": "Credenciales LDAP",
+  "signup.ldap": "Credenciales AD/LDAP",
   "signup.office365": "Office 365",
   "signup.title": "Crea una cuenta con:",
   "signup_team.choose": "Tus equipos: ",
@@ -1616,7 +1625,7 @@
   "signup_team.no_open_teams": "No hay equipos están disponibles para unirse. Por favor, solicita una invitación a tu administrador.",
   "signup_team.no_open_teams_canCreate": "No hay equipos están disponibles para unirse. Por favor, crear un nuevo equipo, o solicita una invitación a tu administrador.",
   "signup_team.no_teams": "No se han creado equipos. Por favor contacta a tu administrador.",
-  "signup_team.no_teams_canCreate": "No se han creado equipos. Puedes crear uno al pinchar \"Crear nuevo equipo\".",
+  "signup_team.no_teams_canCreate": "No se han creado equipos. Puedes crear uno al hacer clic en \"Crear nuevo equipo\".",
   "signup_team.none": "No se ha habilitado ningún método para creación de equipos.  Por favor contacta a un administrador de sistema para solicitar acceso.",
   "signup_team_complete.completed": "Ya haz completado el proceso de entrada para esta invitación, o esta invitación ya ha expirado.",
   "signup_team_confirm.checkEmail": "Por favor revisa tu correo electrónico: <strong>{email}</strong><br />Se ha enviado un correo con un enlace para configurar tu equipo",
@@ -1647,7 +1656,7 @@
   "signup_user_completed.validEmail": "Por favor ingresa una dirección de correo electrónico válida",
   "signup_user_completed.welcome": "Bienvenido a:",
   "signup_user_completed.whatis": "¿Cuál es tu dirección de correo electrónico?",
-  "signup_user_completed.withLdap": "Con tus credenciales de LDAP",
+  "signup_user_completed.withLdap": "Con tus credenciales de AD/LDAP",
   "sso_signup.find": "Encontrar mi equipo",
   "sso_signup.gitlab": "Crea un equipo con una cuenta de GitLab",
   "sso_signup.google": "Crea un equipo con una cuenta de Google Apps",
@@ -1704,7 +1713,7 @@
   "textbox.quote": ">cita",
   "textbox.strike": "tachado",
   "tutorial_intro.allSet": "Ya estás listo para comenzar",
-  "tutorial_intro.end": "Pincha “Siguiente” para entrar al {channel}. Este es el primer canal que ven tus compañeros cuando ingresan. Utilizalo para mandar mensajes que todos deben leer.",
+  "tutorial_intro.end": "Clic en “Siguiente” para entrar al {channel}. Este es el primer canal que ven tus compañeros cuando ingresan. Utilízalo para mandar mensajes que todos deben leer.",
   "tutorial_intro.invite": "Invitar compañeros",
   "tutorial_intro.mobileApps": "Instalar las apps para {link} para un fácil acceso y notificaciones sobre la marcha.",
   "tutorial_intro.mobileAppsLinkText": "PC, Mac, iOS y Android",
@@ -1732,8 +1741,8 @@
   "user.settings.advance.on": "Encendido",
   "user.settings.advance.preReleaseDesc": "Marca las características de pre-lanzamiento que quieras previsualizar.  Es posible que necesites refrescar la página antes de que los cambios se vean reflejados.",
   "user.settings.advance.preReleaseTitle": "Previsualizar características de pre-lanzamiento",
-  "user.settings.advance.sendDesc": "Si está habilitado 'Retorno' inserta una nueva linea y 'Ctrl + Retorno' envía el mensaje.",
-  "user.settings.advance.sendTitle": "Enviar mensajes con Ctrl + Retorno",
+  "user.settings.advance.sendDesc": "Si está habilitado 'RETORNO' inserta una nueva linea y 'Ctrl + RETORNO' envía el mensaje.",
+  "user.settings.advance.sendTitle": "Enviar mensajes con Ctrl + RETORNO",
   "user.settings.advance.slashCmd_autocmp": "Habilitar que una aplicación externa ofrezca el autocompletado de los comandos de barra",
   "user.settings.advance.title": "Configuración Avanzada",
   "user.settings.custom_theme.awayIndicator": "Indicador Ausente",
@@ -1805,13 +1814,13 @@
   "user.settings.general.emailHelp2": "El correo ha sido desactivado por el Administrador de Sistema. No llegarán correos de notificación hasta que se vuelva a habilitar.",
   "user.settings.general.emailHelp3": "El correo electrónico es utilizado para iniciar sesión, recibir notificaciones y para restablecer la contraseña.",
   "user.settings.general.emailHelp4": "Un correo de verificación ha sido enviado a {email}.",
-  "user.settings.general.emailLdapCantUpdate": "El inicio de sesión ocurre a través LDAP. El correo electrónico no puede ser actualizado. La dirección de correo electrónico utilizada para las notificaciones es {email}.",
+  "user.settings.general.emailLdapCantUpdate": "El inicio de sesión ocurre a través AD/LDAP. El correo electrónico no puede ser actualizado. La dirección de correo electrónico utilizada para las notificaciones es {email}.",
   "user.settings.general.emailMatch": "El nuevo correo electrónico introducido no coincide.",
   "user.settings.general.emailOffice365CantUpdate": "El inicio de sesión ocurre a través Office 365. El correo electrónico no puede ser actualizado. La dirección de correo electrónico utilizada para las notificaciones es {email}.",
   "user.settings.general.emailSamlCantUpdate": "El Inicio de sesión se produce a través de SAML. El correo electrónico no puede ser actualizado. La dirección de correo electrónico utilizado para las notificaciones es {email}.",
   "user.settings.general.emailUnchanged": "Tu nueva dirección de correo electrónico es la misma que la dirección anterior.",
-  "user.settings.general.emptyName": "Pincha 'Editar' para agregar tu nombre completo",
-  "user.settings.general.emptyNickname": "Pincha 'Edita' para agregar un sobrenombre",
+  "user.settings.general.emptyName": "Clic en 'Editar' para agregar tu nombre completo",
+  "user.settings.general.emptyNickname": "Clic en 'Editar' para agregar un sobrenombre",
   "user.settings.general.field_handled_externally": "Este campo es manejado a través del proveedor de inicio de sesión. Si deseas cambiarlo, deberás hacerlo a través del proveedor.",
   "user.settings.general.firstName": "Nombre",
   "user.settings.general.fullName": "Nombre completo",
@@ -1820,7 +1829,7 @@
   "user.settings.general.lastName": "Apellido",
   "user.settings.general.loginGitlab": "Inicio de sesión realizado a través de GitLab ({email})",
   "user.settings.general.loginGoogle": "Inicio de sesión realizado a través de Google ({email})",
-  "user.settings.general.loginLdap": "Inicio de sesión realizado a través de LDAP ({email})",
+  "user.settings.general.loginLdap": "Inicio de sesión realizado a través de AD/LDAP ({email})",
   "user.settings.general.loginOffice365": "Inicio de sesión realizado a través de Office 365 ({email})",
   "user.settings.general.loginSaml": "Inicio de sesión realizado a través de SAML ({email})",
   "user.settings.general.newAddress": "Nueva dirección: {email}<br />Revisa tu correo electrónico para verificar tu nueva dirección.",
@@ -1831,7 +1840,7 @@
   "user.settings.general.primaryEmail": "Correo Principal",
   "user.settings.general.profilePicture": "Foto del Perfil",
   "user.settings.general.title": "Configuración General",
-  "user.settings.general.uploadImage": "Pinchar 'Editar' para subir una imagen.",
+  "user.settings.general.uploadImage": "Clic en 'Editar' para subir una imagen.",
   "user.settings.general.username": "Nombre de usuario",
   "user.settings.general.usernameInfo": "Escoge algo que sea fácil de reconocer y recordar para tus compañeros.",
   "user.settings.general.usernameReserved": "Este nombre de usuario está reservado, por favor escoge otro",
@@ -1890,15 +1899,16 @@
   "user.settings.notifications.desktop.title": "Notificaciones de escritorio",
   "user.settings.notifications.desktop.unlimited": "Ilimitada",
   "user.settings.notifications.desktopSounds": "Sonidos de notificación de escritorio",
+  "user.settings.notifications.email.everyHour": "Cada hora",
+  "user.settings.notifications.email.everyXMinutes": "Cada {count, plural, one {minuto} other {{count, number} minutos}}",
+  "user.settings.notifications.email.immediately": "Inmediatamente",
+  "user.settings.notifications.email.never": "Nunca",
+  "user.settings.notifications.email.send": "Enviar notificaciones de correo electrónico",
   "user.settings.notifications.emailBatchingInfo": "Las notificaciones recibidas durante el período de tiempo seleccionado se combinan y enviar en un solo correo electrónico.",
   "user.settings.notifications.emailInfo": "El correo electrónico que se envía para notificaciones de menciones y mensajes directos cuando estás ausente o desconectado de {siteName} por más de 5 minutos.",
   "user.settings.notifications.emailNotifications": "Notificaciones de correo",
-  "user.settings.notifications.everyHour": "Cada hora",
-  "user.settings.notifications.everyXMinutes": "Cada {count, plural, one {minuto} other {{count, number} minutos}}",
   "user.settings.notifications.header": "Notificaciones",
-  "user.settings.notifications.immediately": "Inmediatamente",
   "user.settings.notifications.info": "Las notificaciones de escritorio están disponibles en Firefox, Safari y Chrome.",
-  "user.settings.notifications.never": "Nunca",
   "user.settings.notifications.noWords": "No hay palabras configuradas",
   "user.settings.notifications.off": "Apagado",
   "user.settings.notifications.on": "Encendido",
@@ -1937,9 +1947,9 @@
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "Google",
   "user.settings.security.lastUpdated": "Última actualización {date} a las {time}",
-  "user.settings.security.ldap": "LDAP",
+  "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "Inicio de sesión realizado a través de Gitlab",
-  "user.settings.security.loginLdap": "Inicio de sesión realizado a través de LDAP",
+  "user.settings.security.loginLdap": "Inicio de sesión realizado a través de AD/LDAP",
   "user.settings.security.logoutActiveSessions": "Visualizar y cerrar las sesiones activas",
   "user.settings.security.method": "Método de inicio de sesión",
   "user.settings.security.newPassword": "Nueva Contraseña",
@@ -1967,7 +1977,7 @@
   "user.settings.security.passwordErrorUppercaseNumberSymbol": "La contraseña debe contener al menos {min} caracteres compuesta de al menos una letra mayúscula, al menos un número, y al menos un símbolo (por ejemplo,\"~!@#$%^&*()\").",
   "user.settings.security.passwordErrorUppercaseSymbol": "La contraseña debe contener al menos {min} caracteres compuesta de al menos una letra mayúscula y al menos un símbolo (por ejemplo,\"~!@#$%^&*()\").",
   "user.settings.security.passwordGitlabCantUpdate": "El inicio de sesión ocurre a través GitLab. La contraseña no se puede actualizar.",
-  "user.settings.security.passwordLdapCantUpdate": "El inicio de sesión ocurre a través LDAP. La contraseña no se puede actualizar.",
+  "user.settings.security.passwordLdapCantUpdate": "El inicio de sesión ocurre a través AD/LDAP. La contraseña no se puede actualizar.",
   "user.settings.security.passwordMatchError": "La nuevas contraseñas que ingresaste no coinciden.",
   "user.settings.security.passwordMinLength": "Longitud mínima no válida, no se puede mostrar la vista previa.",
   "user.settings.security.retypePassword": "Reescribe la Nueva Contraseña",
@@ -1975,7 +1985,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.switchLdap": "Cambiar para utilizar LDAP",
+  "user.settings.security.switchLdap": "Cambiar para utilizar AD/LDAP",
   "user.settings.security.switchOffice365": "Cambiar para utilizar Office 365 SSO",
   "user.settings.security.switchSaml": "Cambiar para utilizar SAML SSO",
   "user.settings.security.title": "Configuración de Seguridad",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index c2542520c..bd6efce57 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -1,11 +1,11 @@
 {
   "about.close": "Quitter",
-  "about.copyright": "Copyright 2016 Mattermost, Inc. Tout droits réservés",
-  "about.database": "Base de donnée :",
+  "about.copyright": "Copyright 2016 Mattermost, Inc. Tous droits réservés",
+  "about.database": "Base de données :",
   "about.date": "Date de compilation :",
-  "about.enterpriseEditionLearn": "Apprenez-en plus avec l’édition Entreprise à : ",
+  "about.enterpriseEditionLearn": "Apprenez-en plus sur l’Édition Entreprise à : ",
   "about.enterpriseEditionSt": "Communication moderne derrière votre pare-feu.",
-  "about.enterpriseEditione1": "Édition Enterprise",
+  "about.enterpriseEditione1": "Édition Entreprise",
   "about.hash": "Clé de compilation :",
   "about.hashee": "Clé de compilation EE :",
   "about.licensed": "Clé de licence :",
@@ -13,7 +13,7 @@
   "about.teamEditionLearn": "Rejoignez la communauté Mattermost à : ",
   "about.teamEditionSt": "Toute la communication de votre équipe à un endroit, accessible de partout.",
   "about.teamEditiont0": "Édition Team",
-  "about.teamEditiont1": "Édition Enterprise",
+  "about.teamEditiont1": "Édition Entreprise",
   "about.title": "À propos de Mattermost",
   "about.version": "Version :",
   "access_history.title": "Accéder à l'historique",
@@ -35,14 +35,14 @@
   "add_command.autocompleteDescription.help": "(facultatif) Description de la commande Slash pour la liste d'auto-complétion.",
   "add_command.autocompleteDescription.placeholder": "Exemple : \"Retourne les résultats de recherche de dossiers médicaux\"",
   "add_command.autocompleteHint": "Indice de l’auto-complétion",
-  "add_command.autocompleteHint.help": "(Facultatif) Arguments associés à votre commande slash, affichés dans l'aide le la liste d'auto-complétion.",
+  "add_command.autocompleteHint.help": "(Facultatif) Arguments associés à votre commande slash, affichés dans l'aide de la liste d'auto-complétion.",
   "add_command.autocompleteHint.placeholder": "Exemple : [Nom du patient]",
   "add_command.cancel": "Annuler",
   "add_command.description": "Description",
   "add_command.description.help": "Description de votre webhook entrant.",
-  "add_command.displayName": "Nom d'affichage",
+  "add_command.displayName": "Nom affiché",
   "add_command.displayName.help": "Nom d'affichage pour votre commande slash, avec un maximum de 64 caractères.",
-  "add_command.doneHelp": "Your slash command has been set up. The following token will be sent in the outgoing payload. Please use it to verify the request came from your Mattermost team (see <a href=\"https://docs.mattermost.com/developer/slash-commands.html\">documentation</a> for further details).",
+  "add_command.doneHelp": "Votre webhook sortant est en place. Le token suivant sera envoyé dans le payload sortant. Utilisez-le pour vérifier que la requête provienne bien de votre équipe Mattermost (voir la <a href=\"https://docs.mattermost.com/developer/webhooks-outgoing.html\">docuementation</a> pour plus de détails).",
   "add_command.iconUrl": "Icône de la réponse",
   "add_command.iconUrl.help": "Choisissez une photo de profil pour les réponses à cette commande slash. Entrez l'URL d'un fichier .png ou .jpg d'au moins 128x128 pixels.",
   "add_command.iconUrl.placeholder": "https://www.example.com/myicon.png",
@@ -53,11 +53,11 @@
   "add_command.save": "Enregistrer",
   "add_command.token": "<b>Token</b>: {token}",
   "add_command.trigger": "Mot-clé de déclenchement",
-  "add_command.trigger.help": "Un mot déclencheur doit être unique, ne peut commencer par un slash ni contenir le moindre espace.",
+  "add_command.trigger.help": "Un mot déclencheur doit être unique, ne peut commencer par un slash ni contenir d'espaces.",
   "add_command.trigger.helpExamples": "Exemples : client, employé, patient, météo",
   "add_command.trigger.helpReserved": "Réservé : {link}",
-  "add_command.trigger.helpReservedLinkText": "voir la liste des commandes slash inclues",
-  "add_command.trigger.placeholder": "Mot-clé de déclenchement exemple \"hello\"",
+  "add_command.trigger.helpReservedLinkText": "voir la liste des commandes slash incluses",
+  "add_command.trigger.placeholder": "Mot-clé de déclenchement par exemple \"hello\"",
   "add_command.triggerInvalidLength": "un mot-clé doit contenir entre {min} à {max} caractères",
   "add_command.triggerInvalidSlash": "Un mot-clé ne peut commencer par un /",
   "add_command.triggerInvalidSpace": "Un mot-clé ne doit pas contenir d’espaces",
@@ -67,7 +67,7 @@
   "add_command.url.placeholder": "Doit commencer par http:// ou https://",
   "add_command.urlRequired": "Une requête URL est demandée",
   "add_command.username": "Utilisateur affiché dans la réponse",
-  "add_command.username.help": "Choisissez un nom d'utilisateur qui sera affiché dans la réponse de la commande slash. Les noms d'utilisateurs peuvent contenir jusqu'à 22 caractères, chiffres, lettres minuscules et symboles \"-\", \"_\" et \".\" .",
+  "add_command.username.help": "Choisissez un nom d'utilisateur qui sera affiché dans la réponse de la commande slash. Les noms d'utilisateurs peuvent contenir jusqu'à 22 caractères comprenant chiffres, lettres minuscules et symboles \"-\", \"_\" et \".\" .",
   "add_command.username.placeholder": "Nom d'utilisateur",
   "add_emoji.cancel": "Annuler",
   "add_emoji.header": "Ajouter",
@@ -77,7 +77,7 @@
   "add_emoji.imageRequired": "Une image est requise pour l'emoji",
   "add_emoji.name": "Nom",
   "add_emoji.name.help": "Choisissez un nom pour votre emoji de 64 caractères au maximum, constitué de lettres minuscules, nombres et '-' ou '_'.",
-  "add_emoji.nameInvalid": "Un nom d'emoji ne peut contenir des lettres minuscules, nombres et les caractères '-' ou '_'.",
+  "add_emoji.nameInvalid": "Un nom d'emoji ne peut contenir que des lettres minuscules, nombres et les caractères '-' ou '_'.",
   "add_emoji.nameRequired": "Saisissez un nom pour l'emoji",
   "add_emoji.nameTaken": "Ce nom est déjà utilisé pour un emoji système. Choisissez un autre nom.",
   "add_emoji.preview": "Aperçu",
@@ -85,59 +85,59 @@
   "add_emoji.save": "Enregistrer",
   "add_incoming_webhook.cancel": "Annuler",
   "add_incoming_webhook.channel": "Canal",
-  "add_incoming_webhook.channel.help": "Canal public ou groupe privé qui reçois les payloads du webhook. Vous devez appartenir au groupe privé pendant la mise en place du webhook.",
+  "add_incoming_webhook.channel.help": "Canal public ou groupe privé qui reçoit les payloads du webhook. Vous devez appartenir au groupe privé pendant la mise en place du webhook.",
   "add_incoming_webhook.channelRequired": "Un canal valide est demandé",
   "add_incoming_webhook.description": "Description",
   "add_incoming_webhook.description.help": "Description pour votre webhook entrant.",
   "add_incoming_webhook.displayName": "Nom à afficher",
   "add_incoming_webhook.displayName.help": "Nom d'affichage pour votre webhook entrant, avec un maximum de 64 caractères.",
-  "add_incoming_webhook.doneHelp": "Your incoming webhook has been set up. Please send data to the following URL (see <a href=\"https://docs.mattermost.com/developer/webhooks-incoming.html\">documentation</a> for further details).",
+  "add_incoming_webhook.doneHelp": "Votre webhook entrant est installé. Vous pouvez envoyer des données a l'URL suivante (voir la <a href=\"https://docs.mattermost.com/developer/webhooks-incoming.html\">documentation</a> pour plus de détails).",
   "add_incoming_webhook.name": "Nom",
   "add_incoming_webhook.save": "Enregistrer",
   "add_incoming_webhook.url": "<b>URL</b>: {url}",
-  "add_oauth_app.callbackUrls.help": "Les URIs de redirection vers lesquelles le service dirigera les utilisateurs après avoir accepté ou refusé l'autorisation de votre application, et qui gèreront les codes d'autorisation ou les jeton d'accès. Doit être une URL valide commençant par http:// ou https://.",
+  "add_oauth_app.callbackUrls.help": "Les URIs de redirection vers lesquelles le service dirigera les utilisateurs après avoir accepté ou refusé l'autorisation de votre application, et qui géreront les codes d'autorisation ou les jeton d'accès. Doit être une URL valide commençant par http:// ou https://.",
   "add_oauth_app.callbackUrlsRequired": "Saisissez une ou plusieurs URL de callback",
-  "add_oauth_app.clientId": "<b>Client ID</b>: {id}",
-  "add_oauth_app.clientSecret": "<b>Client Secret</b>: {secret}",
+  "add_oauth_app.clientId": "<b>Identifiant Client</b>: {id}",
+  "add_oauth_app.clientSecret": "<b>Clé secrète du client</b>: {secret}",
   "add_oauth_app.description.help": "Description pour votre application OAuth 2.0.",
-  "add_oauth_app.descriptionRequired": "La description pour votre application OAuth 2.0 est requise.",
-  "add_oauth_app.doneHelp": "Your OAuth 2.0 application has been set up. Please use the following Client ID and Client Secret when requesting authorization for your application.",
-  "add_oauth_app.doneUrlHelp": "The following are your authorized redirect URL(s).",
+  "add_oauth_app.descriptionRequired": "Une description pour votre application OAuth 2.0 est requise.",
+  "add_oauth_app.doneHelp": "Votre application OAuth 2.0 est en place. Merci d'utiliser l'identifiant client et la clé secrète suivants pour demander une autorisation pour votre application.",
+  "add_oauth_app.doneUrlHelp": "Liste des URLs de redirection autorisées.",
   "add_oauth_app.header": "Ajouter",
-  "add_oauth_app.homepage.help": "L'URL de la page d'accueil de votre application OAuth 2.0. Veillez à saisir HTTP ou HTTPS dans l'URL suivant votre configuration.",
+  "add_oauth_app.homepage.help": "L'URL de la page d'accueil de votre application OAuth 2.0. Veillez à saisir HTTP ou HTTPS dans l'URL en fonction de votre configuration.",
   "add_oauth_app.homepageRequired": "La page d'accueil pour l'application OAuth 2.0 est requise.",
   "add_oauth_app.icon.help": "(Facultatif) L'URL de l'image utilisée pour votre application OAuth 2.0. Veillez à saisir HTTP ou HTTPS dans l'URL.",
   "add_oauth_app.name.help": "Nom d'affichage pour votre application OAuth 2.0, avec un maximum de 64 caractères.",
   "add_oauth_app.nameRequired": "Le nom pour l'application OAuth 2.0 est requis.",
   "add_oauth_app.trusted.help": "Si activé, l'application OAuth 2.0 est considérée comme étant de confiance par le serveur Mattermost et ne requerra pas l'approbation de l'utilisateur. Si désactivé, une fenêtre additionnelle apparaîtra, demandant à l'utilisateur d'accepter ou de refuser son autorisation.",
   "add_oauth_app.url": "<b>URL(s)</b>: {url}",
-  "add_outgoing_webhook.callbackUrls": "URLs de rappel (un par ligne)",
+  "add_outgoing_webhook.callbackUrls": "URLs de rappel (une par ligne)",
   "add_outgoing_webhook.callbackUrls.help": "L'URL à laquelle les messages seront envoyés.",
-  "add_outgoing_webhook.callbackUrlsRequired": "Un ou plusieurs rappel d’URL est demandé",
+  "add_outgoing_webhook.callbackUrlsRequired": "Une ou plusieurs URLs de rappel sont requises",
   "add_outgoing_webhook.cancel": "Annuler",
   "add_outgoing_webhook.channel": "Canal",
-  "add_outgoing_webhook.channel.help": "Canal public qui recevra les payloads de webhooks. Facultatif si au moins un mot déclencheur est spécifié.",
+  "add_outgoing_webhook.channel.help": "Canal public qui recevra les payloads des webhooks. Facultatif si au moins un mot déclencheur est spécifié.",
   "add_outgoing_webhook.contentType.help1": "Choisissez le type de contenu par lequel la réponse sera envoyée.",
-  "add_outgoing_webhook.contentType.help2": "Si application/x-www-form-urlencoded est choisi, le serveur suppose que vous aller encoder les paramètres dans un format URL.",
+  "add_outgoing_webhook.contentType.help2": "Si application/x-www-form-urlencoded est choisi, le serveur suppose que vous allez encoder les paramètres dans un format URL.",
   "add_outgoing_webhook.contentType.help3": "Si application/json est choisi, le serveur suppose que vous allez envoyer des données JSON.",
   "add_outgoing_webhook.content_Type": "Type de contenu",
   "add_outgoing_webhook.description": "Description",
   "add_outgoing_webhook.description.help": "Description pour votre webhook sortant.",
   "add_outgoing_webhook.displayName": "Nom à afficher",
   "add_outgoing_webhook.displayName.help": "Nom d'affichage pour votre webhook sortant, avec un maximum de 64 caractères.",
-  "add_outgoing_webhook.doneHelp": "Your outgoing webhook has been set up. The following token will be sent in the outgoing payload. Please use it to verify the request came from your Mattermost team (see <a href=\"https://docs.mattermost.com/developer/webhooks-outgoing.html\">documentation</a> for further details).",
+  "add_outgoing_webhook.doneHelp": "Votre webhook sortant est en place. Le token suivant sera envoyé dans le payload sortant. Utilisez-le pour vérifier que la requête provienne bien de votre équipe Mattermost (voir la <a href=\"https://docs.mattermost.com/developer/webhooks-outgoing.html\">docuementation</a> pour plus de détails).",
   "add_outgoing_webhook.name": "Nom",
   "add_outgoing_webhook.save": "Enregistrer",
   "add_outgoing_webhook.token": "<b>Token</b>: {token}",
   "add_outgoing_webhook.triggerWords": "Mot-clé (Un par ligne)",
   "add_outgoing_webhook.triggerWords.help": "Les messages qui débutent par un des mots spécifiés vont déclencher le webhook sortant. Optionnel si Canal est sélectionné.",
-  "add_outgoing_webhook.triggerWordsOrChannelRequired": "Un canal valide ou une liste de mot-clé est demander",
+  "add_outgoing_webhook.triggerWordsOrChannelRequired": "Un canal valide ou une liste de mot-clés est requise",
   "add_outgoing_webhook.triggerWordsTriggerWhen": "Déclencher lorsque",
-  "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choisissez quand déclencher le webhook sortant; si le premier mot d'un message correspond exactement à un mot déclencheur, ou si il démarre par un mot déclencheur.",
-  "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "Premier mot correspondant exactement à un mot déclencheur",
+  "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choisissez quand déclencher le webhook sortant; si le premier mot d'un message correspond exactement à un mot déclencheur, ou si il commence par un mot déclencheur.",
+  "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "Premier mot correspond exactement à un mot déclencheur",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "Le premier mot commence avec un mot déclencheur",
-  "admin.advance.cluster": "Haute disponibilité (Beta)",
-  "admin.audits.reload": "Rafraîchir",
+  "admin.advance.cluster": "Haute disponibilité (Bêta)",
+  "admin.audits.reload": "Recharger les logs de l'activité utilisateur",
   "admin.audits.title": "Activité de l'utilisateur",
   "admin.authentication.email": "Authentification email",
   "admin.authentication.gitlab": "GitLab",
@@ -145,33 +145,33 @@
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "Remarque :",
-  "admin.cluster.enableDescription": "Si activé, Mattermost autorise la connexion en utilisant SAML. Consultez la <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> pour en apprendre davantage sur la configuration de SAML pour Mattermost.",
-  "admin.cluster.enableTitle": "Enable High Availability Mode:",
-  "admin.cluster.interNodeListenAddressDesc": "The address the server will listen on for communicating with other servers.",
+  "admin.cluster.enableDescription": "Si activé, Mattermost sera lancé en mode Haute Disponibilité. Consultez la <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> pour en apprendre davantage sur la configuration de la Haute Disponibilité pour Mattermost.",
+  "admin.cluster.enableTitle": "Activer le mode Haute Disponibilité",
+  "admin.cluster.interNodeListenAddressDesc": "L'adresse écoutée par le serveur pour communiquer avec d'autres serveurs.",
   "admin.cluster.interNodeListenAddressEx": "Exemple : \":8075\"",
   "admin.cluster.interNodeListenAddressTitle": "Inter-Node Listen Address:",
-  "admin.cluster.interNodeUrlsDesc": "The internal/private URLs of all the Mattermost servers separated by commas.",
-  "admin.cluster.interNodeUrlsEx": "Ex \"http://10.10.10.30, http://10.10.10.31\"",
+  "admin.cluster.interNodeUrlsDesc": "Les URLs internes/privées de tous les serveurs Mattermost, séparés par des virgules",
+  "admin.cluster.interNodeUrlsEx": "Exemple: \"http://10.10.10.30, http://10.10.10.31\"",
   "admin.cluster.interNodeUrlsTitle": "Inter-Node URLs:",
   "admin.cluster.loadedFrom": "This configuration file was loaded from Node ID {clusterId}. Please see the Troubleshooting Guide in our <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> if you are accessing the System Console through a load balancer and experiencing issues.",
   "admin.cluster.noteDescription": "Changing properties in this section will require a server restart before taking effect. When High Availability mode is enabled, the System Console is set to read-only and can only be changed from the configuration file.",
   "admin.cluster.should_not_change": "WARNING: These settings may not sync with the other servers in the cluster. High Availability inter-node communication will not start until you modify the config.json to be identical on all servers and restart Mattermost. Please see the <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> on how to add or remove a server from the cluster. If you are accessing the System Console through a load balancer and experiencing issues, please see the Troubleshooting Guide in our <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a>.",
-  "admin.cluster.status_table.config_hash": "Config File MD5",
+  "admin.cluster.status_table.config_hash": "MD5 du fichier de configuration",
   "admin.cluster.status_table.hostname": "Hostname",
-  "admin.cluster.status_table.id": "Node ID",
-  "admin.cluster.status_table.reload": " Reload Cluster Status",
+  "admin.cluster.status_table.id": "ID du nœud",
+  "admin.cluster.status_table.reload": "Recharger l'état du cluster",
   "admin.cluster.status_table.status": "État",
   "admin.cluster.status_table.url": "Inter-Node URL",
   "admin.cluster.status_table.version": "Version",
   "admin.compliance.directoryDescription": "Répertoire des rapports de conformité. Si non spécifié :  ./data/ .",
   "admin.compliance.directoryExample": "Ex : \"./data/\"",
   "admin.compliance.directoryTitle": "Répertoire du rapport de conformité :",
-  "admin.compliance.enableDailyDesc": "Si activé, Mattermost générera un rapport quotidien de conformité",
+  "admin.compliance.enableDailyDesc": "Si activé, Mattermost générera un rapport de conformité quotidien",
   "admin.compliance.enableDailyTitle": "Activer le rapport quotidien :",
-  "admin.compliance.enableDesc": "Si activé, Mattermost autorise les rapports de conformité de puis l'onglet <strong>Conformité et vérification</strong>. Consultez la <a href=\"https://docs.mattermost.com/administration/compliance.html\" target=\"_blank\">documentation</a> pour en apprendre davantage.",
+  "admin.compliance.enableDesc": "Si activé, Mattermost autorise les rapports de conformité depuis l'onglet <strong>Conformité et vérification</strong>. Consultez la <a href=\"https://docs.mattermost.com/administration/compliance.html\" target=\"_blank\">documentation</a> pour en apprendre davantage.",
   "admin.compliance.enableTitle": "Activer le rapport de conformité :",
   "admin.compliance.false": "non",
-  "admin.compliance.noLicense": "<h4 class=\"banner__heading\">Note :</h4><p>La conformité est une option disponible sur l'édition d’Enterprise. Votre licence ne permet pas d'utiliser cette fonction. Cliquez sur <a href=\"http://mattermost.com\" target=\"_blank\">ici</a> pour des informations et des prix sur la licence d’Enterprise.</p>",
+  "admin.compliance.noLicense": "<h4 class=\"banner__heading\">Note :</h4><p>La conformité est une option disponible sur l'édition Entreprise. Votre licence ne permet pas d'utiliser cette fonction. Cliquez sur <a href=\"http://mattermost.com\" target=\"_blank\">ici</a> pour des informations et des prix sur la licence Entreprise.</p>",
   "admin.compliance.save": "Enregistrer",
   "admin.compliance.saving": "Enregistrement des paramètres...",
   "admin.compliance.title": "Configuration de la conformité",
@@ -413,6 +413,7 @@
   "admin.ldap.lastnameAttrDesc": "(Optionnel) Attribut du serveur LDAP utilisé pour le champ \"nom de famille\" des utilisateurs dans Mattermost.",
   "admin.ldap.lastnameAttrEx": "Exemple : \"sn\"",
   "admin.ldap.lastnameAttrTitle": "Attribut \"nom de famille\" :",
+  "admin.ldap.ldap_test_button": "AD/LDAP Test",
   "admin.ldap.loginNameDesc": "L’espace texte réservé apparaît dans le champ de connexion sur la page de connexion. Par défaut \"LDAP Nom d'utilisateur\".",
   "admin.ldap.loginNameEx": "Exemple : \"LDAP nom d’utilisateur\".",
   "admin.ldap.loginNameTitle": "Champ de connexion :",
@@ -439,8 +440,9 @@
   "admin.ldap.syncIntervalTitle": "Intervalle de synchronisation (en minutes)",
   "admin.ldap.syncNowHelpText": "Provoque une synchronisation LDAP immédiate.",
   "admin.ldap.sync_button": "Synchroniser maintenant l'annuaire LDAP",
-  "admin.ldap.testFailure": "LDAP Test Failure: {error}",
-  "admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the LDAP server specified. See log file for more detailed error messages.",
+  "admin.ldap.testFailure": "AD/LDAP Test Failure: {error}",
+  "admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the AD/LDAP server specified. See log file for more detailed error messages.",
+  "admin.ldap.testSuccess": "AD/LDAP Test Successful",
   "admin.ldap.uernameAttrDesc": "Attribut du serveur LDAP utilisé pour le champ \"nom d'utilisateur\" dans Mattermost. Utilisez de préférence le même champ que l'attribut \"identifiant d'utilisateur\".",
   "admin.ldap.userFilterDisc": "Entrez éventuellement un filtre LDAP à utiliser lors de la recherche d'objets utilisateur. Seuls les utilisateurs sélectionnés par la requête seront en mesure d'accéder à Mattermost . Pour Active Directory, la requête pour filtrer les utilisateurs désactivés est (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "Exemple : \"(objectClass=utilisateur)\"",
@@ -461,6 +463,8 @@
   "admin.license.uploading": "Téléchargement de la licence…",
   "admin.log.consoleDescription": "En principe désactivée en production. Utilisé pour le développement, pour afficher les messages d'information sur la console (stdout).",
   "admin.log.consoleTitle": "Affiche les journaux sur la console : ",
+  "admin.log.enableDiagnostics": "Enable Diagnostics and Error Reporting:",
+  "admin.log.enableDiagnosticsDescription": "Enable this feature to improve the quality and performance of Mattermost by sending error reporting and diagnostic information to Mattermost, Inc. Read our <a href=\"https://about.mattermost.com/default-privacy-policy/\" target=\"_blank\">privacy policy</a> to learn more.",
   "admin.log.enableWebhookDebugging": "Activer le débogage des webhooks :",
   "admin.log.enableWebhookDebuggingDescription": "Si ce paramètre est faux, les traces de débogage des requêtes webhook entrantes seront désactivées.",
   "admin.log.fileDescription": "En principe activé en production. Si activé, les journaux sont écrits dans le fichier spécifié ci-dessous.",
@@ -636,8 +640,8 @@
   "admin.service.iconTitle": "Enable integrations to override profile picture icons:",
   "admin.service.insecureTlsDesc": "Si activé, toute requête sortante HTTPS acceptera les certificats non-vérifiés et auto-signés. Par exemple, les requêtes webhook sortantes avec un certificat TLS auto-signé, vers n'importe quel domaine, seront autorisées. Attention, cela rend votre serveur vulnérable aux attaques de type \"man in the middle\".",
   "admin.service.insecureTlsTitle": "Autoriser les connexions sortantes non-sécurisées : ",
-  "admin.service.integrationAdmin": "Restreindre les intégrations aux administrateurs : ",
-  "admin.service.integrationAdminDesc": "Si activé, les intégrations ne peuvent être configurées que par les administrateurs.",
+  "admin.service.integrationAdmin": "Restrict managing integrations to Admins:",
+  "admin.service.integrationAdminDesc": "When true, webhooks and slash commands can only be created, edited and viewed by Team and System Admins, and OAuth 2.0 applications by System Admins. Integrations are available to all users after they have been created by the Admin.",
   "admin.service.listenAddress": "Adresse IP du serveur :",
   "admin.service.listenDescription": "Adresse IP à laquelle le serveur écoute. Saisir \":8065\" connectera le serveur depuis toutes les interfaces réseau de la machine. Vous pouvez également choisir une adresse, par exemple \"127.0.0.1:8065\". Ce paramètre nécessite un redémarrage du serveur.",
   "admin.service.listenExample": "Exemple : \":8065\"",
@@ -648,7 +652,7 @@
   "admin.service.outWebhooksDesc": "Si activé, les webhooks sortants seront autorisés. Consultez la <a href='http://docs.mattermost.com/developer/webhooks-outgoing.html' target='_blank'>documentation</a> pour en apprendre davantage.",
   "admin.service.outWebhooksTitle": "Activer les webhooks sortants : ",
   "admin.service.overrideDescription": "When true, webhooks, slash commands and other integrations, such as <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, will be allowed to change the username they are posting as. Note: Combined with allowing integrations to override profile picture icons, users may be able to perform phishing attacks by attempting to impersonate other users.",
-  "admin.service.overrideTitle": "Enable integrations to override usernames:",
+  "admin.service.overrideTitle": "Permettre des intégrations pour remplacer les noms 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": "Segment.com est un service en ligne qui peut éventuellement être utilisé pour le suivi des statistiques détaillées du système. Vous pouvez obtenir une clé de signature -up pour un compte gratuit à Segment.com.",
@@ -658,7 +662,7 @@
   "admin.service.sessionCacheDesc": "Durée pendant laquelle une session est gardée en mémoire.",
   "admin.service.sessionDaysEx": "Exemple : \"30\"",
   "admin.service.siteURL": "Site URL:",
-  "admin.service.siteURLDescription": "The URL, including port number and protocol, that users will use to access Mattermost. Leave blank to automatically configure based on incoming traffic.",
+  "admin.service.siteURLDescription": "The URL, including port number and protocol, that users will use to access Mattermost. This field can be left blank unless you are configuring email batching in <b>Notifications > Email</b>. When blank, the URL is automatically configured based on incoming traffic.",
   "admin.service.siteURLExample": "Ex \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "Durée de la session SSO (en jours) :",
   "admin.service.ssoSessionDaysDesc": "Le nombre de jours entre la dernière fois qu'un utilisateur a entré ses identifiants et l'expiration de la session de l'utilisateur. Si la méthode d'authentification est SAML ou GitLab, l'utilisateur pourra être automatiquement connecté à nouveau dans Mattermost s'ils sont déjà connectés dans SAML ou GitLab. Après le changement de ce paramètre, il prendra effet la prochaine fois que les utilisateurs entreront leurs identifiants.",
@@ -1169,7 +1173,7 @@
   "find_team.send": "Envoyer",
   "find_team.submitError": "Veuillez entrer une adresse électronique valide",
   "flag_post.flag": "Flag for follow up",
-  "flag_post.unflag": "Unflag",
+  "flag_post.unflag": "Supprimer l'indicateur",
   "general_tab.chooseName": "Choisissez un nom pour votre équipe",
   "general_tab.codeDesc": "Cliquez sur \"Modifier\" pour réinitialiser le code d'invitation",
   "general_tab.codeLongDesc": "Le code d'invitation est utilisé dans l'URL contenant l'invitation à votre équipe  créé depuis le menu principal grâce à <strong>Obtenir un lien d’invitation d’équipe</strong>. Regénérer cette clé rend toutes les invitations déjà envoyées invalide.",
@@ -1222,11 +1226,11 @@
   "help.commands.custom": "## Custom Commands\nCustom slash commands integrate with external applications. For example, a team might configure a custom slash command to check internal health records with `/patient joe smith` or check the weekly weather forcast in a city with `/weather toronto week`. Check with your System Admin or open the autocomplete list by typing `/` to determine if your team configured any custom slash commands.",
   "help.commands.custom2": "Custom slash commands are disabled by default and can be enabled by the System Admin in the **System Console** > **Integrations** > **Webhooks and Commands**. Learn about configuring custom slash commands on the [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
   "help.commands.intro": "Slash commands perform operations in Mattermost by typing into the text input box. Enter a `/` followed by a command and some arguments to perform actions.\n\nBuilt-in slash commands come with all Mattermost installations and custom slash commands are configurable to interact with external applications. Learn about configuring custom slash commands on the [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
-  "help.commands.title": "Exécuter des commandes",
+  "help.commands.title": "# Exécuter des commandes\n",
   "help.composing.deleting": "## Deleting a message\nDelete a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Delete**. System and Team Admins can delete any message on their system or team.",
   "help.composing.editing": "## Editing a Message\nEdit a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Edit**. After making modifications to the message text, press **ENTER** to save the modifications. Message edits do not trigger new @mention notifications, desktop notifications or notification sounds.",
   "help.composing.linking": "## Linking to a message\nThe **Permalink** feature creates a link to any message. Sharing this link with other users in the channel lets them view the linked message in the Message Archives. Users who are not a member of the channel where the message was posted cannot view the permalink. Get the permalink to any message by clicking the **[...]** icon next to the message text  > **Permalink** > **Copy Link**.",
-  "help.composing.posting": "## Posting a Message\nWrite a message by typing into the text input box, then press **ENTER** to send it. Use **Shift + ENTER** to create a new line without sending a message. To send messages by pressing **Ctrl+Enter** go to **Main Menu > Account Settings > Send messages on Ctrl + Enter**.",
+  "help.composing.posting": "## Posting a Message\nWrite a message by typing into the text input box, then press **ENTER** to send it. Use **Shift + ENTER** to create a new line without sending a message. To send messages by pressing **CTRL+ENTER** go to **Main Menu > Account Settings > Send messages on CTRL + ENTER**.",
   "help.composing.posts": "#### Posts\nPosts can be considered parent messages. They are the messages that often start a thread of replies. Posts are composed and sent from the text input box at the bottom of the center pane.",
   "help.composing.replies": "#### Replies\nReply to a message by clicking the reply icon next to any message text. This action opens the right-hand-side (RHS) where you can see the message thread, then compose and send your reply. Replies are indented slightly in the center pane to indicate that they are child messages of a parent post.\n\nWhen composing a reply in the right-hand side, click the expand/collapse icon with two arrows at the top of the sidebar to make things easier to read.",
   "help.composing.title": "# Sending Messages\n_____",
@@ -1250,7 +1254,7 @@
   "help.formatting.lines": "## Lines\n\nCreate a line by using three `*`, `_`, or `-`.",
   "help.formatting.linkEx": "[Découvrez Mattermost!](https://about.mattermost.com/)",
   "help.formatting.links": "## Links\n\nCreate labeled links by putting the desired text in square brackets and the associated link in normal brackets.",
-  "help.formatting.listExample": "* list item one\n* list item two\n    * item two sub-point')",
+  "help.formatting.listExample": "* list item one\n* list item two\n    * item two sub-point",
   "help.formatting.lists": "## Lists\n\nCreate a list by using `*` or `-` as bullets. Indent a bullet point by adding two spaces in front of it.",
   "help.formatting.monokaiTheme": "**Monokai Theme**",
   "help.formatting.ordered": "Faire une liste ordonnée en utilisant des nombres à la place :",
@@ -1355,6 +1359,7 @@
   "integrations.oauthApps.title": "Applications OAuth 2.0",
   "integrations.outgoingWebhook.description": "Les webhooks sortants permettent des intégrations externes afin de recevoir et de répondre aux messages",
   "integrations.outgoingWebhook.title": "Webhooks sortants",
+  "integrations.successful": "Installation réussie",
   "intro_messages.DM": "Vous êtes au début de votre historique de messages avec {teammate}.<br />Les messages privés et les fichiers partagés ici ne sont visibles pour personne d'autre.",
   "intro_messages.anyMember": " Tout membre peut rejoindre et lire ce canal.",
   "intro_messages.beginning": "Début de {name}",
@@ -1474,7 +1479,7 @@
   "navbar_dropdown.leave": "Quitter l'équipe",
   "navbar_dropdown.logout": "Se déconnecter",
   "navbar_dropdown.manageMembers": "Gérer les membres",
-  "navbar_dropdown.nativeApps": "Download Mattermost Apps",
+  "navbar_dropdown.nativeApps": "Télécharger les applications",
   "navbar_dropdown.report": "Signaler un problème",
   "navbar_dropdown.switchTeam": "Basculer sur {team}",
   "navbar_dropdown.switchTo": "Basculer vers ",
@@ -1496,7 +1501,7 @@
   "password_send.link": "<p>Un lien de réinitialisation de mot de passe a été envoyé à <b>{email}</b></p>",
   "password_send.reset": "Réinitialiser mon mot de passe",
   "password_send.title": "Réinitialisation mot de passe",
-  "pdf_preview.max_pages": "Les aperçus PDF montrent uniquement les cinq premières pages.",
+  "pdf_preview.max_pages": "Télécharger pour lire plus de pages",
   "pending_post_actions.cancel": "Annuler",
   "pending_post_actions.retry": "Réessayer",
   "permalink.error.access": "Ce lien correspond à un message supprimé ou appartenant à un canal auquel vous n'avez pas accès.",
@@ -1512,8 +1517,8 @@
   "post_focus_view.beginning": "Début des archives du canal",
   "post_info.del": "Supprimer",
   "post_info.edit": "Éditer",
-  "post_info.mobile.flag": "Flag",
-  "post_info.mobile.unflag": "Unflag",
+  "post_info.mobile.flag": "Ajouter un indicateur",
+  "post_info.mobile.unflag": "Supprimer l'indicateur",
   "post_info.permalink": "Lien permanent",
   "post_info.reply": "Répondre",
   "posts_view.loadMore": "Charger plus de messages",
@@ -1537,10 +1542,10 @@
   "rhs_comment.comment": "Commentaire",
   "rhs_comment.del": "Supprimer",
   "rhs_comment.edit": "Éditer",
-  "rhs_comment.mobile.flag": "Flag",
-  "rhs_comment.mobile.unflag": "Unflag",
+  "rhs_comment.mobile.flag": "Ajouter un indicateur",
+  "rhs_comment.mobile.unflag": "Supprimer l'indicateur",
   "rhs_comment.permalink": "Lien permanent",
-  "rhs_header.backToFlaggedTooltip": "Back to Flagged Posts",
+  "rhs_header.backToFlaggedTooltip": "Retourner aux messages avec indicateur",
   "rhs_header.backToResultsTooltip": "Retour aux résultats",
   "rhs_header.closeSidebarTooltip": "Fermer la barre latérale",
   "rhs_header.details": "Détails du message",
@@ -1549,8 +1554,8 @@
   "rhs_root.del": "Supprimer",
   "rhs_root.direct": "Messages privés",
   "rhs_root.edit": "Éditer",
-  "rhs_root.mobile.flag": "Flag",
-  "rhs_root.mobile.unflag": "Unflag",
+  "rhs_root.mobile.flag": "Ajouter un indicateur",
+  "rhs_root.mobile.unflag": "Supprimer l'indicateur",
   "rhs_root.permalink": "Lien permanent",
   "search_bar.cancel": "Annuler",
   "search_bar.search": "Rechercher",
@@ -1563,6 +1568,10 @@
   "search_results.because": "<ul><li>Pour rechercher une partie d'un mot (ex. rechercher \"réa\" en souhaitant \"réagir\" ou \"réaction\"), ajoutez un * au terme recherché</li><li>En raison du nombre de résultats, les recherches sur deux lettres ou sur les mots communs tels que \"ce\", \"un\" et \"est\" n'apparaîtront pas dans les résultats de la recherche</li></ul>",
   "search_results.noResults": "Aucun résultat. Recommencer ?",
   "search_results.usage": "<ul><li>Utilisez <b>\"des guillemets\"</b> pour rechercher des phrases</li><li>Utilisez <b>from:</b> pour rechercher les messages d'utilisateur spécifiques et <b>in:</b> pour rechercher les messages sur des canaux spécifiques</li></ul>",
+  "search_results.usageFlag1": "You haven't flagged any messages yet.",
+  "search_results.usageFlag2": "You can add a flag to messages and comments by clicking the ",
+  "search_results.usageFlag3": " icon next to the timestamp.",
+  "search_results.usageFlag4": "Flags are a way to mark messages for follow up. Your flags are personal, and cannot be seen by other users.",
   "setting_item_max.cancel": "Annuler",
   "setting_item_max.save": "Enregistrer",
   "setting_item_min.edit": "Modifier",
@@ -1595,7 +1604,7 @@
   "sidebar_right_menu.inviteNew": "Inviter un nouveau membre",
   "sidebar_right_menu.logout": "Se déconnecter",
   "sidebar_right_menu.manageMembers": "Gérer les membres",
-  "sidebar_right_menu.nativeApps": "Download Mattermost Apps",
+  "sidebar_right_menu.nativeApps": "Télécharger les applications",
   "sidebar_right_menu.recentMentions": "Mentions récentes",
   "sidebar_right_menu.report": "Signaler un problème",
   "sidebar_right_menu.switch_team": "Sélection de l'équipe",
@@ -1605,7 +1614,7 @@
   "signup.email": "Adresse électronique et mot de passe",
   "signup.gitlab": "GitLab Single-Sign-On",
   "signup.google": "Compte Google",
-  "signup.ldap": "LDAP Credentials",
+  "signup.ldap": "AD/LDAP Credentials",
   "signup.office365": "Office 365",
   "signup.title": "Créer un compte avec :",
   "signup_team.choose": "Vos équipes : ",
@@ -1657,8 +1666,8 @@
   "suggestion.mention.all": "Avertit tout le monde dans le canal, utilisez dans {townsquare} pour notifier toute l'équipe",
   "suggestion.mention.channel": "Notifier tout le monde dans le canal",
   "suggestion.mention.here": "Notifier toutes les personnes connectées dans ce canal",
-  "suggestion.mention.members": "Channel Members",
-  "suggestion.mention.nonmembers": "Not in Channel",
+  "suggestion.mention.members": "Membres du canal",
+  "suggestion.mention.nonmembers": "Pas dans le canal",
   "suggestion.mention.special": "Mentions spéciales",
   "suggestion.search.private": "Groupes privés",
   "suggestion.search.public": "Canaux publics",
@@ -1726,7 +1735,7 @@
   "user.settings.advance.formattingDesc": "Si activé, les messages seront formatés pour créer des liens, montrer des emoji, le style du texte et ajouter des sauts de ligne. Par défaut, ce paramètre est activé. La modification de ce paramètre nécessite le rafraîchissement de la page.",
   "user.settings.advance.formattingTitle": "Activé le formatage des messages",
   "user.settings.advance.joinLeaveDesc": "When \"On\", System Messages saying a user has joined or left a channel will be visible. When \"Off\", the System Messages about joining or leaving a channel will be hidden. A message will still show up when you are added to a channel, so you can receive a notification.",
-  "user.settings.advance.joinLeaveTitle": "Enable Join/Leave Messages",
+  "user.settings.advance.joinLeaveTitle": "Permettre de rejoindre/quitter les messages",
   "user.settings.advance.markdown_preview": "Voir l'option d'aperçu du markdown dans la zone de saisie de message",
   "user.settings.advance.off": "Désactivé",
   "user.settings.advance.on": "Activé",
@@ -1877,28 +1886,29 @@
   "user.settings.notifications.desktop.allNoSoundTimed": "For all activity, without sound, shown for {seconds} seconds",
   "user.settings.notifications.desktop.allSoundForever": "For all activity, with sound, shown indefinitely",
   "user.settings.notifications.desktop.allSoundTimed": "For all activity, with sound, shown for {seconds} seconds",
-  "user.settings.notifications.desktop.duration": "Notification duration",
-  "user.settings.notifications.desktop.durationInfo": "Sets how long desktop notifications will remain on screen.",
-  "user.settings.notifications.desktop.mentionsFirefoxForever": "For mentions and direct messages, shown indefinitely",
+  "user.settings.notifications.desktop.duration": "Durée de notification",
+  "user.settings.notifications.desktop.durationInfo": "Définit combien de temps les notifications de bureau resteront à l'écran.",
+  "user.settings.notifications.desktop.mentionsFirefoxForever": "Pour mentions et messages directs en mode hors connexion",
   "user.settings.notifications.desktop.mentionsFirefoxTimed": "For mentions and direct messages, shown for {seconds} seconds",
   "user.settings.notifications.desktop.mentionsNoSoundForever": "For mentions and direct messages, without sound, shown indefinitely",
   "user.settings.notifications.desktop.mentionsNoSoundTimed": "For mentions and direct messages, without sound, shown for {seconds} seconds",
   "user.settings.notifications.desktop.mentionsSoundForever": "For mentions and direct messages, with sound, shown indefinitely",
   "user.settings.notifications.desktop.mentionsSoundTimed": "For mentions and direct messages, with sound, shown for {seconds} seconds",
-  "user.settings.notifications.desktop.seconds": "{seconds} seconds",
-  "user.settings.notifications.desktop.sound": "Notification sound",
+  "user.settings.notifications.desktop.seconds": "{seconds} secondes",
+  "user.settings.notifications.desktop.sound": "Son de notification",
   "user.settings.notifications.desktop.title": "Sons des notifications",
-  "user.settings.notifications.desktop.unlimited": "Unlimited",
+  "user.settings.notifications.desktop.unlimited": "Illimité",
   "user.settings.notifications.desktopSounds": "Sons des notifications",
+  "user.settings.notifications.email.everyHour": "Toutes les heures",
+  "user.settings.notifications.email.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
+  "user.settings.notifications.email.immediately": "Immédiatement",
+  "user.settings.notifications.email.never": "Jamais",
+  "user.settings.notifications.email.send": "Envoyer des notifications sur le bureau",
   "user.settings.notifications.emailBatchingInfo": "Notifications received over the time period selected are combined and sent in a single email.",
   "user.settings.notifications.emailInfo": "Les notifications par courriel sont envoyées pour les mentions et les messages privés après que vous êtes hors-ligne plus de 60 secondes ou parti de {siteName} pendant plus de 5 minutes.",
   "user.settings.notifications.emailNotifications": "Notifications par courriel",
-  "user.settings.notifications.everyHour": "Toutes les heures",
-  "user.settings.notifications.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
   "user.settings.notifications.header": "Notifications",
-  "user.settings.notifications.immediately": "Immédiatement",
-  "user.settings.notifications.info": "Desktop notifications are available on Firefox, Safari, and Chrome.",
-  "user.settings.notifications.never": "Jamais",
+  "user.settings.notifications.info": "Les notifications de bureau sont disponibles sur Firefox, Safari et Chrome.",
   "user.settings.notifications.noWords": "Aucun mot configuré",
   "user.settings.notifications.off": "Désactivé",
   "user.settings.notifications.on": "Activé",
@@ -1908,23 +1918,23 @@
   "user.settings.notifications.sensitiveUsername": "Votre nom d'utilisateur (insensible à la casse) \"{username}\"",
   "user.settings.notifications.sensitiveWords": "Autres mots insensibles à la casse, séparés par des virgules :",
   "user.settings.notifications.soundConfig": "Configurez les sons des notifications dans les préférences de votre navigateur",
-  "user.settings.notifications.sounds_info": "Notification sounds are available on IE11, Edge, Safari and Chrome.",
+  "user.settings.notifications.sounds_info": "Les sons de notification sont disponibles sur Internet Explorer 11, Edge, Chrome et Safari.",
   "user.settings.notifications.teamWide": "Mentions à toute l'équipe \"@all\"",
   "user.settings.notifications.title": "Paramètres de notification",
   "user.settings.notifications.usernameMention": "Votre nom d'utilisateur mentionné \"@{username}\"",
   "user.settings.notifications.wordsTrigger": "Mots qui déclenchent des mentions",
-  "user.settings.push_notification.allActivityAway": "Pour toutes les activités lorsque vous etes en déplacement ou hors ligne",
+  "user.settings.push_notification.allActivityAway": "Pour toutes les activités lorsque vous etes en absent ou hors ligne",
   "user.settings.push_notification.allActivityOffline": "Pour toutes les activités lorsque vous etes en déplacement ou hors ligne",
   "user.settings.push_notification.allActivityOnline": "Pour toutes les activités lorsque vous etes en déplacement ou hors ligne",
-  "user.settings.push_notification.away": "Away or offline",
+  "user.settings.push_notification.away": "Absent ou hors ligne",
   "user.settings.push_notification.disabled": "Désactivé par l'administrateur système",
   "user.settings.push_notification.disabled_long": "Les notifications Push pour les appareils mobiles ont été désactivées par votre administrateur système .",
   "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.offline": "Hors ligne",
-  "user.settings.push_notification.online": "Online, away or offline",
-  "user.settings.push_notification.onlyMentionsAway": "For mentions and direct messages when away or offline",
-  "user.settings.push_notification.onlyMentionsOffline": "For mentions and direct messages when offline",
+  "user.settings.push_notification.online": "En ligne, absent(e) ou hors ligne",
+  "user.settings.push_notification.onlyMentionsAway": "Pour mentions et messages directs en mode hors connexion",
+  "user.settings.push_notification.onlyMentionsOffline": "Pour mentions et messages directs en mode hors connexion",
   "user.settings.push_notification.onlyMentionsOnline": "For mentions and direct messages when online, away or offline",
   "user.settings.push_notification.send": "Notifications push mobile",
   "user.settings.push_notification.status": "Trigger push notifications when",
@@ -1937,7 +1947,7 @@
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "Google",
   "user.settings.security.lastUpdated": "Dernière mise à jour le {date} à {time}",
-  "user.settings.security.ldap": "LDAP",
+  "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "Connexion avec Gitlab",
   "user.settings.security.loginLdap": "Connexion avec LDAP",
   "user.settings.security.logoutActiveSessions": "Consulter et déconnecter les sessions actives",
diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json
index e8193318b..bdb4707c9 100644
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -155,7 +155,7 @@
   "admin.cluster.interNodeUrlsTitle": "ノード間URL:",
   "admin.cluster.loadedFrom": "この設定ファイルはノードID {clusterId} からロードされます。ロードバランサーからシステムコンソールにアクセスしている場合や問題が発生している場合は、<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">説明文書</a> のTroubleshooting Guideを参照してください。",
   "admin.cluster.noteDescription": "このセクションでの設定値の変更を有効にするにはサーバーを再起動させる必要があります。高可用モードを有効にした場合、システムコンソールは読み込み専用となり、設定ファイルからのみ変更可能となります。",
-  "admin.cluster.should_not_change": "警告: これらの設定はクラスター内のほかのサーバーと同期されません。高可用なノード間接続は、全てのサーバーのconfig.jsonを同一に設定し、Mattermostを再起動するまで開始されません。クラスターからサーバーを追加/削除する方法については<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">説明文書</a>を参照してください。 ロードバランサーからシステムコンソールにアクセスしている場合や問題が発生している場合は、<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">説明文書</a> のTroubleshooting Guideを参照してください。",
+  "admin.cluster.should_not_change": "警告: これらの設定はクラスター内の他のサーバーと同期されません。高可用なノード間接続は、全てのサーバーのconfig.jsonを同一に設定し、Mattermostを再起動するまで開始されません。クラスターからサーバーを追加/削除する方法については<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">説明文書</a>を参照してください。 ロードバランサーからシステムコンソールにアクセスしている場合や問題が発生している場合は、<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">説明文書</a> のTroubleshooting Guideを参照してください。",
   "admin.cluster.status_table.config_hash": "設定ファイルのMD5ハッシュ値",
   "admin.cluster.status_table.hostname": "ホスト名",
   "admin.cluster.status_table.id": "ノードID",
@@ -217,7 +217,7 @@
   "admin.customization.enableCustomEmojiTitle": "カスタム絵文字を有効にする:",
   "admin.customization.iosAppDownloadLinkDesc": "iOSアプリのダウンロードリンクを追加してください。モバイル用ウェブブラウザーでサイトにアクセスしたユーザへ、アプリをダウンロードするか選択するページを表示します。空欄にした場合、そのページは表示されません。",
   "admin.customization.iosAppDownloadLinkTitle": "iOSアプリダウンロード用リンク:",
-  "admin.customization.nativeAppLinks": "Mattermost App Links",
+  "admin.customization.nativeAppLinks": "Mattermostアプリリンク",
   "admin.customization.restrictCustomEmojiCreationAdmin": "システム管理者とチーム管理者にカスタム絵文字を作成できるようにする",
   "admin.customization.restrictCustomEmojiCreationAll": "全員にカスタム絵文字を作成できるようにする",
   "admin.customization.restrictCustomEmojiCreationDesc": "特定のユーザーにカスタム絵文字の作成を限定します。",
@@ -229,7 +229,7 @@
   "admin.email.agreeHPNS": "私はMattermostのホストするプッシュ通知サービスの<a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">使用条件</a>と<a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">プライバシーポリシー</a>を理解し、承諾します。",
   "admin.email.allowEmailSignInDescription": "有効な場合、Mattermostはユーザーが電子メールアドレスとパスワードを使ってサインインをできるようにします。",
   "admin.email.allowEmailSignInTitle": "電子メールアドレスでのログインを有効にする: ",
-  "admin.email.allowSignupDescription": "有効な場合、Mattermostはチームの作成と電子メールアドレスとパスワードによる利用登録を許可します。この値は利用登録をOAuthまたはLDAPによるシングルサインオンに制限したい時のみ無効にしてください。",
+  "admin.email.allowSignupDescription": "有効な場合、Mattermostはチームの作成と電子メールアドレスとパスワードによる利用登録を許可します。この値は利用登録をOAuthまたはAD/LDAPによるシングルサインオンに制限したい時のみ無効にしてください。",
   "admin.email.allowSignupTitle": "電子メールアドレスでのアカウント作成を有効にする: ",
   "admin.email.allowUsernameSignInDescription": "有効な場合、Mattermostはユーザーがユーザー名とパスワードでサインインすることを許可します。この設定は電子メール確認が無効にされている場合にのみ使われます。",
   "admin.email.allowUsernameSignInTitle": "ユーザー名でのサインインを有効にする: ",
@@ -392,57 +392,59 @@
   "admin.image.thumbWidthTitle": "添付サムネイル幅:",
   "admin.integrations.custom": "カスタム統合機能",
   "admin.integrations.external": "外部のサービス",
-  "admin.ldap.baseDesc": "ベースDNはMattermostがLDAPツリーでユーザー検索を始める場所の識別名です。",
+  "admin.ldap.baseDesc": "ベースDNはMattermostがAD/LDAPツリーでユーザー検索を始める場所の識別名です。",
   "admin.ldap.baseEx": "例: \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "ベースDN:",
   "admin.ldap.bindPwdDesc": "「バインドユーザー名」のパスワード:",
   "admin.ldap.bindPwdTitle": "バインドパスワード:",
-  "admin.ldap.bindUserDesc": "LDAPを検索する際に使用するユーザー名です。これは通常はMattermost専用のアカウントを作成しておきます。そしてそのアカウントはベースDNだけに読み取り専用でアクセスできるようにします。",
+  "admin.ldap.bindUserDesc": "AD/LDAPを検索する際に使用するユーザー名です。これは通常はMattermost専用のアカウントを作成しておきます。そしてそのアカウントはベースDNだけに読み取り専用でアクセスできるようにします。",
   "admin.ldap.bindUserTitle": "バインドユーザー名:",
-  "admin.ldap.emailAttrDesc": "Mattermostのユーザーの電子メールアドレスを設定するために使用されるLDAPサーバーの属性値です。",
+  "admin.ldap.emailAttrDesc": "Mattermostのユーザーの電子メールアドレスを設定するために使用されるAD/LDAPサーバーの属性値です。",
   "admin.ldap.emailAttrEx": "例: \"mail\" or \"userPrincipalName\"",
   "admin.ldap.emailAttrTitle": "電子メール属性値:",
-  "admin.ldap.enableDesc": "有効な場合、MattermostはログインにLDAPの使用を許可します",
-  "admin.ldap.enableTitle": "LDAPでのログインを有効にする:",
-  "admin.ldap.firstnameAttrDesc": "(オプション)Mattermostのユーザーの名前(ファーストネーム)を設定するために使用されるLDAPサーバーの属性値です。",
+  "admin.ldap.enableDesc": "有効な場合、MattermostはログインにAD/LDAPの使用を許可します",
+  "admin.ldap.enableTitle": "AD/LDAPでのサインインを有効にする:",
+  "admin.ldap.firstnameAttrDesc": "(オプション)Mattermostのユーザーの名前(ファーストネーム)を設定するために使用されるAD/LDAPサーバーの属性値です。",
   "admin.ldap.firstnameAttrEx": "例: \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "名前(ファーストネーム)の属性値",
-  "admin.ldap.idAttrDesc": "Mattermostで重複なくユーザーを認識するために使用されるLDAPの属性値です。LDAPのこの属性値は変更されないものあるべきであり、ユーザー名やユーザーIDを使用します。この項目が変更されると、新しいMattermostアカウントが古いアカウントとは独立して作成されます。この値は、Mattermostのログイン画面の「LDAPユーザー名」欄に入力します。通常、この属性値は、上の「ユーザー名属性値」欄と同じです。あなたのチームがdomain\\usernameの形式を他のサービスにLDAPを使ってログインするのに使用している場合には、サイト間の一貫性を維持するためこの項目にはdomain\\username形式を使ってください。",
+  "admin.ldap.idAttrDesc": "Mattermostで重複なくユーザーを認識するために使用されるAD/LDAPの属性値です。AD/LDAPのこの属性値は変更されないものあるべきであり、ユーザー名やユーザーIDを使用します。この項目が変更されると、新しいMattermostアカウントが古いアカウントとは独立して作成されます。この値は、Mattermostのログイン画面の「AD/LDAPユーザー名」欄に入力します。通常、この属性値は、上の「ユーザー名属性値」欄と同じです。あなたのチームがdomain\\usernameの形式を他のサービスにAD/LDAPを使ってログインするのに使用している場合には、サイト間の一貫性を維持するためこの項目にはdomain\\username形式を使ってください。",
   "admin.ldap.idAttrEx": "例: \"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "ID属性値: ",
-  "admin.ldap.lastnameAttrDesc": "(オプション)Mattermostのユーザーの苗字(ラストネーム)を設定するために使用されるLDAPサーバーの属性値です。",
+  "admin.ldap.lastnameAttrDesc": "(オプション)Mattermostのユーザーの苗字(ラストネーム)を設定するために使用されるAD/LDAPサーバーの属性値です。",
   "admin.ldap.lastnameAttrEx": "例: \"sn\"",
   "admin.ldap.lastnameAttrTitle": "苗字(ラストネーム)の属性値:",
-  "admin.ldap.loginNameDesc": "ログインページのログイン欄に表示されるプレイスホルダーテキストを設定します。\"LDAP Username\"がデフォルトです。",
-  "admin.ldap.loginNameEx": "例: \"LDAP Username\"",
+  "admin.ldap.ldap_test_button": "AD/LDAP Test",
+  "admin.ldap.loginNameDesc": "ログインページのログイン欄に表示されるプレイスホルダーテキストを設定します。\"AD/LDAP Username\"がデフォルトです。",
+  "admin.ldap.loginNameEx": "例: \"AD/LDAP Username\"",
   "admin.ldap.loginNameTitle": "ログインフィールド名:",
   "admin.ldap.maxPageSizeEx": "例: \"2000\"",
   "admin.ldap.maxPageSizeHelpText": "MattermostサーバーがLDAPサーバーへ一度にリクエストする最大ユーザー数。0を指定した場合、制限しません。",
   "admin.ldap.maxPageSizeTitle": "最大ページサイズ:",
-  "admin.ldap.nicknameAttrDesc": "(オプション)Mattermostのユーザーの苗字(ラストネーム)を設定するために使用されるLDAPサーバーの属性値です。",
+  "admin.ldap.nicknameAttrDesc": "(オプション)Mattermostのユーザーのニックネームを設定するために使用されるAD/LDAPサーバーの属性値です。",
   "admin.ldap.nicknameAttrEx": "例: \"nickname'",
   "admin.ldap.nicknameAttrTitle": "ニックネームの属性値:",
-  "admin.ldap.noLicense": "<h4 class=\"banner__heading\">注意:</h4><p>LDAPはエンタープライズ版のみの機能です。現在のライセンスはLDAPをサポートしていません。詳しくは<a href=\"http://mattermost.com\" target=\"_blank\">エンタープライズ版についての情報と価格</a>をご覧ください。</p>",
-  "admin.ldap.portDesc": "MattermostがLDAPサーバーに接続するポート番号です。デフォルトでは389です。",
+  "admin.ldap.noLicense": "<h4 class=\"banner__heading\">注意:</h4><p>AD/LDAPはエンタープライズ版のみの機能です。現在のライセンスはAD/LDAPをサポートしていません。詳しくは<a href=\"http://mattermost.com\" target=\"_blank\">エンタープライズ版についての情報と価格</a>をご覧ください。</p>",
+  "admin.ldap.portDesc": "MattermostがAD/LDAPサーバーに接続するポート番号です。デフォルトでは389です。",
   "admin.ldap.portEx": "例: \"389\"",
-  "admin.ldap.portTitle": "LDAPポート:",
-  "admin.ldap.queryDesc": "LDAPサーバーに問い合わせをする際のタイムアウト秒数です。遅いLDAPサーバーとの接続でタイムアウトエラーが発生する場合には数値を増やしてください。",
+  "admin.ldap.portTitle": "AD/LDAPポート:",
+  "admin.ldap.queryDesc": "AD/LDAPサーバーに問い合わせをする際のタイムアウト秒数です。遅いAD/LDAPサーバーとの接続でタイムアウトエラーが発生する場合には数値を増やしてください。",
   "admin.ldap.queryEx": "例: \"60\"",
   "admin.ldap.queryTitle": "問い合わせタイムアウト(秒):",
-  "admin.ldap.serverDesc": "LDAPサーバーのドメイン名またはIPアドレスです。",
+  "admin.ldap.serverDesc": "AD/LDAPサーバーのドメイン名またはIPアドレスです。",
   "admin.ldap.serverEx": "例: \"10.0.0.23\"",
-  "admin.ldap.serverTitle": "LDAPサーバー:",
+  "admin.ldap.serverTitle": "AD/LDAPサーバー:",
   "admin.ldap.skipCertificateVerification": "証明書の検証をしない:",
   "admin.ldap.skipCertificateVerificationDesc": "TLSまたはSTARTTLSの証明書の検証ステップをスキップします。TLSが必要な本番環境では設定することは推奨されません。テスト用の設定です。",
   "admin.ldap.syncFailure": "同期の失敗: {error}",
-  "admin.ldap.syncIntervalHelpText": "LDAPの同期は、LDAPサーバでの更新を反映するためにMattermostのユーザー情報を更新します。例えば、LDAPサーバー上でユーザーの名前が変更された場合、その変更はLDAPの同期が実行された時にMattermostへ反映されます。LDAPサーバ上で削除もしくは無効化されたアカウントは、Mattermost上で\"無効\"となり、そのアカウントのセッションは削除されます。Mattermostは入力された同期間隔で同期を実行します。例えば、60が入力された場合、Mattermostは60分ごとに同期を行います。",
+  "admin.ldap.syncIntervalHelpText": "AD/LDAPの同期は、AD/LDAPサーバでの更新を反映するためにMattermostのユーザー情報を更新します。例えば、AD/LDAPサーバー上でユーザーの名前が変更された場合、その変更はAD/LDAPの同期が実行された時にMattermostへ反映されます。AD/LDAPサーバ上で削除もしくは無効化されたアカウントは、Mattermost上で\"無効\"となり、そのアカウントのセッションは削除されます。Mattermostは入力された同期間隔で同期を実行します。例えば、60が入力された場合、Mattermostは60分ごとに同期を行います。",
   "admin.ldap.syncIntervalTitle": "同期間隔(分):",
-  "admin.ldap.syncNowHelpText": "LDAP同期をすぐに実行します。",
-  "admin.ldap.sync_button": "LDAP同期を今すぐ実行する",
-  "admin.ldap.testFailure": "LDAPのテストに失敗: {error}",
-  "admin.ldap.testHelpText": "Mattermostが指定されたLDAPサーバーに接続できるかをテストします。詳しいエラーメッセージは、ログファイルを参照してください。",
-  "admin.ldap.uernameAttrDesc": "Mattermostのユーザー名を設定するために使用されるLDAPサーバーの属性値です。ID属性値と同じである場合があります。",
-  "admin.ldap.userFilterDisc": "(オプション) ユーザーオブジェクトを検索する際のLDAPフィルターを入力できます。これを適用したクエリーで選ばれるユーザーのみがMattermostにアクセスできます。Active Directoryでは、無効化されているユーザーを排除するには、(&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2)))を設定してください。",
+  "admin.ldap.syncNowHelpText": "AD/LDAP同期をすぐに実行します。",
+  "admin.ldap.sync_button": "AD/LDAP同期を今すぐ実行する",
+  "admin.ldap.testFailure": "AD/LDAPのテストに失敗: {error}",
+  "admin.ldap.testHelpText": "Mattermostが指定されたAD/LDAPサーバーに接続できるかをテストします。詳しいエラーメッセージは、ログファイルを参照してください。",
+  "admin.ldap.testSuccess": "AD/LDAP Test Successful",
+  "admin.ldap.uernameAttrDesc": "Mattermostのユーザー名を設定するために使用されるAD/LDAPサーバーの属性値です。ID属性値と同じである場合があります。",
+  "admin.ldap.userFilterDisc": "(オプション) ユーザーオブジェクトを検索する際のAD/LDAPフィルターを入力できます。これを適用したクエリーで選ばれるユーザーのみがMattermostにアクセスできます。Active Directoryでは、無効化されているユーザーを排除するには、(&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2)))を設定してください。",
   "admin.ldap.userFilterEx": "例: \"(objectClass=user)\"",
   "admin.ldap.userFilterTitle": "ユーザーフィルター:",
   "admin.ldap.usernameAttrEx": "例: \"sAMAccountName\"",
@@ -461,6 +463,8 @@
   "admin.license.uploading": "ライセンスをアップロードしています…",
   "admin.log.consoleDescription": "本番環境では無効に設定してください。開発者はこれを有効に設定することで、コンソールレベルオプションに応じてログメッセージを出力させることができます。有効な場合、サーバー標準出力(stdout)にメッセージを出力します。",
   "admin.log.consoleTitle": "ログをコンソールに出力する: ",
+  "admin.log.enableDiagnostics": "診断とエラーレポートを有効にする:",
+  "admin.log.enableDiagnosticsDescription": "Mattermost, Incへエラーレポートと診断情報を送信し、Mattermostの品質とパフォーマンスを改善するために、この機能を有効にしてください。 詳しくは<a href=\"https://about.mattermost.com/default-privacy-policy/\" target=\"_blank\">プライバシーポリシー</a>を参照してください。",
   "admin.log.enableWebhookDebugging": "ウェブフックのデバッグを有効にする:",
   "admin.log.enableWebhookDebuggingDescription": "これを無効にすることで、全ての内向きのウェブフックのリクエストボディーのデバッグログの出力を無効化します。",
   "admin.log.fileDescription": "本番環境では有効に設定してください。有効な場合、ログファイルは以下のファイルの場所欄で指定されたファイルに出力されます。",
@@ -563,7 +567,7 @@
   "admin.saml.enableTitle": "SAMLでのログインを有効にする:",
   "admin.saml.encryptDescription": "有効にした場合、Mattermostは、あなたのサービスプロバイダー公開証明書で暗号化されたSAMLアサーションを復号します。",
   "admin.saml.encryptTitle": "暗号化を有効にする:",
-  "admin.saml.firstnameAttrDesc": "(オプション) Mattermostのユーザーのニックネームを設定するために使用されるSAMLアサーションの属性値です。",
+  "admin.saml.firstnameAttrDesc": "(オプション) Mattermostのユーザーの名前(ファーストネーム)を設定するために使用されるSAMLアサーションの属性値です。",
   "admin.saml.firstnameAttrEx": "例: \"FirstName\"",
   "admin.saml.firstnameAttrTitle": "名前(ファーストネーム)の属性値",
   "admin.saml.idpCertificateFileDesc": "認証プロバイダーによって発行された公開認証証明書です。",
@@ -575,7 +579,7 @@
   "admin.saml.idpUrlDesc": "ログインシーケンスを開始するSAMLリクエストを送るURLです。",
   "admin.saml.idpUrlEx": "例: \"https://idp.example.org/SAML2/SSO/Login\"",
   "admin.saml.idpUrlTitle": "SAMLシングルサインオンURL:",
-  "admin.saml.lastnameAttrDesc": "(オプション) Mattermostのユーザーの使用言語を設定するために使用されるSAMLアサーションの属性値です。",
+  "admin.saml.lastnameAttrDesc": "(オプション) Mattermostのユーザーの苗字(ラストネーム)を設定するために使用されるSAMLアサーションの属性値です。",
   "admin.saml.lastnameAttrEx": "例: \"LastName\"",
   "admin.saml.lastnameAttrTitle": "苗字(ラストネーム)の属性値:",
   "admin.saml.localeAttrDesc": "(オプション) Mattermostのユーザーの使用言語を設定するために使用されるSAMLアサーションの属性値です。",
@@ -636,8 +640,8 @@
   "admin.service.iconTitle": "統合機能によるプロフィール画像アイコンの上書きを許可する:",
   "admin.service.insecureTlsDesc": "有効な場合、外向きのHTTPSリクエストは確認されていない、自己署名の証明書を受け入れます。例えば、自己署名TLS証明書を使ったサーバーへの外向きのウェブフックが全てのドメインで許可されます。注意: これによって、man-in-the-middle攻撃の危険性が生じます。",
   "admin.service.insecureTlsTitle": "安全ではない外向きの接続を有効にする: ",
-  "admin.service.integrationAdmin": "統合機能を作成する権限を、チーム管理者とシステム管理者に限定する: ",
-  "admin.service.integrationAdminDesc": "有効な場合、ユーザー作成の統合機能を管理者による作成のみにします。",
+  "admin.service.integrationAdmin": "統合機能の管理を管理者のみに制限する:",
+  "admin.service.integrationAdminDesc": "有効な場合、ウェブフックとスラッシュコマンドはチーム管理者とシステム管理者のみが、OAuth 2.0アプリケーションはシステム管理者のみが作成、編集、閲覧できるようになります。統合機能は管理者によって作成された後、全てのユーザーが利用できます。",
   "admin.service.listenAddress": "接続待ちアドレス:",
   "admin.service.listenDescription": "使用するIPアドレスとポート番号を設定します。\":8065\"と入力することで全てのインターフェイスのIPアドレスでアクセスを待ちます。\"127.0.0.1:8065\"と指定することで、一つのIPアドレスでアクセスを待ちます。この設定を変更した場合、サーバーを再起動するまで設定は反映されません。",
   "admin.service.listenExample": "例: \":8065\"",
@@ -658,13 +662,13 @@
   "admin.service.sessionCacheDesc": "セッションをメモリーにキャッシュしておく期間(分)です。",
   "admin.service.sessionDaysEx": "例: \"30\"",
   "admin.service.siteURL": "サイトURL:",
-  "admin.service.siteURLDescription": "ユーザーがMattermostにアクセスするための、ポート番号とプロトコルを含むURLです。内向きのトラフィックに基づいて自動的に設定する場合は空欄にしてください。",
+  "admin.service.siteURLDescription": "ユーザーがMattermostへアクセスするために使用する、ポート番号とプロトコルを含むURLです。<b>通知 > 電子メール</b>の電子メールバッチ処理を設定しない限り、空欄にしてください。空欄の場合、URLは自動的に内向きのアクセスに基づいて自動的に設定されます。",
   "admin.service.siteURLExample": "例 \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "シングルサインオンのセッション維持期間 (日数):",
   "admin.service.ssoSessionDaysDesc": "ユーザーが最後に認証情報を入力したときから、そのユーザーのセッションが期限切れとなるまでの日数です。SAMLかGitLabによる認可の場合、SAMLかGitLabに既にログインしていれば、ユーザーは自動的にMattermostへ再ログインされます。この設定を変更した場合、次にユーザーが認証情報を入力してから有効になります。",
   "admin.service.testingDescription": "有効な場合、テストアカウントとテストデータによる /loadtest スラッシュコマンドが使用可能になります。この設定を変更した場合、サーバーを再起動するまで設定は反映されません。",
   "admin.service.testingTitle": "コマンドのテストを有効にする: ",
-  "admin.service.webSessionDays": "LDAPと電子メールのセッション維持期間 (日数):",
+  "admin.service.webSessionDays": "AD/LDAPと電子メールのセッション維持期間 (日数):",
   "admin.service.webSessionDaysDesc": "ユーザーが最後に認証情報を入力してから、そのユーザーのセッションが期限切れとなるまでの日数です。この設定を変更した後の新しいセッション維持期間は、次にユーザーが認証情報を入力してから有効になります。",
   "admin.service.webhooksDescription": "有効な場合、内向きのウェブフックが使用できます。フィッシング攻撃対策のため、ウェブフックからの投稿にはBOTタグが表示されます。詳しくは<a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>説明文書</a>を参照してください。",
   "admin.service.webhooksTitle": "内向きのウェブフックを有効にする: ",
@@ -696,7 +700,7 @@
   "admin.sidebar.logging": "ログ",
   "admin.sidebar.login": "ログイン",
   "admin.sidebar.logs": "ログ",
-  "admin.sidebar.nativeAppLinks": "Mattermost App Links",
+  "admin.sidebar.nativeAppLinks": "Mattermostアプリリンク",
   "admin.sidebar.notifications": "通知",
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "その他",
@@ -1012,18 +1016,18 @@
   "channel_switch_modal.submit": "切り替える",
   "channel_switch_modal.title": "チャンネルを切り替える",
   "claim.account.noEmail": "電子メールアドレスが指定されていません",
-  "claim.email_to_ldap.enterLdapPwd": "LDAPアカウントのユーザーIDとパスワードを入力してください",
+  "claim.email_to_ldap.enterLdapPwd": "AD/LDAPアカウントのユーザーIDとパスワードを入力してください",
   "claim.email_to_ldap.enterPwd": "{site}の電子メールアカウントのパスワードを入力してください",
-  "claim.email_to_ldap.ldapId": "LDAP ID",
-  "claim.email_to_ldap.ldapIdError": "LDAP IDを入力してください。",
-  "claim.email_to_ldap.ldapPasswordError": "LDAPパスワードを入力してください。",
-  "claim.email_to_ldap.ldapPwd": "LDAPパスワード",
+  "claim.email_to_ldap.ldapId": "AD/LDAP ID",
+  "claim.email_to_ldap.ldapIdError": "AD/LDAP IDを入力してください。",
+  "claim.email_to_ldap.ldapPasswordError": "AD/LDAPパスワードを入力してください。",
+  "claim.email_to_ldap.ldapPwd": "AD/LDAPパスワード",
   "claim.email_to_ldap.pwd": "パスワード",
   "claim.email_to_ldap.pwdError": "パスワードを入力してください。",
-  "claim.email_to_ldap.ssoNote": "あなたは既に有効なLDAPアカウントを持っています",
-  "claim.email_to_ldap.ssoType": "この設定をすることで、LDAPでしかログインできなくなります",
-  "claim.email_to_ldap.switchTo": "アカウントをLDAPに切り替える",
-  "claim.email_to_ldap.title": "電子メールアドレス/パスワードによるアカウントをLDAPに切り替える",
+  "claim.email_to_ldap.ssoNote": "あなたは既に有効なAD/LDAPアカウントを持っています",
+  "claim.email_to_ldap.ssoType": "この設定をすることで、AD/LDAPでしかログインできなくなります",
+  "claim.email_to_ldap.switchTo": "アカウントをAD/LDAPに切り替える",
+  "claim.email_to_ldap.title": "電子メールアドレス/パスワードによるアカウントをAD/LDAPに切り替える",
   "claim.email_to_oauth.enterPwd": "{site}アカウントのパスワードを入力してください",
   "claim.email_to_oauth.pwd": "パスワード",
   "claim.email_to_oauth.pwdError": "パスワードを入力してください。",
@@ -1035,14 +1039,14 @@
   "claim.ldap_to_email.email": "電子メールアドレス{email}をログインに使用します",
   "claim.ldap_to_email.enterLdapPwd": "{site}電子メールアカウントの{ldapPassword}を入力してください",
   "claim.ldap_to_email.enterPwd": "電子メールアカウントの新しいパスワードを入力してください",
-  "claim.ldap_to_email.ldapPasswordError": "LDAPパスワードを入力してください。",
-  "claim.ldap_to_email.ldapPwd": "LDAPパスワード",
+  "claim.ldap_to_email.ldapPasswordError": "AD/LDAPパスワードを入力してください。",
+  "claim.ldap_to_email.ldapPwd": "AD/LDAPパスワード",
   "claim.ldap_to_email.pwd": "パスワード",
   "claim.ldap_to_email.pwdError": "パスワードを入力してください。",
   "claim.ldap_to_email.pwdNotMatch": "パスワードが一致していません。",
   "claim.ldap_to_email.ssoType": "この変更をすることで、電子メールアドレスとパスワードでのみログインできるようになります",
   "claim.ldap_to_email.switchTo": "アカウントを電子メールアドレス/パスワードに切り替える",
-  "claim.ldap_to_email.title": "LDAPアカウントを電子メールアドレス/パスワードに切り替える",
+  "claim.ldap_to_email.title": "AD/LDAPアカウントを電子メールアドレス/パスワードに切り替える",
   "claim.oauth_to_email.confirm": "パスワードをもう一度入力してください",
   "claim.oauth_to_email.description": "この変更をすることで、あなたのアカウントでは電子メールアドレスとパスワードでのみログインできるようになります。",
   "claim.oauth_to_email.enterNewPwd": "{site}の電子メールアカウントのパスワードを入力してください",
@@ -1061,7 +1065,7 @@
   "create_post.comment": "コメント",
   "create_post.post": "投稿",
   "create_post.shortcutsNotSupported": "このデバイスではキーボードショートカットはサポートされていません。",
-  "create_post.tutorialTip": "<h4>メッセージを送信する</h4><p>ここにメッセージを書き、<strong>Enter</strong>を押すことで投稿します。</p><p><strong>添付</strong>ボタンを押すことで画像やファイルをアップロードします。</p>",
+  "create_post.tutorialTip": "<h4>メッセージを送信する</h4><p>ここにメッセージを書き、<strong>ENTER</strong>を押すことで投稿します。</p><p><strong>添付</strong>ボタンを押すことで画像やファイルをアップロードします。</p>",
   "create_post.write": "メッセージを書き込んでいます…",
   "create_team.agreement": "アカウントを作成し{siteName}を利用する前に<a href='/static/help/terms.html'>使用条件</a>と<a href='/static/help/privacy.html'>プライバシーポリシー</a>に同意してください。同意できない場合は{siteName}は使用できません。",
   "create_team.display_name.back": "前のステップに戻る",
@@ -1217,16 +1221,16 @@
   "help.attaching.supported": "#### サポートされているメディアタイプ\nサポートされていないメディアタイプをプレビューしようとした場合、ファイルプレビュー画面は標準的なメディア添付アイコンを開きます。サポートされているメディア形式はブラウザーとOSに大きく依存していますが、以下の形式はほとんどのブラウザー上のMattermostでサポートされています:",
   "help.attaching.supportedList": "- 画像: BMP、GIF、JPG、JPEG、PNG\n- ビデオ: MP4\n- 音声: MP3、M4A\n- 文書: PDF",
   "help.attaching.title": "# ファイルを添付する\n_____",
-  "help.commands.builtin": "## 内蔵コマンド\n以下のスラッシュコマンドはすべてのMattermostで利用できます:",
+  "help.commands.builtin": "## 内蔵コマンド\n以下のスラッシュコマンドは全てのMattermostで利用できます:",
   "help.commands.builtin2": "最初に`/`を入力するとスラッシュコマンドのリストがテキスト入力ボックスの上に表示されます。自動補完の提案では黒字での入力例と灰字での短い説明が表示されます。",
   "help.commands.custom": "## カスタムコマンド\nカスタムスラッシュコマンドは外部のアプリケーションを統合します。例えば、あるチームでは、健康記録を`/patient joe smith`でチェックしたり、ある都市の週間天気予報を`/weather toronto week`でチェックするためのカスタムスラッシュコマンドを設定しています。システム管理者に聞くか、`/`を入力して自動補完リストを開いて、あなたのチームがどんなカスタムコマンドをを設定しているか確認してみてください。",
   "help.commands.custom2": "カスタムスラッシュコマンドはデフォルトでは無効化されており、システム管理者によって**システムコンソール** > **統合機能** > **ウェブフックとコマンド**から有効化できます。カスタムスラッシュコマンドの設定については[開発者向けスラッシュコマンド説明文書](http://docs.mattermost.com/developer/slash-commands.html)を参照してください。",
-  "help.commands.intro": "スラッシュコマンドはテキスト入力ボックスへ入力することでMattermost内で処理を実行します。処理を実行するために、`/`に続いてコマンドといくつかの引数を入力してください。\n\n内蔵スラッシュコマンドはすべてのMattermostに搭載されておりカスタムスラッシュコマンドは外部アプリケーションとやり取りするよう設定できます。カスタムスラッシュコマンドの設定については[開発者向けスラッシュコマンド説明文書](http://docs.mattermost.com/developer/slash-commands.html)を参照してください。",
+  "help.commands.intro": "スラッシュコマンドはテキスト入力ボックスへ入力することでMattermost内で処理を実行します。処理を実行するために、`/`に続いてコマンドといくつかの引数を入力してください。\n\n内蔵スラッシュコマンドは全てのMattermostに搭載されておりカスタムスラッシュコマンドは外部アプリケーションとやり取りするよう設定できます。カスタムスラッシュコマンドの設定については[開発者向けスラッシュコマンド説明文書](http://docs.mattermost.com/developer/slash-commands.html)を参照してください。",
   "help.commands.title": "# コマンドを実行する\n___",
   "help.composing.deleting": "## メッセージの削除\nあなたが書いたメッセージの隣にある**[...]**アイコンをクリックし、**削除**をクリックすることでメッセージを削除できます。システム管理者とチーム管理者は彼らのシステムやチーム内のどんなメッセージでも削除できます。",
   "help.composing.editing": "## メッセージの編集\nあなたが書いたメッセージの隣にある**[...]**アイコンをクリックし、**編集**をクリックすることでメッセージを編集できます。メッセージテキストへの修正をした後、**ENTER**を押すと修正を保存します。メッセージの編集は新規に@mention通知やデスクトップ通知、通知音をトリガーしません。",
   "help.composing.linking": "## メッセージへのリンク\n**パーマリンク**機能はメッセージへのリンクを生成します。このリンクをチャンネル内の他のユーザーに共有することで、メッセージアーカイブ内のリンクされたメッセージを見せることができます。メッセージが投稿されたチャンネルのメンバーでないユーザーはパーマリンクを見ることができません。メッセージの隣にある**[...]**アイコン > **パーマリンク** > **リンクをコピーする**からパーマリンクを取得できます。",
-  "help.composing.posting": "## メッセージの投稿\nテキスト入力ボックスへの入力によりメッセージを書き、**ENTER**を押すとメッセージを送信します。メッセージを送信せずに改行するには**Shift + ENTER**を使用してください。**Ctrl + Enter**でメッセージを送信するには**メインメニュー > アカウント設定 > Ctrl + Enterでメッセージを投稿する**から設定してください。",
+  "help.composing.posting": "## メッセージの投稿\nテキスト入力ボックスへの入力によりメッセージを書き、**ENTER**を押すとメッセージを送信します。メッセージを送信せずに改行するには**Shift + ENTER**を使用してください。**CTRL + ENTER**でメッセージを送信するには**メインメニュー > アカウント設定 > CTRL + ENTERでメッセージを投稿する**から設定してください。",
   "help.composing.posts": "#### 投稿\n投稿は親となるメッセージと考えることができます。たびたび返信によるスレッドの始まりとなるメッセージです。投稿は、中央下部にあるテキスト入力ボックスから作成し、送信することができます。",
   "help.composing.replies": "#### 返信\nメッセージテキストの隣の返信アイコンをクリックすることでメッセージへの返信ができます。このアクションでメッセージスレッドを確認できる画面右部を開き、あなたの返信を作成し、送信することができます。返信は元の投稿の子メッセージであることを示すために画面中央部ではわずかにインデントされます。\n\n画面右部で返信を作成する際に、サイドバー上部の二つの矢印で表された展開/折り畳みアイコンをクリックすることで読みやすくなります。",
   "help.composing.title": "# メッセージを送信する\n_____",
@@ -1236,7 +1240,7 @@
   "help.formatting.code": "## コードブロックk\n\nそれぞれの行を4つのスペースでインデントするか、コードの上下の行に```を書くことでコードブロックを作成できます。",
   "help.formatting.codeBlock": "コードブロック",
   "help.formatting.emojiExample": ":smile: :+1: :sheep:",
-  "help.formatting.emojis": "## 絵文字\n\n`:`を入力することで絵文字自動補完を開くことができます。全絵文字のリストは [こちら](http://www.emoji-cheat-sheet.com/)で見ることができます。使いたい絵文字が無い場合、あなた自身の[カスタム絵文字](http://docs.mattermost.com/help/settings/custom-emoji.html)を作成することができます。",
+  "help.formatting.emojis": "## 絵文字\n\n`:`を入力することで絵文字自動補完を開くことができます。全絵文字のリストは [こちら](http://www.emoji-cheat-sheet.com/)で見ることができます。使いたい絵文字がない場合、あなた自身の[カスタム絵文字](http://docs.mattermost.com/help/settings/custom-emoji.html)を作成することができます。",
   "help.formatting.example": "例:",
   "help.formatting.githubTheme": "**GitHubテーマ**",
   "help.formatting.headings": "## 見出し\n\nタイトルの前に # とスペースを入力することで見出しを作成できます。#の数を増やすほど見出しが小さくなります。",
@@ -1355,6 +1359,7 @@
   "integrations.oauthApps.title": "OAuth 2.0アプリケーション",
   "integrations.outgoingWebhook.description": "外向きのウェブフックは外部の統合機能がメッセージを受け取りレスポンスを返してくる場合に使用します",
   "integrations.outgoingWebhook.title": "外向きのウェブフック",
+  "integrations.successful": "セットアップが成功しました",
   "intro_messages.DM": "{teammate}とのダイレクトメッセージの履歴の最初です。<br />ダイレクトメッセージとそこで共有されているファイルは、この領域の外のユーザーからは見ることができません。",
   "intro_messages.anyMember": " このチャンネルには誰でも参加して投稿を閲覧することができます。",
   "intro_messages.beginning": "{name}のはじまり",
@@ -1387,7 +1392,7 @@
   "invite_member.sending": " 送信しています",
   "invite_member.teamInviteLink": "{link}を使っている人も招待することができます。",
   "ldap_signup.find": "参加しているチームを探す",
-  "ldap_signup.ldap": "LDAPアカウントでチームを作成する",
+  "ldap_signup.ldap": "AD/LDAPアカウントでチームを作成する",
   "ldap_signup.length_error": "名称は3文字以上15文字以下にしてください",
   "ldap_signup.teamName": "新しいチーム名を入力してください",
   "ldap_signup.team_error": "チーム名を入力してください",
@@ -1406,15 +1411,15 @@
   "login.gitlab": "GitLabでログインする",
   "login.google": "Google Appsでログインする",
   "login.invalidPassword": "パスワードが正しくありません。",
-  "login.ldapUsername": "LDAPユーザー名",
-  "login.ldapUsernameLower": "LDAPユーザー名",
+  "login.ldapUsername": "AD/LDAPユーザー名",
+  "login.ldapUsernameLower": "AD/LDAPユーザー名",
   "login.noAccount": "アカウントを持っていますか? ",
   "login.noEmail": "電子メールアドレスを入力してください",
   "login.noEmailLdapUsername": "電子メールアドレスまたは{ldapUsername}を入力してください",
   "login.noEmailUsername": "電子メールアドレスまたはユーザー名を入力してください",
   "login.noEmailUsernameLdapUsername": "電子メールアドレスまたはユーザー名、{ldapUsername}を入力してください",
   "login.noLdapUsername": "{ldapUsername}を入力してください",
-  "login.noMethods": "利用登録方法が設定されていません。システム管理者に連絡してください。",
+  "login.noMethods": "サインイン方法が設定されていません。システム管理者に連絡してください。",
   "login.noPassword": "パスワードを入力してください",
   "login.noUsername": "ユーザー名を入力してください",
   "login.noUsernameLdapUsername": "ユーザー名または{ldapUsername}を入力してください",
@@ -1474,7 +1479,7 @@
   "navbar_dropdown.leave": "チームを脱退する",
   "navbar_dropdown.logout": "ログアウト",
   "navbar_dropdown.manageMembers": "メンバーを管理する",
-  "navbar_dropdown.nativeApps": "Download Mattermost Apps",
+  "navbar_dropdown.nativeApps": "アプリをダウンロード",
   "navbar_dropdown.report": "問題を報告する",
   "navbar_dropdown.switchTeam": "{team}に切り替える",
   "navbar_dropdown.switchTo": "切り替え先: ",
@@ -1496,7 +1501,7 @@
   "password_send.link": "<p>パスワード初期化リンクが<b>{email}</b>に送信されました</p>",
   "password_send.reset": "自分のパスワードを初期化する",
   "password_send.title": "パスワードの初期化",
-  "pdf_preview.max_pages": "PDFプレビュー画面は最初の5ページのみを表示します。",
+  "pdf_preview.max_pages": "より多くのページを読むためにダウンロードする",
   "pending_post_actions.cancel": "キャンセル",
   "pending_post_actions.retry": "再試行",
   "permalink.error.access": "削除されたメッセージまたはアクセス権限のないチャンネルへのパーマリンクです。",
@@ -1563,6 +1568,10 @@
   "search_results.because": "<ul><li>語句の一部を検索するには*を付けてください(\"reach\"や\"reaction\"を検索するのに\"rea\"を使う場合等)</li><li>検索結果の件数によっては、2文字の検索、一般的な\"this\"や\"a\"、\"is\"は表示されません</li></ul>",
   "search_results.noResults": "結果が見付かりません。もう一度試しますか?",
   "search_results.usage": "<ul><li>文を検索するには<b>「引用符」</b>を使ってください</li><li>特定のユーザーの投稿に限定して検索するには<b>From:</b>を、特定のチャンネルのみ検索するには<b>in:</b>を使ってください</li></ul>",
+  "search_results.usageFlag1": "まだフラグの立てられたメッセージはありません。",
+  "search_results.usageFlag2": "アイコンをクリックすることでメッセージとコメントにフラグを立てることができます。",
+  "search_results.usageFlag3": "アイコンはタイムスタンプの隣にあります。",
+  "search_results.usageFlag4": "フラグはメッセージに追跡のためのマークを付ける一つの方法です。あなたのフラグは個人のもので、他のユーザーからは見えません。",
   "setting_item_max.cancel": "キャンセル",
   "setting_item_max.save": "保存する",
   "setting_item_min.edit": "編集する",
@@ -1595,7 +1604,7 @@
   "sidebar_right_menu.inviteNew": "新しいメンバーを招待",
   "sidebar_right_menu.logout": "ログアウト",
   "sidebar_right_menu.manageMembers": "メンバーを管理する",
-  "sidebar_right_menu.nativeApps": "Download Mattermost Apps",
+  "sidebar_right_menu.nativeApps": "アプリをダウンロードする",
   "sidebar_right_menu.recentMentions": "最近のあなたについての投稿",
   "sidebar_right_menu.report": "問題を報告する",
   "sidebar_right_menu.switch_team": "チームを切り替える",
@@ -1605,7 +1614,7 @@
   "signup.email": "電子メールアドレスとパスワード",
   "signup.gitlab": "GitLabシングルサインオン",
   "signup.google": "Googleアカウント",
-  "signup.ldap": "LDAP認証情報",
+  "signup.ldap": "AD/LDAP認証情報",
   "signup.office365": "Office 365",
   "signup.title": "アカウントを作成する:",
   "signup_team.choose": "あなたの所属チーム: ",
@@ -1647,7 +1656,7 @@
   "signup_user_completed.validEmail": "有効な電子メールアドレスを入力してください",
   "signup_user_completed.welcome": "ようこそ:",
   "signup_user_completed.whatis": "あなたの電子メールアドレスは何ですか?",
-  "signup_user_completed.withLdap": "LDAP認証情報を使っています",
+  "signup_user_completed.withLdap": "AD/LDAP認証情報を使っています",
   "sso_signup.find": "参加しているチームを探す",
   "sso_signup.gitlab": "GitLabアカウントでチームを作成する",
   "sso_signup.google": "Google Appsアカウントでチームを作成する",
@@ -1732,8 +1741,8 @@
   "user.settings.advance.on": "オン",
   "user.settings.advance.preReleaseDesc": "プレビューしたいプリリリース機能をチェックしてください。効果が有効になるのはページを再読み込みした後からです。",
   "user.settings.advance.preReleaseTitle": "プリリリース機能をプレビューする",
-  "user.settings.advance.sendDesc": "有効な場合「Enter」で改行し「Ctrl + Enter」でメッセージを投稿します。",
-  "user.settings.advance.sendTitle": "Ctrl + Enterでメッセージを投稿する",
+  "user.settings.advance.sendDesc": "有効な場合「ENTER」で改行し「CTRL + ENTER」でメッセージを投稿します。",
+  "user.settings.advance.sendTitle": "CTRL + ENTERでメッセージを投稿する",
   "user.settings.advance.slashCmd_autocmp": "スラッシュコマンドの自動補完をするために外部のアプリケーションを有効にする",
   "user.settings.advance.title": "詳細の設定",
   "user.settings.custom_theme.awayIndicator": "離席表示",
@@ -1805,7 +1814,7 @@
   "user.settings.general.emailHelp2": "電子メールはシステム管理者によって無効にされています。有効にされるまで通知電子メールは送信されません。",
   "user.settings.general.emailHelp3": "電子メールアドレスがサインイン、通知、パスワード初期化に使用されます。",
   "user.settings.general.emailHelp4": "{email}に電子メールアドレスの確認用電子メールが送信されました。",
-  "user.settings.general.emailLdapCantUpdate": "LDAPでログインしました。電子メールアドレスは更新できません。通知に使われる電子メールアドレスは{email}です。",
+  "user.settings.general.emailLdapCantUpdate": "AD/LDAPでログインしました。電子メールアドレスは更新できません。通知に使われる電子メールアドレスは{email}です。",
   "user.settings.general.emailMatch": "あなたの入力した新しい電子メールアドレスが一致しません。",
   "user.settings.general.emailOffice365CantUpdate": "Office 365からログインしました。電子メールアドレスは更新できません。通知に使われる電子メールアドレスは{email}です。",
   "user.settings.general.emailSamlCantUpdate": "SAMLでログインしました。電子メールアドレスは更新できません。通知に使われる電子メールアドレスは{email}です。",
@@ -1820,7 +1829,7 @@
   "user.settings.general.lastName": "苗字(ラストネーム)",
   "user.settings.general.loginGitlab": "GitLabでログインしました({email})",
   "user.settings.general.loginGoogle": "Googleでログインしました({email})",
-  "user.settings.general.loginLdap": "LDAPでログインしました({email})",
+  "user.settings.general.loginLdap": "AD/LDAPでログインしました({email})",
   "user.settings.general.loginOffice365": "Office 365でログインしました({email})",
   "user.settings.general.loginSaml": "SAMLでログインしました({email})",
   "user.settings.general.newAddress": "新しい電子メールアドレス: {email}<br />この電子メールアドレスを確認するために電子メールを確認してください。",
@@ -1868,7 +1877,7 @@
   "user.settings.notifications.comments": "返信通知",
   "user.settings.notifications.commentsAny": "開始もしくは参加した返信スレッドへのメッセージについて通知をトリガーします",
   "user.settings.notifications.commentsInfo": "あなたについての投稿がされた時の通知に加えて、返信スレッドについての通知を受け取るかどうかを選択してください。",
-  "user.settings.notifications.commentsNever": "Do not trigger notifications on messages in reply threads unless I'm mentioned",
+  "user.settings.notifications.commentsNever": "あなたについての投稿がない限り、返信スレッドのメッセージについて通知をトリガーしません",
   "user.settings.notifications.commentsRoot": "あなたが開始したスレッドへのメッセージについて通知をトリガーします",
   "user.settings.notifications.desktop": "デスクトップ通知を送る",
   "user.settings.notifications.desktop.allFirefoxForever": "全てのアクティビティーについて無期限に表示します",
@@ -1890,15 +1899,16 @@
   "user.settings.notifications.desktop.title": "デスクトップ通知",
   "user.settings.notifications.desktop.unlimited": "無期限",
   "user.settings.notifications.desktopSounds": "デスクトップ通知音",
+  "user.settings.notifications.email.everyHour": "1時間毎",
+  "user.settings.notifications.email.everyXMinutes": "{count, plural, one {minute} other {{count, number} minutes}}ごと",
+  "user.settings.notifications.email.immediately": "すぐに",
+  "user.settings.notifications.email.never": "通知しない",
+  "user.settings.notifications.email.send": "電子メール通知を送信する",
   "user.settings.notifications.emailBatchingInfo": "選択された時間内に受信された通知は、まとめられ1通の電子メールで送信されます。",
   "user.settings.notifications.emailInfo": "あなたについての投稿とダイレクトメッセージに関して、電子メール通知を送ります。{siteName}から5分間以上離れている場合に送ります。",
   "user.settings.notifications.emailNotifications": "電子メール通知",
-  "user.settings.notifications.everyHour": "1時間毎",
-  "user.settings.notifications.everyXMinutes": "{count, plural, one {minute} other {{count, number} minutes}}ごと",
   "user.settings.notifications.header": "通知",
-  "user.settings.notifications.immediately": "すぐに",
   "user.settings.notifications.info": "デスクトップ通知はFirefox、Safari、Chromeで利用可能です。",
-  "user.settings.notifications.never": "通知しない",
   "user.settings.notifications.noWords": "設定された単語はありません",
   "user.settings.notifications.off": "オフ",
   "user.settings.notifications.on": "オン",
@@ -1937,9 +1947,9 @@
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "Google",
   "user.settings.security.lastUpdated": "最終更新: {date} {time}",
-  "user.settings.security.ldap": "LDAP",
+  "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "GitLabでログインする",
-  "user.settings.security.loginLdap": "LDAPでログインする",
+  "user.settings.security.loginLdap": "AD/LDAPでログインする",
   "user.settings.security.logoutActiveSessions": "アクティブなセッションを見てログアウトする",
   "user.settings.security.method": "サインイン方法",
   "user.settings.security.newPassword": "新しいパスワード",
@@ -1967,7 +1977,7 @@
   "user.settings.security.passwordErrorUppercaseNumberSymbol": "パスワードは少なくとも{min}文字以上にしてください。少なくとも1つの英大文字と数字、記号 (例: \"~!@#$%^&*()\") も必要です。",
   "user.settings.security.passwordErrorUppercaseSymbol": "パスワードは少なくとも{min}文字以上にしてください。少なくとも1つの英大文字と記号 (例: \"~!@#$%^&*()\") も必要です。",
   "user.settings.security.passwordGitlabCantUpdate": "GitLabでログインしています。パスワードは更新できません。",
-  "user.settings.security.passwordLdapCantUpdate": "LDAPでログインしています。パスワードは更新できません。",
+  "user.settings.security.passwordLdapCantUpdate": "AD/LDAPでログインしています。パスワードは更新できません。",
   "user.settings.security.passwordMatchError": "あなたの入力した新しいパスワードが一致しません。",
   "user.settings.security.passwordMinLength": "最小の長さが不正です。プレビューを表示できません。",
   "user.settings.security.retypePassword": "新しいパスワードをもう一度入力してください",
@@ -1975,7 +1985,7 @@
   "user.settings.security.switchEmail": "電子メールアドレスとパスワードでのログインに切り替える",
   "user.settings.security.switchGitlab": "GitLabシングルサインオンに切り替える",
   "user.settings.security.switchGoogle": "Googleシングルサインオンに切り替える",
-  "user.settings.security.switchLdap": "LDAPシングルサインオンに切り替える",
+  "user.settings.security.switchLdap": "AD/LDAPシングルサインオンに切り替える",
   "user.settings.security.switchOffice365": "Office 365のシングルサインオンに切り替える",
   "user.settings.security.switchSaml": "SAMLシングルサインオンに切り替える",
   "user.settings.security.title": "セキュリティーの設定",
diff --git a/webapp/i18n/ko.json b/webapp/i18n/ko.json
index 1fd729c29..55c06d67b 100644
--- a/webapp/i18n/ko.json
+++ b/webapp/i18n/ko.json
@@ -4,16 +4,16 @@
   "about.database": "데이터베이스:",
   "about.date": "빌드 일자:",
   "about.enterpriseEditionLearn": "엔터프라이즈 에디션에 대한 자세한 정보 ",
-  "about.enterpriseEditionSt": "개인 방화벽 안에 구축 가능한 현대적인 커뮤니케이션",
-  "about.enterpriseEditione1": "엔터프라이즈 에디션 E1",
+  "about.enterpriseEditionSt": "개인 방화벽 안에 구축 가능한 현대적인 커뮤니케이션 플랫폼",
+  "about.enterpriseEditione1": "엔터프라이즈 에디션",
   "about.hash": "빌드 해쉬:",
   "about.hashee": "EE 빌드 해쉬:",
   "about.licensed": "다음 사용자에게 허가되었습니다:",
   "about.number": "빌드 넘버:",
   "about.teamEditionLearn": "Mattermost 커뮤니티에 참여 ",
-  "about.teamEditionSt": "모든 커뮤니케이션 활동을 한 곳에서, 쉽게 접근하고 빠르게 검색할 수 있습니다.",
-  "about.teamEditiont0": "팀 에디션 T0",
-  "about.teamEditiont1": "엔터프라이즈 에디션 E1",
+  "about.teamEditionSt": "모든 팀 커뮤니케이션 활동을 한 곳에 모아 쉽고 빠르게 접근할 수 있습니다.",
+  "about.teamEditiont0": "팀 에디션",
+  "about.teamEditiont1": "엔터프라이즈 에디션",
   "about.title": "Mattermost에 대해",
   "about.version": "버전:",
   "access_history.title": "접근 기록",
@@ -128,7 +128,7 @@
   "add_outgoing_webhook.doneHelp": "Your outgoing webhook has been set up. The following token will be sent in the outgoing payload. Please use it to verify the request came from your Mattermost team (see <a href=\"https://docs.mattermost.com/developer/webhooks-outgoing.html\">documentation</a> for further details).",
   "add_outgoing_webhook.name": "이름",
   "add_outgoing_webhook.save": "저장",
-  "add_outgoing_webhook.token": "<b>Token</b>: {token}",
+  "add_outgoing_webhook.token": "<b>토큰</b>: {token}",
   "add_outgoing_webhook.triggerWords": "트리거 단어 (줄 당 하나씩 입력합니다)",
   "add_outgoing_webhook.triggerWords.help": "Messages that start with one of the specified words will trigger the outgoing webhook. Optional if Channel is selected.",
   "add_outgoing_webhook.triggerWordsOrChannelRequired": "유효한 채널과 트리거 단어 목록을 입력하세요",
@@ -139,7 +139,7 @@
   "admin.advance.cluster": "High Availability (Beta)",
   "admin.audits.reload": "Reload User Activity Logs",
   "admin.audits.title": "User Activity Logs",
-  "admin.authentication.email": "Email Auth",
+  "admin.authentication.email": "이메일 인증",
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
@@ -194,7 +194,7 @@
   "admin.compliance_table.params": "Params",
   "admin.compliance_table.records": "기록",
   "admin.compliance_table.status": "상태",
-  "admin.compliance_table.timestamp": "Timestamp",
+  "admin.compliance_table.timestamp": "타임스탬프",
   "admin.compliance_table.type": "종류",
   "admin.compliance_table.userId": "Requested By",
   "admin.connectionSecurityNone": "None",
@@ -244,15 +244,15 @@
   "admin.email.fullPushNotification": "Send full message snippet",
   "admin.email.genericPushNotification": "Send generic description with user and channel names",
   "admin.email.inviteSaltDescription": "32-character salt added to signing of email invites. Randomly generated on install. Click \"Regenerate\" to create new salt.",
-  "admin.email.inviteSaltExample": "예시: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
+  "admin.email.inviteSaltExample": "예시 \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.inviteSaltTitle": "Email Invite Salt:",
   "admin.email.mhpns": "Use encrypted, production-quality HPNS connection to iOS and Android apps",
   "admin.email.mhpnsHelp": "iTunes에서 <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target=\"_blank\">Mattermost iOS 앱</a> 다운로드. Google Play에서 <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target=\"_blank\">Mattermost Android 앱</a> 다운로드.  <a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target=\"_blank\">HPNS</a>에 대해 알아보기.",
   "admin.email.mtpns": "IOS, Android 앱을 TPNS와 사용합니다.",
   "admin.email.mtpnsHelp": "iTunes에서 <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target=\"_blank\">Mattermost iOS 앱</a> 다운로드. Google Play에서 <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target=\"_blank\">Mattermost Android 앱</a> 다운로드. <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target=\"_blank\">TPNS</a>에 대해 알아보기.",
-  "admin.email.nofificationOrganizationExample": "예시. \"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\"",
+  "admin.email.nofificationOrganizationExample": "예시 \"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\"",
   "admin.email.notificationDisplayDescription": "Display name on email account used when sending notification emails from Mattermost.",
-  "admin.email.notificationDisplayExample": "Ex: \"Mattermost Notification\", \"System\", \"No-Reply\"",
+  "admin.email.notificationDisplayExample": "예시 \"Mattermost Notification\", \"System\", \"No-Reply\"",
   "admin.email.notificationDisplayTitle": "알림 표시명:",
   "admin.email.notificationEmailDescription": "Email address displayed on email account used when sending notification emails from Mattermost.",
   "admin.email.notificationEmailExample": "예시: \"mattermost@yourcompany.com\", \"admin@yourcompany.com\"",
@@ -262,7 +262,7 @@
   "admin.email.notificationsDescription": "Typically set to true in production. When true, Mattermost attempts to send email notifications. Developers may set this field to false to skip email setup for faster development.<br />Setting this to true removes the Preview Mode banner (requires logging out and logging back in after setting is changed).",
   "admin.email.notificationsTitle": "Enable Email Notifications: ",
   "admin.email.passwordSaltDescription": "32-character salt added to signing of password reset emails. Randomly generated on install. Click \"Regenerate\" to create new salt.",
-  "admin.email.passwordSaltExample": "예시: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
+  "admin.email.passwordSaltExample": "예시 \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "Password Reset Salt:",
   "admin.email.pushContentDesc": "Selecting \"Send generic description with user and channel names\" provides push notifications with generic messages, including names of users and channels but no specific details from the message text.<br /><br />Selecting \"Send full message snippet\" sends excerpts from messages triggering notifications with specifics and may include confidential information sent in messages. If your Push Notification Service is outside your firewall, it is HIGHLY RECOMMENDED this option only be used with an \"https\" protocol to encrypt the connection.",
   "admin.email.pushContentTitle": "Push Notification Contents:",
@@ -270,44 +270,44 @@
   "admin.email.pushOff": "Do not send push notifications",
   "admin.email.pushOffHelp": "Please see <a href=\"http://docs.mattermost.com/deployment/push.html#push-notifications-and-mobile-devices\" target=\"_blank\">documentation on push notifications</a> to learn more about setup options.",
   "admin.email.pushServerDesc": "Location of Mattermost push notification service you can set up behind your firewall using https://github.com/mattermost/push-proxy. For testing you can use http://push-test.mattermost.com, which connects to the sample Mattermost iOS app in the public Apple AppStore. Please do not use test service for production deployments.",
-  "admin.email.pushServerEx": "E.g.: \"http://push-test.mattermost.com\"",
-  "admin.email.pushServerTitle": "Push Notification Server:",
+  "admin.email.pushServerEx": "예시 \"http://push-test.mattermost.com\"",
+  "admin.email.pushServerTitle": "푸시 알림 서버:",
   "admin.email.pushTitle": "Enable Push Notifications: ",
   "admin.email.requireVerificationDescription": "Typically set to true in production. When true, Mattermost requires email verification after account creation prior to allowing login. Developers may set this field to false so skip sending verification emails for faster development.",
   "admin.email.requireVerificationTitle": "Require Email Verification: ",
   "admin.email.selfPush": "Manually enter Push Notification Service location",
   "admin.email.smtpPasswordDescription": " Obtain this credential from administrator setting up your email server.",
-  "admin.email.smtpPasswordExample": "Ex: \"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.email.smtpPasswordTitle": "SMTP Server Password:",
+  "admin.email.smtpPasswordExample": "예시 \"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
+  "admin.email.smtpPasswordTitle": "SMTP 서버 비밀번호:",
   "admin.email.smtpPortDescription": "Port of SMTP email server.",
-  "admin.email.smtpPortExample": "Ex: \"25\", \"465\"",
-  "admin.email.smtpPortTitle": "SMTP Server Port:",
+  "admin.email.smtpPortExample": "예시 \"25\", \"465\"",
+  "admin.email.smtpPortTitle": "SMTP 서버 포트:",
   "admin.email.smtpServerDescription": "Location of SMTP email server.",
-  "admin.email.smtpServerExample": "Ex: \"smtp.yourcompany.com\", \"email-smtp.us-east-1.amazonaws.com\"",
-  "admin.email.smtpServerTitle": "SMTP Server:",
+  "admin.email.smtpServerExample": "예시 \"smtp.yourcompany.com\", \"email-smtp.us-east-1.amazonaws.com\"",
+  "admin.email.smtpServerTitle": "SMTP 서버:",
   "admin.email.smtpUsernameDescription": " Obtain this credential from administrator setting up your email server.",
-  "admin.email.smtpUsernameExample": "Ex: \"admin@yourcompany.com\", \"AKIADTOVBGERKLCBV\"",
-  "admin.email.smtpUsernameTitle": "SMTP Server Username:",
+  "admin.email.smtpUsernameExample": "예시 \"admin@yourcompany.com\", \"AKIADTOVBGERKLCBV\"",
+  "admin.email.smtpUsernameTitle": "SMTP 서버 사용자명:",
   "admin.email.testing": "테스트 중...",
   "admin.false": "비활성화",
   "admin.file_upload.chooseFile": "파일 선택",
-  "admin.file_upload.noFile": "No file uploaded",
-  "admin.file_upload.uploadFile": "Upload",
+  "admin.file_upload.noFile": "업로드 된 파일이 없습니다.",
+  "admin.file_upload.uploadFile": "업로드",
   "admin.files.images": "이미지",
   "admin.files.storage": "저장소",
-  "admin.general.configuration": "Configuration",
-  "admin.general.localization": "Localization",
+  "admin.general.configuration": "환경설정",
+  "admin.general.localization": "지역화",
   "admin.general.localization.availableLocalesDescription": "Set which languages are available for users in Account Settings (leave this field blank to have all supported languages available). If you’re manually adding new languages, the <strong>Default Client Language</strong> must be added before saving this setting.<br /><br />Would like to help with translations? Join the <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> to contribute.",
   "admin.general.localization.availableLocalesTitle": "Available Languages:",
   "admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.",
-  "admin.general.localization.clientLocaleTitle": "Default Client Language:",
+  "admin.general.localization.clientLocaleTitle": "클라이언트 기본 언어:",
   "admin.general.localization.serverLocaleDescription": "Default language for system messages and logs. Changing this will require a server restart before taking effect.",
-  "admin.general.localization.serverLocaleTitle": "Default Server Language:",
+  "admin.general.localization.serverLocaleTitle": "서버 기본 언어:",
   "admin.general.log": "로그",
   "admin.general.policy": "정책",
   "admin.general.policy.permissionsAdmin": "Team and System Admins",
-  "admin.general.policy.permissionsAll": "All team members",
-  "admin.general.policy.permissionsSystemAdmin": "System Admins",
+  "admin.general.policy.permissionsAll": "모든 팀 회원",
+  "admin.general.policy.permissionsSystemAdmin": "시스템 관리자",
   "admin.general.policy.restrictPrivateChannelManagementDescription": "Set policy on who can create, delete, rename, and set the header or purpose for private groups.",
   "admin.general.policy.restrictPrivateChannelManagementTitle": "Enable private group management permissions for:",
   "admin.general.policy.restrictPublicChannelManagementDescription": "Set policy on who can create, delete, rename, and set the header or purpose for public channels.",
@@ -315,66 +315,66 @@
   "admin.general.policy.teamInviteDescription": "Set policy on who can invite others to a team using <b>Invite New Member</b> to invite new users by email, or the <b>Get Team Invite Link</b> options from the Main Menu. If <b>Get Team Invite Link</b> is used to share a link, you can expire the invite code from <b>Team Settings</b> > <b>Invite Code</b> after the desired users join the team.",
   "admin.general.policy.teamInviteTitle": "Enable sending team invites from:",
   "admin.general.privacy": "Privacy",
-  "admin.general.usersAndTeams": "Users and Teams",
+  "admin.general.usersAndTeams": "팀과 사용자",
   "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 \"Application Secret Key\" and \"Application 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.",
   "admin.gitlab.authExample": "예: \"https://<your-gitlab-url>/api/v3/user\"",
-  "admin.gitlab.authTitle": "Auth Endpoint:",
+  "admin.gitlab.authTitle": "인증 엔드포인트:",
   "admin.gitlab.clientIdDescription": "Obtain this value via the instructions above for logging into GitLab",
   "admin.gitlab.clientIdExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.gitlab.clientIdTitle": "Application ID:",
+  "admin.gitlab.clientIdTitle": "애플리케이션 ID:",
   "admin.gitlab.clientSecretExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.gitlab.clientSecretTitle": "Application Secret Key:",
   "admin.gitlab.enableDescription": "When true, Mattermost allows team creation and account signup using GitLab OAuth.",
   "admin.gitlab.enableTitle": "Enable authentication with GitLab: ",
-  "admin.gitlab.settingsTitle": "GitLab Settings",
+  "admin.gitlab.settingsTitle": "GitLab 설정",
   "admin.gitlab.tokenDescription": "GitLab 연동을 위해 다음 URL https://<your-gitlab-url>/api/v3/user 을 입력하십시오.   서버 설정에 따라 HTTP와 HTTPS 중 올바른 것을 사용하여야 합니다.",
-  "admin.gitlab.tokenExample": "예: \"https://<your-gitlab-url>/api/v3/user\"",
-  "admin.gitlab.tokenTitle": "Token Endpoint:",
+  "admin.gitlab.tokenExample": "예시 \"https://<your-gitlab-url>/api/v3/user\"",
+  "admin.gitlab.tokenTitle": "토큰 엔드포인트:",
   "admin.gitlab.userDescription": "GitLab 연동을 위해 다음 URL https://<your-gitlab-url>/api/v3/user 을 입력하십시오.   서버 설정에 따라 HTTP와 HTTPS 중 올바른 것을 사용하여야 합니다.",
-  "admin.gitlab.userExample": "예: \"https://<your-gitlab-url>/api/v3/user\"",
+  "admin.gitlab.userExample": "예시 \"https://<your-gitlab-url>/api/v3/user\"",
   "admin.gitlab.userTitle": "사용자 API 엔드포인트:",
   "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>Log in</a> to your Google account.</li><li>Go to <a href='https://console.developers.google.com'>https://console.developers.google.com</a>, click <strong>Credentials</strong> in the left hand sidebar and enter \"Mattermost - your-company-name\" as the <strong>Project Name</strong>, then click <strong>Create</strong>.</li><li>Click the <strong>OAuth consent screen</strong> header and enter \"Mattermost\" as the <strong>Product name shown to users</strong>, then click <strong>Save</strong>.</li><li>Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.</li><li>Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong>your-mattermost-url/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.</li><li>Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.</li><li>Finally, go to <a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> and click <strong>Enable</strong>. This might take a few minutes to propagate through Google's systems.</li></ol>",
   "admin.google.authTitle": "Auth Endpoint:",
   "admin.google.clientIdDescription": "The Client ID you received when registering your application with Google.",
   "admin.google.clientIdExample": "Ex \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
-  "admin.google.clientIdTitle": "Client ID",
+  "admin.google.clientIdTitle": "클라이언트 ID",
   "admin.google.clientSecretDescription": "The Client Secret you received when registering your application with Google.",
-  "admin.google.clientSecretExample": "Ex \"H8sz0Az-dDs2p15-7QzD231\"",
+  "admin.google.clientSecretExample": "예시 \"H8sz0Az-dDs2p15-7QzD231\"",
   "admin.google.clientSecretTitle": "Client Secret",
   "admin.google.tokenTitle": "Token Endpoint:",
   "admin.google.userTitle": "사용자 API 엔드포인트:",
   "admin.image.amazonS3BucketDescription": "Name you selected for your S3 bucket in AWS.",
-  "admin.image.amazonS3BucketExample": "Ex \"mattermost-media\"",
+  "admin.image.amazonS3BucketExample": "예시 \"mattermost-media\"",
   "admin.image.amazonS3BucketTitle": "Amazon S3 Bucket:",
   "admin.image.amazonS3IdDescription": "Obtain this credential from your Amazon EC2 administrator.",
-  "admin.image.amazonS3IdExample": "Ex \"AKIADTOVBGERKLCBV\"",
+  "admin.image.amazonS3IdExample": "예시 \"AKIADTOVBGERKLCBV\"",
   "admin.image.amazonS3IdTitle": "Amazon S3 Access Key ID:",
   "admin.image.amazonS3RegionDescription": "AWS region you selected for creating your S3 bucket.",
-  "admin.image.amazonS3RegionExample": "Ex \"us-east-1\"",
+  "admin.image.amazonS3RegionExample": "예시 \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Amazon S3 Region:",
   "admin.image.amazonS3SecretDescription": "Obtain this credential from your Amazon EC2 administrator.",
-  "admin.image.amazonS3SecretExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
+  "admin.image.amazonS3SecretExample": "예시 \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.image.amazonS3SecretTitle": "Amazon S3 Secret Access Key:",
   "admin.image.localDescription": "Directory to which files and images are written. If blank, defaults to ./data/.",
   "admin.image.localExample": "예시: \"./data/\"",
-  "admin.image.localTitle": "Local Storage Directory:",
+  "admin.image.localTitle": "로컬 저장소 경로:",
   "admin.image.maxFileSizeDescription": "Maximum file size for message attachments in megabytes. Caution: Verify server memory can support your setting choice. Large file sizes increase the risk of server crashes and failed uploads due to network interruptions.",
   "admin.image.maxFileSizeExample": "50",
-  "admin.image.maxFileSizeTitle": "Maximum File Size:",
+  "admin.image.maxFileSizeTitle": "최대 파일 크기:",
   "admin.image.previewHeightDescription": "Maximum height of preview image (\"0\": Sets to auto-size). Updating this value changes how preview images render in future, but does not change images created in the past.",
-  "admin.image.previewHeightExample": "Ex \"0\"",
-  "admin.image.previewHeightTitle": "Image Preview Height:",
+  "admin.image.previewHeightExample": "예시 \"0\"",
+  "admin.image.previewHeightTitle": "이미지 미리보기 높이:",
   "admin.image.previewWidthDescription": "Maximum width of preview image. Updating this value changes how preview images render in future, but does not change images created in the past.",
-  "admin.image.previewWidthExample": "Ex \"1024\"",
-  "admin.image.previewWidthTitle": "Image Preview Width:",
+  "admin.image.previewWidthExample": "예시 \"1024\"",
+  "admin.image.previewWidthTitle": "이미지 미리보기 너비:",
   "admin.image.profileHeightDescription": "Height of profile picture.",
-  "admin.image.profileHeightExample": "Ex \"0\"",
-  "admin.image.profileHeightTitle": "Profile Picture Height:",
+  "admin.image.profileHeightExample": "예시 \"0\"",
+  "admin.image.profileHeightTitle": "프로필 사진 높이:",
   "admin.image.profileWidthDescription": "Width of profile picture.",
-  "admin.image.profileWidthExample": "Ex \"1024\"",
-  "admin.image.profileWidthTitle": "Profile Picture Width:",
+  "admin.image.profileWidthExample": "예시 \"1024\"",
+  "admin.image.profileWidthTitle": "프로필 사진 너비:",
   "admin.image.publicLinkDescription": "32-character salt added to signing of public image links. Randomly generated on install. Click \"Regenerate\" to create new salt.",
   "admin.image.publicLinkExample": "Ex \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "Public Link Salt:",
@@ -391,7 +391,7 @@
   "admin.image.thumbWidthExample": "Ex \"120\"",
   "admin.image.thumbWidthTitle": "Attachment Thumbnail Width:",
   "admin.integrations.custom": "Custom Integrations",
-  "admin.integrations.external": "External Services",
+  "admin.integrations.external": "외부 서비스",
   "admin.ldap.baseDesc": "The Base DN is the Distinguished Name of the location where Mattermost should start its search for users in the LDAP tree.",
   "admin.ldap.baseEx": "Ex \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "BaseDN:",
@@ -401,74 +401,78 @@
   "admin.ldap.bindUserTitle": "Bind Username:",
   "admin.ldap.emailAttrDesc": "The attribute in the LDAP server that will be used to populate the email addresses of users in Mattermost.",
   "admin.ldap.emailAttrEx": "Ex \"mail\" or \"userPrincipalName\"",
-  "admin.ldap.emailAttrTitle": "Email Attribute:",
-  "admin.ldap.enableDesc": "When true, Mattermost allows login using LDAP",
-  "admin.ldap.enableTitle": "Enable sign-in with LDAP:",
+  "admin.ldap.emailAttrTitle": "이메일 속성:",
+  "admin.ldap.enableDesc": "활성화하면, LDAP으로 접속 할 수 있습니다.",
+  "admin.ldap.enableTitle": "LDAP으로 접속을 허용:",
   "admin.ldap.firstnameAttrDesc": "(Optional) The attribute in the LDAP server that will be used to populate the nickname of users in Mattermost.",
   "admin.ldap.firstnameAttrEx": "Ex \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "First Name Attribute",
   "admin.ldap.idAttrDesc": "The attribute in the LDAP server that will be used as a unique identifier in Mattermost. It should be an LDAP attribute with a value that does not change, such as username or uid. If a user’s ID Attribute changes, it will create a new Mattermost account unassociated with their old one. This is the value used to log in to Mattermost in the \"LDAP Username\" field on the sign in page. Normally this attribute is the same as the “Username Attribute” field above. If your team typically uses domain\\username to sign in to other services with LDAP, you may choose to put domain\\username in this field to maintain consistency between sites.",
-  "admin.ldap.idAttrEx": "Ex \"sAMAccountName\"",
-  "admin.ldap.idAttrTitle": "ID Attribute: ",
+  "admin.ldap.idAttrEx": "예시 \"sAMAccountName\"",
+  "admin.ldap.idAttrTitle": "ID 속성: ",
   "admin.ldap.lastnameAttrDesc": "(Optional) The attribute in the LDAP server that will be used to populate the nickname of users in Mattermost.",
-  "admin.ldap.lastnameAttrEx": "Ex \"sn\"",
+  "admin.ldap.lastnameAttrEx": "예시 \"sn\"",
   "admin.ldap.lastnameAttrTitle": "Last Name Attribute:",
+  "admin.ldap.ldap_test_button": "AD/LDAP Test",
   "admin.ldap.loginNameDesc": "The placeholder text that appears in the login field on the login page. Defaults to \"LDAP Username\".",
-  "admin.ldap.loginNameEx": "Ex \"LDAP Username\"",
+  "admin.ldap.loginNameEx": "예시 \"LDAP Username\"",
   "admin.ldap.loginNameTitle": "Login Field Name:",
-  "admin.ldap.maxPageSizeEx": "Ex \"2000\"",
+  "admin.ldap.maxPageSizeEx": "예시 \"2000\"",
   "admin.ldap.maxPageSizeHelpText": "The maximum number of users the Mattermost server will request from the LDAP server at one time. 0 is unlimited.",
   "admin.ldap.maxPageSizeTitle": "Maximum Page Size",
   "admin.ldap.nicknameAttrDesc": "(Optional) The attribute in the LDAP server that will be used to populate the nickname of users in Mattermost.",
-  "admin.ldap.nicknameAttrEx": "Ex \"nickname\"",
-  "admin.ldap.nicknameAttrTitle": "Nickname Attribute:",
+  "admin.ldap.nicknameAttrEx": "예시 \"nickname\"",
+  "admin.ldap.nicknameAttrTitle": "별명 속성:",
   "admin.ldap.noLicense": "<h4 class=\"banner__heading\">Note:</h4><p>Compliance 는 엔터프라이즈 에디션의 기능입니다. 현재 라이센스는 Compliance 기능을 지원하지 않습니다. <a href=\"http://mattermost.com\" target=\"_blank\">이 곳</a>에서 엔터프라이즈 라이센스에 대한 정보를 확인하세요.</p>",
   "admin.ldap.portDesc": "The port Mattermost will use to connect to the LDAP server. Default is 389.",
   "admin.ldap.portEx": "Ex \"389\"",
   "admin.ldap.portTitle": "LDAP 포트:",
   "admin.ldap.queryDesc": "The timeout value for queries to the LDAP server. Increase if you are getting timeout errors caused by a slow LDAP server.",
   "admin.ldap.queryEx": "Ex \"60\"",
-  "admin.ldap.queryTitle": "Query Timeout (seconds):",
-  "admin.ldap.serverDesc": "The domain or IP address of LDAP server.",
+  "admin.ldap.queryTitle": "Query Timeout (초):",
+  "admin.ldap.serverDesc": "LDAP 서버의 도메인 또는 IP 주소",
   "admin.ldap.serverEx": "Ex \"10.0.0.23\"",
   "admin.ldap.serverTitle": "LDAP 서버:",
   "admin.ldap.skipCertificateVerification": "Skip Certificate Verification",
   "admin.ldap.skipCertificateVerificationDesc": "Skips the certificate verification step for TLS or STARTTLS connections. Not recommended for production environments where TLS is required. For testing only.",
-  "admin.ldap.syncFailure": "Sync Failure: {error}",
+  "admin.ldap.syncFailure": "동기화 실패: {error}",
   "admin.ldap.syncIntervalHelpText": "LDAP Synchronization updates Mattermost user information to reflect updates on the LDAP server. For example, when a user’s name changes on the LDAP server, the change updates in Mattermost when synchronization is performed. Accounts removed from or disabled in the LDAP server have their Mattermost accounts set to “Inactive” and have their account sessions revoked. Mattermost performs synchronization on the interval entered. For example, if 60 is entered, Mattermost synchronizes every 60 minutes.",
-  "admin.ldap.syncIntervalTitle": "Synchronization Interval (minutes)",
-  "admin.ldap.syncNowHelpText": "Initiates an LDAP synchronization immediately.",
-  "admin.ldap.sync_button": "LDAP Synchronize Now",
-  "admin.ldap.testFailure": "LDAP Test Failure: {error}",
-  "admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the LDAP server specified. See log file for more detailed error messages.",
+  "admin.ldap.syncIntervalTitle": "동기화 간격 (분)",
+  "admin.ldap.syncNowHelpText": "지금 바로 LDAP 동기화를 초기화",
+  "admin.ldap.sync_button": "지금 LDAP 동기화하기",
+  "admin.ldap.testFailure": "AD/LDAP 테스트 실패: {error}",
+  "admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the AD/LDAP server specified. See log file for more detailed error messages.",
+  "admin.ldap.testSuccess": "AD/LDAP Test Successful",
   "admin.ldap.uernameAttrDesc": "The attribute in the LDAP server that will be used to populate the username field in Mattermost. This may be the same as the ID Attribute.",
   "admin.ldap.userFilterDisc": "(Optional) Enter an LDAP Filter to use when searching for user objects. Only the users selected by the query will be able to access Mattermost. For Active Directory, the query to filter out disabled users is (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
-  "admin.ldap.userFilterEx": "Ex. \"(objectClass=user)\"",
-  "admin.ldap.userFilterTitle": "User Filter:",
-  "admin.ldap.usernameAttrEx": "Ex \"sAMAccountName\"",
-  "admin.ldap.usernameAttrTitle": "Username Attribute:",
+  "admin.ldap.userFilterEx": "예시 \"(objectClass=user)\"",
+  "admin.ldap.userFilterTitle": "사용자 필터:",
+  "admin.ldap.usernameAttrEx": "예시 \"sAMAccountName\"",
+  "admin.ldap.usernameAttrTitle": "사용자명 속성:",
   "admin.license.choose": "파일 선택",
   "admin.license.chooseFile": "파일 선택",
-  "admin.license.edition": "Edition: ",
+  "admin.license.edition": "에디션: ",
   "admin.license.key": "라이센스 키: ",
-  "admin.license.keyRemove": "Remove Enterprise License and Downgrade Server",
-  "admin.license.noFile": "No file uploaded",
-  "admin.license.removing": "Removing License...",
-  "admin.license.title": "Edition and License",
+  "admin.license.keyRemove": "엔터프라이즈 라이센스를 제거하고 서버를 다운그레이드 합니다.",
+  "admin.license.noFile": "업로드된 파일이 없습니다.",
+  "admin.license.removing": "라이센스 제거 중...",
+  "admin.license.title": "라이센스와 에디션",
   "admin.license.type": "라이센스: ",
-  "admin.license.upload": "Upload",
+  "admin.license.upload": "업로드",
   "admin.license.uploadDesc": "Upload a license key for Mattermost Enterprise Edition to upgrade this server. <a href=\"http://mattermost.com\" target=\"_blank\">Visit us online</a> to learn more about the benefits of Enterprise Edition or to purchase a key.",
-  "admin.license.uploading": "Uploading License...",
+  "admin.license.uploading": "라이센스 업로드 중...",
   "admin.log.consoleDescription": "Typically set to false in production. Developers may set this field to true to output log messages to console based on the console level option.  If true, server writes messages to the standard output stream (stdout).",
   "admin.log.consoleTitle": "Output logs to console: ",
+  "admin.log.enableDiagnostics": "Enable Diagnostics and Error Reporting:",
+  "admin.log.enableDiagnosticsDescription": "Enable this feature to improve the quality and performance of Mattermost by sending error reporting and diagnostic information to Mattermost, Inc. Read our <a href=\"https://about.mattermost.com/default-privacy-policy/\" target=\"_blank\">privacy policy</a> to learn more.",
   "admin.log.enableWebhookDebugging": "Webhook 디버깅 활성화:",
-  "admin.log.enableWebhookDebuggingDescription": "false로 설정하면 incoming webhook의 모든 요청 내용이 디버그 로그에 남는 것을 막을 수 있습니다.",
+  "admin.log.enableWebhookDebuggingDescription": "비활성화하면 incoming webhook의 모든 요청 내용이 디버그 로그에 남는 것을 막을 수 있습니다.",
   "admin.log.fileDescription": "Typically set to true in production.  When true, log files are written to the log file specified in file location field below.",
   "admin.log.fileLevelDescription": "This setting determines the level of detail at which log events are written to the log file. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues.",
-  "admin.log.fileLevelTitle": "File Log Level:",
+  "admin.log.fileLevelTitle": "파일 로그 레벨:",
   "admin.log.fileTitle": "Output logs to file: ",
-  "admin.log.formatDateLong": "Date (2006/01/02)",
-  "admin.log.formatDateShort": "Date (01/02/06)",
+  "admin.log.formatDateLong": "날짜 (2006/01/02)",
+  "admin.log.formatDateShort": "날짜 (01/02/06)",
   "admin.log.formatDescription": "Format of log message output. If blank will be set to \"[%D %T] [%L] %M\", where:",
   "admin.log.formatLevel": "Level (DEBG, INFO, EROR)",
   "admin.log.formatMessage": "메시지",
@@ -479,8 +483,8 @@
   "admin.log.levelDescription": "This setting determines the level of detail at which log events are written to the console. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues.",
   "admin.log.levelTitle": "Console Log Level:",
   "admin.log.locationDescription": "File to which log files are written. If blank, will be set to ./logs/mattermost, which writes logs to mattermost.log. Log rotation is enabled and every 10,000 lines of log information is written to new files stored in the same directory, for example mattermost.2015-09-23.001, mattermost.2015-09-23.002, and so forth.",
-  "admin.log.locationPlaceholder": "Enter your file location",
-  "admin.log.locationTitle": "File Log Directory:",
+  "admin.log.locationPlaceholder": "파일 위치를 지정하세요.",
+  "admin.log.locationTitle": "파일 로그 경로:",
   "admin.log.logSettings": "로그 설정",
   "admin.logs.reload": "새로 고침",
   "admin.logs.title": "서버 로그",
@@ -506,7 +510,7 @@
   "admin.office365.clientSecretDescription": "The Application Secret Password you generated when registering your application with Microsoft.",
   "admin.office365.clientSecretExample": "Ex \"shAieM47sNBfgl20f8ci294\"",
   "admin.office365.clientSecretTitle": "Application Secret Password:",
-  "admin.office365.tokenTitle": "Token Endpoint:",
+  "admin.office365.tokenTitle": "Token 엔드포인트:",
   "admin.office365.userTitle": "사용자 API 엔드포인트:",
   "admin.password.lowercase": "At least one lowercase letter",
   "admin.password.minimumLength": "Minimum Password Length:",
@@ -522,7 +526,7 @@
   "admin.privacy.showEmailTitle": "Show Email Address: ",
   "admin.privacy.showFullNameDescription": "When false, hides full name of users from other users, including team owners and team administrators. Username is shown in place of full name.",
   "admin.privacy.showFullNameTitle": "Show Full Name: ",
-  "admin.rate.enableLimiterDescription": "true로 설정하면 API 호출이 아래에 설정된 속도로 조절됩니다.",
+  "admin.rate.enableLimiterDescription": "활성화하면 API 호출이 아래에 설정된 속도로 조절됩니다.",
   "admin.rate.enableLimiterTitle": "Enable Rate Limiting: ",
   "admin.rate.httpHeaderDescription": "When filled in, vary rate limiting by HTTP header field specified (e.g. when configuring NGINX set to \"X-Real-IP\", when configuring AmazonELB set to \"X-Forwarded-For\").",
   "admin.rate.httpHeaderExample": "Ex \"X-Real-IP\", \"X-Forwarded-For\"",
@@ -548,7 +552,7 @@
   "admin.reload.reloadDescription": "Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating \"config.json\" to the new desired configuration and using the <b>Reload Configuration from Disk</b> feature to load the new settings while the server is running. The administrator should then use the <a href=\"../advanced/database\"><b>Database > Recycle Database Connections</b></a> feature to recycle the database connections based on the new settings.",
   "admin.reload.reloadFail": "연결을 실패했습니다: {error}",
   "admin.reset_password.close": "닫기",
-  "admin.reset_password.newPassword": "New Password",
+  "admin.reset_password.newPassword": "새 비밀번호",
   "admin.reset_password.select": "선택",
   "admin.reset_password.submit": "최소 {chars}글자 이상 입력하세요.",
   "admin.reset_password.titleReset": "Reset Password",
@@ -636,8 +640,8 @@
   "admin.service.iconTitle": "Enable integrations to override profile picture icons:",
   "admin.service.insecureTlsDesc": "true로 설정하면 Mattermost에서 밖으로 나가는 어떤 HTTPS 요청에 대해서도 인증서 검사를 하지 않습니다. 예를 들어, self-signed TLS 인증서를 아무 도메인 이름에 대해 설정하더라도 HTTPS 통신을 진행합니다. 이 설정을 켤 때는 MITM 공격에 주의하세요.",
   "admin.service.insecureTlsTitle": "Enable Insecure Outgoing Connections: ",
-  "admin.service.integrationAdmin": "Restrict creating integrations to Team and System Admins: ",
-  "admin.service.integrationAdminDesc": "When true, user created integrations can only be created by admins.",
+  "admin.service.integrationAdmin": "Restrict managing integrations to Admins:",
+  "admin.service.integrationAdminDesc": "When true, webhooks and slash commands can only be created, edited and viewed by Team and System Admins, and OAuth 2.0 applications by System Admins. Integrations are available to all users after they have been created by the Admin.",
   "admin.service.listenAddress": "Listen Address:",
   "admin.service.listenDescription": "The address to which to bind and listen. Entering \":8065\" will bind to all interfaces or you can choose one like \"127.0.0.1:8065\".  Changing this will require a server restart before taking effect.",
   "admin.service.listenExample": "Ex \":8065\"",
@@ -658,7 +662,7 @@
   "admin.service.sessionCacheDesc": "The number of minutes to cache a session in memory.",
   "admin.service.sessionDaysEx": "Ex \"30\"",
   "admin.service.siteURL": "Site URL:",
-  "admin.service.siteURLDescription": "The URL, including port number and protocol, that users will use to access Mattermost. Leave blank to automatically configure based on incoming traffic.",
+  "admin.service.siteURLDescription": "The URL, including port number and protocol, that users will use to access Mattermost. This field can be left blank unless you are configuring email batching in <b>Notifications > Email</b>. When blank, the URL is automatically configured based on incoming traffic.",
   "admin.service.siteURLExample": "Ex \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "Session length for mobile apps (days):",
   "admin.service.ssoSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.",
@@ -691,12 +695,12 @@
   "admin.sidebar.integrations": "통합",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "지원",
-  "admin.sidebar.license": "Edition and License",
+  "admin.sidebar.license": "라이센스와 에디션",
   "admin.sidebar.localization": "지역화",
   "admin.sidebar.logging": "로그",
   "admin.sidebar.login": "로그인",
   "admin.sidebar.logs": "서버 로그 보기",
-  "admin.sidebar.nativeAppLinks": "Mattermost App Links",
+  "admin.sidebar.nativeAppLinks": "Mattermost 애플리케이션 링크",
   "admin.sidebar.notifications": "알림",
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "기타",
@@ -804,7 +808,7 @@
   "admin.user_item.confirmDemoteRoleTitle": "Confirm demotion from System Admin role",
   "admin.user_item.confirmDemotion": "Confirm Demotion",
   "admin.user_item.confirmDemotionCmd": "platform -assign_role -team_name=\"yourteam\" -email=\"name@yourcompany.com\" -role=\"system_admin\"",
-  "admin.user_item.emailTitle": "<strong>Email:</strong> {email}",
+  "admin.user_item.emailTitle": "<strong>이메일:</strong> {email}",
   "admin.user_item.inactive": "비활성",
   "admin.user_item.makeActive": "활성화",
   "admin.user_item.makeInactive": "비활성화",
@@ -859,7 +863,7 @@
   "analytics.team.totalUsers": "전체 사용자",
   "audit_table.accountActive": "Account made active",
   "audit_table.accountInactive": "Account made inactive",
-  "audit_table.action": "Action",
+  "audit_table.action": "활동",
   "audit_table.attemptedAllowOAuthAccess": "Attempted to allow a new OAuth service access",
   "audit_table.attemptedLicenseAdd": "Attempted to add new license",
   "audit_table.attemptedLogin": "Attempted to login",
@@ -902,7 +906,7 @@
   "audit_table.successfullReset": "Successfully reset password",
   "audit_table.successfullWebhookCreate": "Successfully created a webhook",
   "audit_table.successfullWebhookDelete": "Successfully deleted a webhook",
-  "audit_table.timestamp": "Timestamp",
+  "audit_table.timestamp": "타임스탬프",
   "audit_table.updateGeneral": "Updated the general settings of your account",
   "audit_table.updateGlobalNotifications": "Updated your global notification settings",
   "audit_table.updatePicture": "Updated your profile picture",
@@ -917,14 +921,14 @@
   "authorize.deny": "Deny",
   "authorize.title": "<strong>{appName}</strong> would like to connect to your <strong>Mattermost</strong> user account",
   "backstage_list.search": "검색",
-  "backstage_navbar.backToMattermost": "Back to {siteName}",
-  "backstage_sidebar.integrations": "Integrations",
+  "backstage_navbar.backToMattermost": "{siteName}(으)로 돌아가기",
+  "backstage_sidebar.integrations": "통합 기능",
   "backstage_sidebar.integrations.commands": "슬래시 명령어",
   "backstage_sidebar.integrations.incoming_webhooks": "Incoming Webhooks",
-  "backstage_sidebar.integrations.oauthApps": "OAuth 2.0 Applications",
+  "backstage_sidebar.integrations.oauthApps": "OAuth 2.0 애플리케이션",
   "backstage_sidebar.integrations.outgoing_webhooks": "Outgoing Webhooks",
   "center_panel.recent": "Click here to jump to recent messages. ",
-  "chanel_header.addMembers": "Add Members",
+  "chanel_header.addMembers": "회원 추가",
   "change_url.close": "닫기",
   "change_url.endWithLetter": "Must end with a letter or number",
   "change_url.invalidUrl": "잘못된 URL",
@@ -935,11 +939,11 @@
   "channel_flow.changeUrlDescription": "일부 URL로 사용할 수 없는 문자들은 제거될 수 있습니다.",
   "channel_flow.changeUrlTitle": "{term} URL 변경",
   "channel_flow.channel": "채널",
-  "channel_flow.create": "Create {term}",
+  "channel_flow.create": "{term} 생성",
   "channel_flow.group": "그룹",
   "channel_flow.handleTooShort": "Channel URL must be 2 or more lowercase alphanumeric characters",
   "channel_flow.invalidName": "잘못된 채널 이름",
-  "channel_flow.set_url_title": "Set {term} URL",
+  "channel_flow.set_url_title": "{term} URL 설정",
   "channel_header.channel": "채널",
   "channel_header.channelHeader": "채널 헤더 설정...",
   "channel_header.delete": "{term} 삭제...",
@@ -962,7 +966,7 @@
   "channel_info.purpose": "설명:",
   "channel_info.url": "URL:",
   "channel_invite.add": " 추가",
-  "channel_invite.addNewMembers": "Add New Members to ",
+  "channel_invite.addNewMembers": "새로운 회원 추가하기 ",
   "channel_invite.close": "닫기",
   "channel_loader.connection_error": "There appears to be a problem with your internet connection.",
   "channel_loader.posted": "Posted",
@@ -1014,7 +1018,7 @@
   "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 {site} email account",
-  "claim.email_to_ldap.ldapId": "LDAP ID",
+  "claim.email_to_ldap.ldapId": "AD/LDAP ID",
   "claim.email_to_ldap.ldapIdError": "LDAP ID를 입력하세요.",
   "claim.email_to_ldap.ldapPasswordError": "LDAP 비밀번호를 입력하세요.",
   "claim.email_to_ldap.ldapPwd": "LDAP 비밀번호",
@@ -1054,10 +1058,10 @@
   "confirm_modal.cancel": "취소",
   "create_comment.addComment": "답글 달기...",
   "create_comment.comment": "답글 달기",
-  "create_comment.commentLength": "Comment length must be less than {max} characters.",
-  "create_comment.commentTitle": "Comment",
-  "create_comment.file": "File uploading",
-  "create_comment.files": "Files uploading",
+  "create_comment.commentLength": "답글의 길이는 {max}글자를 초과할 수 없습니다.",
+  "create_comment.commentTitle": "답글",
+  "create_comment.file": "파일 업로드 중",
+  "create_comment.files": "파일 업로드 중",
   "create_post.comment": "답글",
   "create_post.post": "글",
   "create_post.shortcutsNotSupported": "Keyboard shortcuts are not supported on your device.",
@@ -1077,7 +1081,7 @@
   "create_team.team_url.hint": "<li>Short and memorable is best</li><li>Use lowercase letters, numbers and dashes</li><li>Must start with a letter and can't end in a dash</li>",
   "create_team.team_url.regex": "Use only lower case letters, numbers and dashes. Must start with a letter and can't end in a dash.",
   "create_team.team_url.required": "필수 항목입니다.",
-  "create_team.team_url.taken": "URL is taken or contains a reserved word",
+  "create_team.team_url.taken": "URL이 이미 있거나 예약된 단어입니다.",
   "create_team.team_url.teamUrl": "팀 URL",
   "create_team.team_url.unavailable": "This URL is unavailable. Please try another.",
   "create_team.team_url.webAddress": "Choose the web address of your new team:",
@@ -1168,8 +1172,8 @@
   "find_team.placeholder": "you@domain.com",
   "find_team.send": "보내기",
   "find_team.submitError": "유효한 이메일 주소를 입력하세요.",
-  "flag_post.flag": "Flag for follow up",
-  "flag_post.unflag": "Unflag",
+  "flag_post.flag": "중요 메시지로 지정",
+  "flag_post.unflag": "중요 메시지 해제",
   "general_tab.chooseName": "사용자 이름을 선택하세요.",
   "general_tab.codeDesc": "가입 링크를 변경하려면 '편집'을 클릭하세요.",
   "general_tab.codeLongDesc": "The Invite Code is used as part of the URL in the team invitation link created by <strong>Get Team Invite Link</strong> in the main menu. Regenerating creates a new team invitation link and invalidates the previous link.",
@@ -1190,12 +1194,12 @@
   "get_app.alreadyHaveIt": "Already have it?",
   "get_app.androidAppName": "Mattermost for Android",
   "get_app.androidHeader": "Mattermost works best if you switch to our Android app",
-  "get_app.continue": "continue",
+  "get_app.continue": "계속하기",
   "get_app.continueWithBrowser": "Or {link}",
-  "get_app.continueWithBrowserLink": "continue with browser",
+  "get_app.continueWithBrowserLink": "브라우저로 계속하기",
   "get_app.iosHeader": "Mattermost works best if you switch to our iPhone app",
   "get_app.mattermostInc": "Mattermost, Inc",
-  "get_app.openMattermost": "Open Mattermost",
+  "get_app.openMattermost": "Mattermost 열기",
   "get_link.clipboard": " 링크가 클립보드에 복사되었습니다.",
   "get_link.close": "닫기",
   "get_link.copy": "링크 복사",
@@ -1226,7 +1230,7 @@
   "help.composing.deleting": "## Deleting a message\nDelete a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Delete**. System and Team Admins can delete any message on their system or team.",
   "help.composing.editing": "## Editing a Message\nEdit a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Edit**. After making modifications to the message text, press **ENTER** to save the modifications. Message edits do not trigger new @mention notifications, desktop notifications or notification sounds.",
   "help.composing.linking": "## Linking to a message\nThe **Permalink** feature creates a link to any message. Sharing this link with other users in the channel lets them view the linked message in the Message Archives. Users who are not a member of the channel where the message was posted cannot view the permalink. Get the permalink to any message by clicking the **[...]** icon next to the message text  > **Permalink** > **Copy Link**.",
-  "help.composing.posting": "## Posting a Message\nWrite a message by typing into the text input box, then press **ENTER** to send it. Use **Shift + ENTER** to create a new line without sending a message. To send messages by pressing **Ctrl+Enter** go to **Main Menu > Account Settings > Send messages on Ctrl + Enter**.",
+  "help.composing.posting": "## Posting a Message\nWrite a message by typing into the text input box, then press **ENTER** to send it. Use **Shift + ENTER** to create a new line without sending a message. To send messages by pressing **CTRL+ENTER** go to **Main Menu > Account Settings > Send messages on CTRL + ENTER**.",
   "help.composing.posts": "#### Posts\nPosts can be considered parent messages. They are the messages that often start a thread of replies. Posts are composed and sent from the text input box at the bottom of the center pane.",
   "help.composing.replies": "#### Replies\nReply to a message by clicking the reply icon next to any message text. This action opens the right-hand-side (RHS) where you can see the message thread, then compose and send your reply. Replies are indented slightly in the center pane to indicate that they are child messages of a parent post.\n\nWhen composing a reply in the right-hand side, click the expand/collapse icon with two arrows at the top of the sidebar to make things easier to read.",
   "help.composing.title": "# Sending Messages\n_____",
@@ -1250,7 +1254,7 @@
   "help.formatting.lines": "## Lines\n\nCreate a line by using three `*`, `_`, or `-`.",
   "help.formatting.linkEx": "[Check out Mattermost!](https://about.mattermost.com/)",
   "help.formatting.links": "## Links\n\nCreate labeled links by putting the desired text in square brackets and the associated link in normal brackets.",
-  "help.formatting.listExample": "* list item one\n* list item two\n    * item two sub-point')",
+  "help.formatting.listExample": "* list item one\n* list item two\n    * item two sub-point",
   "help.formatting.lists": "## Lists\n\nCreate a list by using `*` or `-` as bullets. Indent a bullet point by adding two spaces in front of it.",
   "help.formatting.monokaiTheme": "**Monokai Theme**",
   "help.formatting.ordered": "Make it an ordered list by using numbers instead:",
@@ -1321,19 +1325,19 @@
   "installed_integrations.triggerWords": "Trigger Words: {triggerWords}",
   "installed_integrations.unnamed_oauth_app": "Unnamed OAuth 2.0 Application",
   "installed_integrations.url": "URL: {url}",
-  "installed_oauth_apps.add": "Add OAuth 2.0 Application",
+  "installed_oauth_apps.add": "OAuth 2.0 애플리케이션 추가하기",
   "installed_oauth_apps.callbackUrls": "Callback URLs (One Per Line)",
   "installed_oauth_apps.cancel": "취소",
   "installed_oauth_apps.description": "설명",
-  "installed_oauth_apps.empty": "No OAuth 2.0 Applications found",
-  "installed_oauth_apps.header": "OAuth 2.0 Applications",
+  "installed_oauth_apps.empty": "OAuth 2.0 애플리케이션이 없습니다",
+  "installed_oauth_apps.header": "OAuth 2.0 애플리케이션",
   "installed_oauth_apps.help": "OAuth 2.0 Applications are available to everyone on your server.",
-  "installed_oauth_apps.homepage": "Homepage",
-  "installed_oauth_apps.iconUrl": "Icon URL",
+  "installed_oauth_apps.homepage": "홈페이지",
+  "installed_oauth_apps.iconUrl": "아이콘 URL",
   "installed_oauth_apps.is_trusted": "Is Trusted: <strong>{isTrusted}</strong>",
   "installed_oauth_apps.name": "표시명",
   "installed_oauth_apps.save": "저장",
-  "installed_oauth_apps.search": "Search OAuth 2.0 Applications",
+  "installed_oauth_apps.search": "OAuth 2.0 애플리케이션 찾아보기",
   "installed_oauth_apps.trusted": "Is Trusted",
   "installed_oauth_apps.trusted.no": "아니요",
   "installed_oauth_apps.trusted.yes": "네",
@@ -1342,7 +1346,7 @@
   "installed_outgoing_webhooks.header": "Outgoing Webhooks",
   "installed_outgoing_webhooks.help": "외부 통합에 사용하기 위한 Outgoing webhook URL을 생성하세요. 자세한 내용은 {link}를 참조하세요.",
   "installed_outgoing_webhooks.helpLink": "문서",
-  "installed_outgoing_webhooks.search": "Outgoing Webhooks 검색하기",
+  "installed_outgoing_webhooks.search": "Outgoing Webhook 검색하기",
   "installed_outgoing_webhooks.unknown_channel": "A Private Webhook",
   "integrations.add": "추가",
   "integrations.command.description": "슬래시 명령어는 외부에 연결한 서비스에 이벤트를 보냅니다.",
@@ -1352,15 +1356,16 @@
   "integrations.incomingWebhook.description": "Incoming webhook은 외부 시스템에서 메시지를 받는 것을 허용합니다.",
   "integrations.incomingWebhook.title": "Incoming Webhook",
   "integrations.oauthApps.description": "OAuth 2.0 allows external applications to make authorized requests to the Mattermost API.",
-  "integrations.oauthApps.title": "OAuth 2.0 Applications",
+  "integrations.oauthApps.title": "OAuth 2.0 애플리케이션",
   "integrations.outgoingWebhook.description": "Outgoing webhook은 외부 시스템에 메시지를 요청하고 응답받는 것을 허용합니다.",
   "integrations.outgoingWebhook.title": "Outgoing Webhook",
-  "intro_messages.DM": "{teammate}와 개인 메시지 기록의 시작입니다.<br />개인 메시지나 여기서 공유된 파일들은 외부에서 보여지지 않습니다.",
+  "integrations.successful": "설정 성공",
+  "intro_messages.DM": "{teammate}와 개인 메시지의 시작입니다.<br />개인 메시지나 여기서 공유된 파일들은 외부에서 보여지지 않습니다.",
   "intro_messages.anyMember": " 모든 회원가 이 채널에 가입하고 글을 읽을 수 있습니다.",
   "intro_messages.beginning": "{name}의 시작",
   "intro_messages.channel": "채널",
   "intro_messages.creator": "<strong>{name}</strong> {type}입니다. 만든 사람: <strong>{creator}</strong> 만든 날짜: <strong>{date}</strong>",
-  "intro_messages.default": "<h4 class='channel-intro__title'>{display_name}의 시작</h4><p class='channel-intro__content'><strong>{display_name}에 오신 것을 환영합니다!</strong><br/><br/>이 곳은 팀 회원가 처음 로그인 할 때 보이는 공간입니다다 - 모두가 알아야할 내용을 공유하는데 사용하세요.</p>",
+  "intro_messages.default": "<h4 class='channel-intro__title'>{display_name}의 시작</h4><p class='channel-intro__content'><strong>{display_name}에 오신 것을 환영합니다!</strong><br/><br/>이 곳은 팀에 가입한 회원들이 가장 먼저 보게되는 채널입니다. 모두가 알아야 할 내용을 공지할 때 사용하세요. </p>",
   "intro_messages.group": "비공개 그룹",
   "intro_messages.invite": "{type}에 사용자 초대하기",
   "intro_messages.inviteOthers": "팀에 사용자 초대하기",
@@ -1396,7 +1401,7 @@
   "leave_team_modal.title": "Leave the team?",
   "leave_team_modal.yes": "네",
   "loading_screen.loading": "불러오는 중",
-  "login.changed": " Sign-in method changed successfully",
+  "login.changed": " 인증 방식이 성공적으로 변경되었습니다.",
   "login.create": "Create one now",
   "login.createTeam": "팀 만들기",
   "login.createTeamAdminOnly": "This option is only available for System Administrators, and does not show up for other users.",
@@ -1414,7 +1419,7 @@
   "login.noEmailUsername": "이메일 또는 사용자명을 입력하세요.",
   "login.noEmailUsernameLdapUsername": "이메일, 사용자명 또는 {ldapUsername}을 입력하세요.",
   "login.noLdapUsername": "{ldapUsername}을 입력하세요.",
-  "login.noMethods": "No sign-in methods are enabled. Please contact your System Administrator.",
+  "login.noMethods": "활성화된 접속방식이 없습니다. 시스템 관리자에게 문의해보세요.",
   "login.noPassword": "비밀번호를 입력하세요.",
   "login.noUsername": "사용자명을 입력하세요.",
   "login.noUsernameLdapUsername": "사용자명 또는 {ldapUsername}을 입력하세요.",
@@ -1447,21 +1452,21 @@
   "more_direct_channels.close": "닫기",
   "more_direct_channels.message": "메시지",
   "more_direct_channels.title": "개인 메시지",
-  "msg_typing.areTyping": "{users} and {last} are typing...",
-  "msg_typing.isTyping": "{user} is typing...",
+  "msg_typing.areTyping": "{users}, {last}(이)가 입력중입니다...",
+  "msg_typing.isTyping": "{user}(이)가 입력중입니다...",
   "msg_typing.someone": "Someone",
-  "navbar.addMembers": "Add Members",
-  "navbar.click": "Click here",
-  "navbar.delete": "채널 삭제하기...",
+  "navbar.addMembers": "회원 추가",
+  "navbar.click": "클릭하기",
+  "navbar.delete": "채널 삭제",
   "navbar.leave": "채널 떠나기",
-  "navbar.manageMembers": "회원 관리하기",
-  "navbar.noHeader": "No channel header yet.{newline}{link} to add one.",
+  "navbar.manageMembers": "회원 관리",
+  "navbar.noHeader": "채널 헤더가 없습니다.{newline}{link} to add one.",
   "navbar.preferences": "알림 설정",
-  "navbar.rename": "채널 이름 변경...",
-  "navbar.setHeader": "채널 헤더 설정...",
-  "navbar.setPurpose": "채널 설명 설정...",
-  "navbar.toggle1": "Toggle sidebar",
-  "navbar.toggle2": "Toggle sidebar",
+  "navbar.rename": "채널 이름 변경",
+  "navbar.setHeader": "채널 헤더 설정",
+  "navbar.setPurpose": "채널 설명 설정",
+  "navbar.toggle1": "사이드바 토글",
+  "navbar.toggle2": "사이드바 토글",
   "navbar.viewInfo": "정보 보기",
   "navbar_dropdown.about": "Mattermost 정보",
   "navbar_dropdown.accountSettings": "계정 설정",
@@ -1470,24 +1475,24 @@
   "navbar_dropdown.emoji": "사용자 정의 이모티콘",
   "navbar_dropdown.help": "도움말",
   "navbar_dropdown.integrations": "통합 기능",
-  "navbar_dropdown.inviteMember": "회원 초대하기",
+  "navbar_dropdown.inviteMember": "회원 초대",
   "navbar_dropdown.leave": "팀 떠나기",
   "navbar_dropdown.logout": "로그아웃",
-  "navbar_dropdown.manageMembers": "회원 관리하기",
-  "navbar_dropdown.nativeApps": "Download Mattermost Apps",
+  "navbar_dropdown.manageMembers": "회원 관리",
+  "navbar_dropdown.nativeApps": "애플리케이션 다운로드",
   "navbar_dropdown.report": "문제 보고",
   "navbar_dropdown.switchTeam": "{team}(으)로 돌아가기",
   "navbar_dropdown.switchTo": "팀 변경: ",
   "navbar_dropdown.teamLink": "팀 가입 링크",
   "navbar_dropdown.teamSettings": "팀 설정",
-  "navbar_dropdown.viewMembers": "회원목록 보기",
+  "navbar_dropdown.viewMembers": "회원 목록",
   "notification.dm": "개인 메시지",
   "password_form.change": "비밀번호 변경하기",
   "password_form.click": "Click <a href={url}>here</a> to log in.",
   "password_form.enter": "Enter a new password for your {siteName} account.",
   "password_form.error": "최소 {chars}글자 이상 입력하세요.",
   "password_form.pwd": "비밀번호",
-  "password_form.title": "Password Reset",
+  "password_form.title": "비밀번호 재설정",
   "password_form.update": "Your password has been updated successfully.",
   "password_send.checkInbox": "Please check your inbox.",
   "password_send.description": "To reset your password, enter the email address you used to sign up",
@@ -1496,7 +1501,7 @@
   "password_send.link": "<p>A password reset link has been sent to <b>{email}</b></p>",
   "password_send.reset": "Reset my password",
   "password_send.title": "Password Reset",
-  "pdf_preview.max_pages": "PDF previews only show the first five pages.",
+  "pdf_preview.max_pages": "Download to read more pages",
   "pending_post_actions.cancel": "취소",
   "pending_post_actions.retry": "다시 시도",
   "permalink.error.access": "Permalink belongs to a deleted message or to a channel to which you do not have access.",
@@ -1512,12 +1517,12 @@
   "post_focus_view.beginning": "채널의 시작",
   "post_info.del": "삭제",
   "post_info.edit": "편집",
-  "post_info.mobile.flag": "Flag",
-  "post_info.mobile.unflag": "Unflag",
+  "post_info.mobile.flag": "중요 지정",
+  "post_info.mobile.unflag": "중요 해제",
   "post_info.permalink": "링크",
   "post_info.reply": "답글",
   "posts_view.loadMore": "메시지 더 보기",
-  "posts_view.newMsg": "New Messages",
+  "posts_view.newMsg": "새로운 메시지",
   "removed_channel.channelName": "the channel",
   "removed_channel.from": "Removed from ",
   "removed_channel.okay": "확인",
@@ -1537,32 +1542,36 @@
   "rhs_comment.comment": "답글",
   "rhs_comment.del": "삭제",
   "rhs_comment.edit": "편집",
-  "rhs_comment.mobile.flag": "Flag",
-  "rhs_comment.mobile.unflag": "Unflag",
+  "rhs_comment.mobile.flag": "중요 표시",
+  "rhs_comment.mobile.unflag": "중요 해제",
   "rhs_comment.permalink": "바로가기",
-  "rhs_header.backToFlaggedTooltip": "Back to Flagged Posts",
+  "rhs_header.backToFlaggedTooltip": "중요 메시지로 돌아가기",
   "rhs_header.backToResultsTooltip": "검색결과로 돌아가기",
   "rhs_header.closeSidebarTooltip": "사이드바 닫기",
   "rhs_header.details": "메시지 세부사항",
-  "rhs_header.expandSidebarTooltip": "Expand Sidebar",
-  "rhs_header.shrinkSidebarTooltip": "Shrink Sidebar",
+  "rhs_header.expandSidebarTooltip": "사이드바 펴기",
+  "rhs_header.shrinkSidebarTooltip": "사이드바 접기",
   "rhs_root.del": "삭제",
   "rhs_root.direct": "개인 메시지",
   "rhs_root.edit": "편집",
-  "rhs_root.mobile.flag": "Flag",
-  "rhs_root.mobile.unflag": "Unflag",
+  "rhs_root.mobile.flag": "중요 표시",
+  "rhs_root.mobile.unflag": "중요 해제",
   "rhs_root.permalink": "바로가기",
   "search_bar.cancel": "취소",
   "search_bar.search": "검색",
   "search_bar.usage": "<h4>검색 옵션</h4><ul><li><b>\"따옴표\"</b><span>를 사용해서 문구를 검색할 수 있습니다.</span></li><li><b>from:</b><span> 를 사용해서 특정 사용자의 포스트를 검색하거나, </span><b>in:</b><span>을 사용하여 특정 채널의 포스트를 검색할 수 있습니다.</span></li></ul>",
   "search_header.results": "검색 결과",
   "search_header.title2": "최근 멘션",
-  "search_header.title3": "Flagged Posts",
+  "search_header.title3": "중요 메시지",
   "search_item.direct": "개인 메시지",
   "search_item.jump": "바로가기",
   "search_results.because": "<ul><li>문구의 일부분을 검색하려면(예: \"rea\", 를 검색하여 \"reach\" 또는 \"reaction\") 단어 앞 또는 뒤에 와일드카드 문자(*)를 붙여보세요.</li><li>두 글자 검색이나 \"this\", \"a\", \"is\"같이 일반적인 단어는 과도한 결과를 반환하기 때문에 검색결과에 표시되지 않습니다.</li></ul>",
   "search_results.noResults": "검색 결과가 없습니다. 다시 시도하세요.",
   "search_results.usage": "<ul><li><b>\"따옴표\"</b>를 사용하여 문구를 검색할 수 있습니다.</li><li><b>from:</b> 을 사용하여 특정 작성자를 검색하거나 <b>in:</b> 을 사용하여 특정 채널에 대해 검색할 수 있습니다.</li></ul>",
+  "search_results.usageFlag1": "중요 지정된 메시지가 아직 없습니다.",
+  "search_results.usageFlag2": "타임스탬프 옆의 ",
+  "search_results.usageFlag3": " 아이콘을 클릭하여 중요 메시지를 추가할 수 있습니다.",
+  "search_results.usageFlag4": "중요한 메시지를 따로 모아 확인할 수 있습니다. 중요 메시지는 개인별로 표시되며 다른 사람이 볼 수 없습니다.",
   "setting_item_max.cancel": "취소",
   "setting_item_max.save": "저장",
   "setting_item_min.edit": "편집",
@@ -1582,20 +1591,20 @@
   "sidebar.otherMembers": "팀 외부",
   "sidebar.pg": "비공개 그룹",
   "sidebar.removeList": "목록에서 제거",
-  "sidebar.tutorialScreen1": "<h4>Channels</h4><p><strong>Channels</strong> organize conversations across different topics. They’re open to everyone on your team. To send private communications use <strong>Direct Messages</strong> for a single person or <strong>Private Groups</strong> for multiple people.</p>",
-  "sidebar.tutorialScreen2": "<h4>\"{townsquare}\" and \"{offtopic}\" channels</h4><p>Here are two public channels to start:</p><p><strong>{townsquare}</strong> is a place for team-wide communication. Everyone in your team is a member of this channel.</p><p><strong>{offtopic}</strong> is a place for fun and humor outside of work-related channels. You and your team can decide what other channels to create.</p>",
-  "sidebar.tutorialScreen3": "<h4>Creating and Joining Channels</h4><p>Click <strong>\"More...\"</strong> to create a new channel or join an existing one.</p><p>You can also create a new channel or private group by clicking the <strong>\"+\" symbol</strong> next to the channel or private group header.</p>",
-  "sidebar.unreadAbove": "Unread post(s) above",
-  "sidebar.unreadBelow": "Unread post(s) below",
-  "sidebar_header.tutorial": "<h4>Main Menu</h4><p>The <strong>Main Menu</strong> is where you can <strong>Invite New Members</strong>, access your <strong>Account Settings</strong> and set your <strong>Theme Color</strong>.</p><p>Team administrators can also access their <strong>Team Settings</strong> from this menu.</p><p>System administrators will find a <strong>System Console</strong> option to administrate the entire system.</p>",
+  "sidebar.tutorialScreen1": "<h4>채널</h4><p><strong>채널</strong>을 통해 주제별로 대화를 구성합니다. 팀의 모든 일원에게 공개되어 있습니다. 공개하고 싶지 않은 메시지는 <strong>개인 메시지</strong>나 <strong>비공개 그룹</strong>으로 전달할 수 있습니다. </p>",
+  "sidebar.tutorialScreen2": "<h4>\"{townsquare}\" 와 \"{offtopic}\" 채널</h4><p>두 채널과 함께 시작합니다:</p><p><strong>{townsquare}</strong>(은)는 팀 전체의 소통을 위한 공간입니다. 모든 팀의 구성원들이 확인할 수 있습니다.</p><p><strong>{offtopic}</strong> 비업무 대화를 위한 공간입니다. 당신의 팀에 어떤 채널을 만들고 운영할지 결정할 수 있습니다.</p>",
+  "sidebar.tutorialScreen3": "<h4>채널 만들고 가입하기</h4><p><strong>\"더 보기...\"</strong>를 눌러 새로운 채널을 만들거나 기존 채널에 입장할 수 있습니다.</p><p>채널이나 비공개 그룹의 헤더 옆에 <strong>\"+\" 표시</strong> 를 눌러 새로운 채널이나 비공개 그룹을 만들 수 있습니다.</p>",
+  "sidebar.unreadAbove": "상단에 읽지않은 메시지",
+  "sidebar.unreadBelow": "하단에 읽지않은 메시지",
+  "sidebar_header.tutorial": "<h4>메인 메뉴</h4><p> <strong>메인 메뉴</strong>에서 <strong>회원 초대</strong>를 하거나, <strong>계정 설정</strong>에 진입하여 <strong>테마 색상</strong>을 변경할 수 있습니다.</p><p>팀 관리자는 메뉴에서 <strong>팀 설정</strong>에 진입할 수 있습니다.</p><p>시스템 관리자는 <strong>관리자 도구</strong> 메뉴를 통해 시스템을 전체 설정을 관리할 수 있습니다.</p>",
   "sidebar_right_menu.accountSettings": "계정 설정",
   "sidebar_right_menu.console": "관리자 도구",
-  "sidebar_right_menu.flagged": "Flagged Posts",
+  "sidebar_right_menu.flagged": "중요 메시지",
   "sidebar_right_menu.help": "도움말",
   "sidebar_right_menu.inviteNew": "회원 초대하기",
   "sidebar_right_menu.logout": "로그아웃",
   "sidebar_right_menu.manageMembers": "회원 관리하기",
-  "sidebar_right_menu.nativeApps": "Download Mattermost Apps",
+  "sidebar_right_menu.nativeApps": "애플리케이션 다운로드",
   "sidebar_right_menu.recentMentions": "최근 멘션",
   "sidebar_right_menu.report": "문제 보고",
   "sidebar_right_menu.switch_team": "팀 선택",
@@ -1603,11 +1612,11 @@
   "sidebar_right_menu.teamSettings": "팀 설정",
   "sidebar_right_menu.viewMembers": "회원 보기",
   "signup.email": "이메일과 비밀번호",
-  "signup.gitlab": "GitLab Single-Sign-On",
-  "signup.google": "Google Account",
-  "signup.ldap": "LDAP Credentials",
+  "signup.gitlab": "GitLab SSO",
+  "signup.google": "Google 계정",
+  "signup.ldap": "AD/LDAP Credentials",
   "signup.office365": "Office 365",
-  "signup.title": "Create an account with:",
+  "signup.title": "다음 계정으로 가입하기:",
   "signup_team.choose": "가입한 팀: ",
   "signup_team.createTeam": "팀 생성하기",
   "signup_team.disabled": "팀을 생성할 수 없습니다. 시스템 관리자에게 문의하세요.",
@@ -1625,7 +1634,7 @@
   "signup_user_completed.choosePwd": "패스워드를 입력하세요.",
   "signup_user_completed.chooseUser": "사용자 이름을 입력하세요.",
   "signup_user_completed.create": "계정 만들기",
-  "signup_user_completed.emailHelp": "Valid email required for sign-up",
+  "signup_user_completed.emailHelp": "유효한 이메일 주소가 필요합니다.",
   "signup_user_completed.emailIs": "Your email address is <strong>{email}</strong>. You'll use this address to sign in to {siteName}.",
   "signup_user_completed.expired": "You've already completed the signup process for this invitation or this invitation has expired.",
   "signup_user_completed.gitlab": "with GitLab",
@@ -1645,7 +1654,7 @@
   "signup_user_completed.userHelp": "Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-' and '_'",
   "signup_user_completed.usernameLength": "Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-' and '_'.",
   "signup_user_completed.validEmail": "Please enter a valid email address",
-  "signup_user_completed.welcome": "Welcome to:",
+  "signup_user_completed.welcome": "환영합니다!",
   "signup_user_completed.whatis": "What's your email address?",
   "signup_user_completed.withLdap": "With your LDAP credentials",
   "sso_signup.find": "팀 찾기",
@@ -1655,9 +1664,9 @@
   "sso_signup.teamName": "팀 이름을 입력하세요.",
   "sso_signup.team_error": "팀 이름을 입력하세요.",
   "suggestion.mention.all": "Notifies everyone in the channel, use in {townsquare} to notify the whole team",
-  "suggestion.mention.channel": "Notifies everyone in the channel",
-  "suggestion.mention.here": "Notifies everyone in the channel and online",
-  "suggestion.mention.members": "Channel Members",
+  "suggestion.mention.channel": "모든 채널 회원들에게 알림을 보냅니다",
+  "suggestion.mention.here": "채널에 접속 중인 회원들에게 알림을 보냅니다",
+  "suggestion.mention.members": "채널 회원",
   "suggestion.mention.nonmembers": "Not in Channel",
   "suggestion.mention.special": "Special Mentions",
   "suggestion.search.private": "비공개 그룹",
@@ -1667,7 +1676,7 @@
   "team_export_tab.exportTeam": "팀 내보내기",
   "team_export_tab.exporting": " 내보내는 중...",
   "team_export_tab.ready": " Ready for ",
-  "team_export_tab.unable": " Unable to export: {error}",
+  "team_export_tab.unable": " 내보낼 수 없습니다: {error}",
   "team_import_tab.failure": " 가져오기 실패: ",
   "team_import_tab.import": "가져오기",
   "team_import_tab.importHelp": "<p>To import a team from Slack go to Slack > Team Settings > Import/Export Data > Export > Start Export. Slack does not allow you to export files, images, private groups or direct messages stored in Slack. Therefore, Slack import to Mattermost only supports importing of text messages in your Slack team's public channels.</p><p>The Slack import to Mattermost is in 'Beta'. Slack bot posts do not yet import and Slack @mentions are not currently supported.</p>",
@@ -1703,25 +1712,25 @@
   "textbox.preview": "미리보기",
   "textbox.quote": ">인용",
   "textbox.strike": "취소선",
-  "tutorial_intro.allSet": "You’re all set",
-  "tutorial_intro.end": "Click “Next” to enter {channel}. This is the first channel teammates see when they sign up. Use it for posting updates everyone needs to know.",
-  "tutorial_intro.invite": "Invite teammates",
-  "tutorial_intro.mobileApps": "Install the apps for {link} for easy access and notifications on the go.",
-  "tutorial_intro.mobileAppsLinkText": "PC, Mac, iOS and Android",
+  "tutorial_intro.allSet": "모든 준비가 끝났습니다",
+  "tutorial_intro.end": "“다음” 을 눌러 {channel}에 입장합니다. 이 곳은 팀에 가입한 회원들이 가장 먼저 보게되는 채널입니다. 모두가 알아야 할 내용을 공지할 때 이 채널을 사용하세요.",
+  "tutorial_intro.invite": "회원을 초대",
+  "tutorial_intro.mobileApps": "{link} 애플리케이션을 설치하여 접근성과 알림을 향상시키세요.",
+  "tutorial_intro.mobileAppsLinkText": "PC, Mac, iOS, Android",
   "tutorial_intro.next": "다음",
-  "tutorial_intro.screenOne": "<h3>Welcome to:</h3><h1>Mattermost</h1><p>Your team communication all in one place, instantly searchable and available anywhere</p><p>Keep your team connected to help them achieve what matters most.</p>",
+  "tutorial_intro.screenOne": "<h3>환영합니다!</h3><h1>Mattermost</h1><p>모든 팀 커뮤니케이션 활동을 한 곳에 모아 쉽고 빠르게 접근할 수 있습니다.</p><p>팀 커뮤니케이션을 연결하여 가장 중요한 목표를 공유하세요.</p>",
   "tutorial_intro.screenTwo": "<h3>Mattermost를 활용하는 법:</h3><p>공개된 논의 채널, 비공개 그룹, 또는 개인 메시지를 통해 이야기를 나눌 수 있습니다.</p><p>모든 내용은 저장되고, 웹페이지를 볼 수 있는 곳이라면 어디서든 검색 가능합니다.</p>",
   "tutorial_intro.skip": "튜토리얼 생략",
-  "tutorial_intro.support": "Need anything, just email us at ",
-  "tutorial_intro.teamInvite": "Invite teammates",
-  "tutorial_intro.whenReady": " when you’re ready.",
+  "tutorial_intro.support": "도움이 필요하면 아래 이메일로 문의주세요 ",
+  "tutorial_intro.teamInvite": "회원을 초대",
+  "tutorial_intro.whenReady": "하여 시작하세요.",
   "tutorial_tip.next": "다음",
   "tutorial_tip.ok": "확인",
   "tutorial_tip.out": "이 팁 더이상 보지 않기.",
   "tutorial_tip.seen": "이미 알고 계신가요? ",
   "upload_overlay.info": "이 곳에 파일을 끌어 업로드하세요.",
   "user.settings.advance.embed_preview": "가능한 경우, 링크 내용 미리보기를 표시",
-  "user.settings.advance.embed_toggle": "Show toggle for all embed previews",
+  "user.settings.advance.embed_toggle": "미리보기 토글 버튼 보여주기",
   "user.settings.advance.enabledFeatures": "{count, number}개 기능 활성화",
   "user.settings.advance.formattingDesc": "활성화 하면 링크, 이모티콘, 글자 스타일 등을 사용할 수 있습니다. 기본적으로 활성화 되있습니다. 설정을 변경하려면 페이지 새로고침이 필요합니다.",
   "user.settings.advance.formattingTitle": "마크다운으로 글쓰기",
@@ -1801,21 +1810,21 @@
   "user.settings.general.email": "이메일",
   "user.settings.general.emailGitlabCantUpdate": "Login occurs through GitLab. Email cannot be updated. Email address used for notifications is {email}.",
   "user.settings.general.emailGoogleCantUpdate": "Login occurs through GitLab. Email cannot be updated. Email address used for notifications is {email}.",
-  "user.settings.general.emailHelp1": "Email is used for sign-in, notifications, and password reset. Email requires verification if changed.",
+  "user.settings.general.emailHelp1": "이메일은 접속, 알림 수신, 비밀번호 변경 등에 사용됩니다. 이메일을 변경하면 재검증이 필요합니다.",
   "user.settings.general.emailHelp2": "이메일 기능이 시스템 관리자에 의해 비활성화 되었습니다. 활성화 되기 전까진 알림 메일이 발송되지 않습니다.",
-  "user.settings.general.emailHelp3": "Email is used for sign-in, notifications, and password reset.",
-  "user.settings.general.emailHelp4": "A verification email was sent to {email}.",
+  "user.settings.general.emailHelp3": "이메일은 접속, 알림 수신, 비밀번호 변경 등에 사용됩니다.",
+  "user.settings.general.emailHelp4": "{email}(으)로 검증메일이 발송됐습니다.",
   "user.settings.general.emailLdapCantUpdate": "Login occurs through LDAP. Email cannot be updated. Email address used for notifications is {email}.",
   "user.settings.general.emailMatch": "The new emails you entered do not match.",
   "user.settings.general.emailOffice365CantUpdate": "Login occurs through GitLab. Email cannot be updated. Email address used for notifications is {email}.",
   "user.settings.general.emailSamlCantUpdate": "Login occurs through SAML. Email cannot be updated. Email address used for notifications is {email}.",
-  "user.settings.general.emailUnchanged": "Your new email address is the same as your old email address.",
+  "user.settings.general.emailUnchanged": "새로 입력한 이메일 주소가 기존과 동일합니다.",
   "user.settings.general.emptyName": "'편집'을 클릭하여 본명을 설정",
   "user.settings.general.emptyNickname": "'편집'을 클릭하여 별명을 설정",
   "user.settings.general.field_handled_externally": "This field is handled through your login provider. If you want to change it, you need to do so through your login provider.",
   "user.settings.general.firstName": "이름",
   "user.settings.general.fullName": "본명",
-  "user.settings.general.imageTooLarge": "Unable to upload profile image. File is too large.",
+  "user.settings.general.imageTooLarge": "이미지를 업로드 할 수 없습니다. 파일이 너무 큽니다.",
   "user.settings.general.imageUpdated": "Image last updated {date}",
   "user.settings.general.lastName": "성",
   "user.settings.general.loginGitlab": "Login done through GitLab ({email})",
@@ -1836,8 +1845,8 @@
   "user.settings.general.usernameInfo": "팀원들에게 불리기 쉬운 이름을 선택하세요.",
   "user.settings.general.usernameReserved": "예약된 사용자 이름입니다. 다른 이름을 선택하세요.",
   "user.settings.general.usernameRestrictions": "Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-', and '_'.",
-  "user.settings.general.validEmail": "Please enter a valid email address",
-  "user.settings.general.validImage": "Only JPG or PNG images may be used for profile pictures",
+  "user.settings.general.validEmail": "유효한 이메일 주소를 입력하세요.",
+  "user.settings.general.validImage": "JPG 또는 PNG 이미지만 프로필 사진으로 사용할 수 있습니다.",
   "user.settings.import_theme.cancel": "취소",
   "user.settings.import_theme.importBody": "Slack 의 팀 메뉴에서 “Preferences -> Sidebar Theme”를 선택하세요. Custom theme 옵션을 선택 후, 테마 색상 값들을 복사하여 이 곳에 붙여넣으세요.",
   "user.settings.import_theme.importHeader": "Slack 테마 불러오기",
@@ -1848,14 +1857,14 @@
   "user.settings.mfa.add": "Add MFA to your account",
   "user.settings.mfa.addHelp": "You can require a smartphone-based token, in addition to your password, to sign into Mattermost.<br/><br/>To enable, download Google Authenticator from <a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a> or <a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a> for your phone, then<br/><br/>1. Click the <strong>Add MFA to your account</strong> button above.<br/>2. Use Google Authenticator to scan the QR code that appears.<br/>3. Type in the Token generated by Google Authenticator and click <strong>Save</strong>.<br/><br/>When logging in, you will be asked to enter a token from Google Authenticator in addition to your regular credentials.",
   "user.settings.mfa.addHelpQr": "Please scan the bar code with the Google Authenticator app on your smartphone and fill in the token with one provided by the app.",
-  "user.settings.mfa.enterToken": "Token (numbers only)",
+  "user.settings.mfa.enterToken": "토큰 (숫자만)",
   "user.settings.mfa.qrCode": "Bar Code",
   "user.settings.mfa.remove": "Remove MFA from your account",
   "user.settings.mfa.removeHelp": "Removing multi-factor authentication means you will no longer require a phone-based passcode to sign-in to your account.",
   "user.settings.mfa.title": "Enable Multi-factor Authentication:",
   "user.settings.modal.advanced": "고급",
   "user.settings.modal.confirmBtns": "네, 취소합니다.",
-  "user.settings.modal.confirmMsg": "You have unsaved changes, are you sure you want to discard them?",
+  "user.settings.modal.confirmMsg": "저장되지 않은 변경사항이 있습니다, 저장하지 않고 취소하겠습니까?",
   "user.settings.modal.confirmTitle": "변경을 취소하시겠습니까?",
   "user.settings.modal.display": "화면",
   "user.settings.modal.general": "일반",
@@ -1865,40 +1874,41 @@
   "user.settings.notifications.allActivity": "모든 활동",
   "user.settings.notifications.channelWide": "채널 전체 멘션 \"@channel\", \"@all\"",
   "user.settings.notifications.close": "닫기",
-  "user.settings.notifications.comments": "Reply notifications",
+  "user.settings.notifications.comments": "답글 알림",
   "user.settings.notifications.commentsAny": "Trigger notifications on messages in reply threads that I start or participate in",
   "user.settings.notifications.commentsInfo": "In addition to notifications for when you're mentioned, select if you would like to receive notifications on reply threads.",
   "user.settings.notifications.commentsNever": "Do not trigger notifications on messages in reply threads unless I'm mentioned",
   "user.settings.notifications.commentsRoot": "Trigger notifications on messages in threads that I start",
-  "user.settings.notifications.desktop": "데스크탑 알림 받기",
-  "user.settings.notifications.desktop.allFirefoxForever": "For all activity, shown indefinitely",
-  "user.settings.notifications.desktop.allFirefoxTimed": "For all activity, shown for {seconds} seconds",
-  "user.settings.notifications.desktop.allNoSoundForever": "For all activity, without sound, shown indefinitely",
-  "user.settings.notifications.desktop.allNoSoundTimed": "For all activity, without sound, shown for {seconds} seconds",
-  "user.settings.notifications.desktop.allSoundForever": "For all activity, with sound, shown indefinitely",
-  "user.settings.notifications.desktop.allSoundTimed": "For all activity, with sound, shown for {seconds} seconds",
-  "user.settings.notifications.desktop.duration": "Notification duration",
-  "user.settings.notifications.desktop.durationInfo": "Sets how long desktop notifications will remain on screen.",
-  "user.settings.notifications.desktop.mentionsFirefoxForever": "For mentions and direct messages, shown indefinitely",
-  "user.settings.notifications.desktop.mentionsFirefoxTimed": "For mentions and direct messages, shown for {seconds} seconds",
-  "user.settings.notifications.desktop.mentionsNoSoundForever": "For mentions and direct messages, without sound, shown indefinitely",
-  "user.settings.notifications.desktop.mentionsNoSoundTimed": "For mentions and direct messages, without sound, shown for {seconds} seconds",
-  "user.settings.notifications.desktop.mentionsSoundForever": "For mentions and direct messages, with sound, shown indefinitely",
-  "user.settings.notifications.desktop.mentionsSoundTimed": "For mentions and direct messages, with sound, shown for {seconds} seconds",
-  "user.settings.notifications.desktop.seconds": "{seconds} seconds",
-  "user.settings.notifications.desktop.sound": "Notification sound",
-  "user.settings.notifications.desktop.title": "데스크탑 알림 소리",
-  "user.settings.notifications.desktop.unlimited": "Unlimited",
-  "user.settings.notifications.desktopSounds": "데스크탑 알림 소리",
+  "user.settings.notifications.desktop": "알림 받기",
+  "user.settings.notifications.desktop.allFirefoxForever": "모든 활동에 대해 무기한 보여줍니다.",
+  "user.settings.notifications.desktop.allFirefoxTimed": "모든 활동에 대해, {seconds}초 동안 보여줍니다.",
+  "user.settings.notifications.desktop.allNoSoundForever": "모든 활동에 대해, 소리 없이 무기한 보여줍니다.",
+  "user.settings.notifications.desktop.allNoSoundTimed": "모든 활동에 대해, 소리 없이 {seconds}초 동안 보여줍니다.",
+  "user.settings.notifications.desktop.allSoundForever": "모든 활동에 대해 무기한 보여줍니다.",
+  "user.settings.notifications.desktop.allSoundTimed": "모든 활동에 대해 {seconds}초 동안 보여줍니다.",
+  "user.settings.notifications.desktop.duration": "알림 지속시간",
+  "user.settings.notifications.desktop.durationInfo": "데스크탑 알림이 얼마나 긴 시간동안 화면에 지속되게 할 것인지 선택합니다.",
+  "user.settings.notifications.desktop.mentionsFirefoxForever": "개인 메시지와 멘션에 대해 무기한 보여줍니다",
+  "user.settings.notifications.desktop.mentionsFirefoxTimed": "개인 메시지와 멘션에 대해, {seconds}초 동안 보여줍니다.",
+  "user.settings.notifications.desktop.mentionsNoSoundForever": "개인 메시지와 멘션에 대해, 소리 없이 무기한 보여줍니다.",
+  "user.settings.notifications.desktop.mentionsNoSoundTimed": "개인 메시지와 멘션에 대해, 소리 없이 {seconds}초 동안 보여줍니다.",
+  "user.settings.notifications.desktop.mentionsSoundForever": "개인 메시지와 멘션에 대해 무기한 보여줍니다.",
+  "user.settings.notifications.desktop.mentionsSoundTimed": "개인 메시지와 멘션에 대해, {seconds}초 동안 보여줍니다.",
+  "user.settings.notifications.desktop.seconds": "{seconds}초 동안",
+  "user.settings.notifications.desktop.sound": "알림음",
+  "user.settings.notifications.desktop.title": "데스크탑 알림",
+  "user.settings.notifications.desktop.unlimited": "제한 없음",
+  "user.settings.notifications.desktopSounds": "데스크탑 알림음",
+  "user.settings.notifications.email.everyHour": "매 시간마다",
+  "user.settings.notifications.email.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
+  "user.settings.notifications.email.immediately": "바로",
+  "user.settings.notifications.email.never": "사용 안함",
+  "user.settings.notifications.email.send": "데스크탑 알림음",
   "user.settings.notifications.emailBatchingInfo": "Notifications received over the time period selected are combined and sent in a single email.",
   "user.settings.notifications.emailInfo": "Email notifications are sent for mentions and direct messages after you’ve been offline for more than 60 seconds or away from {siteName} for more than 5 minutes.",
   "user.settings.notifications.emailNotifications": "이메일 알림",
-  "user.settings.notifications.everyHour": "Every hour",
-  "user.settings.notifications.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
   "user.settings.notifications.header": "알림",
-  "user.settings.notifications.immediately": "Immediately",
-  "user.settings.notifications.info": "Desktop notifications are available on Firefox, Safari, and Chrome.",
-  "user.settings.notifications.never": "알림을 받지 않기",
+  "user.settings.notifications.info": "데스크탑 알림은 Firefox, Safari, Chrome 브라우저에서 사용할 수 있습니다.",
   "user.settings.notifications.noWords": "설정한 단어가 없습니다",
   "user.settings.notifications.off": "끄기",
   "user.settings.notifications.on": "켜기",
@@ -1908,27 +1918,27 @@
   "user.settings.notifications.sensitiveUsername": "내 사용자명 \"{username}\" (대소문자 구별 안함)",
   "user.settings.notifications.sensitiveWords": "다른 알림받을 단어들을 쉼표로 구분하여 입력: (대소문자 구별 안함)",
   "user.settings.notifications.soundConfig": "브라우저 설정에서 알림 소리를 변경하세요",
-  "user.settings.notifications.sounds_info": "Notification sounds are available on IE11, Edge, Safari and Chrome.",
+  "user.settings.notifications.sounds_info": "알림음은 IE11, Edge, Safari, Chrome 브라우저에서 사용할 수 있습니다.",
   "user.settings.notifications.teamWide": "팀 전체 멘션 \"@all\"",
   "user.settings.notifications.title": "알림 설정",
   "user.settings.notifications.usernameMention": "내 사용자명을 멘션 \"@{username}\"",
-  "user.settings.notifications.wordsTrigger": "언급에 대한 알림",
-  "user.settings.push_notification.allActivityAway": "For all activity when away or offline",
-  "user.settings.push_notification.allActivityOffline": "For all activity when offline",
-  "user.settings.push_notification.allActivityOnline": "For all activity when online, away or offline",
-  "user.settings.push_notification.away": "Away or offline",
+  "user.settings.notifications.wordsTrigger": "멘션 알림",
+  "user.settings.push_notification.allActivityAway": "오프라인이거나 자리비움 상태일 때의 모든 활동",
+  "user.settings.push_notification.allActivityOffline": "오프라인일 때의 모든 활동",
+  "user.settings.push_notification.allActivityOnline": "온라인, 오프라인, 자리비움 상태의 모든 활동",
+  "user.settings.push_notification.away": "오프라인이거나 자리비움",
   "user.settings.push_notification.disabled": "시스템 관리자에 의해 비활성화 됨",
   "user.settings.push_notification.disabled_long": "모바일 기기를 위한 푸시 알림 기능이 시스템 관리자에 의해 비활성화 되었습니다.",
-  "user.settings.push_notification.info": "Notification alerts are pushed to your mobile device when there is activity in Mattermost.",
+  "user.settings.push_notification.info": "지정한 Mattermost 활동에 대해서만 모바일 푸시 알림을 받습니다.",
   "user.settings.push_notification.off": "Off",
-  "user.settings.push_notification.offline": "Offline",
-  "user.settings.push_notification.online": "Online, away or offline",
+  "user.settings.push_notification.offline": "오프라인",
+  "user.settings.push_notification.online": "온라인, 오프라인, 자리비움",
   "user.settings.push_notification.onlyMentionsAway": "For mentions and direct messages when away or offline",
   "user.settings.push_notification.onlyMentionsOffline": "For mentions and direct messages when offline",
   "user.settings.push_notification.onlyMentionsOnline": "For mentions and direct messages when online, away or offline",
   "user.settings.push_notification.send": "모바일 푸시 알림",
-  "user.settings.push_notification.status": "Trigger push notifications when",
-  "user.settings.push_notification.status_info": "Notification alerts are only pushed to your mobile device when your online status matches the selection above.",
+  "user.settings.push_notification.status": "지정한 상태일 때 모바일 푸시 알림",
+  "user.settings.push_notification.status_info": "위에서 지정한 상태와 일치할 때만 모바일 푸시 알림을 받습니다.",
   "user.settings.security.close": "닫기",
   "user.settings.security.currentPassword": "현재 비밀번호",
   "user.settings.security.currentPasswordError": "현재 비밀번호를 입력해주세요",
@@ -1937,15 +1947,15 @@
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "Google",
   "user.settings.security.lastUpdated": "{date} {time} 에 마지막으로 변경됨",
-  "user.settings.security.ldap": "LDAP",
-  "user.settings.security.loginGitlab": "Login done through Gitlab",
-  "user.settings.security.loginLdap": "Login done through LDAP",
+  "user.settings.security.ldap": "AD/LDAP",
+  "user.settings.security.loginGitlab": "Gitlab을 통해 로그인 되었습니다.",
+  "user.settings.security.loginLdap": "LDAP을 통해 로그인 되었습니다.",
   "user.settings.security.logoutActiveSessions": "활성화 된 세션 보기/로그아웃 하기",
-  "user.settings.security.method": "Sign-in Method",
+  "user.settings.security.method": "접속 방식",
   "user.settings.security.newPassword": "새로운 비밀번호",
-  "user.settings.security.noApps": "No OAuth 2.0 Applications are authorized.",
-  "user.settings.security.oauthApps": "OAuth 2.0 Applications",
-  "user.settings.security.oauthAppsDescription": "Click 'Edit' to manage your OAuth 2.0 Applications",
+  "user.settings.security.noApps": "허가된 OAuth 2.0 애플리케이션이 없습니다.",
+  "user.settings.security.oauthApps": "OAuth 2.0 애플리케이션",
+  "user.settings.security.oauthAppsDescription": "'편집'을 눌러 OAuth 2.0 애플리케이션을 관리하세요",
   "user.settings.security.oauthAppsHelp": "Applications act on your behalf to access your data based on the permissions you grant them.",
   "user.settings.security.office365": "Office 365",
   "user.settings.security.oneSignin": "You may only have one sign-in method at a time. Switching sign-in method will send an email notifying you if the change was successful.",
@@ -1972,24 +1982,24 @@
   "user.settings.security.passwordMinLength": "Invalid minimum length, cannot show preview.",
   "user.settings.security.retypePassword": "비밀번호 재입력",
   "user.settings.security.saml": "SAML",
-  "user.settings.security.switchEmail": "Switch to using email and password",
-  "user.settings.security.switchGitlab": "Switch to using GitLab SSO",
-  "user.settings.security.switchGoogle": "Switch to using Google SSO",
-  "user.settings.security.switchLdap": "Switch to using LDAP",
-  "user.settings.security.switchOffice365": "Switch to using Office 365 SSO",
-  "user.settings.security.switchSaml": "Switch to using SAML SSO",
+  "user.settings.security.switchEmail": "이메일과 비밀번호를 사용하도록 변경",
+  "user.settings.security.switchGitlab": "GitLab SSO을 사용하도록 변경",
+  "user.settings.security.switchGoogle": "Google SSO을 사용하도록 변경",
+  "user.settings.security.switchLdap": "LDAP을 사용하도록 변경",
+  "user.settings.security.switchOffice365": "Office 365 SSO을 사용하도록 변경",
+  "user.settings.security.switchSaml": "SAML SSO을 사용하도록 변경",
   "user.settings.security.title": "보안 설정",
   "user.settings.security.viewHistory": "접속 내역 보기",
   "user_list.notFound": "사용자를 찾을 수 없습니다 :(",
-  "view_image.loading": "Loading ",
+  "view_image.loading": "로딩 중 ",
   "view_image_popover.download": "다운로드",
   "view_image_popover.file": "File {count} of {total}",
-  "view_image_popover.publicLink": "Get Public Link",
+  "view_image_popover.publicLink": "공개 링크 보기",
   "web.footer.about": "알아보기",
   "web.footer.help": "도움말",
   "web.footer.privacy": "정책",
   "web.footer.terms": "서비스 약관",
   "web.header.back": "돌아가기",
-  "web.root.signup_info": "모든 팀 커뮤니케이션을 한 곳에서 확인하고, 검색하고, 접근할 수 있습니다.",
+  "web.root.signup_info": "모든 팀 커뮤니케이션 활동을 한 곳에 모아 쉽고 빠르게 접근할 수 있습니다.",
   "youtube_video.notFound": "비밀번호를 찾을 수 없습니다."
 }
diff --git a/webapp/i18n/nl.json b/webapp/i18n/nl.json
index f44403e08..292346168 100644
--- a/webapp/i18n/nl.json
+++ b/webapp/i18n/nl.json
@@ -413,6 +413,7 @@
   "admin.ldap.lastnameAttrDesc": "(Optioneel) Het attribuut in the LDAP-server dat wordt gebruikt voor het vullen van de bijnaam van de gebruikers in Mattermost.",
   "admin.ldap.lastnameAttrEx": "Bijv. \"sn\"",
   "admin.ldap.lastnameAttrTitle": "Achternaam attribuut:",
+  "admin.ldap.ldap_test_button": "AD/LDAP Test",
   "admin.ldap.loginNameDesc": "De tijdelijke tekst die wordt weergegeven in het veld 'login' op de login pagina. Standaard ingesteld op \"LDAP-Gebruikersnaam\".",
   "admin.ldap.loginNameEx": "B.v. \"LDAP Gebruikersnaam\"",
   "admin.ldap.loginNameTitle": "Login veld naam:",
@@ -439,8 +440,9 @@
   "admin.ldap.syncIntervalTitle": "Synchronisatie-Interval (in minuten)",
   "admin.ldap.syncNowHelpText": "Initieer een LDAP synchronisatie meteen.",
   "admin.ldap.sync_button": "Synchroniseer LDAP Nu",
-  "admin.ldap.testFailure": "LDAP Test Failure: {error}",
-  "admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the LDAP server specified. See log file for more detailed error messages.",
+  "admin.ldap.testFailure": "AD/LDAP Test Failure: {error}",
+  "admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the AD/LDAP server specified. See log file for more detailed error messages.",
+  "admin.ldap.testSuccess": "AD/LDAP Test Successful",
   "admin.ldap.uernameAttrDesc": "Het attribuut in the LDAP-server dat wordt gebruikt voor het vullen van het veld gebruikersnaam in Mattermost. Dit kan hetzelfde zijn als het ID-attribuut.",
   "admin.ldap.userFilterDisc": "Voer eventueel een LDAP filter in om te gebruiken bij het zoeken naar de gebruiker objecten. Alleen de gebruikers geselecteerd door deze query zullen in staat zijn om toegang te krijgen tot Mattermost. Voor Active Directory is de query om gebruikers te filteren (&(objectCategory=Persoon)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "Bijv. \"(objectClass=user)\"",
@@ -461,6 +463,8 @@
   "admin.license.uploading": "De licentie wordt geüpload...",
   "admin.log.consoleDescription": "Meestal uitgeschakeld in de productie. Ontwikkelaars kunnen dit veld op ingeschakeld zetten om de uitvoer van de log boodschappen naar de console te sturen, gebaseerd op de console niveau optie. Als dit ingeschakeld is, schrijft de server berichten naar de standaard output stroom (stdout).",
   "admin.log.consoleTitle": "Log naar console:",
+  "admin.log.enableDiagnostics": "Enable Diagnostics and Error Reporting:",
+  "admin.log.enableDiagnosticsDescription": "Enable this feature to improve the quality and performance of Mattermost by sending error reporting and diagnostic information to Mattermost, Inc. Read our <a href=\"https://about.mattermost.com/default-privacy-policy/\" target=\"_blank\">privacy policy</a> to learn more.",
   "admin.log.enableWebhookDebugging": "Webhook debugging inschakelen:",
   "admin.log.enableWebhookDebuggingDescription": "Zet debug logging uit voor alle inkomende webhook requests.",
   "admin.log.fileDescription": "Meestal ingesteld op 'ingeschakeld' in de productie. Wanneer dit ingeschakeld is, worden log bestanden geschreven naar het log-bestand dat is opgegeven in de bestandslocatie in het veld hieronder.",
@@ -636,8 +640,8 @@
   "admin.service.iconTitle": "Enable integrations to override profile picture icons:",
   "admin.service.insecureTlsDesc": "Wanneer dit aanstaat, alle uitgaande HTTPS verzoeken zullen ongeverifieerde en self-signed certificaten accepteren. Bijvoorbeeld, uitgaande webhooks naar een server met een self-signed TLS certificaat, gebruik makend van een willekeurig domein, zullen worden toegestaan. Let op, dit maakt deze verbindingen vatbaar voor man-in-the-middle aanvallen.",
   "admin.service.insecureTlsTitle": "Schakel onbeveiligde uitgaande verbindingen in: ",
-  "admin.service.integrationAdmin": "Beperkt het  maken van nieuwe integraties tot Team- en Systeembeheerders",
-  "admin.service.integrationAdminDesc": "Wanneer ingeschakeld, kunnen integraties enkel gemaakt worden door de systeembeheerder.",
+  "admin.service.integrationAdmin": "Restrict managing integrations to Admins:",
+  "admin.service.integrationAdminDesc": "When true, webhooks and slash commands can only be created, edited and viewed by Team and System Admins, and OAuth 2.0 applications by System Admins. Integrations are available to all users after they have been created by the Admin.",
   "admin.service.listenAddress": "Luister Adres:",
   "admin.service.listenDescription": "Het adres waar aan te luisteren. Ingeven van \":8065\" zal alle interfaces gebruiken of je kan er 1 kiezen zoals \"127.0.0.1:8065\". Wijziging hiervan zal een herstart van de server vereisen om de verandering zichtbaar te maken.",
   "admin.service.listenExample": "B.v. \":8065\"",
@@ -658,7 +662,7 @@
   "admin.service.sessionCacheDesc": "Het aantal minuten dat een sessie in het geheugen wordt gecached.",
   "admin.service.sessionDaysEx": "B.v. \"30\"",
   "admin.service.siteURL": "Site URL:",
-  "admin.service.siteURLDescription": "De URL, inclusief poort nummer en protocol, waarvandaan Mattermost gebruikers toegang zullen hebben. Laat dit leeg om automatisch te configureren op basis van inkomend verkeer. ",
+  "admin.service.siteURLDescription": "The URL, including port number and protocol, that users will use to access Mattermost. This field can be left blank unless you are configuring email batching in <b>Notifications > Email</b>. When blank, the URL is automatically configured based on incoming traffic.",
   "admin.service.siteURLExample": "Bv \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "Sessie duur voor SSO (dagen):",
   "admin.service.ssoSessionDaysDesc": "Het aantal dagen dat de gebruiker voor het laatst zijn credentials heeft ingevoerd voordat gebruikers sessie verloopt. Als de authenticatie SAML of GitLab is, kan de gebruiker automatisch worden terug ingelogd in Mattermost omdat ze al waren ingelogd in SAML of GitLab. Nadat deze instelling is gewijzigd, zal de nieuwe sessie lengte plaatsvinden de volgende keer de gebruiker zijn credentials invult. ",
@@ -1014,7 +1018,7 @@
   "claim.account.noEmail": "Geen e-mail adres opgegeven",
   "claim.email_to_ldap.enterLdapPwd": "Voer de ID en het wachtwoord voor uw LDAP-account in",
   "claim.email_to_ldap.enterPwd": "Voer het wachtwoord in voor uw {site} e-mail account",
-  "claim.email_to_ldap.ldapId": "LDAP ID",
+  "claim.email_to_ldap.ldapId": "AD/LDAP ID",
   "claim.email_to_ldap.ldapIdError": "Vul uw LDAP-ID in.",
   "claim.email_to_ldap.ldapPasswordError": "Voer uw LDAP wachtwoord in.",
   "claim.email_to_ldap.ldapPwd": "LDAP wachtwoord",
@@ -1226,7 +1230,7 @@
   "help.composing.deleting": "## Deleting a message\nDelete a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Delete**. System and Team Admins can delete any message on their system or team.",
   "help.composing.editing": "## Editing a Message\nEdit a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Edit**. After making modifications to the message text, press **ENTER** to save the modifications. Message edits do not trigger new @mention notifications, desktop notifications or notification sounds.",
   "help.composing.linking": "## Linking to a message\nThe **Permalink** feature creates a link to any message. Sharing this link with other users in the channel lets them view the linked message in the Message Archives. Users who are not a member of the channel where the message was posted cannot view the permalink. Get the permalink to any message by clicking the **[...]** icon next to the message text  > **Permalink** > **Copy Link**.",
-  "help.composing.posting": "## Posting a Message\nWrite a message by typing into the text input box, then press **ENTER** to send it. Use **Shift + ENTER** to create a new line without sending a message. To send messages by pressing **Ctrl+Enter** go to **Main Menu > Account Settings > Send messages on Ctrl + Enter**.",
+  "help.composing.posting": "## Posting a Message\nWrite a message by typing into the text input box, then press **ENTER** to send it. Use **Shift + ENTER** to create a new line without sending a message. To send messages by pressing **CTRL+ENTER** go to **Main Menu > Account Settings > Send messages on CTRL + ENTER**.",
   "help.composing.posts": "#### Posts\nPosts can be considered parent messages. They are the messages that often start a thread of replies. Posts are composed and sent from the text input box at the bottom of the center pane.",
   "help.composing.replies": "#### Replies\nReply to a message by clicking the reply icon next to any message text. This action opens the right-hand-side (RHS) where you can see the message thread, then compose and send your reply. Replies are indented slightly in the center pane to indicate that they are child messages of a parent post.\n\nWhen composing a reply in the right-hand side, click the expand/collapse icon with two arrows at the top of the sidebar to make things easier to read.",
   "help.composing.title": "# Sending Messages\n_____",
@@ -1250,7 +1254,7 @@
   "help.formatting.lines": "## Lines\n\nCreate a line by using three `*`, `_`, or `-`.",
   "help.formatting.linkEx": "[Check out Mattermost!](https://about.mattermost.com/)",
   "help.formatting.links": "## Links\n\nCreate labeled links by putting the desired text in square brackets and the associated link in normal brackets.",
-  "help.formatting.listExample": "* list item one\n* list item two\n    * item two sub-point')",
+  "help.formatting.listExample": "* list item one\n* list item two\n    * item two sub-point",
   "help.formatting.lists": "## Lists\n\nCreate a list by using `*` or `-` as bullets. Indent a bullet point by adding two spaces in front of it.",
   "help.formatting.monokaiTheme": "**Monokai Theme**",
   "help.formatting.ordered": "Make it an ordered list by using numbers instead:",
@@ -1355,6 +1359,7 @@
   "integrations.oauthApps.title": "OAuth 2.0 Applicaties",
   "integrations.outgoingWebhook.description": "Uitgaande webhooks laten externe integraties toe om berichten te ontvangen en hierop te antwoorden",
   "integrations.outgoingWebhook.title": "Uitgaande webhook",
+  "integrations.successful": "Setup Successful",
   "intro_messages.DM": "Dit is de start van uw privé berichten historiek met teamlid {teammate}.<br /> Privé berichten en bestanden die hier gedeeld worden zijn niet zichtbaar voor anderen.",
   "intro_messages.anyMember": "Ieder lid kan dit kanaal lezen en volgen.",
   "intro_messages.beginning": "Begin van {name}",
@@ -1474,7 +1479,7 @@
   "navbar_dropdown.leave": "Team verlaten",
   "navbar_dropdown.logout": "Afmelden",
   "navbar_dropdown.manageMembers": "Leden beheren",
-  "navbar_dropdown.nativeApps": "Download Mattermost Apps",
+  "navbar_dropdown.nativeApps": "Download Apps",
   "navbar_dropdown.report": "Een probleem melden",
   "navbar_dropdown.switchTeam": "Schakel naar {team}",
   "navbar_dropdown.switchTo": "Omschakelen naar ",
@@ -1496,7 +1501,7 @@
   "password_send.link": "<p>Een wachtwoord reset link is verstuurd naar <b>{email}</b></p>",
   "password_send.reset": "Reset wachtwoord",
   "password_send.title": "Wachtwoord reset",
-  "pdf_preview.max_pages": "PDF previews only show the first five pages.",
+  "pdf_preview.max_pages": "Download to read more pages",
   "pending_post_actions.cancel": "Annuleren",
   "pending_post_actions.retry": "Probeer opnieuw",
   "permalink.error.access": "Permalink behoort toe aan een verwijderd bericht of aan een kanaal waar je geen toegang tot hebt.",
@@ -1563,6 +1568,10 @@
   "search_results.because": "<ul><li>Wanneer u op zoek bent naar een gedeeltelijk woord (b.v. zoek naar \"tele\", op zoek naar \"telefooon\" of \"televisie\"), moet u een * aan de zoekterm toevoegen</li><li>Zoekopdrachten van 2 letters en algemene woorden zoals \"dit\", \"een\", \"het\" verschijnen niet in de zoekresultaten</li></ul>",
   "search_results.noResults": "Geen resultaten gevonden. Opnieuw proberen?",
   "search_results.usage": "<ul><li>Gebruik <b>\"aanhalingstekens\"</b> om hele zinnen te zoeken</li><li>Gebruik <b>van:</b> om berichten van specifieke gebruikers te zoeken en <b>in:</b> om berichten in specifieke kanalen te zoeken</li></ul>",
+  "search_results.usageFlag1": "You haven't flagged any messages yet.",
+  "search_results.usageFlag2": "You can add a flag to messages and comments by clicking the ",
+  "search_results.usageFlag3": " icon next to the timestamp.",
+  "search_results.usageFlag4": "Flags are a way to mark messages for follow up. Your flags are personal, and cannot be seen by other users.",
   "setting_item_max.cancel": "Annuleren",
   "setting_item_max.save": "Opslaan",
   "setting_item_min.edit": "Bewerken",
@@ -1595,7 +1604,7 @@
   "sidebar_right_menu.inviteNew": "Nodig een nieuw lid uit...",
   "sidebar_right_menu.logout": "Afmelden",
   "sidebar_right_menu.manageMembers": "Leden beheren",
-  "sidebar_right_menu.nativeApps": "Download Mattermost Apps",
+  "sidebar_right_menu.nativeApps": "Download Apps",
   "sidebar_right_menu.recentMentions": "Recente vermeldingen",
   "sidebar_right_menu.report": "Een probleem melden",
   "sidebar_right_menu.switch_team": "Team Selectie",
@@ -1605,7 +1614,7 @@
   "signup.email": "E-mail en wachtwoord",
   "signup.gitlab": "GitLab Single-Sign-On",
   "signup.google": "Google Account",
-  "signup.ldap": "LDAP Credentials",
+  "signup.ldap": "AD/LDAP Credentials",
   "signup.office365": "Office 365",
   "signup.title": "Create an account with:",
   "signup_team.choose": "Je teams:",
@@ -1890,15 +1899,16 @@
   "user.settings.notifications.desktop.title": "Desktop meldings-geluid",
   "user.settings.notifications.desktop.unlimited": "Unlimited",
   "user.settings.notifications.desktopSounds": "Desktop meldings-geluid",
+  "user.settings.notifications.email.everyHour": "Elk uur",
+  "user.settings.notifications.email.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
+  "user.settings.notifications.email.immediately": "Onmiddellijk",
+  "user.settings.notifications.email.never": "Nooit",
+  "user.settings.notifications.email.send": "Stuur desktop meldingen",
   "user.settings.notifications.emailBatchingInfo": "Notifications received over the time period selected are combined and sent in a single email.",
   "user.settings.notifications.emailInfo": "E-mailmeldingen worden verzonden voor vermeldingen en rechtstreekse berichten nadat u bent offline bent voor meer dan 60 seconden of weg van {siteName} voor meer dan 5 minuten.",
   "user.settings.notifications.emailNotifications": "E-mail meldingen",
-  "user.settings.notifications.everyHour": "Elk uur",
-  "user.settings.notifications.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
   "user.settings.notifications.header": "Meldingen",
-  "user.settings.notifications.immediately": "Onmiddellijk",
   "user.settings.notifications.info": "Desktop notifications are available on Firefox, Safari, and Chrome.",
-  "user.settings.notifications.never": "Nooit",
   "user.settings.notifications.noWords": "Geen woorden geconfigureerd",
   "user.settings.notifications.off": "Uit",
   "user.settings.notifications.on": "Aan",
@@ -1937,7 +1947,7 @@
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "Google",
   "user.settings.security.lastUpdated": "Laatst bijgewerkt op {date} {time}",
-  "user.settings.security.ldap": "LDAP",
+  "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "Aanmelden via Gitlab",
   "user.settings.security.loginLdap": "Aanmelden via LDAP",
   "user.settings.security.logoutActiveSessions": "Bekijk en uitloggen huidige sessies",
diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json
index 148eef0be..45afbd184 100644
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -1,1995 +1,2005 @@
 {
-  "about.close": "Fechar",
-  "about.copyright": "Copyright 2016 Mattermost, Inc. Todos os direitos reservados",
-  "about.database": "Banco de dados:",
-  "about.date": "Data De Criação:",
-  "about.enterpriseEditionLearn": "Saiba mais sobre Enterprise Edition em ",
-  "about.enterpriseEditionSt": "Comunicação empresarial moderna atrás do seu firewall.",
+  "about.close": "Close",
+  "about.copyright": "Copyright 2016 Mattermost, Inc. All rights reserved",
+  "about.database": "Database:",
+  "about.date": "Build Date:",
+  "about.enterpriseEditionLearn": "Learn more about Enterprise Edition at ",
+  "about.enterpriseEditionSt": "Modern communication from behind your firewall.",
   "about.enterpriseEditione1": "Enterprise Edition",
-  "about.hash": "Hash de Compilação:",
-  "about.hashee": "Hash de Compilação EE:",
-  "about.licensed": "Licenciado por:",
-  "about.number": "O Número de Compilação:",
-  "about.teamEditionLearn": "Junte-se a comunidade Mattermost em ",
-  "about.teamEditionSt": "Toda comunicação da sua equipe em um só lugar, instantaneamente pesquisável e acessível em qualquer lugar.",
+  "about.hash": "Build Hash:",
+  "about.hashee": "EE Build Hash:",
+  "about.licensed": "Licensed by:",
+  "about.number": "Build Number:",
+  "about.teamEditionLearn": "Join the Mattermost community at ",
+  "about.teamEditionSt": "All your team communication in one place, instantly searchable and accessible anywhere.",
   "about.teamEditiont0": "Team Edition",
   "about.teamEditiont1": "Enterprise Edition",
-  "about.title": "Sobre o Mattermost",
-  "about.version": "Versão:",
-  "access_history.title": "Histórico de Acesso",
-  "activity_log.activeSessions": "Sessões ativas",
+  "about.title": "About Mattermost",
+  "about.version": "Version:",
+  "access_history.title": "Access History",
+  "activity_log.activeSessions": "Active Sessions",
   "activity_log.browser": "Browser: {browser}",
-  "activity_log.firstTime": "Primeira vez ativo: {date}, {time}",
-  "activity_log.lastActivity": "Última atividade: {date}, {time}",
+  "activity_log.firstTime": "First time active: {date}, {time}",
+  "activity_log.lastActivity": "Last activity: {date}, {time}",
   "activity_log.logout": "Logout",
-  "activity_log.moreInfo": "Mais informações",
-  "activity_log.os": "SO: {os}",
-  "activity_log.sessionId": "ID da Sessão: {id}",
-  "activity_log.sessionsDescription": "Sessões são criadas quando você efetuar login em um novo navegador em um dispositivo. Sessões permitem que você use Mattermost sem ter que logar novamente por um período de tempo especificado pelo administrador do sistema. Se você deseja sair mais cedo, use o botão 'Logout' abaixo para terminar uma sessão.",
+  "activity_log.moreInfo": "More info",
+  "activity_log.os": "OS: {os}",
+  "activity_log.sessionId": "Session ID: {id}",
+  "activity_log.sessionsDescription": "Sessions are created when you log in to a new browser on a device. Sessions let you use Mattermost without having to log in again for a time period specified by the System Admin. If you want to log out sooner, use the 'Logout' button below to end a session.",
   "activity_log_modal.android": "Android",
-  "activity_log_modal.androidNativeApp": "App Nativo para Android",
-  "activity_log_modal.iphoneNativeApp": "App Nativo para iPhone",
-  "add_command.autocomplete": "Autocompletar",
-  "add_command.autocomplete.help": "(Opcional) Exibir comandos slash na lista de auto preenchimento.",
-  "add_command.autocompleteDescription": "Autocompletar Descrição: ",
-  "add_command.autocompleteDescription.help": "(Opcional) Breve descrição opcional do comando slash para a lista de preenchimento automático.",
-  "add_command.autocompleteDescription.placeholder": "Exemplo: \"Retorna os resultados da pesquisa, prontuário\"",
-  "add_command.autocompleteHint": "Autocompletar Sugestão",
-  "add_command.autocompleteHint.help": "(Opcional) Argumentos associados com seu comando slash, exibido como ajuda na lista de preenchimento automático.",
-  "add_command.autocompleteHint.placeholder": "Exemplo: [Nome Do Paciente]",
-  "add_command.cancel": "Cancelar",
-  "add_command.description": "Descrição",
-  "add_command.description.help": "Descrição do seu webhook de entrada.",
-  "add_command.displayName": "Nome de Exibição",
-  "add_command.displayName.help": "Nome de exibição para seu comando slash contendo até 64 caracteres.",
-  "add_command.doneHelp": "Seu comando slash foi definido. O seguinte token será enviado com a mensagem de saída. Por favor, usá-lo para verificar o pedido vindo da sua equipe Mattermost (veja <a href=\"https://docs.mattermost.com/developer/slash-commands.html\">documentação</a> para mais detalhes).",
-  "add_command.iconUrl": "Ícone de Resposta",
-  "add_command.iconUrl.help": "(Opcional) Escolha uma imagem do perfil para substituir as respostas dos posts deste comando slash. Digite a URL de um arquivo .png ou .jpg com pelo menos 128 pixels por 128 pixels.",
+  "activity_log_modal.androidNativeApp": "Android Native App",
+  "activity_log_modal.iphoneNativeApp": "iPhone Native App",
+  "add_command.autocomplete": "Autocomplete",
+  "add_command.autocomplete.help": "(Optional) Show slash command in autocomplete list.",
+  "add_command.autocompleteDescription": "Autocomplete Description",
+  "add_command.autocompleteDescription.help": "(Optional) Short description of slash command for the autocomplete list.",
+  "add_command.autocompleteDescription.placeholder": "Example: \"Returns search results for patient records\"",
+  "add_command.autocompleteHint": "Autocomplete Hint",
+  "add_command.autocompleteHint.help": "(Optional) Arguments associated with your slash command, displayed as help in the autocomplete list.",
+  "add_command.autocompleteHint.placeholder": "Example: [Patient Name]",
+  "add_command.cancel": "Cancel",
+  "add_command.description": "Description",
+  "add_command.description.help": "Description for your incoming webhook.",
+  "add_command.displayName": "Display Name",
+  "add_command.displayName.help": "Display name for your slash command made of up to 64 characters.",
+  "add_command.doneHelp": "Your slash command has been set up. The following token will be sent in the outgoing payload. Please use it to verify the request came from your Mattermost team (see <a href=\"https://docs.mattermost.com/developer/slash-commands.html\">documentation</a> for further details).",
+  "add_command.iconUrl": "Response Icon",
+  "add_command.iconUrl.help": "(Optional) Choose a profile picture override for the post responses to this slash command. Enter the URL of a .png or .jpg file at least 128 pixels by 128 pixels.",
   "add_command.iconUrl.placeholder": "https://www.example.com/myicon.png",
-  "add_command.method": "Método da Requisição",
+  "add_command.method": "Request Method",
   "add_command.method.get": "GET",
-  "add_command.method.help": "O tipo de solicitação do comando emitido para a URL requisitada.",
+  "add_command.method.help": "The type of command request issued to the Request URL.",
   "add_command.method.post": "POST",
-  "add_command.save": "Salvar",
+  "add_command.save": "Save",
   "add_command.token": "<b>Token</b>: {token}",
-  "add_command.trigger": "Comando Palavra Gatilho",
-  "add_command.trigger.help": "Palavra gatilho precisa ser única, e não pode começar com uma barra ou conter espaços.",
-  "add_command.trigger.helpExamples": "Exemplos: cliente, funcionario, paciente, tempo",
-  "add_command.trigger.helpReserved": "Reservado: {link}",
-  "add_command.trigger.helpReservedLinkText": "veja a lista de comandos slash nativos",
-  "add_command.trigger.placeholder": "Comando gatilho ex. \"ola\"",
-  "add_command.triggerInvalidLength": "Uma palavra gatilho precisa conter entre {min} e {max} caracteres",
-  "add_command.triggerInvalidSlash": "Uma palavra gatilho não pode começar com /",
-  "add_command.triggerInvalidSpace": "Uma palavra gatilho não pode conter espaços",
-  "add_command.triggerRequired": "Uma palavra gatilho é necessária",
-  "add_command.url": "URL da solicitação",
-  "add_command.url.help": "A URL callback para receber o evento HTTP POST ou GET quando o comando slash for executado.",
-  "add_command.url.placeholder": "Deve começar com http:// ou https://",
-  "add_command.urlRequired": "Uma URL de requisição é necessária",
-  "add_command.username": "Usuário de Resposta",
-  "add_command.username.help": "(Opcional) Escolha um nome de usuário para substituir as respostas deste comando slash. O nome de usuário deve ter até 22 caracteres contendo letras minúsculas, números e os símbolos \"-\", \"_\", e \".\" .",
-  "add_command.username.placeholder": "Usuário",
-  "add_emoji.cancel": "Cancelar",
-  "add_emoji.header": "Adicionar",
-  "add_emoji.image": "Imagem",
-  "add_emoji.image.button": "Selecionar",
-  "add_emoji.image.help": "Escolha a imagem para o seu emoji. A imagem pode ser em um arquivo gif, png or jpeg com tamanho máximo de 64 KB and dimensões de até 128 por 128 pixels.",
-  "add_emoji.imageRequired": "Uma imagem é necessária para o emoji",
-  "add_emoji.name": "Nome",
-  "add_emoji.name.help": "Escolha um nome para o seu emoji que pode ter até 64 letras minúsculas, números, e símbolos '-' e '_'.",
-  "add_emoji.nameInvalid": "Os nomes dos emojis apenas podem conter números, letras e os símbolos '-' e '_'.",
-  "add_emoji.nameRequired": "Um nome é necessário para o emoji",
-  "add_emoji.nameTaken": "Este nome já está sendo usado por um emoji do sistema. Por Favor escolha outro nome.",
-  "add_emoji.preview": "Pré-visualização",
-  "add_emoji.preview.sentence": "Esta é uma frase com a {image} nela.",
-  "add_emoji.save": "Salvar",
-  "add_incoming_webhook.cancel": "Cancelar",
-  "add_incoming_webhook.channel": "Canal",
-  "add_incoming_webhook.channel.help": "Canal público ou grupo privado que recebe as cargas webhook. Você deve pertencer ao grupo privado quando configurar o webhook.",
-  "add_incoming_webhook.channelRequired": "Um canal válido é necessário",
-  "add_incoming_webhook.description": "Descrição",
-  "add_incoming_webhook.description.help": "Descrição do seu webhook de entrada.",
-  "add_incoming_webhook.displayName": "Nome de Exibição",
-  "add_incoming_webhook.displayName.help": "Nome de exibição para seu webhook de entrada contendo até 64 caracteres.",
-  "add_incoming_webhook.doneHelp": "Seu webhook de entrada foi definido. Por favor envie dados para a URL seguinte (veja <a href=\"https://docs.mattermost.com/developer/webhooks-incoming.html\">documentação</a> para mais detalhes).",
-  "add_incoming_webhook.name": "Nome",
-  "add_incoming_webhook.save": "Salvar",
+  "add_command.trigger": "Command Trigger Word",
+  "add_command.trigger.help": "Trigger word must be unique, and cannot begin with a slash or contain any spaces.",
+  "add_command.trigger.helpExamples": "Examples: client, employee, patient, weather",
+  "add_command.trigger.helpReserved": "Reserved: {link}",
+  "add_command.trigger.helpReservedLinkText": "see list of built-in slash commands",
+  "add_command.trigger.placeholder": "Command trigger e.g. \"hello\"",
+  "add_command.triggerInvalidLength": "A trigger word must contain between {min} and {max} characters",
+  "add_command.triggerInvalidSlash": "A trigger word cannot begin with a /",
+  "add_command.triggerInvalidSpace": "A trigger word must not contain spaces",
+  "add_command.triggerRequired": "A trigger word is required",
+  "add_command.url": "Request URL",
+  "add_command.url.help": "The callback URL to receive the HTTP POST or GET event request when the slash command is run.",
+  "add_command.url.placeholder": "Must start with http:// or https://",
+  "add_command.urlRequired": "A request URL is required",
+  "add_command.username": "Response Username",
+  "add_command.username.help": "(Optional) Choose a username override for responses for this slash command. Usernames can consist of up to 22 characters consisting of lowercase letters, numbers and they symbols \"-\", \"_\", and \".\" .",
+  "add_command.username.placeholder": "Username",
+  "add_emoji.cancel": "Cancel",
+  "add_emoji.header": "Add",
+  "add_emoji.image": "Image",
+  "add_emoji.image.button": "Select",
+  "add_emoji.image.help": "Choose the image for your emoji. The image can be a gif, png, or jpeg file with a max size of 64 KB and dimensions up to 128 by 128 pixels.",
+  "add_emoji.imageRequired": "An image is required for the emoji",
+  "add_emoji.name": "Name",
+  "add_emoji.name.help": "Choose a name for your emoji made of up to 64 characters consisting of lowercase letters, numbers, and the symbols '-' and '_'.",
+  "add_emoji.nameInvalid": "An emoji's name can only contain numbers, letters, and the symbols '-' and '_'.",
+  "add_emoji.nameRequired": "A name is required for the emoji",
+  "add_emoji.nameTaken": "This name is already in use by a system emoji. Please choose another name.",
+  "add_emoji.preview": "Preview",
+  "add_emoji.preview.sentence": "This is a sentence with {image} in it.",
+  "add_emoji.save": "Save",
+  "add_incoming_webhook.cancel": "Cancel",
+  "add_incoming_webhook.channel": "Channel",
+  "add_incoming_webhook.channel.help": "Public channel or private group that receives the webhook payloads. You must belong to the private group when setting up the webhook.",
+  "add_incoming_webhook.channelRequired": "A valid channel is required",
+  "add_incoming_webhook.description": "Description",
+  "add_incoming_webhook.description.help": "Description for your incoming webhook.",
+  "add_incoming_webhook.displayName": "Display Name",
+  "add_incoming_webhook.displayName.help": "Display name for your incoming webhook made of up to 64 characters.",
+  "add_incoming_webhook.doneHelp": "Your incoming webhook has been set up. Please send data to the following URL (see <a href=\"https://docs.mattermost.com/developer/webhooks-incoming.html\">documentation</a> for further details).",
+  "add_incoming_webhook.name": "Name",
+  "add_incoming_webhook.save": "Save",
   "add_incoming_webhook.url": "<b>URL</b>: {url}",
-  "add_oauth_app.callbackUrls.help": "Os URIs de redirecionamento para o qual o serviço irá redirecionar os usuários depois de aceitar ou negar a autorização de sua aplicação, e que irá lidar com códigos de autorização ou tokens de acesso. Deve ser uma URL válida e começar com http:// ou https://.",
-  "add_oauth_app.callbackUrlsRequired": "Uma ou mais URLs callback são necessárias",
-  "add_oauth_app.clientId": "<b>ID Cliente</b>: {id}",
-  "add_oauth_app.clientSecret": "<b>Cliente Chave Secreta</b>: {secret}",
-  "add_oauth_app.description.help": "Descrição para sua aplicação OAuth 2.0.",
-  "add_oauth_app.descriptionRequired": "Descrição para a aplicação OAuth 2.0 é obrigatória.",
-  "add_oauth_app.doneHelp": "Sua aplicação OAuth 2.0 foi configurada. Por favor use o seguinte ID Cliente e Chave Secreta Cliente ao solicitar a autorização para a sua aplicação.",
-  "add_oauth_app.doneUrlHelp": "A seguir estão as URL(s) de redirecionamento autorizadas.",
-  "add_oauth_app.header": "Adicionar",
-  "add_oauth_app.homepage.help": "A URL para a página inicial da aplicação OAuth 2.0. Certifique-se de usar HTTP ou HTTPS em sua URL dependendo da sua configuração do servidor.",
-  "add_oauth_app.homepageRequired": "Página Inicial para a aplicação OAuth 2.0 é obrigatória.",
-  "add_oauth_app.icon.help": "(Opcional) A URL da imagem usada para a sua aplicação OAuth 2.0. Certifique-se de usar HTTP ou HTTPS em sua URL.",
-  "add_oauth_app.name.help": "Nome de exibição para sua aplicação OAuth 2.0 contendo até 64 caracteres.",
-  "add_oauth_app.nameRequired": "Nome para a aplicação OAuth 2.0 é obrigatória.",
-  "add_oauth_app.trusted.help": "Quando verdadeiro, a aplicação OAuth 2.0 é considerado confiável pelo servidor Mattermost e não requer que o usuário aceite a autorização. Quando falso, uma janela adicional será exibida, solicitando ao usuário para aceitar ou negar a autorização.",
-  "add_oauth_app.url": "<b>URL</b>: {url}",
-  "add_outgoing_webhook.callbackUrls": "URLs Callback (Uma Por Linha)",
-  "add_outgoing_webhook.callbackUrls.help": "A URL que as mensagens serão enviadas.",
-  "add_outgoing_webhook.callbackUrlsRequired": "Uma ou mais URLs callback são necessárias",
-  "add_outgoing_webhook.cancel": "Cancelar",
-  "add_outgoing_webhook.channel": "Canal",
-  "add_outgoing_webhook.channel.help": "Canal público para receber cargas webhook. Opcional se pelo menos uma Palavra Gatilho for especificado.",
-  "add_outgoing_webhook.contentType.help1": "Escolha o tipo de conteúdo pelo qual a resposta será enviada.",
-  "add_outgoing_webhook.contentType.help2": "Se application/x-www-form-urlencoded for escolhida, o servidor assume que você vai codificar os parâmetros em um formato de URL.",
-  "add_outgoing_webhook.contentType.help3": "Se application/json for escolhida, o servidor assume que você irá postar os dados em JSON.",
-  "add_outgoing_webhook.content_Type": "Tipo de Conteúdo",
-  "add_outgoing_webhook.description": "Descrição",
-  "add_outgoing_webhook.description.help": "Descrição do seu webhook de saída.",
-  "add_outgoing_webhook.displayName": "Nome de Exibição",
-  "add_outgoing_webhook.displayName.help": "Nome de exibição para seu webhook de saída contendo até 64 caracteres.",
-  "add_outgoing_webhook.doneHelp": "Seu webhook de saída foi definido. O seguinte token será enviado com a mensagem de saída. Por favor, usá-lo para verificar o pedido vindo da sua equipe Mattermost (veja <a href=\"https://docs.mattermost.com/developer/webhooks-outgoing.html\">documentação</a> para mais detalhes).",
-  "add_outgoing_webhook.name": "Nome",
-  "add_outgoing_webhook.save": "Salvar",
+  "add_oauth_app.callbackUrls.help": "The redirect URIs to which the service will redirect users after accepting or denying authorization of your application, and which will handle authorization codes or access tokens. Must be a valid URL and start with http:// or https://.",
+  "add_oauth_app.callbackUrlsRequired": "One or more callback URLs are required",
+  "add_oauth_app.clientId": "<b>Client ID</b>: {id}",
+  "add_oauth_app.clientSecret": "<b>Client Secret</b>: {secret}",
+  "add_oauth_app.description.help": "Description for your OAuth 2.0 application.",
+  "add_oauth_app.descriptionRequired": "Description for the OAuth 2.0 application is required.",
+  "add_oauth_app.doneHelp": "Your OAuth 2.0 application has been set up. Please use the following Client ID and Client Secret when requesting authorization for your application.",
+  "add_oauth_app.doneUrlHelp": "The following are your authorized redirect URL(s).",
+  "add_oauth_app.header": "Add",
+  "add_oauth_app.homepage.help": "The URL for the homepage of the OAuth 2.0 application. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.",
+  "add_oauth_app.homepageRequired": "Homepage for the OAuth 2.0 application is required.",
+  "add_oauth_app.icon.help": "(Optional) The URL of the image used for your OAuth 2.0 application. Make sure you use HTTP or HTTPS in your URL.",
+  "add_oauth_app.name.help": "Display name for your OAuth 2.0 application made of up to 64 characters.",
+  "add_oauth_app.nameRequired": "Name for the OAuth 2.0 application is required.",
+  "add_oauth_app.trusted.help": "When true, the OAuth 2.0 application is considered trusted by the Mattermost server and doesn't require the user to accept authorization. When false, an additional window will appear, asking the user to accept or deny the authorization.",
+  "add_oauth_app.url": "<b>URL(s)</b>: {url}",
+  "add_outgoing_webhook.callbackUrls": "Callback URLs (One Per Line)",
+  "add_outgoing_webhook.callbackUrls.help": "The URL that messages will be sent to.",
+  "add_outgoing_webhook.callbackUrlsRequired": "One or more callback URLs are required",
+  "add_outgoing_webhook.cancel": "Cancel",
+  "add_outgoing_webhook.channel": "Channel",
+  "add_outgoing_webhook.channel.help": "Public channel to receive webhook payloads. Optional if at least one Trigger Word is specified.",
+  "add_outgoing_webhook.contentType.help1": "Choose the content type by which the response will be sent.",
+  "add_outgoing_webhook.contentType.help2": "If application/x-www-form-urlencoded is chosen, the server assumes you will be encoding the parameters in a URL format.",
+  "add_outgoing_webhook.contentType.help3": "If application/json is chosen, the server assumes you will posting JSON data.",
+  "add_outgoing_webhook.content_Type": "Content Type",
+  "add_outgoing_webhook.description": "Description",
+  "add_outgoing_webhook.description.help": "Description for your outgoing webhook.",
+  "add_outgoing_webhook.displayName": "Display Name",
+  "add_outgoing_webhook.displayName.help": "Display name for your outgoing webhook made of up to 64 characters.",
+  "add_outgoing_webhook.doneHelp": "Your outgoing webhook has been set up. The following token will be sent in the outgoing payload. Please use it to verify the request came from your Mattermost team (see <a href=\"https://docs.mattermost.com/developer/webhooks-outgoing.html\">documentation</a> for further details).",
+  "add_outgoing_webhook.name": "Name",
+  "add_outgoing_webhook.save": "Save",
   "add_outgoing_webhook.token": "<b>Token</b>: {token}",
-  "add_outgoing_webhook.triggerWords": "Palavras Gatilho (Uma Por Linha)",
-  "add_outgoing_webhook.triggerWords.help": "Mensagens que começam com uma das palavras especificadas irá disparar o webhook de saída. Opcional se o canal for selecionado.",
-  "add_outgoing_webhook.triggerWordsOrChannelRequired": "Um canal válido ou uma lista de palavras gatilho é necessário",
-  "add_outgoing_webhook.triggerWordsTriggerWhen": "Gatilho Quando",
-  "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Escolher quando disparar o webhook de saída; se a primeira palavra de uma mensagem corresponde exatamente a uma Palavra Gatilho, ou se ele começa com uma Palavra Gatilho.",
-  "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "Primeira palavra corresponde exatamente a uma palavra gatilho",
-  "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "Primeira palavra começa com uma palavra gatilho",
-  "admin.advance.cluster": "Alta Disponibilidade (Beta)",
-  "admin.audits.reload": "Recarregar",
-  "admin.audits.title": "Atividade de Usuário",
-  "admin.authentication.email": "Autenticação Email",
+  "add_outgoing_webhook.triggerWords": "Trigger Words (One Per Line)",
+  "add_outgoing_webhook.triggerWords.help": "Messages that start with one of the specified words will trigger the outgoing webhook. Optional if Channel is selected.",
+  "add_outgoing_webhook.triggerWordsOrChannelRequired": "A valid channel or a list of trigger words is required",
+  "add_outgoing_webhook.triggerWordsTriggerWhen": "Trigger When",
+  "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choose when to trigger the outgoing webhook; if the first word of a message matches a Trigger Word exactly, or if it starts with a Trigger Word.",
+  "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "First word matches a trigger word exactly",
+  "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "First word starts with a trigger word",
+  "admin.advance.cluster": "High Availability (Beta)",
+  "admin.audits.reload": "Reload User Activity Logs",
+  "admin.audits.title": "User Activity Logs",
+  "admin.authentication.email": "Email Auth",
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
-  "admin.banner.heading": "Nota:",
-  "admin.cluster.enableDescription": "Quando verdadeiro, Mattermost irá executar no modo de Alta Disponibilidade. Por favor veja a <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentação</a> para aprender mais sobre configurar Alta Disponibilidade para o Mattermost.",
-  "admin.cluster.enableTitle": "Ativar modo Alta Disponibilidade:",
-  "admin.cluster.interNodeListenAddressDesc": "O endereço que o servidor irá escutar para a comunicação com os outros servidores.",
-  "admin.cluster.interNodeListenAddressEx": "Ex \":8065\"",
-  "admin.cluster.interNodeListenAddressTitle": "Inter-Node Escutar Endereço:",
-  "admin.cluster.interNodeUrlsDesc": "As URLs internas/privadas de todos os servidores Mattermost separados por virgulas.",
+  "admin.banner.heading": "Note:",
+  "admin.cluster.enableDescription": "When true, Mattermost will run in High Availability mode. Please see <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> to learn more about configuring High Availability for Mattermost.",
+  "admin.cluster.enableTitle": "Enable High Availability Mode:",
+  "admin.cluster.interNodeListenAddressDesc": "The address the server will listen on for communicating with other servers.",
+  "admin.cluster.interNodeListenAddressEx": "Ex \":8075\"",
+  "admin.cluster.interNodeListenAddressTitle": "Inter-Node Listen Address:",
+  "admin.cluster.interNodeUrlsDesc": "The internal/private URLs of all the Mattermost servers separated by commas.",
   "admin.cluster.interNodeUrlsEx": "Ex \"http://10.10.10.30, http://10.10.10.31\"",
   "admin.cluster.interNodeUrlsTitle": "Inter-Node URLs:",
-  "admin.cluster.loadedFrom": "Este arquivo de configuração foi carregado do Node ID {clusterId}. Por favor consulte o Guia de Resolução de Problemas na nossa <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentação</a> se você está acessando o Console do Sistema através de um balanceador de carga e enfrentando problemas.",
-  "admin.cluster.noteDescription": "Alterando propriedades nesta seção irá exigir a reinicialização do servidor antes de ter efeito. Quando o modo de Alta Disponibilidade é ativado, o Console do Sistema é definido para somente leitura e só pode ser alterado a partir do arquivo de configuração.",
-  "admin.cluster.should_not_change": "ATENÇÃO: Essas configurações podem não sincronizar com outros servidores no cluster. Comunicação de Alta Disponibilidade inter-node não será iniciado até que você modifique o config.json para ser idênticos em todos os servidores e reiniciar Mattermost. Por favor veja a <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentação</a> como adicionar ou remover um servidor do cluster. Se você estiver acessando o Console do Sistema através de um balanceador e enfrentando problemas, por favor veja o Guia de Resolução de Problemas na nossa <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentação</a>.",
-  "admin.cluster.status_table.config_hash": "MD5 Arquivo de Configuração",
-  "admin.cluster.status_table.hostname": "Nome da máquina",
+  "admin.cluster.loadedFrom": "This configuration file was loaded from Node ID {clusterId}. Please see the Troubleshooting Guide in our <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> if you are accessing the System Console through a load balancer and experiencing issues.",
+  "admin.cluster.noteDescription": "Changing properties in this section will require a server restart before taking effect. When High Availability mode is enabled, the System Console is set to read-only and can only be changed from the configuration file.",
+  "admin.cluster.should_not_change": "WARNING: These settings may not sync with the other servers in the cluster. High Availability inter-node communication will not start until you modify the config.json to be identical on all servers and restart Mattermost. Please see the <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> on how to add or remove a server from the cluster. If you are accessing the System Console through a load balancer and experiencing issues, please see the Troubleshooting Guide in our <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a>.",
+  "admin.cluster.status_table.config_hash": "Config File MD5",
+  "admin.cluster.status_table.hostname": "Hostname",
   "admin.cluster.status_table.id": "Node ID",
-  "admin.cluster.status_table.reload": " Recarregar Cluster Status",
+  "admin.cluster.status_table.reload": " Reload Cluster Status",
   "admin.cluster.status_table.status": "Status",
   "admin.cluster.status_table.url": "Inter-Node URL",
-  "admin.cluster.status_table.version": "Versão",
-  "admin.compliance.directoryDescription": "Diretório o qual os relatórios compliance são gravados. Se estiver em branco, será usado ./data/.",
+  "admin.cluster.status_table.version": "Version",
+  "admin.compliance.directoryDescription": "Directory to which compliance reports are written. If blank, will be set to ./data/.",
   "admin.compliance.directoryExample": "Ex \"./data/\"",
-  "admin.compliance.directoryTitle": "Diretório de Relatórios de conformidade:",
-  "admin.compliance.enableDailyDesc": "Quando verdadeiro, Mattermost irá gerar um relatório diário de compliance.",
-  "admin.compliance.enableDailyTitle": "Ativar Relatório Diário:",
-  "admin.compliance.enableDesc": "Quando verdadeiro, Mattermost permite relatórios de compliance para a aba <strong>Compliance e Auditoria</strong>. Veja a <a href=\"https://docs.mattermost.com/administration/compliance.html\" target=\"_blank\">documentação</a> para saber mais.",
-  "admin.compliance.enableTitle": "Habilitar Relatórios de Conformidade:",
-  "admin.compliance.false": "falso",
-  "admin.compliance.noLicense": "<h4 class=\"banner__heading\">Nota:</h4><p>Compliance é um recurso enterprise. Sua licença atual não suporta Compliance. Clique <a href=\"http://mattermost.com\" target=\"_blank\">aqui</a> para informações e preços da licença enterprise.</p>",
-  "admin.compliance.save": "Salvar",
-  "admin.compliance.saving": "Salvando Config...",
-  "admin.compliance.title": "Configurações Compliance",
-  "admin.compliance.true": "verdadeiro",
-  "admin.compliance_reports.desc": "Nome da Tarefa:",
-  "admin.compliance_reports.desc_placeholder": "Ex: \"Audit 445 for HR\"",
+  "admin.compliance.directoryTitle": "Compliance Report Directory:",
+  "admin.compliance.enableDailyDesc": "When true, Mattermost will generate a daily compliance report.",
+  "admin.compliance.enableDailyTitle": "Enable Daily Report:",
+  "admin.compliance.enableDesc": "When true, Mattermost allows compliance reporting from the <strong>Compliance and Auditing</strong> tab. See <a href=\"https://docs.mattermost.com/administration/compliance.html\" target=\"_blank\">documentation</a> to learn more.",
+  "admin.compliance.enableTitle": "Enable Compliance Reporting:",
+  "admin.compliance.false": "false",
+  "admin.compliance.noLicense": "<h4 class=\"banner__heading\">Note:</h4><p>Compliance is an enterprise feature. Your current license does not support Compliance. Click <a href=\"http://mattermost.com\" target=\"_blank\">here</a> for information and pricing on enterprise licenses.</p>",
+  "admin.compliance.save": "Save",
+  "admin.compliance.saving": "Saving Config...",
+  "admin.compliance.title": "Compliance Settings",
+  "admin.compliance.true": "true",
+  "admin.compliance_reports.desc": "Job Name:",
+  "admin.compliance_reports.desc_placeholder": "E.g. \"Audit 445 for HR\"",
   "admin.compliance_reports.emails": "Emails:",
-  "admin.compliance_reports.emails_placeholder": "Ex: \"bill@example.com, bob@example.com\"",
-  "admin.compliance_reports.from": "De:",
-  "admin.compliance_reports.from_placeholder": "Ex: \"2016-03-11\"",
-  "admin.compliance_reports.keywords": "Palavras-chave:",
-  "admin.compliance_reports.keywords_placeholder": "Ex: \"diminuir estoque\"",
-  "admin.compliance_reports.reload": "Recarregar",
-  "admin.compliance_reports.run": "Executar",
-  "admin.compliance_reports.title": "Relatórios Compliance",
-  "admin.compliance_reports.to": "Para:",
-  "admin.compliance_reports.to_placeholder": "Ex: \"2016-03-15\"",
-  "admin.compliance_table.desc": "Descrição",
+  "admin.compliance_reports.emails_placeholder": "E.g. \"bill@example.com, bob@example.com\"",
+  "admin.compliance_reports.from": "From:",
+  "admin.compliance_reports.from_placeholder": "E.g. \"2016-03-11\"",
+  "admin.compliance_reports.keywords": "Keywords:",
+  "admin.compliance_reports.keywords_placeholder": "E.g. \"shorting stock\"",
+  "admin.compliance_reports.reload": "Reload Completed Compliance Reports",
+  "admin.compliance_reports.run": "Run Compliance Report",
+  "admin.compliance_reports.title": "Compliance Reports",
+  "admin.compliance_reports.to": "To:",
+  "admin.compliance_reports.to_placeholder": "E.g. \"2016-03-15\"",
+  "admin.compliance_table.desc": "Description",
   "admin.compliance_table.download": "Download",
-  "admin.compliance_table.params": "Parâmetros",
-  "admin.compliance_table.records": "Registros",
+  "admin.compliance_table.params": "Params",
+  "admin.compliance_table.records": "Records",
   "admin.compliance_table.status": "Status",
   "admin.compliance_table.timestamp": "Timestamp",
-  "admin.compliance_table.type": "Tipo",
-  "admin.compliance_table.userId": "Solicitado Por",
-  "admin.connectionSecurityNone": "Nenhum",
-  "admin.connectionSecurityNoneDescription": "Mattermost irá conectar usando uma conexão insegura.",
+  "admin.compliance_table.type": "Type",
+  "admin.compliance_table.userId": "Requested By",
+  "admin.connectionSecurityNone": "None",
+  "admin.connectionSecurityNoneDescription": "Mattermost will connect over an unsecure connection.",
   "admin.connectionSecurityPlain": "PLAIN",
-  "admin.connectionSecurityPlainDescription": "Mattermost irá conectar e autenticar usando uma conexão insegura.",
+  "admin.connectionSecurityPlainDescription": "Mattermost will connect and authenticate over an unsecure connection.",
   "admin.connectionSecurityStart": "STARTTLS",
-  "admin.connectionSecurityStartDescription": "Obtém uma conexão insegura existente e tenta atualizá-la para uma conexão segura usando TLS.",
-  "admin.connectionSecurityTest": "Testar Conexão",
-  "admin.connectionSecurityTitle": "Segurança da Conexão:",
+  "admin.connectionSecurityStartDescription": "Takes an existing insecure connection and attempts to upgrade it to a secure connection using TLS.",
+  "admin.connectionSecurityTest": "Test Connection",
+  "admin.connectionSecurityTitle": "Connection Security:",
   "admin.connectionSecurityTls": "TLS",
-  "admin.connectionSecurityTlsDescription": "Encriptar a comunicação entre Mattermost e o seu servidor.",
-  "admin.customization.androidAppDownloadLinkDesc": "Adiciona um link para download do app Android. Usuários que acessarem o site em um navegador móvel serão perguntados com uma página dando a opção para download do app. Deixe este campo em branco para evitar que a página apareça.",
-  "admin.customization.androidAppDownloadLinkTitle": "App Android Link para Download:",
-  "admin.customization.appDownloadLinkDesc": "Adiciona um link para página de download dos apps Mattermost. Quando um link está presente, a opção \"Download Apps Mattermost\" será adicionada no Menu Principal então os usuários poderão acessar a página de download. Deixe este campo em branco para ocultar a opção no Menu Principal.",
-  "admin.customization.appDownloadLinkTitle": "Apps Mattermost Link para Página de Download:",
-  "admin.customization.customBrand": "Marca Personalizada",
-  "admin.customization.customEmoji": "Emoji Personalizado",
-  "admin.customization.enableCustomEmojiDesc": "Habilitar para os usuários a criação de emoji personalizados para usar nas mensagens. Quando habilitado, as configurações dos Emoji personalizados podem ser acessadas trocando para Time e clicando nos três pontos encima do canal, e selecionando \"Emoji Personalizados\".",
-  "admin.customization.enableCustomEmojiTitle": "Ativar Emoji Personalizado:",
-  "admin.customization.iosAppDownloadLinkDesc": "Adiciona um link para download do app iOS. Usuários que acessarem o site em um navegador móvel serão perguntados com uma página dando a opção para download do app. Deixe este campo em branco para evitar que a página apareça.",
-  "admin.customization.iosAppDownloadLinkTitle": "App iOS Link para Download:",
+  "admin.connectionSecurityTlsDescription": "Encrypts the communication between Mattermost and your server.",
+  "admin.customization.androidAppDownloadLinkDesc": "Add a link to download the Android app. Users who access the site on a mobile web browser will be prompted with a page giving them the option to download the app. Leave this field blank to prevent the page from appearing.",
+  "admin.customization.androidAppDownloadLinkTitle": "Android App Download Link:",
+  "admin.customization.appDownloadLinkDesc": "Add a link to a download page for the Mattermost apps. When a link is present, an option to \"Download Mattermost Apps\" will be added in the Main Menu so users can find the download page. Leave this field blank to hide the option from the Main Menu.",
+  "admin.customization.appDownloadLinkTitle": "Mattermost Apps Download Page Link:",
+  "admin.customization.customBrand": "Custom Branding",
+  "admin.customization.customEmoji": "Custom Emoji",
+  "admin.customization.enableCustomEmojiDesc": "Enable users to create custom emoji for use in messages. When enabled, Custom Emoji settings can be accessed by switching to a team and clicking the three dots above the channel sidebar, and selecting \"Custom Emoji\".",
+  "admin.customization.enableCustomEmojiTitle": "Enable Custom Emoji:",
+  "admin.customization.iosAppDownloadLinkDesc": "Add a link to download the iOS app. Users who access the site on a mobile web browser will be prompted with a page giving them the option to download the app. Leave this field blank to prevent the page from appearing.",
+  "admin.customization.iosAppDownloadLinkTitle": "iOS App Download Link:",
   "admin.customization.nativeAppLinks": "Mattermost App Links",
-  "admin.customization.restrictCustomEmojiCreationAdmin": "Habilitar criação de emoji personalizados para Administradores de Sistemas e de Times ",
-  "admin.customization.restrictCustomEmojiCreationAll": "Permitir que todos possam criar emoji personalizados",
-  "admin.customization.restrictCustomEmojiCreationDesc": "Restringir a criação de emoji personalizado para determinados usuários.",
-  "admin.customization.restrictCustomEmojiCreationSystemAdmin": "Permitir que apenas administradores de sistema possam criar emoji personalizados",
-  "admin.customization.restrictCustomEmojiCreationTitle": "Restringir a Criação Emoji Personalizado:",
-  "admin.customization.support": "Legal e Suporte",
-  "admin.database.title": "Configurações do Banco de dados",
-  "admin.developer.title": "Configurações de Desenvolvedor",
-  "admin.email.agreeHPNS": " Eu entendo e aceito o serviço de notificação push Mattermost Hosted<a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">Termos do Serviço</a> e <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Politica de Privacidade</a>.",
-  "admin.email.allowEmailSignInDescription": "Quando verdadeiro, Mattermost permite aos usuários fazer login usando o e-mail e senha.",
-  "admin.email.allowEmailSignInTitle": "Habilitar Login por email:",
-  "admin.email.allowSignupDescription": "Quando verdadeiro, Mattermost permite a criação de equipe e conta de inscrição através de e-mail e senha.  Este valor deve ser falso somente quando você deseja limitar a entrada para o single-sign-on service como OAuth ou LDAP.",
-  "admin.email.allowSignupTitle": "Habilitar criação de contas com email: ",
-  "admin.email.allowUsernameSignInDescription": "Quando verdadeiro, Mattermost permite os usuários fazer login usando seu nome de usuário e senha.  Esta configuração é normalmente utilizado apenas quando a verificação de e-mail está desativada.",
-  "admin.email.allowUsernameSignInTitle": "Habilitar Login com nome de usuário:",
-  "admin.email.connectionSecurityTest": "Testar Conexão",
-  "admin.email.easHelp": "Leia mais sobre compilar e publicar seu próprio aplicativo móvel em <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target=\"_blank\">Enterprise App Store</a>.",
-  "admin.email.emailFail": "Conexão falhou: {error}",
-  "admin.email.emailSuccess": "Nenhum erro foram relatados durante o envio de um e-mail.  Por favor verifique a sua caixa de entrada para se certificar.",
-  "admin.email.enableEmailBatching.clusterEnabled": "Email em lote não pode ser ativado quando modo de Alta Disponibilidade está ativo.",
-  "admin.email.enableEmailBatching.siteURL": "Email em lote não pode ser ativo a menos que o SiteURL estiver configurado em <b>Configurações > SiteURL</b>.",
-  "admin.email.enableEmailBatchingDesc": "Quando verdadeiro, os usuários podem ter notificações de e-mail para várias mensagens diretas e menções combinados em um único e-mail, configurável em <b>Configurações de Conta > Notificações</b>.",
-  "admin.email.enableEmailBatchingTitle": "Ativar Email em Lote:",
-  "admin.email.fullPushNotification": "Enviar trecho de mensagem",
-  "admin.email.genericPushNotification": "Enviar descrição genérica com nomes do usuário e canal",
-  "admin.email.inviteSaltDescription": "Salt de 32-caracteres adicionados a assinatura de convites por e-mail. Aleatoriamente gerados na instalação. Click \"Re-Gerar\" para criar um novo salt.",
+  "admin.customization.restrictCustomEmojiCreationAdmin": "Allow System and Team Admins to create custom emoji",
+  "admin.customization.restrictCustomEmojiCreationAll": "Allow everyone to create custom emoji",
+  "admin.customization.restrictCustomEmojiCreationDesc": "Restrict the creation of custom emoji to certain users.",
+  "admin.customization.restrictCustomEmojiCreationSystemAdmin": "Only allow System Admins to create custom emoji",
+  "admin.customization.restrictCustomEmojiCreationTitle": "Restrict Custom Emoji Creation:",
+  "admin.customization.support": "Legal and Support",
+  "admin.database.title": "Database Settings",
+  "admin.developer.title": "Developer Settings",
+  "admin.email.agreeHPNS": " I understand and accept the Mattermost Hosted Push Notification Service <a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">Terms of Service</a> and <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Privacy Policy</a>.",
+  "admin.email.allowEmailSignInDescription": "When true, Mattermost allows users to sign in using their email and password.",
+  "admin.email.allowEmailSignInTitle": "Enable sign-in with email: ",
+  "admin.email.allowSignupDescription": "When true, Mattermost allows team creation and account signup using email and password.  This value should be false only when you want to limit signup to a single-sign-on service like OAuth or AD/LDAP.",
+  "admin.email.allowSignupTitle": "Enable account creation with email: ",
+  "admin.email.allowUsernameSignInDescription": "When true, Mattermost allows users to sign in using their username and password.  This setting is typically only used when email verification is disabled.",
+  "admin.email.allowUsernameSignInTitle": "Enable sign-in with username: ",
+  "admin.email.connectionSecurityTest": "Test Connection",
+  "admin.email.easHelp": "Learn more about compiling and deploying your own mobile apps from an <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target=\"_blank\">Enterprise App Store</a>.",
+  "admin.email.emailFail": "Connection unsuccessful: {error}",
+  "admin.email.emailSuccess": "No errors were reported while sending an email.  Please check your inbox to make sure.",
+  "admin.email.enableEmailBatching.clusterEnabled": "Email batching cannot be enabled when High Availability mode is enabled.",
+  "admin.email.enableEmailBatching.siteURL": "Email batching cannot be enabled unless the SiteURL is configured in <b>Configuration > SiteURL</b>.",
+  "admin.email.enableEmailBatchingDesc": "When true, users can have email notifications for multiple direct messages and mentions combined into a single email, configurable in <b>Account Settings > Notifications</b>.",
+  "admin.email.enableEmailBatchingTitle": "Enable Email Batching:",
+  "admin.email.fullPushNotification": "Send full message snippet",
+  "admin.email.genericPushNotification": "Send generic description with user and channel names",
+  "admin.email.inviteSaltDescription": "32-character salt added to signing of email invites. Randomly generated on install. Click \"Regenerate\" to create new salt.",
   "admin.email.inviteSaltExample": "Ex \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
-  "admin.email.inviteSaltTitle": "Salt Email Convite:",
-  "admin.email.mhpns": "Use criptografado, com qualidade de produção conexão HPNS com aplicativos Android e iOS",
-  "admin.email.mhpnsHelp": "Download <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target=\"_blank\">Mattermost iOS app</a> no iTunes. Download <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target=\"_blank\">Mattermost Android app</a> no Google Play. Leia mais sobre <a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target=\"_blank\">HPNS</a>.",
-  "admin.email.mtpns": "Use apps iOS e Android no iTunes e Google Play com TPMS",
-  "admin.email.mtpnsHelp": "Download <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target=\"_blank\">Mattermost iOS app</a> no iTunes. Download <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target=\"_blank\">Mattermost Android app</a> no Google Play. Leia mais sobre <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target=\"_blank\">TPNS</a>.",
-  "admin.email.nofificationOrganizationExample": "Ex. \"® Empresa ABC, Av. Paulista, 1000, São Paulo, SP, 12345-150, BRA\"",
-  "admin.email.notificationDisplayDescription": "Mostra o nome da conta de e-mail usada quando a notificação de e-mail é enviado do Mattermost.",
-  "admin.email.notificationDisplayExample": "Ex: \"Mattermost Notificação\", \"Sistema\", \"Não-Responda\"",
-  "admin.email.notificationDisplayTitle": "Notificação Nome de Exibição:",
-  "admin.email.notificationEmailDescription": "Endereço de email mostrado na conta de email quando envia notificações do Mattermost.",
+  "admin.email.inviteSaltTitle": "Email Invite Salt:",
+  "admin.email.mhpns": "Use encrypted, production-quality HPNS connection to iOS and Android apps",
+  "admin.email.mhpnsHelp": "Download <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target=\"_blank\">Mattermost iOS app</a> from iTunes. Download <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target=\"_blank\">Mattermost Android app</a> from Google Play. Learn more about <a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target=\"_blank\">HPNS</a>.",
+  "admin.email.mtpns": "Use iOS and Android apps on iTunes and Google Play with TPNS",
+  "admin.email.mtpnsHelp": "Download <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target=\"_blank\">Mattermost iOS app</a> from iTunes. Download <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target=\"_blank\">Mattermost Android app</a> from Google Play. Learn more about <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target=\"_blank\">TPNS</a>.",
+  "admin.email.nofificationOrganizationExample": "Ex. \"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\"",
+  "admin.email.notificationDisplayDescription": "Display name on email account used when sending notification emails from Mattermost.",
+  "admin.email.notificationDisplayExample": "Ex: \"Mattermost Notification\", \"System\", \"No-Reply\"",
+  "admin.email.notificationDisplayTitle": "Notification Display Name:",
+  "admin.email.notificationEmailDescription": "Email address displayed on email account used when sending notification emails from Mattermost.",
   "admin.email.notificationEmailExample": "Ex: \"mattermost@yourcompany.com\", \"admin@yourcompany.com\"",
-  "admin.email.notificationEmailTitle": "Notificação a Partir do Endereço:",
-  "admin.email.notificationOrganization": "Notificação Endereço Rodapé:",
-  "admin.email.notificationOrganizationDescription": "Nome da empresa e endereço de email mostrado nas notificações do Mattermost, como \"® Empresa ABC, Av. Paulista, 1000, São Paulo, SP, 12345-150, BRA\". Se este campo for deixado em branco, o nome da organização e endereço não será mostrado.",
-  "admin.email.notificationsDescription": "Normalmente definido como verdadeiro em produção. Quando verdadeiro, Mattermost tenta enviar notificações por e-mail. Os desenvolvedores podem definir este campo como falso para ignorar configuração de e-mail para o desenvolvimento mais rápido.<br /> A definição deste como verdadeiro remove a bandeira modo de visualização (requer sair e entrar novamente após a alteração).",
-  "admin.email.notificationsTitle": "Habilitar Notificações por E-mail: ",
-  "admin.email.passwordSaltDescription": "Salt de 32-caracteres adicionado para assinar o redefinição de senha por e-mail. Gerada aleatoriamente na instalação. Clique em \"Re-Gerar\" para criar um novo salt.",
+  "admin.email.notificationEmailTitle": "Notification From Address:",
+  "admin.email.notificationOrganization": "Notification Footer Mailing Address:",
+  "admin.email.notificationOrganizationDescription": "Organization name and address displayed on email notifications from Mattermost, such as \"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\". If the field is left empty, the organization name and address will not be displayed.",
+  "admin.email.notificationsDescription": "Typically set to true in production. When true, Mattermost attempts to send email notifications. Developers may set this field to false to skip email setup for faster development.<br />Setting this to true removes the Preview Mode banner (requires logging out and logging back in after setting is changed).",
+  "admin.email.notificationsTitle": "Enable Email Notifications: ",
+  "admin.email.passwordSaltDescription": "32-character salt added to signing of password reset emails. Randomly generated on install. Click \"Regenerate\" to create new salt.",
   "admin.email.passwordSaltExample": "Ex \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
-  "admin.email.passwordSaltTitle": "Salt Reset Senha:",
-  "admin.email.pushContentDesc": "Selecionar \"Enviar descrição genérica com nomes de usuário e canal\" fornece envio de notificações push com mensagens genéricas, inclui nomes de usuários e canais mas não específica detalhes do texto da mensagem.<br /><br />Selecionar \"Enviar trecho da mensagem\" envia trechos da mensagem que desencadearam as notificações e pode incluir informações confidenciais enviadas na mensagem. Se o seu serviço de Envio de Notificação Push está fora de um firewall, é ALTAMENTE RECOMENDADO que está opção somente seja usada com o protocolo \"https\" para encriptar a conexão.",
-  "admin.email.pushContentTitle": "Conteúdo Notificação Push:",
-  "admin.email.pushDesc": "Normalmente definida como verdadeiro na produção. Quando verdadeiro, Mattermost tenta enviar notificações push no iOS e Android, através do servidor de notificação push.",
-  "admin.email.pushOff": "Não enviar notificações push",
-  "admin.email.pushOffHelp": "Por favor veja <a href=\"http://docs.mattermost.com/deployment/push.html#push-notifications-and-mobile-devices\" target=\"_blank\">documentação de notificações push</a> para aprender mais sobre as opções de configurações.",
-  "admin.email.pushServerDesc": "Localização do serviço de notificação push Mattermost você pode configurar por trás do firewall usando https://github.com/mattermost/push-proxy. Para testar, você pode usar http://push-test.mattermost.com, que liga à amostra do app Mattermost iOS na Apple AppStore pública. Por favor, não use o serviço de teste para implantações de produção.",
-  "admin.email.pushServerEx": "Ex: \"http://push-test.mattermost.com\"",
-  "admin.email.pushServerTitle": "Servidor de Notificação Push:",
-  "admin.email.pushTitle": "Habilitar Notificações por Push: ",
-  "admin.email.requireVerificationDescription": "Normalmente definido como verdadeiro em produção. Quando verdadeiro, Mattermost requer a verificação de e-mail após a criação da conta antes de permitir login. Os desenvolvedores podem definir este campo como falso para ignorar o envio de e-mails de verificação para o desenvolvimento mais rápido.",
-  "admin.email.requireVerificationTitle": "Requer Verificação de E-mail: ",
-  "admin.email.selfPush": "Manualmente entre a localização do Serviço de Notificação Push",
-  "admin.email.smtpPasswordDescription": " Obter essa credencial do administrador das configurações do servidor de email.",
-  "admin.email.smtpPasswordExample": "Ex: \"suasenha\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.email.smtpPasswordTitle": "Senha do Servidor de SMTP:",
-  "admin.email.smtpPortDescription": "Porta do servidor de e-mail SMTP.",
+  "admin.email.passwordSaltTitle": "Password Reset Salt:",
+  "admin.email.pushContentDesc": "Selecting \"Send generic description with user and channel names\" provides push notifications with generic messages, including names of users and channels but no specific details from the message text.<br /><br />Selecting \"Send full message snippet\" sends excerpts from messages triggering notifications with specifics and may include confidential information sent in messages. If your Push Notification Service is outside your firewall, it is HIGHLY RECOMMENDED this option only be used with an \"https\" protocol to encrypt the connection.",
+  "admin.email.pushContentTitle": "Push Notification Contents:",
+  "admin.email.pushDesc": "Typically set to true in production. When true, Mattermost attempts to send iOS and Android push notifications through the push notification server.",
+  "admin.email.pushOff": "Do not send push notifications",
+  "admin.email.pushOffHelp": "Please see <a href=\"http://docs.mattermost.com/deployment/push.html#push-notifications-and-mobile-devices\" target=\"_blank\">documentation on push notifications</a> to learn more about setup options.",
+  "admin.email.pushServerDesc": "Location of Mattermost push notification service you can set up behind your firewall using https://github.com/mattermost/push-proxy. For testing you can use http://push-test.mattermost.com, which connects to the sample Mattermost iOS app in the public Apple AppStore. Please do not use test service for production deployments.",
+  "admin.email.pushServerEx": "E.g.: \"http://push-test.mattermost.com\"",
+  "admin.email.pushServerTitle": "Push Notification Server:",
+  "admin.email.pushTitle": "Enable Push Notifications: ",
+  "admin.email.requireVerificationDescription": "Typically set to true in production. When true, Mattermost requires email verification after account creation prior to allowing login. Developers may set this field to false so skip sending verification emails for faster development.",
+  "admin.email.requireVerificationTitle": "Require Email Verification: ",
+  "admin.email.selfPush": "Manually enter Push Notification Service location",
+  "admin.email.smtpPasswordDescription": " Obtain this credential from administrator setting up your email server.",
+  "admin.email.smtpPasswordExample": "Ex: \"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
+  "admin.email.smtpPasswordTitle": "SMTP Server Password:",
+  "admin.email.smtpPortDescription": "Port of SMTP email server.",
   "admin.email.smtpPortExample": "Ex: \"25\", \"465\"",
-  "admin.email.smtpPortTitle": "Porta do Servidor de SMTP:",
-  "admin.email.smtpServerDescription": "Localização do servidor de e-mail SMTP.",
-  "admin.email.smtpServerExample": "Ex: \"smtp.suaempresa.com\", \"email-smtp.us-east-1.amazonaws.com\"",
-  "admin.email.smtpServerTitle": "Servidor SMTP:",
-  "admin.email.smtpUsernameDescription": " Obter essa credencial do administrador das configurações do servidor de email.",
+  "admin.email.smtpPortTitle": "SMTP Server Port:",
+  "admin.email.smtpServerDescription": "Location of SMTP email server.",
+  "admin.email.smtpServerExample": "Ex: \"smtp.yourcompany.com\", \"email-smtp.us-east-1.amazonaws.com\"",
+  "admin.email.smtpServerTitle": "SMTP Server:",
+  "admin.email.smtpUsernameDescription": " Obtain this credential from administrator setting up your email server.",
   "admin.email.smtpUsernameExample": "Ex: \"admin@yourcompany.com\", \"AKIADTOVBGERKLCBV\"",
-  "admin.email.smtpUsernameTitle": "Nome do Usuário do Servidor de SMTP:",
-  "admin.email.testing": "Testando...",
-  "admin.false": "falso",
-  "admin.file_upload.chooseFile": "Escolher Arquivo",
-  "admin.file_upload.noFile": "Nenhum arquivo enviado",
-  "admin.file_upload.uploadFile": "Enviar",
-  "admin.files.images": "Imagens",
-  "admin.files.storage": "Armazenamento",
-  "admin.general.configuration": "Configuração",
-  "admin.general.localization": "Regionalização",
-  "admin.general.localization.availableLocalesDescription": "Defina qual idioma está disponível para os usuários em Configurações de Conta (deixe este campo em branco para ter todos os idiomas disponíveis). Se você está adicionando novos idiomas manualmente, o <strong>Idioma Padrão do Cliente</strong> precisa ser adicionado antes de salvar esta configuração.<br /><br />Gostaria de ajudar com tradução? Junte-se ao <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> para contribuir.",
-  "admin.general.localization.availableLocalesTitle": "Idiomas Disponíveis:",
-  "admin.general.localization.clientLocaleDescription": "Linguagem padrão para os novos usuários criados e páginas onde o usuário não esteja logado.",
-  "admin.general.localization.clientLocaleTitle": "Idioma Padrão do Cliente:",
-  "admin.general.localization.serverLocaleDescription": "Linguagem padrão para o sistema de mensagens e logs. Alterando isto será necessário reiniciar o servidor antes que a alteração tenha efeito.",
-  "admin.general.localization.serverLocaleTitle": "Idioma Padrão do Servidor:",
-  "admin.general.log": "Carregando",
-  "admin.general.policy": "Política",
-  "admin.general.policy.permissionsAdmin": "Administradores de Time e Sistema",
-  "admin.general.policy.permissionsAll": "Todos os membros da equipe",
-  "admin.general.policy.permissionsSystemAdmin": "Administrador de Sistema",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "Definir a política de quem pode criar, apagar, renomear e definir o cabeçalho ou propósito para grupos privados.",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "Habilitar permissões de administração do canal privado para:",
-  "admin.general.policy.restrictPublicChannelManagementDescription": "Definir a política de quem pode criar, apagar, renomear e definir o cabeçalho ou propósito para canais públicos.",
-  "admin.general.policy.restrictPublicChannelManagementTitle": "Habilitar permissões de administração do canal público para:",
-  "admin.general.policy.teamInviteDescription": "Definir a política de quem pode convidar outros para a equipe usando <b>Convide um Novo Membro</b> para convidar um novo usuário por email, ou a opção <b>Obter Link Convite para Equipe</b> no Menu Principal. Se <b>Obter Link Convite para Equipe</b> for usado para compartilhar um link, você pode expirar o código convite em <b>Configurações de Equipe</b> > <b>Código Convite</b> depois que os usuários desejados já se juntaram a equipe.",
-  "admin.general.policy.teamInviteTitle": "Permitir o envio de convites de equipe para:",
-  "admin.general.privacy": "Privacidade",
-  "admin.general.usersAndTeams": "Usuários e Equipes",
-  "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 \"Chave Secreta do Aplicativo\" e \"ID Aplicativo\" 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.",
+  "admin.email.smtpUsernameTitle": "SMTP Server Username:",
+  "admin.email.testing": "Testing...",
+  "admin.false": "false",
+  "admin.file_upload.chooseFile": "Choose File",
+  "admin.file_upload.noFile": "No file uploaded",
+  "admin.file_upload.uploadFile": "Upload",
+  "admin.files.images": "Images",
+  "admin.files.storage": "Storage",
+  "admin.general.configuration": "Configuration",
+  "admin.general.localization": "Localization",
+  "admin.general.localization.availableLocalesDescription": "Set which languages are available for users in Account Settings (leave this field blank to have all supported languages available). If you’re manually adding new languages, the <strong>Default Client Language</strong> must be added before saving this setting.<br /><br />Would like to help with translations? Join the <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> to contribute.",
+  "admin.general.localization.availableLocalesTitle": "Available Languages:",
+  "admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.",
+  "admin.general.localization.clientLocaleTitle": "Default Client Language:",
+  "admin.general.localization.serverLocaleDescription": "Default language for system messages and logs. Changing this will require a server restart before taking effect.",
+  "admin.general.localization.serverLocaleTitle": "Default Server Language:",
+  "admin.general.log": "Logging",
+  "admin.general.policy": "Policy",
+  "admin.general.policy.permissionsAdmin": "Team and System Admins",
+  "admin.general.policy.permissionsAll": "All team members",
+  "admin.general.policy.permissionsSystemAdmin": "System Admins",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Set policy on who can create, delete, rename, and set the header or purpose for private groups.",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "Enable private group management permissions for:",
+  "admin.general.policy.restrictPublicChannelManagementDescription": "Set policy on who can create, delete, rename, and set the header or purpose for public channels.",
+  "admin.general.policy.restrictPublicChannelManagementTitle": "Enable public channel management permissions for:",
+  "admin.general.policy.teamInviteDescription": "Set policy on who can invite others to a team using <b>Invite New Member</b> to invite new users by email, or the <b>Get Team Invite Link</b> options from the Main Menu. If <b>Get Team Invite Link</b> is used to share a link, you can expire the invite code from <b>Team Settings</b> > <b>Invite Code</b> after the desired users join the team.",
+  "admin.general.policy.teamInviteTitle": "Enable sending team invites from:",
+  "admin.general.privacy": "Privacy",
+  "admin.general.usersAndTeams": "Users and Teams",
+  "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 \"Application Secret Key\" and \"Application 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.",
   "admin.gitlab.authExample": "Ex \"https://<your-gitlab-url>/oauth/authorize\"",
-  "admin.gitlab.authTitle": "Autenticação Endpoint:",
-  "admin.gitlab.clientIdDescription": "Obter este valor de acordo com as instruções acima para logar no GitLab",
+  "admin.gitlab.authTitle": "Auth Endpoint:",
+  "admin.gitlab.clientIdDescription": "Obtain this value via the instructions above for logging into GitLab",
   "admin.gitlab.clientIdExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.gitlab.clientIdTitle": "ID do aplicativo:",
+  "admin.gitlab.clientIdTitle": "Application ID:",
   "admin.gitlab.clientSecretExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.gitlab.clientSecretTitle": "Chave Secreta do Aplicativo:",
-  "admin.gitlab.enableDescription": "Quando verdadeiro, Mattermost permite a criação de equipes e inscrições de conta usando GitLab OAuth.",
-  "admin.gitlab.enableTitle": "Habilitar autenticação com o GitLab: ",
-  "admin.gitlab.settingsTitle": "Configurações GitLab",
-  "admin.gitlab.tokenDescription": "Digite https://<your-gitlab-url>/oauth/token.  Certifique-se de usar HTTP ou HTTPS na sua URL dependendo da configuração de seu servidor.",
+  "admin.gitlab.clientSecretTitle": "Application Secret Key:",
+  "admin.gitlab.enableDescription": "When true, Mattermost allows team creation and account signup using GitLab OAuth.",
+  "admin.gitlab.enableTitle": "Enable authentication with GitLab: ",
+  "admin.gitlab.settingsTitle": "GitLab Settings",
+  "admin.gitlab.tokenDescription": "Enter https://<your-gitlab-url>/oauth/token.   Make sure you use HTTP or HTTPS in your URL depending on your server configuration.",
   "admin.gitlab.tokenExample": "Ex \"https://<your-gitlab-url>/oauth/token\"",
   "admin.gitlab.tokenTitle": "Token Endpoint:",
-  "admin.gitlab.userDescription": "Digite https://<your-gitlab-url>/api/v3/user.   Certifique-se de usar HTTP ou HTTPS na sua URL dependendo da configuração de seu servidor.",
+  "admin.gitlab.userDescription": "Enter https://<your-gitlab-url>/api/v3/user.   Make sure you use HTTP or HTTPS in your URL depending on your server configuration.",
   "admin.gitlab.userExample": "Ex \"https://<your-gitlab-url>/api/v3/user\"",
-  "admin.gitlab.userTitle": "API Usuário Endpoint:",
-  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>Log in</a> to sua conta Google.</li><li>Ir para <a href='https://console.developers.google.com'>https://console.developers.google.com</a>, clique <strong>Credenciais</strong> na barra lateral esquerda e digite \"Mattermost - nome-da-sua-empresa\" como o <strong>Nome do Projeto</strong>, então clique <strong>Criar</strong>.</li><li>Clique no título <strong>tela de consentimento OAuth</strong> e digite \"Mattermost\" como o <strong>nome do Produto exibido para os usuários</strong>, então clique <strong>Salvar</strong>.</li><li>Dentro do título <strong>Credenciais</strong>, clique <strong>Criar credenciais</strong>, escolha <strong>ID do cliente OAuth</strong> e selecione <strong>Aplicação da Web</strong>.</li><li>Dentro de <strong>Restrições</strong> e <strong>URIs de redirecionamento autorizados</strong> digite <strong>sua-url-mattermost/signup/google/complete</strong> (exemplo: http://localhost:8065/signup/google/complete). Clique <strong>Criar</strong>.</li><li>Cole <strong>ID do Cliente</strong> e <strong>Chave Secreta do Cliente</strong> nos campos abaixo, então clique <strong>Salvar</strong>.</li><li>Finalmente, vá para <a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> e clique <strong>Ativar</strong>. Isto pode levar alguns minutos para propagar através do si sistema do Google.</li></ol>",
-  "admin.google.authTitle": "Autenticação Endpoint:",
-  "admin.google.clientIdDescription": "A ID do Cliente que você recebeu quando registrou sua aplicação com o Google.",
+  "admin.gitlab.userTitle": "User API Endpoint:",
+  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>Log in</a> to your Google account.</li><li>Go to <a href='https://console.developers.google.com'>https://console.developers.google.com</a>, click <strong>Credentials</strong> in the left hand sidebar and enter \"Mattermost - your-company-name\" as the <strong>Project Name</strong>, then click <strong>Create</strong>.</li><li>Click the <strong>OAuth consent screen</strong> header and enter \"Mattermost\" as the <strong>Product name shown to users</strong>, then click <strong>Save</strong>.</li><li>Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.</li><li>Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong>your-mattermost-url/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.</li><li>Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.</li><li>Finally, go to <a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> and click <strong>Enable</strong>. This might take a few minutes to propagate through Google's systems.</li></ol>",
+  "admin.google.authTitle": "Auth Endpoint:",
+  "admin.google.clientIdDescription": "The Client ID you received when registering your application with Google.",
   "admin.google.clientIdExample": "Ex \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
-  "admin.google.clientIdTitle": "ID do Cliente",
-  "admin.google.clientSecretDescription": "A Chave Secreta do Cliente que você recebeu quando registrou sua aplicação com o Google.",
+  "admin.google.clientIdTitle": "Client ID:",
+  "admin.google.clientSecretDescription": "The Client Secret you received when registering your application with Google.",
   "admin.google.clientSecretExample": "Ex \"H8sz0Az-dDs2p15-7QzD231\"",
-  "admin.google.clientSecretTitle": "Chave Secreta do Cliente:",
+  "admin.google.clientSecretTitle": "Client Secret:",
   "admin.google.tokenTitle": "Token Endpoint:",
-  "admin.google.userTitle": "API Usuário Endpoint:",
-  "admin.image.amazonS3BucketDescription": "Nome selecionado para o seu S3 bucket in AWS.",
+  "admin.google.userTitle": "User API Endpoint:",
+  "admin.image.amazonS3BucketDescription": "Name you selected for your S3 bucket in AWS.",
   "admin.image.amazonS3BucketExample": "Ex \"mattermost-media\"",
   "admin.image.amazonS3BucketTitle": "Amazon S3 Bucket:",
-  "admin.image.amazonS3IdDescription": "Obter essa credencial do seu administrador Amazon EC2.",
+  "admin.image.amazonS3IdDescription": "Obtain this credential from your Amazon EC2 administrator.",
   "admin.image.amazonS3IdExample": "Ex \"AKIADTOVBGERKLCBV\"",
   "admin.image.amazonS3IdTitle": "Amazon S3 Access Key ID:",
-  "admin.image.amazonS3RegionDescription": "Região AWS selecionada para a criação do seu S3 bucket.",
+  "admin.image.amazonS3RegionDescription": "AWS region you selected for creating your S3 bucket.",
   "admin.image.amazonS3RegionExample": "Ex \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Amazon S3 Region:",
-  "admin.image.amazonS3SecretDescription": "Obter essa credencial do seu administrador Amazon EC2.",
+  "admin.image.amazonS3SecretDescription": "Obtain this credential from your Amazon EC2 administrator.",
   "admin.image.amazonS3SecretExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.image.amazonS3SecretTitle": "Amazon S3 Secret Access Key:",
-  "admin.image.localDescription": "Diretório o qual arquivos e imagens são arquivados. Se vazio, padrão ./data/.",
+  "admin.image.localDescription": "Directory to which files and images are written. If blank, defaults to ./data/.",
   "admin.image.localExample": "Ex \"./data/\"",
-  "admin.image.localTitle": "Pasta de Armazenamento Local:",
-  "admin.image.maxFileSizeDescription": "Tamanho máximo de arquivo para anexos de mensagens em megabytes. Atenção: Verifique a memória do servidor pode suportar sua escolha configuração. Tamanhos de arquivos grandes aumentam o risco de falhas do servidor e falhas de uploads devido a interrupções de rede.",
+  "admin.image.localTitle": "Local Storage Directory:",
+  "admin.image.maxFileSizeDescription": "Maximum file size for message attachments in megabytes. Caution: Verify server memory can support your setting choice. Large file sizes increase the risk of server crashes and failed uploads due to network interruptions.",
   "admin.image.maxFileSizeExample": "50",
-  "admin.image.maxFileSizeTitle": "Tamanho Máximo do Arquivo:",
-  "admin.image.previewHeightDescription": "Altura máxima da imagem de pré-visualização (\"0\": Define como tamanho automático). Atualizando este valor muda como as imagens de pré-visualização serão exibidas no futuro, mas não altera as imagens já criadas.",
+  "admin.image.maxFileSizeTitle": "Maximum File Size:",
+  "admin.image.previewHeightDescription": "Maximum height of preview image (\"0\": Sets to auto-size). Updating this value changes how preview images render in future, but does not change images created in the past.",
   "admin.image.previewHeightExample": "Ex \"0\"",
-  "admin.image.previewHeightTitle": "Altura da Visualização da Imagem:",
-  "admin.image.previewWidthDescription": "Largura máxima da imagem de pré-visualização. Atualizando este valor muda como as imagens de pré-visualização serão mostradas no futuro, mas não altera as imagens já criadas.",
+  "admin.image.previewHeightTitle": "Image Preview Height:",
+  "admin.image.previewWidthDescription": "Maximum width of preview image. Updating this value changes how preview images render in future, but does not change images created in the past.",
   "admin.image.previewWidthExample": "Ex \"1024\"",
-  "admin.image.previewWidthTitle": "Largura da Visualização da Imagem:",
-  "admin.image.profileHeightDescription": "Altura da imagem do perfil.",
+  "admin.image.previewWidthTitle": "Image Preview Width:",
+  "admin.image.profileHeightDescription": "Height of profile picture.",
   "admin.image.profileHeightExample": "Ex \"0\"",
-  "admin.image.profileHeightTitle": "Altura da Imagem do Perfil:",
-  "admin.image.profileWidthDescription": "Largura do imagem do perfil.",
+  "admin.image.profileHeightTitle": "Profile Picture Height:",
+  "admin.image.profileWidthDescription": "Width of profile picture.",
   "admin.image.profileWidthExample": "Ex \"1024\"",
-  "admin.image.profileWidthTitle": "Largura da Imagem do Perfil:",
-  "admin.image.publicLinkDescription": "Salt de 32-caracteres adicionados a assinatura de links de imagens públicas. Aleatoriamente gerados na instalação. Click \"Re-Gerar\" para criar um novo salt.",
+  "admin.image.profileWidthTitle": "Profile Picture Width:",
+  "admin.image.publicLinkDescription": "32-character salt added to signing of public image links. Randomly generated on install. Click \"Regenerate\" to create new salt.",
   "admin.image.publicLinkExample": "Ex \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
-  "admin.image.publicLinkTitle": "Link Público Salt:",
-  "admin.image.shareDescription": "Permitir aos usuários compartilhar links públicos para arquivos e imagens.",
-  "admin.image.shareTitle": "Ativar Links para Arquivos Públicos: ",
+  "admin.image.publicLinkTitle": "Public Link Salt:",
+  "admin.image.shareDescription": "Allow users to share public links to files and images.",
+  "admin.image.shareTitle": "Enable Public File Links: ",
   "admin.image.storeAmazonS3": "Amazon S3",
-  "admin.image.storeDescription": "Sistema de armazenamento onde os arquivos anexos de imagem são salvos.<br /><br />Selecionando \"Amazon S3\" habilita campos para inserir suas credenciais Amazon e detalhes de bucket.<br /><br />Selecionando \"Sistema de Arquivos Local\" habilita o campo para especificar um diretório de arquivos local.",
-  "admin.image.storeLocal": "Sistema de Arquivos Local",
-  "admin.image.storeTitle": "Sistema de Armazenamento de Arquivo:",
-  "admin.image.thumbHeightDescription": "Altura 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.storeDescription": "Storage system where files and image attachments are saved.<br /><br />Selecting \"Amazon S3\" enables fields to enter your Amazon credentials and bucket details.<br /><br />Selecting \"Local File System\" enables the field to specify a local file directory.",
+  "admin.image.storeLocal": "Local File System",
+  "admin.image.storeTitle": "File Storage System:",
+  "admin.image.thumbHeightDescription": "Height of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.",
   "admin.image.thumbHeightExample": "Ex \"100\"",
-  "admin.image.thumbHeightTitle": "Anexo Thumbnail Altura:",
-  "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.thumbHeightTitle": "Attachment Thumbnail Height:",
+  "admin.image.thumbWidthDescription": "Width of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.",
   "admin.image.thumbWidthExample": "Ex \"120\"",
-  "admin.image.thumbWidthTitle": "Anexo Thumbnail Largura:",
-  "admin.integrations.custom": "Integrações Personalizadas",
-  "admin.integrations.external": "Serviços Externos",
-  "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.image.thumbWidthTitle": "Attachment Thumbnail Width:",
+  "admin.integrations.custom": "Custom Integrations",
+  "admin.integrations.external": "External Services",
+  "admin.ldap.baseDesc": "The Base DN is the Distinguished Name of the location where Mattermost should start its search for users in the AD/LDAP tree.",
   "admin.ldap.baseEx": "Ex \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "BaseDN:",
-  "admin.ldap.bindPwdDesc": "Senha do usuário fornecido em \"Bind Username\".",
-  "admin.ldap.bindPwdTitle": "Vincular Senha:",
-  "admin.ldap.bindUserDesc": "O nome de usuário usado para realizar a pesquisa LDAP. Isso deve ser tipicamente uma conta criada especificamente para uso do Mattermost. Deve ter acesso limitado a ler a parte da árvore LDAP especificado no campo BaseDN.",
+  "admin.ldap.bindPwdDesc": "Password of the user given in \"Bind Username\".",
+  "admin.ldap.bindPwdTitle": "Bind Password:",
+  "admin.ldap.bindUserDesc": "The username used to perform the AD/LDAP search. This should typically be an account created specifically for use with Mattermost. It should have access limited to read the portion of the AD/LDAP tree specified in the BaseDN field.",
   "admin.ldap.bindUserTitle": "Bind Username:",
-  "admin.ldap.emailAttrDesc": "O atributo no servidor LDAP que será usado para preencher os endereços de e-mail de usuários no Mattermost.",
-  "admin.ldap.emailAttrEx": "Ex \"mail\" ou \"userPrincipalName\"",
-  "admin.ldap.emailAttrTitle": "Atributo de E-mail:",
-  "admin.ldap.enableDesc": "Quando verdadeiro, Mattermost permite login utilizando LDAP",
-  "admin.ldap.enableTitle": "Ativar login with LDAP:",
-  "admin.ldap.firstnameAttrDesc": "(Opcional) O atributo no servidor LDAP que será usado para preencher o primeiro nome dos usuários no Mattermost.",
+  "admin.ldap.emailAttrDesc": "The attribute in the AD/LDAP server that will be used to populate the email addresses of users in Mattermost.",
+  "admin.ldap.emailAttrEx": "Ex \"mail\" or \"userPrincipalName\"",
+  "admin.ldap.emailAttrTitle": "Email Attribute:",
+  "admin.ldap.enableDesc": "When true, Mattermost allows login using AD/LDAP",
+  "admin.ldap.enableTitle": "Enable sign-in with AD/LDAP:",
+  "admin.ldap.firstnameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the first name of users in Mattermost.",
   "admin.ldap.firstnameAttrEx": "Ex \"givenName\"",
-  "admin.ldap.firstnameAttrTitle": "Primeiro Nome do Atributo",
-  "admin.ldap.idAttrDesc": "O atributo no servidor LDAP que vai ser utilizado como um identificador único no Mattermost. Ele deve ser um atributo LDAP com um valor que não muda, como nome de usuário ou uid. Se atributo Id do usuário mudar, isto irá criar uma nova conta Mattermost não associada com a sua antiga. Este é o valor utilizado para efetuar login no Mattermost no campo \"Nome de usuário LDAP\" na página de login. Normalmente, este atributo é o mesmo que o campo “Atributo Nome de Usuário” acima. Se sua equipe usa tipicamente de domínio\\nome de usuário para fazer login em outros serviços com LDAP, você pode optar por colocar domínio\\nome de usuário neste campo para manter a consistência entre os sites.",
+  "admin.ldap.firstnameAttrTitle": "First Name Attribute",
+  "admin.ldap.idAttrDesc": "The attribute in the AD/LDAP server that will be used as a unique identifier in Mattermost. It should be an AD/LDAP attribute with a value that does not change, such as username or uid. If a user’s ID Attribute changes, it will create a new Mattermost account unassociated with their old one. This is the value used to log in to Mattermost in the \"AD/LDAP Username\" field on the sign in page. Normally this attribute is the same as the “Username Attribute” field above. If your team typically uses domain\\username to sign in to other services with AD/LDAP, you may choose to put domain\\username in this field to maintain consistency between sites.",
   "admin.ldap.idAttrEx": "Ex \"sAMAccountName\"",
-  "admin.ldap.idAttrTitle": "Atributo ID: ",
-  "admin.ldap.lastnameAttrDesc": "(Opcional) O atributo no servidor LDAP que será usado para preencher o sobrenome dos usuários no Mattermost.",
+  "admin.ldap.idAttrTitle": "ID Attribute: ",
+  "admin.ldap.lastnameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the last name of users in Mattermost.",
   "admin.ldap.lastnameAttrEx": "Ex \"sn\"",
-  "admin.ldap.lastnameAttrTitle": "Atributo Último Nome:",
-  "admin.ldap.loginNameDesc": "O texto placeholder que aparece no campo de login na página de login. O padrão é \"Usuário LDAP\".",
-  "admin.ldap.loginNameEx": "Ex \"Usuário LDAP\"",
-  "admin.ldap.loginNameTitle": "Nome do Campo Login:",
+  "admin.ldap.lastnameAttrTitle": "Last Name Attribute:",
+  "admin.ldap.ldap_test_button": "AD/LDAP Test",
+  "admin.ldap.loginNameDesc": "The placeholder text that appears in the login field on the login page. Defaults to \"AD/LDAP Username\".",
+  "admin.ldap.loginNameEx": "Ex \"AD/LDAP Username\"",
+  "admin.ldap.loginNameTitle": "Login Field Name:",
   "admin.ldap.maxPageSizeEx": "Ex \"2000\"",
-  "admin.ldap.maxPageSizeHelpText": "O número máximo de usuários que servidor Mattermost irá solicitar ao servidor LDAP ao mesmo tempo. 0 é ilimitado.",
-  "admin.ldap.maxPageSizeTitle": "Tamanho Máximo da Página:",
-  "admin.ldap.nicknameAttrDesc": "(Opcional) O atributo no servidor LDAP que será usado para preencher o apelido dos usuários no Mattermost.",
+  "admin.ldap.maxPageSizeHelpText": "The maximum number of users the Mattermost server will request from the AD/LDAP server at one time. 0 is unlimited.",
+  "admin.ldap.maxPageSizeTitle": "Maximum Page Size:",
+  "admin.ldap.nicknameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the nickname of users in Mattermost.",
   "admin.ldap.nicknameAttrEx": "Ex \"nickname\"",
-  "admin.ldap.nicknameAttrTitle": "Atributo Apelido:",
-  "admin.ldap.noLicense": "<h4 class=\"banner__heading\">Nota:</h4><p>LDAP é um recurso enterprise. Sua licença atual não suporta LDAP. Clique <a href=\"http://mattermost.com\" target=\"_blank\">aqui</a> para informações e preços da licença enterprise.</p>",
-  "admin.ldap.portDesc": "A porta que o Mattermost irá usar para conectar ao servidor LDAP. Padrão é 389.",
+  "admin.ldap.nicknameAttrTitle": "Nickname Attribute:",
+  "admin.ldap.noLicense": "<h4 class=\"banner__heading\">Note:</h4><p>AD/LDAP is an enterprise feature. Your current license does not support AD/LDAP. Click <a href=\"http://mattermost.com\" target=\"_blank\">here</a> for information and pricing on enterprise licenses.</p>",
+  "admin.ldap.portDesc": "The port Mattermost will use to connect to the AD/LDAP server. Default is 389.",
   "admin.ldap.portEx": "Ex \"389\"",
-  "admin.ldap.portTitle": "Porta LDAP:",
-  "admin.ldap.queryDesc": "O valor de tempo limite para consultas para o servidor LDAP. Aumentar se você está recebendo erros de tempo limite causados por um servidor LDAP lento.",
+  "admin.ldap.portTitle": "AD/LDAP Port:",
+  "admin.ldap.queryDesc": "The timeout value for queries to the AD/LDAP server. Increase if you are getting timeout errors caused by a slow AD/LDAP server.",
   "admin.ldap.queryEx": "Ex \"60\"",
-  "admin.ldap.queryTitle": "Tempo limite de Consulta (segundos):",
-  "admin.ldap.serverDesc": "O domínio ou o endereço IP do servidor LDAP.",
+  "admin.ldap.queryTitle": "Query Timeout (seconds):",
+  "admin.ldap.serverDesc": "The domain or IP address of AD/LDAP server.",
   "admin.ldap.serverEx": "Ex \"10.0.0.23\"",
-  "admin.ldap.serverTitle": "Servidor LDAP:",
-  "admin.ldap.skipCertificateVerification": "Pular a Verificação do Certificado:",
-  "admin.ldap.skipCertificateVerificationDesc": "Pula a etapa de verificação do certificado para conexões TLS ou STARTTLS. Não recomentado para ambientes de produção onde TLS é necessário. Apenas para teste.",
-  "admin.ldap.syncFailure": "Falha de Sincronização: {error}",
-  "admin.ldap.syncIntervalHelpText": "Sincronização LDAP atualiza as informações do usuário Mattermost para refletir atualizações no servidor LDAP. Por exemplo, quando o nome de um usuário muda no servidor LDAP, a mudança atualiza o Mattermost quando a sincronização é executada. Contas removidas ou desativas no servidor LDAP tem suas contas definidas como “Inativa” e suas sessões revogadas. Mattermos executa a sincronização no intervalo digitado. Por exemplo, se 60 for digitado, Mattermost irá sincronizar a cada 60 minutos.",
-  "admin.ldap.syncIntervalTitle": "Intervalo de sincronização (minutos):",
-  "admin.ldap.syncNowHelpText": "Iniciar uma sincronização LDAP imediatamente.",
-  "admin.ldap.sync_button": "Sincronizar LDAP Agora",
-  "admin.ldap.testFailure": "Falha Teste LDAP: {error}",
-  "admin.ldap.testHelpText": "Testa se o servidor Mattermost pode conectar ao servidor LDAP especificado. Veja o log para as mensagens de erros mais detalhadas.",
-  "admin.ldap.uernameAttrDesc": "O atributo no servidor LDAP que será usado para preencher o campo nome de usuário no Mattermost. Este pode ser o mesmo que o Atributo ID.",
-  "admin.ldap.userFilterDisc": "(Opcional), insira um filtro LDAP para usar ao procurar por objetos de usuário. Somente os usuários selecionados pela consulta serão capazes de acessar o Mattermost. Para o Active Directory, a consulta para filtrar os usuários desativados é (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
+  "admin.ldap.serverTitle": "AD/LDAP Server:",
+  "admin.ldap.skipCertificateVerification": "Skip Certificate Verification:",
+  "admin.ldap.skipCertificateVerificationDesc": "Skips the certificate verification step for TLS or STARTTLS connections. Not recommended for production environments where TLS is required. For testing only.",
+  "admin.ldap.syncFailure": "Sync Failure: {error}",
+  "admin.ldap.syncIntervalHelpText": "AD/LDAP Synchronization updates Mattermost user information to reflect updates on the AD/LDAP server. For example, when a user’s name changes on the AD/LDAP server, the change updates in Mattermost when synchronization is performed. Accounts removed from or disabled in the AD/LDAP server have their Mattermost accounts set to “Inactive” and have their account sessions revoked. Mattermost performs synchronization on the interval entered. For example, if 60 is entered, Mattermost synchronizes every 60 minutes.",
+  "admin.ldap.syncIntervalTitle": "Synchronization Interval (minutes):",
+  "admin.ldap.syncNowHelpText": "Initiates an AD/LDAP synchronization immediately.",
+  "admin.ldap.sync_button": "AD/LDAP Synchronize Now",
+  "admin.ldap.testFailure": "AD/LDAP Test Failure: {error}",
+  "admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the AD/LDAP server specified. See log file for more detailed error messages.",
+  "admin.ldap.testSuccess": "AD/LDAP Test Successful",
+  "admin.ldap.uernameAttrDesc": "The attribute in the AD/LDAP server that will be used to populate the username field in Mattermost. This may be the same as the ID Attribute.",
+  "admin.ldap.userFilterDisc": "(Optional) Enter an AD/LDAP Filter to use when searching for user objects. Only the users selected by the query will be able to access Mattermost. For Active Directory, the query to filter out disabled users is (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "Ex. \"(objectClass=user)\"",
-  "admin.ldap.userFilterTitle": "Filtro de Usuário:",
+  "admin.ldap.userFilterTitle": "User Filter:",
   "admin.ldap.usernameAttrEx": "Ex \"sAMAccountName\"",
-  "admin.ldap.usernameAttrTitle": "Atributo do Usuário:",
-  "admin.license.choose": "Escolha o Arquivo",
-  "admin.license.chooseFile": "Escolha um Arquivo",
-  "admin.license.edition": "Edição: ",
-  "admin.license.key": "Chave da Licença: ",
-  "admin.license.keyRemove": "Remover a Licença Enterprise e fazer Downgrade do Servidor",
-  "admin.license.noFile": "Nenhum arquivo enviado",
-  "admin.license.removing": "Removendo a Licença...",
-  "admin.license.title": "Edição e Licença",
-  "admin.license.type": "Licença: ",
-  "admin.license.upload": "Enviar",
-  "admin.license.uploadDesc": "Enviar uma chave da licença para Mattermost Enterprise Edition para fazer upgrade deste servidor. <a href=\"http://mattermost.com\" target=\"_blank\">Visite-nos online</a> para saber mais sobre os beneficios da Enterprise Edition ou para comprar uma chave.",
-  "admin.license.uploading": "Enviando Licença...",
-  "admin.log.consoleDescription": "Normalmente definido como falso em produção. Os desenvolvedores podem definir este campo como verdadeiro para mensagens de log de saída no console baseado na opção de nível de console.  Se verdadeiro, o servidor escreve mensagens para o fluxo de saída padrão (stdout).",
-  "admin.log.consoleTitle": "Log de saída para o console: ",
-  "admin.log.enableWebhookDebugging": "Ativar Debugging Webhook:",
-  "admin.log.enableWebhookDebuggingDescription": "Você pode definir isto como falso para desativar o log de depuração de todos os bodies de solicitação de solicitação webhook recebidas.",
-  "admin.log.fileDescription": "Normalmente definido como verdadeiro em produção.  Quando verdadeiro, arquivos de log são gravados no arquivo de log especificado no campo de localização abaixo.",
-  "admin.log.fileLevelDescription": "Esta configuração determina o nível de detalhe que são gravados no log de eventos no console. ERROR: Saídas somente mensagens de erro. INFO: Saídas de mensagens de erro e informações em torno de inicialização. DEBUG: Impressões de alto detalhe para desenvolvedores que trabalham na depuração de problemas.",
-  "admin.log.fileLevelTitle": "Nível do Arquivo de Log:",
-  "admin.log.fileTitle": "Arquivo de logs de saída: ",
-  "admin.log.formatDateLong": "Data (2006/01/02)",
-  "admin.log.formatDateShort": "Data (01/02/06)",
-  "admin.log.formatDescription": "Formato da mensagem de saída do log. Se branco será ajustador para \"[%D %T] [%L] %M\", onde:",
-  "admin.log.formatLevel": "Nível (DEBG, INFO, EROR)",
-  "admin.log.formatMessage": "Mensagem",
-  "admin.log.formatPlaceholder": "Entre seu formato de arquivo",
-  "admin.log.formatSource": "Origem",
-  "admin.log.formatTime": "Hora (15:04:05 MST)",
-  "admin.log.formatTitle": "Formato do Arquivo de Log:",
-  "admin.log.levelDescription": "Esta configuração determina o nível de detalhe que são gravados no log de eventos no console. ERROR: Saídas somente mensagens de erro. INFO: Saídas de mensagens de erro e informações em torno de inicialização. DEBUG: Impressões de alto detalhe para desenvolvedores que trabalham na depuração de problemas.",
-  "admin.log.levelTitle": "Nível de Log Console:",
-  "admin.log.locationDescription": "Arquivo para o qual os arquivos de log são escritos. Se estiver em branco, será definido para ./logs/mattermost, que grava logs em mattermost.log. Rotação de log está habilitada a cada 10.000 linhas de informações de log gravada para novos arquivos armazenados no mesmo diretório, por exemplo mattermost.2015-09-23.001, mattermost.2015-09-23.002, e assim por diante.",
-  "admin.log.locationPlaceholder": "Entre a localização do seu arquivo",
-  "admin.log.locationTitle": "Diretório do Arquivo de Log:",
-  "admin.log.logSettings": "Configurações de Log",
-  "admin.logs.reload": "Recarregar",
-  "admin.logs.title": "Log do Servidor",
-  "admin.nav.help": "Ajuda",
-  "admin.nav.logout": "Sair",
-  "admin.nav.report": "Relatar um Problema",
-  "admin.nav.switch": "Seleção de Equipe",
-  "admin.notifications.email": "E-mail",
-  "admin.notifications.push": "Notificação Móvel",
-  "admin.notifications.title": "Configurações de Notificação",
+  "admin.ldap.usernameAttrTitle": "Username Attribute:",
+  "admin.license.choose": "Choose File",
+  "admin.license.chooseFile": "Choose File",
+  "admin.license.edition": "Edition: ",
+  "admin.license.key": "License Key: ",
+  "admin.license.keyRemove": "Remove Enterprise License and Downgrade Server",
+  "admin.license.noFile": "No file uploaded",
+  "admin.license.removing": "Removing License...",
+  "admin.license.title": "Edition and License",
+  "admin.license.type": "License: ",
+  "admin.license.upload": "Upload",
+  "admin.license.uploadDesc": "Upload a license key for Mattermost Enterprise Edition to upgrade this server. <a href=\"http://mattermost.com\" target=\"_blank\">Visit us online</a> to learn more about the benefits of Enterprise Edition or to purchase a key.",
+  "admin.license.uploading": "Uploading License...",
+  "admin.log.consoleDescription": "Typically set to false in production. Developers may set this field to true to output log messages to console based on the console level option.  If true, server writes messages to the standard output stream (stdout).",
+  "admin.log.consoleTitle": "Output logs to console: ",
+  "admin.log.enableDiagnostics": "Enable Diagnostics and Error Reporting:",
+  "admin.log.enableDiagnosticsDescription": "Enable this feature to improve the quality and performance of Mattermost by sending error reporting and diagnostic information to Mattermost, Inc. Read our <a href=\"https://about.mattermost.com/default-privacy-policy/\" target=\"_blank\">privacy policy</a> to learn more.",
+  "admin.log.enableWebhookDebugging": "Enable Webhook Debugging:",
+  "admin.log.enableWebhookDebuggingDescription": "You can set this to false to disable the debug logging of all incoming webhook request bodies.",
+  "admin.log.fileDescription": "Typically set to true in production.  When true, log files are written to the log file specified in file location field below.",
+  "admin.log.fileLevelDescription": "This setting determines the level of detail at which log events are written to the log file. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues.",
+  "admin.log.fileLevelTitle": "File Log Level:",
+  "admin.log.fileTitle": "Output logs to file: ",
+  "admin.log.formatDateLong": "Date (2006/01/02)",
+  "admin.log.formatDateShort": "Date (01/02/06)",
+  "admin.log.formatDescription": "Format of log message output. If blank will be set to \"[%D %T] [%L] %M\", where:",
+  "admin.log.formatLevel": "Level (DEBG, INFO, EROR)",
+  "admin.log.formatMessage": "Message",
+  "admin.log.formatPlaceholder": "Enter your file format",
+  "admin.log.formatSource": "Source",
+  "admin.log.formatTime": "Time (15:04:05 MST)",
+  "admin.log.formatTitle": "File Log Format:",
+  "admin.log.levelDescription": "This setting determines the level of detail at which log events are written to the console. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues.",
+  "admin.log.levelTitle": "Console Log Level:",
+  "admin.log.locationDescription": "File to which log files are written. If blank, will be set to ./logs/mattermost, which writes logs to mattermost.log. Log rotation is enabled and every 10,000 lines of log information is written to new files stored in the same directory, for example mattermost.2015-09-23.001, mattermost.2015-09-23.002, and so forth.",
+  "admin.log.locationPlaceholder": "Enter your file location",
+  "admin.log.locationTitle": "File Log Directory:",
+  "admin.log.logSettings": "Log Settings",
+  "admin.logs.reload": "Reload",
+  "admin.logs.title": "Server Logs",
+  "admin.nav.help": "Help",
+  "admin.nav.logout": "Logout",
+  "admin.nav.report": "Report a Problem",
+  "admin.nav.switch": "Team Selection",
+  "admin.notifications.email": "Email",
+  "admin.notifications.push": "Mobile Push",
+  "admin.notifications.title": "Notification Settings",
   "admin.oauth.gitlab": "GitLab",
   "admin.oauth.google": "Google Apps",
-  "admin.oauth.off": "Não é permitido login via um provedor OAuth 2.0",
+  "admin.oauth.off": "Do not allow sign-in via an OAuth 2.0 provider",
   "admin.oauth.office365": "Office 365 (Beta)",
-  "admin.oauth.providerDescription": "Quando verdadeiro, Mattermost pode atuar como um provedor de serviços OAuth 2.0 pra permitir solicitações de API de aplicações externas.",
-  "admin.oauth.providerTitle": "Ativar Provedor de Serviço OAuth 2.0: ",
-  "admin.oauth.select": "Selecione provedor de serviço OAuth 2.0:",
-  "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>Log in</a> na sua conta Microsoft ou Office 365. Certifique-se que esta conta é do mesmo <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> que você gostaria que os usuários entrassem.</li><li>Vá para <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, clique <strong>Ir para lista de aplicativo</strong> > <strong>Adicionar um aplicativo</strong> e use \"Mattermost - nome-da-sua-empresa\" como <strong>Nome da Aplicação</strong>.</li><li>Dentro de <strong>Segredos do Aplicativo</strong>, clique <strong>Gerar Nova Senha</strong> copie e cole no campo abaixo <strong>Aplicativo Senha Secreta</strong>.</li><li>Dentro de <strong>Plataformas</strong>, clique <strong>Adicionar Plataforma</strong>, escolha <strong>Web</strong> e digite <strong>url-da-sua-empresa/signup/office365/complete</strong> (exemplo: http://localhost:8065/signup/office365/complete) dentro de <strong>Redirecionar URIs</strong>. Também desmarque <strong>Permitir Fluxo Implícito</strong>.</li><li>Finalmente, clique <strong>Salvar</strong> e então copie e cole no campo abaixo <strong>ID da Aplicação</strong>.</li></ol>",
-  "admin.office365.authTitle": "Autenticação Endpoint:",
-  "admin.office365.clientIdDescription": "O Aplicativo/ID do Cliente que você recebeu quando registrou seu aplicativo com a Microsoft.",
+  "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications.",
+  "admin.oauth.providerTitle": "Enable OAuth 2.0 Service Provider: ",
+  "admin.oauth.select": "Select OAuth 2.0 service provider:",
+  "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>Log in</a> to your Microsoft or Office 365 account. Make sure it's the account on the same <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> that you would like users to log in with.</li><li>Go to <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, click <strong>Go to app list</strong> > <strong>Add an app</strong> and use \"Mattermost - your-company-name\" as the <strong>Application Name</strong>.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and paste it to the <strong>Application Secret Password</strong> field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong>your-mattermost-url/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and then paste the <strong>Application ID</strong> below.</li></ol>",
+  "admin.office365.authTitle": "Auth Endpoint:",
+  "admin.office365.clientIdDescription": "The Application/Client ID you received when registering your application with Microsoft.",
   "admin.office365.clientIdExample": "Ex \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
-  "admin.office365.clientIdTitle": "ID do Aplicativo:",
-  "admin.office365.clientSecretDescription": "O Aplicativo Senha Secreta que você gerou quando registrou seu aplicativo com a Microsoft.",
+  "admin.office365.clientIdTitle": "Application ID:",
+  "admin.office365.clientSecretDescription": "The Application Secret Password you generated when registering your application with Microsoft.",
   "admin.office365.clientSecretExample": "Ex \"shAieM47sNBfgl20f8ci294\"",
-  "admin.office365.clientSecretTitle": "Aplicativo Senha Secreta:",
+  "admin.office365.clientSecretTitle": "Application Secret Password:",
   "admin.office365.tokenTitle": "Token Endpoint:",
-  "admin.office365.userTitle": "API Usuário Endpoint:",
-  "admin.password.lowercase": "Pelo menos uma letra minúscula",
-  "admin.password.minimumLength": "Tamanho Mínimo de Senha:",
-  "admin.password.minimumLengthDescription": "Número mínimo de caracteres necessários para uma senha válida. Deve ser um número inteiro maior que ou igual a {min} e menor ou igual a {max}.",
+  "admin.office365.userTitle": "User API Endpoint:",
+  "admin.password.lowercase": "At least one lowercase letter",
+  "admin.password.minimumLength": "Minimum Password Length:",
+  "admin.password.minimumLengthDescription": "Minimum number of characters required for a valid password. Must be a whole number greater than or equal to {min} and less than or equal to {max}.",
   "admin.password.minimumLengthExample": "Ex \"5\"",
-  "admin.password.number": "Pelo menos um número",
-  "admin.password.preview": "Erro pré-visualização de mensagem",
-  "admin.password.requirements": "Requerimentos de Senha:",
-  "admin.password.requirementsDescription": "Tipos de caracteres necessários em uma senha válida.",
-  "admin.password.symbol": "Pelo menos um símbolo (ex. \"~!@#$%^&*()\")",
-  "admin.password.uppercase": "Pelo menos uma letra maiuscula",
-  "admin.privacy.showEmailDescription": "Quando falso, esconde endereço de e-mail dos outros usuários na interface do usuário, incluindo donos da equipe e Administradores de Equipe. Usado quando o sistema está configurado para gerenciar equipes onde alguns usuários optam por manter suas informações de contato privado.",
-  "admin.privacy.showEmailTitle": "Mostrar Endereços de Email: ",
-  "admin.privacy.showFullNameDescription": "Quando falso, oculta o nome completo dos usuários dos outros usuários, incluindo donos de equipe e Administradores de Equipe. Nome de usuário é mostrado no lugar do nome completo.",
-  "admin.privacy.showFullNameTitle": "Mostrar Nome Completo: ",
-  "admin.rate.enableLimiterDescription": "Quando verdadeiro, as APIs são estranguladas para as taxas especificadas abaixo.",
-  "admin.rate.enableLimiterTitle": "Ativar Rate Limiting: ",
-  "admin.rate.httpHeaderDescription": "Quando preenchido, variam limitação de taxa pelo compo cabeçalho HTTP especificado (ex. quando configurado NGINX ajustado para \"X-Real-IP\", quando configurado AmazonELB ajustado para \"X-Forwarded-For\").",
+  "admin.password.number": "At least one number",
+  "admin.password.preview": "Error message preview",
+  "admin.password.requirements": "Password Requirements:",
+  "admin.password.requirementsDescription": "Character types required in a valid password.",
+  "admin.password.symbol": "At least one symbol (e.g. \"~!@#$%^&*()\")",
+  "admin.password.uppercase": "At least one uppercase letter",
+  "admin.privacy.showEmailDescription": "When false, hides email address of users from other users in the user interface, including team owners and Team Administrators. Used when system is set up for managing teams where some users choose to keep their contact information private.",
+  "admin.privacy.showEmailTitle": "Show Email Address: ",
+  "admin.privacy.showFullNameDescription": "When false, hides full name of users from other users, including team owners and Team Administrators. Username is shown in place of full name.",
+  "admin.privacy.showFullNameTitle": "Show Full Name: ",
+  "admin.rate.enableLimiterDescription": "When true, APIs are throttled at rates specified below.",
+  "admin.rate.enableLimiterTitle": "Enable Rate Limiting: ",
+  "admin.rate.httpHeaderDescription": "When filled in, vary rate limiting by HTTP header field specified (e.g. when configuring NGINX set to \"X-Real-IP\", when configuring AmazonELB set to \"X-Forwarded-For\").",
   "admin.rate.httpHeaderExample": "Ex \"X-Real-IP\", \"X-Forwarded-For\"",
-  "admin.rate.httpHeaderTitle": "Variar o rate limit pelo cabeçalho HTTP",
-  "admin.rate.memoryDescription": "Número máximo de sessões de usuários conectados ao sistema conforme determinado pelas configurações abaixo \"Variar rate limit pelo endereço remoto\" e \"Variar rate limit pelo cabeçalho HTTP\".",
+  "admin.rate.httpHeaderTitle": "Vary rate limit by HTTP header",
+  "admin.rate.memoryDescription": "Maximum number of users sessions connected to the system as determined by \"Vary rate limit by remote address\" and \"Vary rate limit by HTTP header\" settings below.",
   "admin.rate.memoryExample": "Ex \"10000\"",
-  "admin.rate.memoryTitle": "Tamanho da Memória de Armazenamento:",
-  "admin.rate.noteDescription": "Alterando as propriedades nesta seção irá exigir que o servidor seja reiniciado para que tenha efeito.",
-  "admin.rate.noteTitle": "Nota:",
-  "admin.rate.queriesDescription": "Estrangula API neste número de solicitações por segundo.",
+  "admin.rate.memoryTitle": "Memory Store Size:",
+  "admin.rate.noteDescription": "Changing properties in this section will require a server restart before taking effect.",
+  "admin.rate.noteTitle": "Note:",
+  "admin.rate.queriesDescription": "Throttles API at this number of requests per second.",
   "admin.rate.queriesExample": "Ex \"10\"",
-  "admin.rate.queriesTitle": "Máxima Consultas por Segundo:",
-  "admin.rate.remoteDescription": "Quando verdadeiro, taxa limite de acesso de API por endereço de IP.",
-  "admin.rate.remoteTitle": "Variar rate limit pelo endereço remoto: ",
-  "admin.rate.title": "Configurações Rate Limit",
-  "admin.recycle.button": "Reciclar Conexão do Banco de Dados",
-  "admin.recycle.loading": " Reciclando...",
-  "admin.recycle.recycleDescription": "Instalações usando vários bancos de dados podem trocar de um banco de dados principal para outro sem reiniciar o servidor Mattermost, atualizando \"config.json\" com a nova configuração desejada e usando <a href=\"../general/configuration\"><b>Configuração > Recarregar Configuração do Disco</b></a> recarrega as novas configurações enquanto o servidor está em execução. O administrador deve então usar <b>Reciclagem de Conexões do Banco de Dados</b> recurso para reciclar as conexões do banco de dados com base nas novas definições.",
-  "admin.recycle.reloadFail": "Reciclagem malsucedida: {error}",
-  "admin.regenerate": "Re-Gerar",
-  "admin.reload.button": "Recarregar Configuração do Disco",
-  "admin.reload.loading": " Carregando...",
-  "admin.reload.reloadDescription": "Instalações usando vários bancos de dados podem trocar de um banco de dados principal para outro sem reiniciar o servidor Mattermost, atualizando \"config.json\" com a nova configuração desejada e usando <b>Recarregar Configuração do Disco</b> recarrega as novas configurações enquanto o servidor está em execução. O administrador deve então usar <a href=\"../advanced/database\"><b>Banco de Dados > Reciclagem de Conexões do Banco de Dados</b></a> recurso para reciclar as conexões do banco de dados com base nas novas definições.",
-  "admin.reload.reloadFail": "Recarregamento malsucedido: {error}",
-  "admin.reset_password.close": "Fechar",
-  "admin.reset_password.newPassword": "Nova Senha",
-  "admin.reset_password.select": "Selecionar",
-  "admin.reset_password.submit": "Por favor, insira pelo menos {chars} caracteres.",
-  "admin.reset_password.titleReset": "Resetar Senha",
-  "admin.reset_password.titleSwitch": "Trocar a conta para e-mail/senha",
-  "admin.saml.assertionConsumerServiceURLDesc": "Digite https://<your-mattermost-url>/login/sso/saml. Certifique-se de usar HTTP ou HTTPS em sua URL, dependendo da sua configuração do servidor. Este campo também é conhecido como Assertion Consumer Service URL.",
+  "admin.rate.queriesTitle": "Maximum Queries per Second:",
+  "admin.rate.remoteDescription": "When true, rate limit API access by IP address.",
+  "admin.rate.remoteTitle": "Vary rate limit by remote address: ",
+  "admin.rate.title": "Rate Limit Settings",
+  "admin.recycle.button": "Recycle Database Connections",
+  "admin.recycle.loading": " Recycling...",
+  "admin.recycle.recycleDescription": "Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating \"config.json\" to the new desired configuration and using the <a href=\"../general/configuration\"><b>Configuration > Reload Configuration from Disk</b></a> feature to load the new settings while the server is running. The administrator should then use <b>Recycle Database Connections</b> feature to recycle the database connections based on the new settings.",
+  "admin.recycle.reloadFail": "Recycling unsuccessful: {error}",
+  "admin.regenerate": "Regenerate",
+  "admin.reload.button": "Reload Configuration From Disk",
+  "admin.reload.loading": " Loading...",
+  "admin.reload.reloadDescription": "Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating \"config.json\" to the new desired configuration and using the <b>Reload Configuration from Disk</b> feature to load the new settings while the server is running. The administrator should then use the <a href=\"../advanced/database\"><b>Database > Recycle Database Connections</b></a> feature to recycle the database connections based on the new settings.",
+  "admin.reload.reloadFail": "Reloading unsuccessful: {error}",
+  "admin.reset_password.close": "Close",
+  "admin.reset_password.newPassword": "New Password",
+  "admin.reset_password.select": "Select",
+  "admin.reset_password.submit": "Please enter at least {chars} characters.",
+  "admin.reset_password.titleReset": "Reset Password",
+  "admin.reset_password.titleSwitch": "Switch Account to Email/Password",
+  "admin.saml.assertionConsumerServiceURLDesc": "Enter https://<your-mattermost-url>/login/sso/saml. Make sure you use HTTP or HTTPS in your URL depending on your server configuration. This field is also known as the Assertion Consumer Service URL.",
   "admin.saml.assertionConsumerServiceURLEx": "Ex \"https://<your-mattermost-url>/login/sso/saml\"",
-  "admin.saml.assertionConsumerServiceURLTitle": "URL Provedor de Serviço de Login:",
-  "admin.saml.emailAttrDesc": "O atributo na SAML Assertion que será usado para preencher os endereços de email dos usuários em Mattermost.",
-  "admin.saml.emailAttrEx": "Ex \"Email\" ou \"PrimaryEmail\"",
-  "admin.saml.emailAttrTitle": "Atributo de E-mail:",
-  "admin.saml.enableDescription": "Quando verdadeiro, Mattermost irá permitir login usando SAML. Por favor veja a <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentação</a> para aprender mais sobre configurar SAML para o Mattermost.",
-  "admin.saml.enableTitle": "Ativar Login With SAML:",
-  "admin.saml.encryptDescription": "Quando verdadeiro, Mattermost irá descriptografar SAML Assertions criptografados com o seu Provedor de Serviços de Certificado Público.",
-  "admin.saml.encryptTitle": "Ativar Criptografia:",
-  "admin.saml.firstnameAttrDesc": "(Opcional) O atributo em SAML Assertion que será usado para preencher o apelido dos usuários no Mattermost.",
+  "admin.saml.assertionConsumerServiceURLTitle": "Service Provider Login URL:",
+  "admin.saml.emailAttrDesc": "The attribute in the SAML Assertion that will be used to populate the email addresses of users in Mattermost.",
+  "admin.saml.emailAttrEx": "Ex \"Email\" or \"PrimaryEmail\"",
+  "admin.saml.emailAttrTitle": "Email Attribute:",
+  "admin.saml.enableDescription": "When true, Mattermost allows login using SAML. Please see <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentation</a> to learn more about configuring SAML for Mattermost.",
+  "admin.saml.enableTitle": "Enable Login With SAML:",
+  "admin.saml.encryptDescription": "When true, Mattermost will decrypt SAML Assertions encrypted with your Service Provider Public Certificate.",
+  "admin.saml.encryptTitle": "Enable Encryption:",
+  "admin.saml.firstnameAttrDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the first name of users in Mattermost.",
   "admin.saml.firstnameAttrEx": "Ex \"FirstName\"",
-  "admin.saml.firstnameAttrTitle": "Primeiro Nome Atributo:",
-  "admin.saml.idpCertificateFileDesc": "O certificado de autenticação pública emitida pelo seu Provedor de Identidade.",
-  "admin.saml.idpCertificateFileRemoveDesc": "Remover o certificado de autenticação pública emitida pelo seu Provedor de Identidade.",
-  "admin.saml.idpCertificateFileTitle": "Provedor de Identidade Certificado Público:",
-  "admin.saml.idpDescriptorUrlDesc": "A URL emissora para o Provedor de Identidade que você usa para solicitações SAML.",
+  "admin.saml.firstnameAttrTitle": "First Name Attribute:",
+  "admin.saml.idpCertificateFileDesc": "The public authentication certificate issued by your Identity Provider.",
+  "admin.saml.idpCertificateFileRemoveDesc": "Remove the public authentication certificate issued by your Identity Provider.",
+  "admin.saml.idpCertificateFileTitle": "Identity Provider Public Certificate:",
+  "admin.saml.idpDescriptorUrlDesc": "The issuer URL for the Identity Provider you use for SAML requests.",
   "admin.saml.idpDescriptorUrlEx": "Ex \"https://idp.example.org/SAML2/issuer\"",
-  "admin.saml.idpDescriptorUrlTitle": "URL Emissor Provedor Identidade:",
-  "admin.saml.idpUrlDesc": "A URL onde o Mattermost envia a requisição SAML para iniciar a sequencia de login.",
+  "admin.saml.idpDescriptorUrlTitle": "Identity Provider Issuer URL:",
+  "admin.saml.idpUrlDesc": "The URL where Mattermost sends a SAML request to start login sequence.",
   "admin.saml.idpUrlEx": "Ex \"https://idp.example.org/SAML2/SSO/Login\"",
   "admin.saml.idpUrlTitle": "SAML SSO URL:",
-  "admin.saml.lastnameAttrDesc": "(Opcional) O atributo em SAML Assertion que será usado para preencher o idioma dos usuários no Mattermost.",
+  "admin.saml.lastnameAttrDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the last name of users in Mattermost.",
   "admin.saml.lastnameAttrEx": "Ex \"LastName\"",
-  "admin.saml.lastnameAttrTitle": "Atributo Último Nome:",
-  "admin.saml.localeAttrDesc": "(Opcional) O atributo em SAML Assertion que será usado para preencher o idioma dos usuários no Mattermost.",
+  "admin.saml.lastnameAttrTitle": "Last Name Attribute:",
+  "admin.saml.localeAttrDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the language of users in Mattermost.",
   "admin.saml.localeAttrEx": "Ex \"Locale\" or \"PrimaryLanguage\"",
-  "admin.saml.localeAttrTitle": "Atributo Idioma Preferencial:",
-  "admin.saml.loginButtonTextDesc": "(Opcional) O texto que aparece no botão de login na página de login. O padrão é \"Com SAML\".",
-  "admin.saml.loginButtonTextEx": "Ex \"Com OKTA\"",
-  "admin.saml.loginButtonTextTitle": "Texto Botão Login:",
-  "admin.saml.nicknameAttrDesc": "(Opcional) O atributo em SAML Assertion que será usado para preencher o apelido dos usuários no Mattermost.",
+  "admin.saml.localeAttrTitle": "Preferred Language Attribute:",
+  "admin.saml.loginButtonTextDesc": "(Optional) The text that appears in the login button on the login page. Defaults to \"With SAML\".",
+  "admin.saml.loginButtonTextEx": "Ex \"With OKTA\"",
+  "admin.saml.loginButtonTextTitle": "Login Button Text:",
+  "admin.saml.nicknameAttrDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the nickname of users in Mattermost.",
   "admin.saml.nicknameAttrEx": "Ex \"Nickname\"",
-  "admin.saml.nicknameAttrTitle": "Atributo Apelido:",
-  "admin.saml.privateKeyFileFileDesc": "A chave privada usada para descriptografar SAML Assertion do Provedor de Identidade.",
-  "admin.saml.privateKeyFileFileRemoveDesc": "Remover a chave privada usada para descriptografar SAML Assertion do Provedor de Identidade.",
-  "admin.saml.privateKeyFileTitle": "Provedor de Serviço Chave Privada:",
-  "admin.saml.publicCertificateFileDesc": "O certificado usado para gerar a assinatura de um pedido SAML ao Provedor de Identidade para um Provedor de Serviços iniciado o login SAML, quando Mattermost é o Provedor de Serviços.",
-  "admin.saml.publicCertificateFileRemoveDesc": "Remover o certificado usado para gerar a assinatura de um pedido SAML ao Provedor de Identidade para um login SAML iniciado por um provedor de serviços, quando Mattermost é o provedor de serviços.",
-  "admin.saml.publicCertificateFileTitle": "Certificado Público Provedor Serviço:",
-  "admin.saml.remove.idp_certificate": "Remover Certificado Provedor de Serviço",
-  "admin.saml.remove.privKey": "Remover Chave Privada Provedor de Serviço",
-  "admin.saml.remove.sp_certificate": "Remover Certificado Provedor de Serviço",
-  "admin.saml.removing.certificate": "Removendo Certificado...",
-  "admin.saml.removing.privKey": "Removendo Chave Privada...",
-  "admin.saml.uploading.certificate": "Enviando Certificado...",
-  "admin.saml.uploading.privateKey": "Enviando Chave Privada...",
-  "admin.saml.usernameAttrDesc": "O atributo em SAML Assertion que será usado para preencher o campo usuário no Mattermost.",
+  "admin.saml.nicknameAttrTitle": "Nickname Attribute:",
+  "admin.saml.privateKeyFileFileDesc": "The private key used to decrypt SAML Assertions from the Identity Provider.",
+  "admin.saml.privateKeyFileFileRemoveDesc": "Remove the private key used to decrypt SAML Assertions from the Identity Provider.",
+  "admin.saml.privateKeyFileTitle": "Service Provider Private Key:",
+  "admin.saml.publicCertificateFileDesc": "The certificate used to generate the signature on a SAML request to the Identity Provider for a service provider initiated SAML login, when Mattermost is the Service Provider.",
+  "admin.saml.publicCertificateFileRemoveDesc": "Remove the certificate used to generate the signature on a SAML request to the Identity Provider for a service provider initiated SAML login, when Mattermost is the Service Provider.",
+  "admin.saml.publicCertificateFileTitle": "Service Provider Public Certificate:",
+  "admin.saml.remove.idp_certificate": "Remove Identity Provider Certificate",
+  "admin.saml.remove.privKey": "Remove Service Provider Private Key",
+  "admin.saml.remove.sp_certificate": "Remove Service Provider Certificate",
+  "admin.saml.removing.certificate": "Removing Certificate...",
+  "admin.saml.removing.privKey": "Removing Private Key...",
+  "admin.saml.uploading.certificate": "Uploading Certificate...",
+  "admin.saml.uploading.privateKey": "Uploading Private Key...",
+  "admin.saml.usernameAttrDesc": "The attribute in the SAML Assertion that will be used to populate the username field in Mattermost.",
   "admin.saml.usernameAttrEx": "Ex \"Username\"",
-  "admin.saml.usernameAttrTitle": "Atributo do Usuário:",
-  "admin.saml.verifyDescription": "Quando verdadeiro, Mattermost verifica se a assinatura enviada da resposta SAML corresponde a URL de Login do Privedor de Serviço",
-  "admin.saml.verifyTitle": "Verificar Assinatura:",
-  "admin.save": "Salvar",
-  "admin.saving": "Salvando Config...",
-  "admin.security.connection": "Conexões",
-  "admin.security.inviteSalt.disabled": "Salt convite não pode ser alterado enquanto envio de emails está desativado.",
+  "admin.saml.usernameAttrTitle": "Username Attribute:",
+  "admin.saml.verifyDescription": "When true, Mattermost verifies that the signature sent from the SAML Response matches the Service Provider Login URL",
+  "admin.saml.verifyTitle": "Verify Signature:",
+  "admin.save": "Save",
+  "admin.saving": "Saving Config...",
+  "admin.security.connection": "Connections",
+  "admin.security.inviteSalt.disabled": "Invite salt cannot be changed while sending emails is disabled.",
   "admin.security.login": "Login",
-  "admin.security.password": "Senha",
-  "admin.security.passwordResetSalt.disabled": "Salt de redefinição de senha não pode ser alterado enquanto o envio de emails está desabilitado.",
-  "admin.security.public_links": "Links Públicos",
-  "admin.security.requireEmailVerification.disabled": "Verificação de Email não pode ser alterado enquanto o envio de emails está desabilitado.",
-  "admin.security.session": "Sessões",
-  "admin.security.signup": "Inscrever-se",
-  "admin.select_team.close": "Fechar",
-  "admin.select_team.select": "Selecionar",
-  "admin.select_team.selectTeam": "Selecione Equipe",
-  "admin.service.attemptDescription": "Tentativas de login permitidas antes que do usuário ser bloqueado e necessário redefinir a senha por e-mail.",
+  "admin.security.password": "Password",
+  "admin.security.passwordResetSalt.disabled": "Password reset salt cannot be changed while sending emails is disabled.",
+  "admin.security.public_links": "Public Links",
+  "admin.security.requireEmailVerification.disabled": "Email verification cannot be changed while sending emails is disabled.",
+  "admin.security.session": "Sessions",
+  "admin.security.signup": "Signup",
+  "admin.select_team.close": "Close",
+  "admin.select_team.select": "Select",
+  "admin.select_team.selectTeam": "Select Team",
+  "admin.service.attemptDescription": "Number of login attempts allowed before a user is locked out and required to reset their password via email.",
   "admin.service.attemptExample": "Ex \"10\"",
-  "admin.service.attemptTitle": "Máxima Tentativas de Login:",
-  "admin.service.cmdsDesc": "Quando verdadeiro, comandos slash personalizados serão permitidos. Veja a <a href='http://docs.mattermost.com/developer/slash-commands.html' target='_blank'>documentação</a> para saber mais.",
-  "admin.service.cmdsTitle": "Ativar Comandos Slash Personalizados: ",
-  "admin.service.corsDescription": "Ativar requisição de origem HTTP Cross dos domínios especificados (separados por espaço). Usar \"*\" se você quiser permitir CORS de qualquer domínio ou deixe em branco para desativar.",
+  "admin.service.attemptTitle": "Maximum Login Attempts:",
+  "admin.service.cmdsDesc": "When true, custom slash commands will be allowed. See <a href='http://docs.mattermost.com/developer/slash-commands.html' target='_blank'>documentation</a> to learn more.",
+  "admin.service.cmdsTitle": "Enable Custom Slash Commands: ",
+  "admin.service.corsDescription": "Enable HTTP Cross origin request from a specific domain. Use \"*\" if you want to allow CORS from any domain or leave it blank to disable it.",
   "admin.service.corsEx": "http://example.com",
-  "admin.service.corsTitle": "Permitir requisição cross-origin de:",
-  "admin.service.developerDesc": "Quando verdadeiro, erros Javascript são mostrados em uma barra vermelha no topo da interface de usuário. Não recomendado para uso em produção. ",
-  "admin.service.developerTitle": "Ativar o Modo Desenvolvedor: ",
-  "admin.service.googleDescription": "Defina esta chave para permitir a exibição de títulos para pré-visualizações de vídeo do YouTube embutidos. Sem a chave, pré-visualizações do YouTube ainda serão criadas com base em hiperlinks que aparecem nas mensagens ou comentários, mas eles não vão mostrar o título do vídeo. Veja o <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> para instruções sobre como obter uma chave.",
+  "admin.service.corsTitle": "Enable cross-origin requests from:",
+  "admin.service.developerDesc": "When true, Javascript errors are shown in a red bar at the top of the user interface. Not recommended for use in production. ",
+  "admin.service.developerTitle": "Enable Developer Mode: ",
+  "admin.service.googleDescription": "Set this key to enable the display of titles for embedded YouTube video previews. Without the key, YouTube previews will still be created based on hyperlinks appearing in messages or comments but they will not show the video title. View a <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> for instructions on how to obtain a key.",
   "admin.service.googleExample": "Ex \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Google API Key:",
-  "admin.service.iconDescription": "Quando verdadeiro, webhooks, comandos slash e outras integrações, como <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, terão permissão para mudar a foto do perfil dos posts. Nota: Combinado com a permissão de integrações para substituir nomes de usuários, os usuários podem ser capazes de realizar ataques de phishing ao tentar passar por outros usuários.",
-  "admin.service.iconTitle": "Permitir que integrações sobrescreva o imagem do perfil:",
-  "admin.service.insecureTlsDesc": "Quando verdadeiro, quaisquer pedidos de HTTPS de saída vão aceitar certificados não verificados ou auto-assinados. Por exemplo, webhooks de saída para um servidor com um certificado TLS auto-assinado, usando qualquer domínio, serão permitidos. Note-se que isso faz com que essas conexões sejam suscetíveis a ataques man-in-the-middle.",
-  "admin.service.insecureTlsTitle": "Ativar Conexões de Saída Inseguras: ",
-  "admin.service.integrationAdmin": "Restringir a criação de integrações para Administradores de Sistema e Equipe: ",
-  "admin.service.integrationAdminDesc": "Quando verdadeiro, integrações de usuário somente poderão ser criadas pelos admins.",
-  "admin.service.listenAddress": "Endereço à Escutar:",
-  "admin.service.listenDescription": "O endereço para o qual ligar e ouvir. Inserir \":8065\" irá ligar para todas as interfaces, ou você pode escolher um como \"127.0.0.1:8065\".  Essa mudança irá exigir uma reinicialização do servidor antes de ter efeito.",
+  "admin.service.iconDescription": "When true, webhooks, slash commands and other integrations, such as <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, will be allowed to change the profile picture they post with. Note: Combined with allowing integrations to override usernames, users may be able to perform phishing attacks by attempting to impersonate other users.",
+  "admin.service.iconTitle": "Enable integrations to override profile picture icons:",
+  "admin.service.insecureTlsDesc": "When true, any outgoing HTTPS requests will accept unverified, self-signed certificates. For example, outgoing webhooks to a server with a self-signed TLS certificate, using any domain, will be allowed. Note that this makes these connections susceptible to man-in-the-middle attacks.",
+  "admin.service.insecureTlsTitle": "Enable Insecure Outgoing Connections: ",
+  "admin.service.integrationAdmin": "Restrict managing integrations to Admins:",
+  "admin.service.integrationAdminDesc": "When true, webhooks and slash commands can only be created, edited and viewed by Team and System Admins, and OAuth 2.0 applications by System Admins. Integrations are available to all users after they have been created by the Admin.",
+  "admin.service.listenAddress": "Listen Address:",
+  "admin.service.listenDescription": "The address to which to bind and listen. Entering \":8065\" will bind to all interfaces or you can choose one like \"127.0.0.1:8065\".  Changing this will require a server restart before taking effect.",
   "admin.service.listenExample": "Ex \":8065\"",
-  "admin.service.mfaDesc": "Quando verdadeiro, vai ser dada a opção do usuário adicionar autenticação multi-fator em sua conta. Eles irão precisar de um smartphone e um app autenticador como o Google Authenticator.",
-  "admin.service.mfaTitle": "Ativar Autenticação Multi-Fator:",
-  "admin.service.mobileSessionDays": "Tamanho da sessão para app móvel (dias):",
-  "admin.service.mobileSessionDaysDesc": "O número de dias desde a última vez que um usuário entrou suas credenciais para expirar a sessão do usuário. Depois de alterar essa configuração, a nova duração da sessão terá efeito após a próxima vez que o usuário digitar suas credenciais.",
-  "admin.service.outWebhooksDesc": "Quando verdadeiro, webhooks de saída serão permitidos. Veja a <a href='http://docs.mattermost.com/developer/webhooks-outgoing.html' target='_blank'>documentação</a> para saber mais.",
-  "admin.service.outWebhooksTitle": "Ativar Webhooks Saída: ",
-  "admin.service.overrideDescription": "Quando verdadeiro, webhooks, comandos slash e outras integrações, como <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, terão permissão para mudar o nome do usuário dos posts. Nota: Combinado com a permissão de integrações para substituir foto do perfil, os usuários podem ser capazes de realizar ataques de phishing ao tentar passar por outros usuários.",
-  "admin.service.overrideTitle": "Permitir que integrações sobrescrevam o nome do usuário:",
-  "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": "Segment.com é um serviço online que pode opcionalmente ser usado para rastrear detalhes das estatísticas do sistema. Você pode obter uma chave criando uma conta gratuita em Segment.com.",
+  "admin.service.mfaDesc": "When true, users will be given the option to add multi-factor authentication to their account. They will need a smartphone and an authenticator app such as Google Authenticator.",
+  "admin.service.mfaTitle": "Enable Multi-factor Authentication:",
+  "admin.service.mobileSessionDays": "Session length mobile (days):",
+  "admin.service.mobileSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
+  "admin.service.outWebhooksDesc": "When true, outgoing webhooks will be allowed. See <a href='http://docs.mattermost.com/developer/webhooks-outgoing.html' target='_blank'>documentation</a> to learn more.",
+  "admin.service.outWebhooksTitle": "Enable Outgoing Webhooks: ",
+  "admin.service.overrideDescription": "When true, webhooks, slash commands and other integrations, such as <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, will be allowed to change the username they are posting as. Note: Combined with allowing integrations to override profile picture icons, users may be able to perform phishing attacks by attempting to impersonate other users.",
+  "admin.service.overrideTitle": "Enable integrations to override usernames:",
+  "admin.service.securityDesc": "When true, System Administrators are notified by email if a relevant security fix alert has been announced in the last 12 hours. Requires email to be enabled.",
+  "admin.service.securityTitle": "Enable Security Alerts: ",
+  "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": "Segment Write Key:",
-  "admin.service.sessionCache": "Cache da Sessão (minutos):",
-  "admin.service.sessionCacheDesc": "O número de minutos para o cache de uma sessão na memória.",
+  "admin.service.sessionCache": "Session Cache (minutes):",
+  "admin.service.sessionCacheDesc": "The number of minutes to cache a session in memory.",
   "admin.service.sessionDaysEx": "Ex \"30\"",
   "admin.service.siteURL": "Site URL:",
-  "admin.service.siteURLDescription": "A URL, incluindo o número da porta e o protocolo, a partir do qual os usuários irão acessar Mattermost. Deixe em branco para configurar automaticamente com base no tráfego de entrada.",
+  "admin.service.siteURLDescription": "The URL, including port number and protocol, that users will use to access Mattermost. This field can be left blank unless you are configuring email batching in <b>Notifications > Email</b>. When blank, the URL is automatically configured based on incoming traffic.",
   "admin.service.siteURLExample": "Ex \"https://mattermost.example.com:1234\"",
-  "admin.service.ssoSessionDays": "Tamanho da sessão SSO (dias):",
-  "admin.service.ssoSessionDaysDesc": "O número de dias desde a última vez que um usuário entrou suas credenciais para expirar a sessão do usuário. Se o método de autenticação é SAML ou GitLab, o usuário pode automaticamente ser registrado novamente no Mattermost se já estiver conectado ao SAML ou GitLab. Depois de alterar essa configuração, a configuração terá efeito após a próxima vez que o usuário digitar suas credenciais.",
-  "admin.service.testingDescription": "Quando verdadeiro, comando slash /loadtest está habilitado para carregar contas e teste, dados e formatação de texto. Mudar isso exigirá um reinício do servidor antes que tenha efeito.",
-  "admin.service.testingTitle": "Ativar Comandos Teste: ",
-  "admin.service.webSessionDays": "Tamanho da sessão LDAP e email (dias):",
-  "admin.service.webSessionDaysDesc": "O número de dias desde a última vez que um usuário entrou suas credenciais para expirar a sessão do usuário. Depois de alterar essa configuração, a nova duração da sessão terá efeito após a próxima vez que o usuário digitar suas credenciais.",
-  "admin.service.webhooksDescription": "Quando verdadeiro, webhooks de entrada serão permitidos. Para ajudar combater ataques de phishing, todas as postagens por webhook serão marcadas com uma etiqueta BOT. Veja a <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>documentação</a> para saber mais.",
-  "admin.service.webhooksTitle": "Ativar Webhooks Entrada: ",
-  "admin.sidebar.addTeamSidebar": "Adicionar equipe do menu lateral",
-  "admin.sidebar.advanced": "Avançado",
-  "admin.sidebar.audits": "Conformidade e Auditoria",
-  "admin.sidebar.authentication": "Autenticação",
-  "admin.sidebar.cluster": "Alta Disponibilidade (Beta)",
+  "admin.service.ssoSessionDays": "Session length SSO (days):",
+  "admin.service.ssoSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.",
+  "admin.service.testingDescription": "When true, /loadtest slash command is enabled to load test accounts, data and text formatting. Changing this requires a server restart before taking effect.",
+  "admin.service.testingTitle": "Enable Testing Commands: ",
+  "admin.service.webSessionDays": "Session length AD/LDAP and email (days):",
+  "admin.service.webSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
+  "admin.service.webhooksDescription": "When true, incoming webhooks will be allowed. To help combat phishing attacks, all posts from webhooks will be labelled by a BOT tag. See <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>documentation</a> to learn more.",
+  "admin.service.webhooksTitle": "Enable Incoming Webhooks: ",
+  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
+  "admin.sidebar.advanced": "Advanced",
+  "admin.sidebar.audits": "Compliance and Auditing",
+  "admin.sidebar.authentication": "Authentication",
+  "admin.sidebar.cluster": "High Availability (Beta)",
   "admin.sidebar.compliance": "Compliance",
-  "admin.sidebar.configuration": "Configuração",
-  "admin.sidebar.connections": "Conexões",
-  "admin.sidebar.customBrand": "Marca Personalizada",
-  "admin.sidebar.customEmoji": "Emoji Personalizado",
-  "admin.sidebar.customIntegrations": "Integrações Personalizadas",
-  "admin.sidebar.customization": "Customização",
-  "admin.sidebar.database": "Banco de dados",
-  "admin.sidebar.developer": "Desenvolvedor",
-  "admin.sidebar.email": "E-mail",
-  "admin.sidebar.external": "Serviços Externos",
-  "admin.sidebar.files": "Arquivos",
-  "admin.sidebar.general": "Geral",
+  "admin.sidebar.configuration": "Configuration",
+  "admin.sidebar.connections": "Connections",
+  "admin.sidebar.customBrand": "Custom Branding",
+  "admin.sidebar.customEmoji": "Custom Emoji",
+  "admin.sidebar.customIntegrations": "Custom Integrations",
+  "admin.sidebar.customization": "Customization",
+  "admin.sidebar.database": "Database",
+  "admin.sidebar.developer": "Developer",
+  "admin.sidebar.email": "Email",
+  "admin.sidebar.external": "External Services",
+  "admin.sidebar.files": "Files",
+  "admin.sidebar.general": "General",
   "admin.sidebar.gitlab": "GitLab",
-  "admin.sidebar.images": "Imagens",
-  "admin.sidebar.integrations": "Integrações",
+  "admin.sidebar.images": "Images",
+  "admin.sidebar.integrations": "Integrations",
   "admin.sidebar.ldap": "AD/LDAP",
-  "admin.sidebar.legalAndSupport": "Legal e Suporte",
-  "admin.sidebar.license": "Edição e Licença",
-  "admin.sidebar.localization": "Regionalização",
-  "admin.sidebar.logging": "Acesso",
+  "admin.sidebar.legalAndSupport": "Legal and Support",
+  "admin.sidebar.license": "Edition and License",
+  "admin.sidebar.localization": "Localization",
+  "admin.sidebar.logging": "Logging",
   "admin.sidebar.login": "Login",
   "admin.sidebar.logs": "Logs",
   "admin.sidebar.nativeAppLinks": "Mattermost App Links",
-  "admin.sidebar.notifications": "Notificações",
+  "admin.sidebar.notifications": "Notifications",
   "admin.sidebar.oauth": "OAuth 2.0",
-  "admin.sidebar.other": "OUTROS",
-  "admin.sidebar.password": "Senha",
-  "admin.sidebar.policy": "Política",
-  "admin.sidebar.privacy": "Privacidade",
-  "admin.sidebar.publicLinks": "Links Públicos",
-  "admin.sidebar.push": "Notificação Móvel",
+  "admin.sidebar.other": "OTHER",
+  "admin.sidebar.password": "Password",
+  "admin.sidebar.policy": "Policy",
+  "admin.sidebar.privacy": "Privacy",
+  "admin.sidebar.publicLinks": "Public Links",
+  "admin.sidebar.push": "Mobile Push",
   "admin.sidebar.rateLimiting": "Rate Limiting",
-  "admin.sidebar.reports": "REPORTANDO",
-  "admin.sidebar.rmTeamSidebar": "Remover equipe do menu lateral",
+  "admin.sidebar.reports": "REPORTING",
+  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
   "admin.sidebar.saml": "SAML",
-  "admin.sidebar.security": "Segurança",
-  "admin.sidebar.sessions": "Sessões",
-  "admin.sidebar.settings": "CONFIGURAÇÕES",
-  "admin.sidebar.signUp": "Inscrever",
-  "admin.sidebar.sign_up": "Inscrever",
-  "admin.sidebar.statistics": "Estatísticas de Equipe",
-  "admin.sidebar.storage": "Armazenamento",
-  "admin.sidebar.support": "Legal e Suporte",
-  "admin.sidebar.teams": "EQUIPES ({count, number})",
-  "admin.sidebar.users": "Usuários",
-  "admin.sidebar.usersAndTeams": "Usuários e Equipes",
-  "admin.sidebar.view_statistics": "Estatísticas do Site",
-  "admin.sidebarHeader.systemConsole": "Console do Sistema",
-  "admin.sql.dataSource": "Fonte de Dados:",
-  "admin.sql.driverName": "Nome do Driver:",
-  "admin.sql.keyDescription": "32-caracteres de salt disponível para encriptar e desencriptar campos no banco de dados.",
+  "admin.sidebar.security": "Security",
+  "admin.sidebar.sessions": "Sessions",
+  "admin.sidebar.settings": "SETTINGS",
+  "admin.sidebar.signUp": "Sign Up",
+  "admin.sidebar.sign_up": "Sign Up",
+  "admin.sidebar.statistics": "Team Statistics",
+  "admin.sidebar.storage": "Storage",
+  "admin.sidebar.support": "Legal and Support",
+  "admin.sidebar.teams": "TEAMS ({count, number})",
+  "admin.sidebar.users": "Users",
+  "admin.sidebar.usersAndTeams": "Users and Teams",
+  "admin.sidebar.view_statistics": "Site Statistics",
+  "admin.sidebarHeader.systemConsole": "System Console",
+  "admin.sql.dataSource": "Data Source:",
+  "admin.sql.driverName": "Driver Name:",
+  "admin.sql.keyDescription": "32-character salt available to encrypt and decrypt sensitive fields in database.",
   "admin.sql.keyExample": "Ex \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.sql.keyTitle": "At Rest Encrypt Key:",
-  "admin.sql.maxConnectionsDescription": "Número máximo de conexões ociosas abertas para o banco de dados.",
+  "admin.sql.maxConnectionsDescription": "Maximum number of idle connections held open to the database.",
   "admin.sql.maxConnectionsExample": "Ex \"10\"",
-  "admin.sql.maxConnectionsTitle": "Máximo de Conexões Inativas:",
-  "admin.sql.maxOpenDescription": "Número máximo de conexões abertas para o banco de dados.",
+  "admin.sql.maxConnectionsTitle": "Maximum Idle Connections:",
+  "admin.sql.maxOpenDescription": "Maximum number of open connections held open to the database.",
   "admin.sql.maxOpenExample": "Ex \"10\"",
-  "admin.sql.maxOpenTitle": "Máximo de Conexões Abertas:",
-  "admin.sql.noteDescription": "Alterando as propriedades nesta seção irá exigir que o servidor seja reiniciado para que tenha efeito.",
-  "admin.sql.noteTitle": "Nota:",
-  "admin.sql.replicas": "Replicas Fonte de Dados:",
-  "admin.sql.traceDescription": "(Modo Desenvolvedor) Quando verdadeiro, execução de instruções SQL será gravado no log.",
-  "admin.sql.traceTitle": "Rastreamento: ",
-  "admin.sql.warning": "Aviso: re-gerar este salt pode causar que o banco de dados retorne algumas colunas com resultados vazios.",
-  "admin.support.aboutDesc": "Link para página Sobre para mais informações sobre a implantação do Mattermost, por exemplo a sua finalidade e público dentro de sua organização. Padrão página de informação Mattermost.",
-  "admin.support.aboutTitle": "Sobre link:",
-  "admin.support.emailHelp": "Endereço de email mostrado na notificação de email e durante o tutorial para o usuário final pedir suporte.",
-  "admin.support.emailTitle": "Email de suporte:",
-  "admin.support.helpDesc": "Link para documentação de ajuda para o site da equipe no menu principal. Normalmente não é alterado ao menos se sua empresa escolha criar uma documentação customizada.",
-  "admin.support.helpTitle": "Link de ajuda:",
-  "admin.support.noteDescription": "Se links para um site externo, URLs devem começar com http:// ou https://.",
-  "admin.support.noteTitle": "Nota:",
-  "admin.support.privacyDesc": "Link para Política de Privacidade para os usuários no desktop ou móvel. Deixando este espaço em branco irá esconder a opção de exibir um aviso.",
-  "admin.support.privacyTitle": "Link da Política de Privacidade:",
-  "admin.support.problemDesc": "Link para a documentação de ajuda do site no menu principal. Por padrão este aponta para um fórum peer-to-peer de solução de problemas onde os usuários podem pesquisar, encontrar e pedir ajuda com problemas técnicos.",
-  "admin.support.problemTitle": "Link para Reportar um Problema:",
-  "admin.support.termsDesc": "Link para os termos em que os usuários podem usar o serviço on-line. Por padrão, isso inclui \"Condições de Uso Mattermost (Usuários Finais)\", explicando os termos sob os quais software Mattermost é fornecido aos usuários finais. Se você alterar o link padrão para adicionar seus próprios termos para usar o serviço que você oferece, seus novos termos devem incluir um link para os termos padrão para que os usuários finais estejam cientes das Condições de Uso Mattermost (Usuário Final) para o software Mattermost.",
-  "admin.support.termsTitle": "Link Termos do Serviço:",
-  "admin.system_analytics.activeUsers": "Usuários Ativos com Postagens",
-  "admin.system_analytics.title": "o Sistema",
+  "admin.sql.maxOpenTitle": "Maximum Open Connections:",
+  "admin.sql.noteDescription": "Changing properties in this section will require a server restart before taking effect.",
+  "admin.sql.noteTitle": "Note:",
+  "admin.sql.replicas": "Data Source Replicas:",
+  "admin.sql.traceDescription": "(Development Mode) When true, executing SQL statements are written to the log.",
+  "admin.sql.traceTitle": "Trace: ",
+  "admin.sql.warning": "Warning: regenerating this salt may cause some columns in the database to return empty results.",
+  "admin.support.aboutDesc": "Link to About page for more information on your Mattermost deployment, for example its purpose and audience within your organization. Defaults to Mattermost information page.",
+  "admin.support.aboutTitle": "About link:",
+  "admin.support.emailHelp": "Email address displayed on email notifications and during tutorial for end users to ask support questions.",
+  "admin.support.emailTitle": "Support Email:",
+  "admin.support.helpDesc": "Link to help documentation from team site main menu. Typically not changed unless your organization chooses to create custom documentation.",
+  "admin.support.helpTitle": "Help link:",
+  "admin.support.noteDescription": "If linking to an external site, URLs should begin with http:// or https://.",
+  "admin.support.noteTitle": "Note:",
+  "admin.support.privacyDesc": "Link to Privacy Policy available to users on desktop and on mobile. Leaving this blank will hide the option to display a notice.",
+  "admin.support.privacyTitle": "Privacy Policy link:",
+  "admin.support.problemDesc": "Link to help documentation from team site main menu. By default this points to the peer-to-peer troubleshooting forum where users can search for, find and request help with technical issues.",
+  "admin.support.problemTitle": "Report a Problem link:",
+  "admin.support.termsDesc": "Link to the terms under which users may use your online service. By default, this includes the \"Mattermost Conditions of Use (End Users)\" explaining the terms under which Mattermost software is provided to end users. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Conditions of Use (End User) for Mattermost software.",
+  "admin.support.termsTitle": "Terms of Service link:",
+  "admin.system_analytics.activeUsers": "Active Users With Posts",
+  "admin.system_analytics.title": "the System",
   "admin.system_analytics.totalPosts": "Total Posts",
-  "admin.team.brandDesc": "Ativar marca personalizada para mostrar uma imagem de sua escolha, carregado abaixo e algum texto de ajuda, escrito abaixo na página de login.",
-  "admin.team.brandDescriptionExample": "Toda comunicação em um só lugar, pesquisável e acessível em qualquer lugar",
-  "admin.team.brandDescriptionHelp": "Nome do serviço mostrado na tela de início da sessão e na UI.",
-  "admin.team.brandDescriptionTitle": "Descrição Site",
-  "admin.team.brandImageTitle": "Imagem Personalizada da Marca:",
-  "admin.team.brandTextDescription": "O texto personalizado da marca formatado em Markdown que você gostaria que aparece-se abaixo da sua imagem de marca personalizada na tela de login.",
-  "admin.team.brandTextTitle": "Texto Personalizado da Marca:",
-  "admin.team.brandTitle": "Ativar Marca Personalizada: ",
-  "admin.team.chooseImage": "Escolha Nova Imagem",
-  "admin.team.dirDesc": "Quando verdadeiro, as equipes que estão configuradas para mostrar o diretório de equipe irá mostrar na página principal, em lugar de criar uma nova equipe.",
-  "admin.team.dirTitle": "Ativar Diretório de Equipe: ",
-  "admin.team.maxUsersDescription": "Número máximo total de usuários por equipe, incluindo ambos usuários ativos e inativos.",
+  "admin.team.brandDesc": "Enable custom branding to show an image of your choice, uploaded below, and some help text, written below, on the login page.",
+  "admin.team.brandDescriptionExample": "All team communication in one place, searchable and accessible anywhere",
+  "admin.team.brandDescriptionHelp": "Description of service shown in login screens and UI.",
+  "admin.team.brandDescriptionTitle": "Site Description",
+  "admin.team.brandImageTitle": "Custom Brand Image:",
+  "admin.team.brandTextDescription": "The custom branding Markdown-formatted text you would like to appear below your custom brand image on your login screen.",
+  "admin.team.brandTextTitle": "Custom Brand Text:",
+  "admin.team.brandTitle": "Enable Custom Branding: ",
+  "admin.team.chooseImage": "Choose New Image",
+  "admin.team.dirDesc": "When true, teams that are configured to show in team directory will show on main page inplace of creating a new team.",
+  "admin.team.dirTitle": "Enable Team Directory: ",
+  "admin.team.maxUsersDescription": "Maximum total number of users per team, including both active and inactive users.",
   "admin.team.maxUsersExample": "Ex \"25\"",
-  "admin.team.maxUsersTitle": "Máximo Usuários Por Equipe:",
-  "admin.team.noBrandImage": "Nenhuma imagem da marca carregada",
-  "admin.team.openServerDescription": "Quando verdadeiro, qualquer pessoa pode se inscrever para uma conta de usuário no servidor sem a necessidade de ser convidado.",
-  "admin.team.openServerTitle": "Ativar Servidor Aberto: ",
-  "admin.team.restrictDescription": "Equipes e contas de usuário só pode ser criada a partir de um domínio específico (ex. \"mattermost.org\") ou lista separada por vírgulas de domínios (ex. \"corp.mattermost.com, mattermost.org\").",
-  "admin.team.restrictDirectMessage": "Permitir que os usuários abram o canal de Mensagens Diretas com:",
-  "admin.team.restrictDirectMessageDesc": "'Qualquer usuário no servidor Mattermost' permite que os usuários abram um canal de Mensagens Diretas com qualquer usuário no servidor, mesmo se eles não estão em nenhuma equipe juntos. 'Qualquer membro da equipe' limita a habilidade de abrir um canal de Mensagens Diretas para somente os usuários que estão na mesma equipe.",
+  "admin.team.maxUsersTitle": "Max Users Per Team:",
+  "admin.team.noBrandImage": "No brand image uploaded",
+  "admin.team.openServerDescription": "When true, anyone can signup for a user account on this server without the need to be invited.",
+  "admin.team.openServerTitle": "Enable Open Server: ",
+  "admin.team.restrictDescription": "Teams and user accounts can only be created from a specific domain (e.g. \"mattermost.org\") or list of comma-separated domains (e.g. \"corp.mattermost.com, mattermost.org\").",
+  "admin.team.restrictDirectMessage": "Enable users to open Direct Message channels with:",
+  "admin.team.restrictDirectMessageDesc": "'Any user on the Mattermost server' enables users to open a Direct Message channel with any user on the server, even if they are not on any teams together. 'Any member of the team' limits the ability to open Direct Message channels to only users who are in the same team.",
   "admin.team.restrictExample": "Ex \"corp.mattermost.com, mattermost.org\"",
-  "admin.team.restrictNameDesc": "Quando verdadeiro, você não pode criar um nome de equipe com as palavras reservadas www, admin, support, test, channel, etc",
-  "admin.team.restrictNameTitle": "Restringir Nomes de Equipe: ",
-  "admin.team.restrictTitle": "Restringir a criação de contas para os domínios de e-mail específicos:",
-  "admin.team.restrict_direct_message_any": "Qualquer usuário no Servidor Mattermost",
-  "admin.team.restrict_direct_message_team": "Qualquer membro da equipe",
-  "admin.team.siteNameDescription": "Nome do serviço mostrado na tela de início da sessão e na UI.",
+  "admin.team.restrictNameDesc": "When true, You cannot create a team name with reserved words like www, admin, support, test, channel, etc",
+  "admin.team.restrictNameTitle": "Restrict Team Names: ",
+  "admin.team.restrictTitle": "Restrict account creation to specified email domains:",
+  "admin.team.restrict_direct_message_any": "Any user on the Mattermost server",
+  "admin.team.restrict_direct_message_team": "Any member of the team",
+  "admin.team.siteNameDescription": "Name of service shown in login screens and UI.",
   "admin.team.siteNameExample": "Ex \"Mattermost\"",
-  "admin.team.siteNameTitle": "Nome do Site:",
-  "admin.team.teamCreationDescription": "Quando falso, somente o Administrador do Sistema poderá criar equipes.",
-  "admin.team.teamCreationTitle": "Habilitar a Criação de Equipes: ",
-  "admin.team.upload": "Enviar",
-  "admin.team.uploadDesc": "Personalizar sua experiência como usuário, adicionando uma imagem personalizada na tela de login. Veja exemplos em <a href='http://docs.mattermost.com/administration/config-settings.html#custom-branding' target='_blank'>docs.mattermost.com/administration/config-settings.html#custom-branding</a>.",
-  "admin.team.uploaded": "Enviado!",
-  "admin.team.uploading": "Enviando..",
-  "admin.team.userCreationDescription": "Quando falso, a capacidade de criar contas é desativada. O botão criar conta apresenta erro quando pressionado.",
-  "admin.team.userCreationTitle": "Ativar Criação de Conta: ",
-  "admin.team_analytics.activeUsers": "Usuários Ativos Com Postagens",
+  "admin.team.siteNameTitle": "Site Name:",
+  "admin.team.teamCreationDescription": "When false, only System Administrators can create teams.",
+  "admin.team.teamCreationTitle": "Enable Team Creation: ",
+  "admin.team.upload": "Upload",
+  "admin.team.uploadDesc": "Customize your user experience by adding a custom image to your login screen. See examples at <a href='http://docs.mattermost.com/administration/config-settings.html#custom-branding' target='_blank'>docs.mattermost.com/administration/config-settings.html#custom-branding</a>.",
+  "admin.team.uploaded": "Uploaded!",
+  "admin.team.uploading": "Uploading..",
+  "admin.team.userCreationDescription": "When false, the ability to create accounts is disabled. The create account button displays error when pressed.",
+  "admin.team.userCreationTitle": "Enable Account Creation: ",
+  "admin.team_analytics.activeUsers": "Active Users With Posts",
   "admin.team_analytics.totalPosts": "Total Posts",
-  "admin.true": "verdadeiro",
-  "admin.userList.title": "Usuários para {team}",
-  "admin.userList.title2": "Usuários para {team} ({count})",
-  "admin.user_item.authServiceEmail": ", <strong>Método de Login:</strong> Email",
-  "admin.user_item.authServiceNotEmail": ", <strong>Método de Login:</strong> {service}",
-  "admin.user_item.confirmDemoteDescription": "Se você rebaixar você mesmo de Admin de Sistema e não exista outro usuário como privilegios de Admin de Sistema, você precisa-rá re-inscrever um Admin de Sistema acessando o servidor Mattermost através do terminal e executando o seguinte comando.",
-  "admin.user_item.confirmDemoteRoleTitle": "Confirmar rebaixamento para Admin do Sistema",
-  "admin.user_item.confirmDemotion": "Confirmar Rebaixamento",
+  "admin.true": "true",
+  "admin.userList.title": "Users for {team}",
+  "admin.userList.title2": "Users for {team} ({count})",
+  "admin.user_item.authServiceEmail": ", <strong>Sign-in Method:</strong> Email",
+  "admin.user_item.authServiceNotEmail": ", <strong>Sign-in Method:</strong> {service}",
+  "admin.user_item.confirmDemoteDescription": "If you demote yourself from the System Admin role and there is not another user with System Admin privileges, you'll need to re-assign a System Admin by accessing the Mattermost server through a terminal and running the following command.",
+  "admin.user_item.confirmDemoteRoleTitle": "Confirm demotion from System Admin role",
+  "admin.user_item.confirmDemotion": "Confirm Demotion",
   "admin.user_item.confirmDemotionCmd": "platform -assign_role -team_name=\"yourteam\" -email=\"name@yourcompany.com\" -role=\"system_admin\"",
   "admin.user_item.emailTitle": "<strong>Email:</strong> {email}",
-  "admin.user_item.inactive": "Inativo",
-  "admin.user_item.makeActive": "Tornar Ativo",
-  "admin.user_item.makeInactive": "Tornar Inativo",
-  "admin.user_item.makeMember": "Tornar um Membro",
-  "admin.user_item.makeSysAdmin": "Tornar Admin do Sistema",
-  "admin.user_item.makeTeamAdmin": "Tornar Admin de Equipe",
-  "admin.user_item.member": "Membro",
-  "admin.user_item.mfaNo": ", <strong>MFA</strong>: Não",
-  "admin.user_item.mfaYes": ", <strong>MFA</strong>: Sim",
-  "admin.user_item.resetMfa": "Remover MFA",
-  "admin.user_item.resetPwd": "Resetar Senha",
-  "admin.user_item.switchToEmail": "Trocar para Email/Senha",
-  "admin.user_item.sysAdmin": "Admin do Sistema",
-  "admin.user_item.teamAdmin": "Admin Equipe",
-  "admin.webserverModeDisabled": "Desabilitado",
-  "admin.webserverModeDisabledDescription": "O servidor Mattermost não serve arquivos estáticos.",
+  "admin.user_item.inactive": "Inactive",
+  "admin.user_item.makeActive": "Make Active",
+  "admin.user_item.makeInactive": "Make Inactive",
+  "admin.user_item.makeMember": "Make Member",
+  "admin.user_item.makeSysAdmin": "Make System Admin",
+  "admin.user_item.makeTeamAdmin": "Make Team Admin",
+  "admin.user_item.member": "Member",
+  "admin.user_item.mfaNo": ", <strong>MFA</strong>: No",
+  "admin.user_item.mfaYes": ", <strong>MFA</strong>: Yes",
+  "admin.user_item.resetMfa": "Remove MFA",
+  "admin.user_item.resetPwd": "Reset Password",
+  "admin.user_item.switchToEmail": "Switch to Email/Password",
+  "admin.user_item.sysAdmin": "System Admin",
+  "admin.user_item.teamAdmin": "Team Admin",
+  "admin.webserverModeDisabled": "Disabled",
+  "admin.webserverModeDisabledDescription": "The Mattermost server will not serve static files.",
   "admin.webserverModeGzip": "gzip",
-  "admin.webserverModeGzipDescription": "O servidor Mattermost irá servir arquivos estáticos comprimidos com gzip.",
-  "admin.webserverModeHelpText": "compressão gzip se aplica a arquivos de conteúdo estático. Recomenda-se a permitir gzip para melhorar o desempenho a menos que seu ambiente tem restrições específicas, tais como um proxy web que distribui arquivos gzip mal. Esta configuração requer a reinicialização do servidor para fazer efeito.",
-  "admin.webserverModeTitle": "Modo Webserver:",
-  "admin.webserverModeUncompressed": "Não comprimido",
-  "admin.webserverModeUncompressedDescription": "O servidor Mattermost irá servir arquivos estáticos não comprimidos.",
-  "analytics.chart.loading": "Carregando...",
-  "analytics.chart.meaningful": "Não há dados suficientes para uma representação significativa.",
-  "analytics.system.activeUsers": "Usuários Ativos Com Posts",
-  "analytics.system.channelTypes": "Tipos de Canal",
-  "analytics.system.expiredBanner": "A licença Enterprise expirou em {date}. Você tem 15 dias a partir desta data para renovar a licença, por favor contate <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
-  "analytics.system.expiringBanner": "A licença Enterprise termina em {date}. Para renovar sua licença, por favor contate <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
-  "analytics.system.postTypes": "Posts, Arquivos e Hashtags",
-  "analytics.system.privateGroups": "Grupos Privados",
-  "analytics.system.publicChannels": "Canais Públicos",
-  "analytics.system.textPosts": "Post com Texto somente",
-  "analytics.system.title": "Estatísticas do Sistema",
-  "analytics.system.totalChannels": "Total de Canais",
-  "analytics.system.totalCommands": "Total de Comandos",
-  "analytics.system.totalFilePosts": "Posts com Arquivos",
-  "analytics.system.totalHashtagPosts": "Posts com Hashtags",
-  "analytics.system.totalIncomingWebhooks": "Webhooks Entrada",
-  "analytics.system.totalOutgoingWebhooks": "Webhooks Saída",
+  "admin.webserverModeGzipDescription": "The Mattermost server will serve static files compressed with gzip.",
+  "admin.webserverModeHelpText": "gzip compression applies to static content files. It is recommended to enable gzip to improve performance unless your environment has specific restrictions, such as a web proxy that distributes gzip files poorly. This setting requires a server restart to take effect.",
+  "admin.webserverModeTitle": "Webserver Mode:",
+  "admin.webserverModeUncompressed": "Uncompressed",
+  "admin.webserverModeUncompressedDescription": "The Mattermost server will serve static files uncompressed.",
+  "analytics.chart.loading": "Loading...",
+  "analytics.chart.meaningful": "Not enough data for a meaningful representation.",
+  "analytics.system.activeUsers": "Active Users With Posts",
+  "analytics.system.channelTypes": "Channel Types",
+  "analytics.system.expiredBanner": "The Enterprise license expired on {date}. You have 15 days from this date to renew the license, please contact <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
+  "analytics.system.expiringBanner": "The Enterprise license is expiring on {date}. To renew your license, please contact <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
+  "analytics.system.postTypes": "Posts, Files and Hashtags",
+  "analytics.system.privateGroups": "Private Groups",
+  "analytics.system.publicChannels": "Public Channels",
+  "analytics.system.textPosts": "Posts with Text-only",
+  "analytics.system.title": "System Statistics",
+  "analytics.system.totalChannels": "Total Channels",
+  "analytics.system.totalCommands": "Total Commands",
+  "analytics.system.totalFilePosts": "Posts with Files",
+  "analytics.system.totalHashtagPosts": "Posts with Hashtags",
+  "analytics.system.totalIncomingWebhooks": "Incoming Webhooks",
+  "analytics.system.totalOutgoingWebhooks": "Outgoing Webhooks",
   "analytics.system.totalPosts": "Total Posts",
-  "analytics.system.totalSessions": "Total de Sessões",
-  "analytics.system.totalTeams": "Total de Equipes",
-  "analytics.system.totalUsers": "Total de Usuários",
-  "analytics.team.activeUsers": "Usuários Ativos Com Posts",
-  "analytics.team.newlyCreated": "Novos Usuários Criados",
-  "analytics.team.privateGroups": "Grupos Privados",
-  "analytics.team.publicChannels": "Canais Públicos",
-  "analytics.team.recentActive": "Usuários Ativos Recentes",
-  "analytics.team.recentUsers": "Usuários Ativos Recentes",
-  "analytics.team.title": "Estatísticas de Equipe para {team}",
+  "analytics.system.totalSessions": "Total Sessions",
+  "analytics.system.totalTeams": "Total Teams",
+  "analytics.system.totalUsers": "Total Users",
+  "analytics.team.activeUsers": "Active Users With Posts",
+  "analytics.team.newlyCreated": "Newly Created Users",
+  "analytics.team.privateGroups": "Private Groups",
+  "analytics.team.publicChannels": "Public Channels",
+  "analytics.team.recentActive": "Recent Active Users",
+  "analytics.team.recentUsers": "Recent Active Users",
+  "analytics.team.title": "Team Statistics for {team}",
   "analytics.team.totalPosts": "Total Posts",
-  "analytics.team.totalUsers": "Total de Usuários",
-  "audit_table.accountActive": "Conta inativada",
-  "audit_table.accountInactive": "Conta inativada",
-  "audit_table.action": "Ação",
-  "audit_table.attemptedAllowOAuthAccess": "Tentativa de permitir um novo acesso ao serviço OAuth",
-  "audit_table.attemptedLicenseAdd": "Tentativa de adicionar uma nova licença",
-  "audit_table.attemptedLogin": "Tentou login",
-  "audit_table.attemptedOAuthToken": "Tentativa de obter um token de acesso OAuth",
-  "audit_table.attemptedPassword": "Tentativa de mudar a senha",
-  "audit_table.attemptedRegisterApp": "Tentativa de registrar um novo Aplicativo OAuth com ID {id}",
-  "audit_table.attemptedReset": "Tentativa de resetar a senha",
-  "audit_table.attemptedWebhookCreate": "Tentativa de criar um webhook",
-  "audit_table.attemptedWebhookDelete": "Tentativa de deletar um webhook",
-  "audit_table.by": " por {username}",
-  "audit_table.byAdmin": " por um admin",
-  "audit_table.channelCreated": "Criado o {channelName} canal/grupo",
-  "audit_table.channelDeleted": "Excluído o canal/grupo com a URL {url}",
-  "audit_table.establishedDM": "Estabelecido uma mensagem direta para o canal com {username}",
-  "audit_table.failedExpiredLicenseAdd": "Falha ao adicionar uma nova licença uma vez que expirou ou ainda não foi iniciado",
-  "audit_table.failedInvalidLicenseAdd": "Falha ao adicionar um licença inválida",
-  "audit_table.failedLogin": "FALHA na tentativa de login",
-  "audit_table.failedOAuthAccess": "Falha ao permitir um novo acesso ao serviço OAuth - a URI de redirecionamento não coincide com o retorno de chamada registrado anteriormente",
-  "audit_table.failedPassword": "Falha ao alterar a senha - tentado atualizar a senha do usuário que estava conectado através do oauth",
-  "audit_table.failedWebhookCreate": "Falha ao criar uma webhook - sem permissão do canal",
-  "audit_table.failedWebhookDelete": "Falha ao deletar um webhook - condições inapropriadas",
-  "audit_table.headerUpdated": "Atualizado o {channelName} canal/cabeçalho de grupo",
-  "audit_table.ip": "Endereço de IP",
-  "audit_table.licenseRemoved": "Licença removida com sucesso",
-  "audit_table.loginAttempt": " (Tentativa de login)",
-  "audit_table.loginFailure": " (Falha de login)",
-  "audit_table.logout": "Logado fora da sua conta",
-  "audit_table.member": "membro",
-  "audit_table.nameUpdated": "Atualizado nome canal/grupo {channelName}",
-  "audit_table.oauthTokenFailed": "Falha ao obter um token de acesso OAuth - {token}",
-  "audit_table.revokedAll": "Revogada todas as sessões atuais para a equipe",
-  "audit_table.sentEmail": "Enviado um email para {email} para resetar sua senha",
-  "audit_table.session": "ID da Sessão",
-  "audit_table.sessionRevoked": "A sessão com id {sessionId} foi revogada",
-  "audit_table.successfullLicenseAdd": "Nova licença adicionada com sucesso",
-  "audit_table.successfullLogin": "Logado com sucesso",
-  "audit_table.successfullOAuthAccess": "Dado novo acesso ao serviço OAuth com sucesso",
-  "audit_table.successfullOAuthToken": "Adicionado um novo serviço OAuth com sucesso",
-  "audit_table.successfullPassword": "Senha alterada com sucesso",
-  "audit_table.successfullReset": "Senha resetada com sucesso",
-  "audit_table.successfullWebhookCreate": "Criado com sucesso um webhook",
-  "audit_table.successfullWebhookDelete": "Criado com sucesso um webhook",
+  "analytics.team.totalUsers": "Total Users",
+  "audit_table.accountActive": "Account made active",
+  "audit_table.accountInactive": "Account made inactive",
+  "audit_table.action": "Action",
+  "audit_table.attemptedAllowOAuthAccess": "Attempted to allow a new OAuth service access",
+  "audit_table.attemptedLicenseAdd": "Attempted to add new license",
+  "audit_table.attemptedLogin": "Attempted to login",
+  "audit_table.attemptedOAuthToken": "Attempted to get an OAuth access token",
+  "audit_table.attemptedPassword": "Attempted to change password",
+  "audit_table.attemptedRegisterApp": "Attempted to register a new OAuth Application with ID {id}",
+  "audit_table.attemptedReset": "Attempted to reset password",
+  "audit_table.attemptedWebhookCreate": "Attempted to create a webhook",
+  "audit_table.attemptedWebhookDelete": "Attempted to delete a webhook",
+  "audit_table.by": " by {username}",
+  "audit_table.byAdmin": " by an admin",
+  "audit_table.channelCreated": "Created the {channelName} channel/group",
+  "audit_table.channelDeleted": "Deleted the channel/group with the URL {url}",
+  "audit_table.establishedDM": "Established a direct message channel with {username}",
+  "audit_table.failedExpiredLicenseAdd": "Failed to add a new license as it has either expired or not yet been started",
+  "audit_table.failedInvalidLicenseAdd": "Failed to add an invalid license",
+  "audit_table.failedLogin": "FAILED login attempt",
+  "audit_table.failedOAuthAccess": "Failed to allow a new OAuth service access - the redirect URI did not match the previously registered callback",
+  "audit_table.failedPassword": "Failed to change password - tried to update user password who was logged in through oauth",
+  "audit_table.failedWebhookCreate": "Failed to create a webhook - bad channel permissions",
+  "audit_table.failedWebhookDelete": "Failed to delete a webhook - inappropriate conditions",
+  "audit_table.headerUpdated": "Updated the {channelName} channel/group header",
+  "audit_table.ip": "IP Address",
+  "audit_table.licenseRemoved": "Successfully removed a license",
+  "audit_table.loginAttempt": " (Login attempt)",
+  "audit_table.loginFailure": " (Login failure)",
+  "audit_table.logout": "Logged out of your account",
+  "audit_table.member": "member",
+  "audit_table.nameUpdated": "Updated the {channelName} channel/group name",
+  "audit_table.oauthTokenFailed": "Failed to get an OAuth access token - {token}",
+  "audit_table.revokedAll": "Revoked all current sessions for the team",
+  "audit_table.sentEmail": "Sent an email to {email} to reset your password",
+  "audit_table.session": "Session ID",
+  "audit_table.sessionRevoked": "The session with id {sessionId} was revoked",
+  "audit_table.successfullLicenseAdd": "Successfully added new license",
+  "audit_table.successfullLogin": "Successfully logged in",
+  "audit_table.successfullOAuthAccess": "Successfully gave a new OAuth service access",
+  "audit_table.successfullOAuthToken": "Successfully added a new OAuth service",
+  "audit_table.successfullPassword": "Successfully changed password",
+  "audit_table.successfullReset": "Successfully reset password",
+  "audit_table.successfullWebhookCreate": "Successfully created a webhook",
+  "audit_table.successfullWebhookDelete": "Successfully deleted a webhook",
   "audit_table.timestamp": "Timestamp",
-  "audit_table.updateGeneral": "Atualizado as configurações gerais da sua conta",
-  "audit_table.updateGlobalNotifications": "Atualizado suas definições globais de notificação",
-  "audit_table.updatePicture": "Atualizado sua imagem do perfil",
-  "audit_table.updatedRol": "Atualizado as função(ões) do usuário para ",
-  "audit_table.userAdded": "Adicionado {username} para o canal/grupo {channelName}",
-  "audit_table.userId": "Usuário ID",
-  "audit_table.userRemoved": "Removido {username} canal/grupo {channelName}",
-  "audit_table.verified": "Seu endereço de e-mail foi verificado com suscesso",
-  "authorize.access": "Permitir acesso <strong>{appName}</strong>?",
-  "authorize.allow": "Permitir",
-  "authorize.app": "O app <strong>{appName}</strong> gostaria de ter a capacidade de acessar e modificar suas informações básicas.",
-  "authorize.deny": "Negar",
-  "authorize.title": "<strong>{appName}</strong> gostaria de conectar a sua conta de usuário <strong>Mattermost</strong>",
-  "backstage_list.search": "Pesquisar",
-  "backstage_navbar.backToMattermost": "Voltar para {siteName}",
-  "backstage_sidebar.integrations": "Integrações",
-  "backstage_sidebar.integrations.commands": "Comandos Slash",
-  "backstage_sidebar.integrations.incoming_webhooks": "Webhooks Entrada",
-  "backstage_sidebar.integrations.oauthApps": "Aplicativos OAuth 2.0",
-  "backstage_sidebar.integrations.outgoing_webhooks": "Webhooks Saída",
-  "center_panel.recent": "Clique aqui para pular para mensagens recentes. ",
-  "chanel_header.addMembers": "Adicionar Membros",
-  "change_url.close": "Fechar",
-  "change_url.endWithLetter": "Deve teminar com uma letra ou número",
-  "change_url.invalidUrl": "URL inválida",
-  "change_url.longer": "Deve ter mais de dois caracteres",
-  "change_url.noUnderscore": "Não pode conter dois sublinhados consecutivos.",
-  "change_url.startWithLetter": "Deve começar com uma letra ou número",
-  "channel_flow.alreadyExist": "Um canal com essa URL já existe",
-  "channel_flow.changeUrlDescription": "Alguns caracteres não são permitidos nas URLs e podem ser removidos.",
-  "channel_flow.changeUrlTitle": "Alterar URL {term}",
-  "channel_flow.channel": "Canal",
-  "channel_flow.create": "Criar {term}",
-  "channel_flow.group": "Grupo",
-  "channel_flow.handleTooShort": "URL do canal precisa ter 2 ou mais caracteres minúsculos alfanuméricos.",
-  "channel_flow.invalidName": "Nome do Canal Inválido",
-  "channel_flow.set_url_title": "Ajustar URL {term}",
-  "channel_header.channel": "Canal",
-  "channel_header.channelHeader": "Definir Cabeçalho do Canal...",
-  "channel_header.delete": "Deletar {term}...",
-  "channel_header.group": "Grupo",
-  "channel_header.leave": "Sair {term}",
-  "channel_header.manageMembers": "Gerenciar Membros",
-  "channel_header.notificationPreferences": "Preferências de Notificação",
-  "channel_header.recentMentions": "Menções Recentes",
-  "channel_header.rename": "Renomear {term}...",
-  "channel_header.setHeader": "Definir Cabeçalho do {term}...",
-  "channel_header.setPurpose": "Ajustar Propósito {term}...",
-  "channel_header.viewInfo": "Ver Informações",
-  "channel_header.viewMembers": "Ver Membros",
-  "channel_info.about": "Sobre",
-  "channel_info.close": "Fechar",
-  "channel_info.header": "Cabeçalho:",
+  "audit_table.updateGeneral": "Updated the general settings of your account",
+  "audit_table.updateGlobalNotifications": "Updated your global notification settings",
+  "audit_table.updatePicture": "Updated your profile picture",
+  "audit_table.updatedRol": "Updated user role(s) to ",
+  "audit_table.userAdded": "Added {username} to the {channelName} channel/group",
+  "audit_table.userId": "User ID",
+  "audit_table.userRemoved": "Removed {username} to the {channelName} channel/group",
+  "audit_table.verified": "Sucessfully verified your email address",
+  "authorize.access": "Allow <strong>{appName}</strong> access?",
+  "authorize.allow": "Allow",
+  "authorize.app": "The app <strong>{appName}</strong> would like the ability to access and modify your basic information.",
+  "authorize.deny": "Deny",
+  "authorize.title": "<strong>{appName}</strong> would like to connect to your <strong>Mattermost</strong> user account",
+  "backstage_list.search": "Search",
+  "backstage_navbar.backToMattermost": "Back to {siteName}",
+  "backstage_sidebar.integrations": "Integrations",
+  "backstage_sidebar.integrations.commands": "Slash Commands",
+  "backstage_sidebar.integrations.incoming_webhooks": "Incoming Webhooks",
+  "backstage_sidebar.integrations.oauthApps": "OAuth 2.0 Applications",
+  "backstage_sidebar.integrations.outgoing_webhooks": "Outgoing Webhooks",
+  "center_panel.recent": "Click here to jump to recent messages. ",
+  "chanel_header.addMembers": "Add Members",
+  "change_url.close": "Close",
+  "change_url.endWithLetter": "Must end with a letter or number",
+  "change_url.invalidUrl": "Invalid URL",
+  "change_url.longer": "Must be longer than two characters",
+  "change_url.noUnderscore": "Can not contain two underscores in a row.",
+  "change_url.startWithLetter": "Must start with a letter or number",
+  "channel_flow.alreadyExist": "A channel with that URL already exists",
+  "channel_flow.changeUrlDescription": "Some characters are not allowed in URLs and may be removed.",
+  "channel_flow.changeUrlTitle": "Change {term} URL",
+  "channel_flow.channel": "Channel",
+  "channel_flow.create": "Create {term}",
+  "channel_flow.group": "Group",
+  "channel_flow.handleTooShort": "Channel URL must be 2 or more lowercase alphanumeric characters",
+  "channel_flow.invalidName": "Invalid Channel Name",
+  "channel_flow.set_url_title": "Set {term} URL",
+  "channel_header.channel": "Channel",
+  "channel_header.channelHeader": "Set Channel Header...",
+  "channel_header.delete": "Delete {term}...",
+  "channel_header.group": "Group",
+  "channel_header.leave": "Leave {term}",
+  "channel_header.manageMembers": "Manage Members",
+  "channel_header.notificationPreferences": "Notification Preferences",
+  "channel_header.recentMentions": "Recent Mentions",
+  "channel_header.rename": "Rename {term}...",
+  "channel_header.setHeader": "Set {term} Header...",
+  "channel_header.setPurpose": "Set {term} Purpose...",
+  "channel_header.viewInfo": "View Info",
+  "channel_header.viewMembers": "View Members",
+  "channel_info.about": "About",
+  "channel_info.close": "Close",
+  "channel_info.header": "Header:",
   "channel_info.id": "ID: ",
-  "channel_info.name": "Nome:",
-  "channel_info.notFound": "Nenhum Canal Encontrado",
-  "channel_info.purpose": "Propósito:",
+  "channel_info.name": "Name:",
+  "channel_info.notFound": "No Channel Found",
+  "channel_info.purpose": "Purpose:",
   "channel_info.url": "URL:",
-  "channel_invite.add": " Adicionar",
-  "channel_invite.addNewMembers": "Adicionar Novo Membro para ",
-  "channel_invite.close": "Fechar",
-  "channel_loader.connection_error": "Parece existir um problema com a sua conexão de internet.",
-  "channel_loader.posted": "Postado",
-  "channel_loader.socketError": "Por favor verifique sua conexão, Mattermost está inalcançável. Se este problema persistir, peça ao administrador para verificar a porta WebSocket.",
-  "channel_loader.someone": "Alguém",
-  "channel_loader.something": " fez algo novo",
-  "channel_loader.unknown_error": "Recebido um código de status inesperado do servidor.",
-  "channel_loader.uploadedFile": " enviado um arquivo",
-  "channel_loader.uploadedImage": " enviado uma imagem",
-  "channel_loader.wrote": " escreveu: ",
-  "channel_members_modal.addNew": " Adicionar Novos Membros",
-  "channel_members_modal.close": "Fechar",
-  "channel_members_modal.remove": "Remover",
-  "channel_memebers_modal.members": " Membros",
-  "channel_modal.cancel": "Cancelar",
-  "channel_modal.channel": "Canal",
-  "channel_modal.createNew": "Criar Novo ",
-  "channel_modal.descriptionHelp": "Descreva como este {term} pode ser usado.",
-  "channel_modal.displayNameError": "Este campo é obrigatório",
-  "channel_modal.edit": "Editar",
-  "channel_modal.group": "Grupo",
-  "channel_modal.header": "Cabeçalho",
-  "channel_modal.headerHelp": "Configure o texto que irá aparecer no topo do {term} ao lado do nome {term}. Por exemplo, inclua os links utilizados frequentemente digitando [Link Title](http://example.com).",
-  "channel_modal.modalTitle": "Novo ",
-  "channel_modal.name": "Nome",
-  "channel_modal.nameEx": "Ex.: \"Bugs\", \"Marketing\", \"办公室恋情\"",
-  "channel_modal.optional": "(opcional)",
-  "channel_modal.privateGroup1": "Criar um novo grupo privado com membros restritos. ",
-  "channel_modal.privateGroup2": "Criar um grupo privado",
-  "channel_modal.publicChannel1": "Criar um canal público",
-  "channel_modal.publicChannel2": "Criar um novo canal público para qualquer um participar. ",
-  "channel_modal.purpose": "Propósito",
-  "channel_notifications.allActivity": "Para todas as atividades",
-  "channel_notifications.allUnread": "Para todas as mensagens não lidas",
-  "channel_notifications.globalDefault": "Global padrão ({notifyLevel})",
-  "channel_notifications.markUnread": "Marcar Canal como Não Lido",
-  "channel_notifications.never": "Nunca",
-  "channel_notifications.onlyMentions": "Somente para menções",
-  "channel_notifications.override": "Selecionar uma opção diferente do \"Padrão\" vai substituir as configurações de notificação global. Notificações na área de trabalho estão disponíveis no Firefox, Safari e Chrome.",
-  "channel_notifications.preferences": "Preferências de Notificação para ",
-  "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.dm": "(Mensagem Direta)",
-  "channel_switch_modal.help": "Digite o nome do canal. Use ↑↓ para navegar, TAB para selecionar, ↵ para confirmar, ESC para cancelar",
-  "channel_switch_modal.not_found": "Nenhum resultado encontrado.",
-  "channel_switch_modal.submit": "Alternar",
-  "channel_switch_modal.title": "Alternar Canais",
-  "claim.account.noEmail": "Nenhum email específicado",
-  "claim.email_to_ldap.enterLdapPwd": "Entre o ID e a senha para sua conta LDAP",
-  "claim.email_to_ldap.enterPwd": "Entre a senha para o sua conta de email no {site}",
-  "claim.email_to_ldap.ldapId": "LDAP ID",
-  "claim.email_to_ldap.ldapIdError": "Por favor digite seu ID LDAP.",
-  "claim.email_to_ldap.ldapPasswordError": "Por favor digite a sua senha LDAP.",
-  "claim.email_to_ldap.ldapPwd": "Senha LDAP",
-  "claim.email_to_ldap.pwd": "Senha",
-  "claim.email_to_ldap.pwdError": "Por favor digite a sua senha.",
-  "claim.email_to_ldap.ssoNote": "Você precisa já ter uma conta LDAP válida",
-  "claim.email_to_ldap.ssoType": "Ao retirar a sua conta, você só vai ser capaz de logar com LDAP",
-  "claim.email_to_ldap.switchTo": "Trocar a conta para LDAP",
-  "claim.email_to_ldap.title": "Trocar E-mail/Senha da Conta para LDAP",
-  "claim.email_to_oauth.enterPwd": "Entre a senha para o sua conta {site}",
-  "claim.email_to_oauth.pwd": "Senha",
-  "claim.email_to_oauth.pwdError": "Por favor digite a sua senha.",
-  "claim.email_to_oauth.ssoNote": "Você precisa já ter uma conta {type} válida",
-  "claim.email_to_oauth.ssoType": "Ao retirar a sua conta, você só vai ser capaz de logar com SSO {type}",
-  "claim.email_to_oauth.switchTo": "Trocar a conta para {uiType}",
-  "claim.email_to_oauth.title": "Trocar E-mail/Senha da Conta para {uiType}",
-  "claim.ldap_to_email.confirm": "Confirmar senha",
-  "claim.ldap_to_email.email": "Você vai usar o email {email} para logar",
-  "claim.ldap_to_email.enterLdapPwd": "Entre a sua senha {ldapPassword} para o sua conta de email {site}",
-  "claim.ldap_to_email.enterPwd": "Entre a nova senha para o sua conta com email.",
-  "claim.ldap_to_email.ldapPasswordError": "Por favor digite a sua senha LDAP.",
-  "claim.ldap_to_email.ldapPwd": "Senha LDAP",
-  "claim.ldap_to_email.pwd": "Senha",
-  "claim.ldap_to_email.pwdError": "Por favor digite a sua senha.",
-  "claim.ldap_to_email.pwdNotMatch": "As senha não correspondem.",
-  "claim.ldap_to_email.ssoType": "Após a alteração do tipo de conta, você só vai ser capaz de logar com seu e-mail e senha.",
-  "claim.ldap_to_email.switchTo": "Trocar a conta para e-mail/senha",
-  "claim.ldap_to_email.title": "Trocar a conta LDAP para E-mail/Senha",
-  "claim.oauth_to_email.confirm": "Confirmar Senha",
-  "claim.oauth_to_email.description": "Após a alteração do tipo de conta, você só vai ser capaz de logar com seu e-mail e senha.",
-  "claim.oauth_to_email.enterNewPwd": "Entre a nova senha para o sua conta de email no {site}",
-  "claim.oauth_to_email.enterPwd": "Por favor entre uma senha.",
-  "claim.oauth_to_email.newPwd": "Nova Senha",
-  "claim.oauth_to_email.pwdNotMatch": "As senha não correspondem.",
-  "claim.oauth_to_email.switchTo": "Trocar {type} para email e senha",
-  "claim.oauth_to_email.title": "Trocar Conta {type} para E-mail",
-  "confirm_modal.cancel": "Cancelar",
-  "create_comment.addComment": "Adicionar um comentário...",
-  "create_comment.comment": "Adicionar Comentário",
-  "create_comment.commentLength": "Tamanho dos comentários precisa ter menos de {max} caracteres.",
-  "create_comment.commentTitle": "Comentário",
-  "create_comment.file": "Enviando arquivo",
-  "create_comment.files": "Enviando arquivos",
-  "create_post.comment": "Comentário",
+  "channel_invite.add": " Add",
+  "channel_invite.addNewMembers": "Add New Members to ",
+  "channel_invite.close": "Close",
+  "channel_loader.connection_error": "There appears to be a problem with your internet connection.",
+  "channel_loader.posted": "Posted",
+  "channel_loader.socketError": "Please check connection, Mattermost unreachable. If issue persists, ask administrator to check WebSocket port.",
+  "channel_loader.someone": "Someone",
+  "channel_loader.something": " did something new",
+  "channel_loader.unknown_error": "We received an unexpected status code from the server.",
+  "channel_loader.uploadedFile": " uploaded a file",
+  "channel_loader.uploadedImage": " uploaded an image",
+  "channel_loader.wrote": " wrote: ",
+  "channel_members_modal.addNew": " Add New Members",
+  "channel_members_modal.close": "Close",
+  "channel_members_modal.remove": "Remove",
+  "channel_memebers_modal.members": " Members",
+  "channel_modal.cancel": "Cancel",
+  "channel_modal.channel": "Channel",
+  "channel_modal.createNew": "Create New ",
+  "channel_modal.descriptionHelp": "Describe how this {term} should be used.",
+  "channel_modal.displayNameError": "This field is required",
+  "channel_modal.edit": "Edit",
+  "channel_modal.group": "Group",
+  "channel_modal.header": "Header",
+  "channel_modal.headerHelp": "Set text that will appear in the header of the {term} beside the {term} name. For example, include frequently used links by typing [Link Title](http://example.com).",
+  "channel_modal.modalTitle": "New ",
+  "channel_modal.name": "Name",
+  "channel_modal.nameEx": "E.g.: \"Bugs\", \"Marketing\", \"客户支持\"",
+  "channel_modal.optional": "(optional)",
+  "channel_modal.privateGroup1": "Create a new private group with restricted membership. ",
+  "channel_modal.privateGroup2": "Create a private group",
+  "channel_modal.publicChannel1": "Create a public channel",
+  "channel_modal.publicChannel2": "Create a new public channel anyone can join. ",
+  "channel_modal.purpose": "Purpose",
+  "channel_notifications.allActivity": "For all activity",
+  "channel_notifications.allUnread": "For all unread messages",
+  "channel_notifications.globalDefault": "Global default ({notifyLevel})",
+  "channel_notifications.markUnread": "Mark Channel Unread",
+  "channel_notifications.never": "Never",
+  "channel_notifications.onlyMentions": "Only for mentions",
+  "channel_notifications.override": "Selecting an option other than \"Default\" will override the global notification settings. Desktop notifications are available on Firefox, Safari, and Chrome.",
+  "channel_notifications.preferences": "Notification Preferences for ",
+  "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",
+  "claim.account.noEmail": "No email specified",
+  "claim.email_to_ldap.enterLdapPwd": "Enter the ID and password for your AD/LDAP account",
+  "claim.email_to_ldap.enterPwd": "Enter the password for your {site} email account",
+  "claim.email_to_ldap.ldapId": "AD/LDAP ID",
+  "claim.email_to_ldap.ldapIdError": "Please enter your AD/LDAP ID.",
+  "claim.email_to_ldap.ldapPasswordError": "Please enter your AD/LDAP password.",
+  "claim.email_to_ldap.ldapPwd": "AD/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 AD/LDAP account",
+  "claim.email_to_ldap.ssoType": "Upon claiming your account, you will only be able to login with AD/LDAP",
+  "claim.email_to_ldap.switchTo": "Switch account to AD/LDAP",
+  "claim.email_to_ldap.title": "Switch Email/Password Account to AD/LDAP",
+  "claim.email_to_oauth.enterPwd": "Enter the password for your {site} account",
+  "claim.email_to_oauth.pwd": "Password",
+  "claim.email_to_oauth.pwdError": "Please enter your password.",
+  "claim.email_to_oauth.ssoNote": "You must already have a valid {type} account",
+  "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 {ldapPassword} for your {site} email account",
+  "claim.ldap_to_email.enterPwd": "Enter a new password for your email account",
+  "claim.ldap_to_email.ldapPasswordError": "Please enter your AD/LDAP password.",
+  "claim.ldap_to_email.ldapPwd": "AD/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 AD/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.enterNewPwd": "Enter a new password for your {site} email account",
+  "claim.oauth_to_email.enterPwd": "Please enter a password.",
+  "claim.oauth_to_email.newPwd": "New Password",
+  "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",
+  "confirm_modal.cancel": "Cancel",
+  "create_comment.addComment": "Add a comment...",
+  "create_comment.comment": "Add Comment",
+  "create_comment.commentLength": "Comment length must be less than {max} characters.",
+  "create_comment.commentTitle": "Comment",
+  "create_comment.file": "File uploading",
+  "create_comment.files": "Files uploading",
+  "create_post.comment": "Comment",
   "create_post.post": "Post",
-  "create_post.shortcutsNotSupported": "Atalhos do teclado não está disponível no seu dispositivo.",
-  "create_post.tutorialTip": "<h4>Enviando Mensagens</h4><p>Digite aqui para escrever uma mensagem e pressione <strong>Enter</strong> para posta-lá.</p><p>Clique no botão <strong>Anexo</strong> para enviar uma imagem ou arquivo.</p>",
-  "create_post.write": "Escreva uma mensagem...",
-  "create_team.agreement": "Ao prosseguir para criar sua conta e usar {siteName}, você concorda com nosso <a href='/static/help/terms.html'>Termo de Serviço</a> e <a href='/static/help/privacy.html'>Politica de Privacidade</a>. Se você não concorda, você não pode usar {siteName}.",
-  "create_team.display_name.back": "Voltar para o passo anterior",
-  "create_team.display_name.charLength": "O nome deve ser de 4 ou mais caracteres até um máximo de 15",
-  "create_team.display_name.nameHelp": "Nome da sua equipe em qualquer idioma. Seu nome de equipe é mostrado em menus e títulos.",
-  "create_team.display_name.next": "Próximo",
-  "create_team.display_name.required": "Este campo é obrigatório",
-  "create_team.display_name.teamName": "Nome da Equipe",
-  "create_team.team_url.back": "Voltar para o passo anterior",
-  "create_team.team_url.charLength": "O nome deve ser de 4 ou mais caracteres até um máximo de 15",
-  "create_team.team_url.creatingTeam": "Criando equipe...",
-  "create_team.team_url.finish": "Terminar",
-  "create_team.team_url.hint": "<li>Curto e memorizável é o melhor</li><li>Use letras minúsculas, números e traços</li><li>Deve começar com uma letra e não pode terminar em um traço</li>",
-  "create_team.team_url.regex": "Utilize apenas letras minúsculas, números e traços. Deve começar com uma letra e não pode terminar em um traço.",
-  "create_team.team_url.required": "Este campo é obrigatório",
-  "create_team.team_url.taken": "URL é usada ou contém uma palavra reservada",
-  "create_team.team_url.teamUrl": "Equipe URL",
-  "create_team.team_url.unavailable": "Está URL está indisponível. Por favor tente outra.",
-  "create_team.team_url.webAddress": "Escolha o endereço web para sua nova equipe:",
-  "custom_emoji.empty": "Emoji personalizado não encontrado",
-  "custom_emoji.header": "Emoji Personalizado",
-  "custom_emoji.search": "Pesquisar Emoji Personalizado",
-  "delete_channel.cancel": "Cancelar",
-  "delete_channel.channel": "canal",
-  "delete_channel.confirm": "Confirmar EXCLUSÃO do Canal",
-  "delete_channel.del": "Deletar",
-  "delete_channel.group": "grupo",
-  "delete_channel.question": "Você tem certeza que deseja deletar o {display_name} {term}?",
-  "delete_post.cancel": "Cancelar",
-  "delete_post.comment": "Comentário",
-  "delete_post.confirm": "Confirmar Delete {term}",
-  "delete_post.del": "Deletar",
+  "create_post.shortcutsNotSupported": "Keyboard shortcuts are not supported on your device.",
+  "create_post.tutorialTip": "<h4>Sending Messages</h4><p>Type here to write a message and press <strong>ENTER</strong> to post it.</p><p>Click the <strong>Attachment</strong> button to upload an image or a file.</p>",
+  "create_post.write": "Write a message...",
+  "create_team.agreement": "By proceeding to create your account and use {siteName}, you agree to our <a href='/static/help/terms.html'>Terms of Service</a> and <a href='/static/help/privacy.html'>Privacy Policy</a>. If you do not agree, you cannot use {siteName}.",
+  "create_team.display_name.back": "Back to previous step",
+  "create_team.display_name.charLength": "Name must be 4 or more characters up to a maximum of 15",
+  "create_team.display_name.nameHelp": "Name your team in any language. Your team name shows in menus and headings.",
+  "create_team.display_name.next": "Next",
+  "create_team.display_name.required": "This field is required",
+  "create_team.display_name.teamName": "Team Name",
+  "create_team.team_url.back": "Back to previous step",
+  "create_team.team_url.charLength": "Name must be 4 or more characters up to a maximum of 15",
+  "create_team.team_url.creatingTeam": "Creating team...",
+  "create_team.team_url.finish": "Finish",
+  "create_team.team_url.hint": "<li>Short and memorable is best</li><li>Use lowercase letters, numbers and dashes</li><li>Must start with a letter and can't end in a dash</li>",
+  "create_team.team_url.regex": "Use only lower case letters, numbers and dashes. Must start with a letter and can't end in a dash.",
+  "create_team.team_url.required": "This field is required",
+  "create_team.team_url.taken": "URL is taken or contains a reserved word",
+  "create_team.team_url.teamUrl": "Team URL",
+  "create_team.team_url.unavailable": "This URL is unavailable. Please try another.",
+  "create_team.team_url.webAddress": "Choose the web address of your new team:",
+  "custom_emoji.empty": "No custom emoji found",
+  "custom_emoji.header": "Custom Emoji",
+  "custom_emoji.search": "Search Custom Emoji",
+  "delete_channel.cancel": "Cancel",
+  "delete_channel.channel": "channel",
+  "delete_channel.confirm": "Confirm DELETE Channel",
+  "delete_channel.del": "Delete",
+  "delete_channel.group": "group",
+  "delete_channel.question": "Are you sure you wish to delete the {display_name} {term}?",
+  "delete_post.cancel": "Cancel",
+  "delete_post.comment": "Comment",
+  "delete_post.confirm": "Confirm {term} Delete",
+  "delete_post.del": "Delete",
   "delete_post.post": "Post",
-  "delete_post.question": "Tem certeza de que deseja excluir este {term}?",
-  "delete_post.warning": "Este post tem {count} comentário(s).",
-  "edit_channel_header_modal.cancel": "Cancelar",
-  "edit_channel_header_modal.description": "Editar o texto que aparece junto ao nome do canal dentro do cabeçalho do canal.",
-  "edit_channel_header_modal.error": "Este cabeçalho de canal é muito longo, por favor insira um menor",
-  "edit_channel_header_modal.save": "Salvar",
-  "edit_channel_header_modal.title": "Editar Cabeçalho para o {channel}",
-  "edit_channel_header_modal.title_dm": "Editar cabeçalho",
-  "edit_channel_purpose_modal.body": "Descreva como este {type} deve ser usado. Este texto aparece na lista de canais no menu \"Mais...\" e ajuda os outros a decidir se deseja participar.",
-  "edit_channel_purpose_modal.cancel": "Cancelar",
-  "edit_channel_purpose_modal.channel": "Canal",
-  "edit_channel_purpose_modal.error": "Este propósito do canal é muito longo, por favor insira um menor",
-  "edit_channel_purpose_modal.group": "Grupo",
-  "edit_channel_purpose_modal.save": "Salvar",
-  "edit_channel_purpose_modal.title1": "Editar Propósito",
-  "edit_channel_purpose_modal.title2": "Editar Propósito para ",
-  "edit_post.cancel": "Cancelar",
-  "edit_post.edit": "Editar {title}",
-  "edit_post.editPost": "Editar o post...",
-  "edit_post.save": "Salvar",
-  "email_signup.address": "Endereço de E-mail",
-  "email_signup.createTeam": "Criar Equipe",
-  "email_signup.emailError": "Por favor entre um endereço de e-mail válido.",
-  "email_signup.find": "Encontrar minhas equipes",
-  "email_verify.almost": "{siteName}: Você está quase pronto",
-  "email_verify.failed": " Falha ao enviar verificação por email.",
-  "email_verify.notVerifiedBody": "Por favor verifique seu endereço de email. Verifique por um email em sua caixa de entrada.",
-  "email_verify.resend": "Re-enviar Email",
-  "email_verify.sent": " Verificação de email enviado.",
-  "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.",
-  "emoji_list.actions": "Ações",
-  "emoji_list.add": "Adicionar Emoji Personalizado",
-  "emoji_list.creator": "Criador",
-  "emoji_list.delete": "Deletar",
-  "emoji_list.empty": "Emoji Personalizado Não Encontrado",
-  "emoji_list.help": "Emojis personalizados estão disponíveis para todos no seu servidor. Digite ':' na caixa de mensagens para trazer o menu de seleção de emojis. Outros usuários podem precisar atualizar a página antes que os novos emojis apareçam.",
-  "emoji_list.help2": "Dica: Se você adicionar #, ##, ou ### como primeiro caractere em uma nova linha contendo um emoji, você poderá usar emoji com tamanho maior. Para testar, envia uma mensagem como: '# :smile:'.",
-  "emoji_list.image": "Imagem",
-  "emoji_list.name": "Nome",
-  "emoji_list.search": "Pesquisar Emoji Personalizado",
-  "emoji_list.somebody": "Alguém em outra equipe",
-  "error.not_found.link_message": "Voltar para Mattermost",
-  "error.not_found.message": "A página que você estava tentando alcançar não existe",
-  "error.not_found.title": "Página não encontrada",
-  "error.not_supported.message": "Navegação privada não é suportado",
-  "error.not_supported.title": "Navegador não suportado",
-  "error_bar.expired": "A licença Enterprise expirou; você tem 15 dias a partir da expiração para renovar a licença, por favor contate commercial@mattermost.com para detalhes",
-  "error_bar.expiring": "A licença Enterprise termina em {date}. Para renovar sua licença, por favor contate commercial@mattermost.com",
-  "error_bar.past_grace": "A licença Enterprise está expirada, por favor contate seu Administrador de Sistema para detalhes",
-  "error_bar.preview_mode": "Modo de visualização: Notificações por E-mail não foram configuradas",
+  "delete_post.question": "Are you sure you want to delete this {term}?",
+  "delete_post.warning": "This post has {count} comment(s) on it.",
+  "edit_channel_header_modal.cancel": "Cancel",
+  "edit_channel_header_modal.description": "Edit the text appearing next to the channel name in the channel header.",
+  "edit_channel_header_modal.error": "This channel header is too long, please enter a shorter one",
+  "edit_channel_header_modal.save": "Save",
+  "edit_channel_header_modal.title": "Edit Header for {channel}",
+  "edit_channel_header_modal.title_dm": "Edit Header",
+  "edit_channel_purpose_modal.body": "Describe how this {type} should be used. This text appears in the channel list in the \"More...\" menu and helps others decide whether to join.",
+  "edit_channel_purpose_modal.cancel": "Cancel",
+  "edit_channel_purpose_modal.channel": "Channel",
+  "edit_channel_purpose_modal.error": "This channel purpose is too long, please enter a shorter one",
+  "edit_channel_purpose_modal.group": "Group",
+  "edit_channel_purpose_modal.save": "Save",
+  "edit_channel_purpose_modal.title1": "Edit Purpose",
+  "edit_channel_purpose_modal.title2": "Edit Purpose for ",
+  "edit_post.cancel": "Cancel",
+  "edit_post.edit": "Edit {title}",
+  "edit_post.editPost": "Edit the post...",
+  "edit_post.save": "Save",
+  "email_signup.address": "Email Address",
+  "email_signup.createTeam": "Create Team",
+  "email_signup.emailError": "Please enter a valid email address.",
+  "email_signup.find": "Find my teams",
+  "email_verify.almost": "{siteName}: You are almost done",
+  "email_verify.failed": " Failed to send verification email.",
+  "email_verify.notVerifiedBody": "Please verify your email address. Check your inbox for an email.",
+  "email_verify.resend": "Resend Email",
+  "email_verify.sent": " Verification email sent.",
+  "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.",
+  "emoji_list.actions": "Actions",
+  "emoji_list.add": "Add Custom Emoji",
+  "emoji_list.creator": "Creator",
+  "emoji_list.delete": "Delete",
+  "emoji_list.empty": "No Custom Emoji Found",
+  "emoji_list.help": "Custom emoji are available to everyone on your server. Type ':' in a message box to bring up the emoji selection menu. Other users may need to refresh the page before new emojis appear.",
+  "emoji_list.help2": "Tip: If you add #, ##, or ### as the first character on a new line containing emoji, you can use larger sized emoji. To try it out, send a message such as: '# :smile:'.",
+  "emoji_list.image": "Image",
+  "emoji_list.name": "Name",
+  "emoji_list.search": "Search Custom Emoji",
+  "emoji_list.somebody": "Somebody on another team",
+  "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",
   "file_attachment.download": "Download",
-  "file_info_preview.size": "Tamanho ",
-  "file_info_preview.type": "Tipo do arquivo ",
-  "file_upload.fileAbove": "Arquivo acima {max}MB não pode ser enviado: {filename}",
-  "file_upload.filesAbove": "Arquivos acima {max}MB não podem ser enviados: {filenames}",
-  "file_upload.limited": "Limite máximo de uploads de {count} arquivos. Por favor use um post adicional para mais arquivos.",
-  "file_upload.pasted": "Imagem Colada em ",
-  "filtered_user_list.any_team": "Todos os Usuários",
-  "filtered_user_list.count": "{count} {count, plural, =0 {0 membros} one {membro} other {membros}}",
-  "filtered_user_list.countTotal": "{count} {count, plural, =0 {0 membros} one {membro} other {membros}} de {total} Total",
-  "filtered_user_list.member": "Membro",
-  "filtered_user_list.search": "Procurar membros",
-  "filtered_user_list.show": "Mostrar",
-  "filtered_user_list.team_only": "Membros desta Equipe",
-  "find_team.email": "E-mail",
-  "find_team.findDescription": "Foi enviado um e-mail com links para todas as equipes do qual você é membro.",
-  "find_team.findTitle": "Encontre Sua Equipe",
-  "find_team.getLinks": "Obter um e-mail com links para quaisquer equipes do qual você é membro.",
-  "find_team.placeholder": "voce@dominio.com",
-  "find_team.send": "Enviar",
-  "find_team.submitError": "Por favor entre um endereço de e-mail válido",
-  "flag_post.flag": "Marcar para seguir",
-  "flag_post.unflag": "Desmarcar",
-  "general_tab.chooseName": "Por favor escolha um novo nome para sua equipe",
-  "general_tab.codeDesc": "Clique 'Edit' para re-gerar o Código de Convite.",
-  "general_tab.codeLongDesc": "O Código de convite é usado como parte da URL no link de convite da equipe criado por <strong>Obter Link de Convite de Equipe</strong> no menu principal. Re-gerar cria um novo link de convite de equipe e invalida os link anteriores.",
-  "general_tab.codeTitle": "Código de Convite",
-  "general_tab.dirDisabled": "Diretório de equipe foi desativado.  Por favor peça a um Administrador de Sistema para ativar o Diretório de Equipe nas configurações do Console do Sistema.",
-  "general_tab.dirOff": "Diretório de equipe está desativado para este sistema.",
-  "general_tab.includeDirDesc": "Incluindo esta equipe irá exibir o nome da equipe da seção Diretório Equipe da página inicial, e fornecer um link para a página de login.",
-  "general_tab.includeDirTitle": "Incluir esta equipe no Diretório de Equipe",
-  "general_tab.no": "Não",
-  "general_tab.openInviteDesc": "Quando permitido, um link para esta equipe vai ser incluído na página de destino permitindo que qualquer pessoa com uma conta possa participar desta equipe.",
-  "general_tab.openInviteTitle": "Permitir que qualquer usuário com uma conta neste servidor possa se juntar a esta equipe",
-  "general_tab.regenerate": "Re-Gerar",
-  "general_tab.required": "Este campo é obrigatório",
-  "general_tab.teamName": "Nome da Equipe",
-  "general_tab.teamNameInfo": "Defina o nome da equipe como aparece na sua tela de login e no topo na lateral esquerda.",
-  "general_tab.title": "Definições Gerais",
-  "general_tab.yes": "Sim",
-  "get_app.alreadyHaveIt": "Já tem isso?",
-  "get_app.androidAppName": "Mattermost para Android",
-  "get_app.androidHeader": "Mattermost funciona melhor se você mudar para o nosso aplicativo Android",
-  "get_app.continue": "continuar",
-  "get_app.continueWithBrowser": "Ou {link}",
-  "get_app.continueWithBrowserLink": "continuar no navegador",
-  "get_app.iosHeader": "Mattermost funciona melhor se você mudar para o nosso aplicativo iPhone",
+  "file_info_preview.size": "Size ",
+  "file_info_preview.type": "File type ",
+  "file_upload.fileAbove": "File above {max}MB cannot be uploaded: {filename}",
+  "file_upload.filesAbove": "Files above {max}MB cannot be uploaded: {filenames}",
+  "file_upload.limited": "Uploads limited to {count} files maximum. Please use additional posts for more files.",
+  "file_upload.pasted": "Image Pasted at ",
+  "filtered_user_list.any_team": "All Users",
+  "filtered_user_list.count": "{count} {count, plural, =0 {0 members} one {member} other {members}}",
+  "filtered_user_list.countTotal": "{count} {count, plural, =0 {0 members} one {member} other {members}} of {total} Total",
+  "filtered_user_list.member": "Member",
+  "filtered_user_list.search": "Search members",
+  "filtered_user_list.show": "Filter:",
+  "filtered_user_list.team_only": "Members of this Team",
+  "find_team.email": "Email",
+  "find_team.findDescription": "An email was sent with links to any teams to which you are a member.",
+  "find_team.findTitle": "Find Your Team",
+  "find_team.getLinks": "Get an email with links to any teams to which you are a member.",
+  "find_team.placeholder": "you@domain.com",
+  "find_team.send": "Send",
+  "find_team.submitError": "Please enter a valid email address",
+  "flag_post.flag": "Flag for follow up",
+  "flag_post.unflag": "Unflag",
+  "general_tab.chooseName": "Please choose a new name for your team",
+  "general_tab.codeDesc": "Click 'Edit' to regenerate Invite Code.",
+  "general_tab.codeLongDesc": "The Invite Code is used as part of the URL in the team invitation link created by <strong>Get Team Invite Link</strong> in the main menu. Regenerating creates a new team invitation link and invalidates the previous link.",
+  "general_tab.codeTitle": "Invite Code",
+  "general_tab.dirDisabled": "Team Directory has been disabled.  Please ask a System Admin to enable the Team Directory in the System Console team settings.",
+  "general_tab.dirOff": "Team directory is turned off for this system.",
+  "general_tab.includeDirDesc": "Including this team will display the team name from the Team Directory section of the Home Page, and provide a link to the sign-in page.",
+  "general_tab.includeDirTitle": "Include this team in the Team Directory",
+  "general_tab.no": "No",
+  "general_tab.openInviteDesc": "When allowed, a link to this team will be included on the landing page allowing anyone with an account to join this team.",
+  "general_tab.openInviteTitle": "Allow any user with an account on this server to join this team",
+  "general_tab.regenerate": "Regenerate",
+  "general_tab.required": "This field is required",
+  "general_tab.teamName": "Team Name",
+  "general_tab.teamNameInfo": "Set the name of the team as it appears on your sign-in screen and at the top of the left-hand sidebar.",
+  "general_tab.title": "General Settings",
+  "general_tab.yes": "Yes",
+  "get_app.alreadyHaveIt": "Already have it?",
+  "get_app.androidAppName": "Mattermost for Android",
+  "get_app.androidHeader": "Mattermost works best if you switch to our Android app",
+  "get_app.continue": "continue",
+  "get_app.continueWithBrowser": "Or {link}",
+  "get_app.continueWithBrowserLink": "continue with browser",
+  "get_app.iosHeader": "Mattermost works best if you switch to our iPhone app",
   "get_app.mattermostInc": "Mattermost, Inc",
-  "get_app.openMattermost": "Abrir Mattermost",
-  "get_link.clipboard": " Link copiado para a área de transferência.",
-  "get_link.close": "Fechar",
-  "get_link.copy": "Copiar Link",
-  "get_post_link_modal.help": "O link abaixo permite que usuários autorizados possam ver seus posts.",
-  "get_post_link_modal.title": "Copiar Permalink",
-  "get_team_invite_link_modal.help": "Enviar o link abaixo para sua equipe de trabalho para que eles se inscrevam no site da sua equipe. O Link de Convite de Equipe como ele não muda pode ser compartilhado com várias pessoas ao menos que seja re-gerado em Configurações de Equipe pelo Administrador de Equipe.",
-  "get_team_invite_link_modal.helpDisabled": "Criação de usuários está desabilitada para sua equipe. Por favor peça ao administrador de equipe por detalhes.",
-  "get_team_invite_link_modal.title": "Link para Convite de Equipe",
-  "help.attaching.downloading": "#### Download Arquivos\nFazer download de um arquivo anexado clicando no ícone de download ao lado da miniatura de arquivos ou abrindo o visualizador de arquivos e clicando em **Download**.",
-  "help.attaching.dragdrop": "#### Arrastar e Soltar\nEnvie um arquivo ou uma seleção de arquivos arrastando-os do seu computador para barra lateral direita ou painel central. Arrastando e soltando anexos para a caixa de entrada de mensagem, então você pode, opcionalmente, digitar uma mensagem e pressionar **ENTER** para postar.",
-  "help.attaching.icon": "#### Ícone de Anexo\nComo alternativa, fazer upload de arquivos clicando no ícone de clipe cinza dentro da caixa de entrada de mensagem. Isso abre o seu visualizador de arquivos do sistema, onde você pode navegar até os arquivos desejados e clique em **Abrir** para enviar os arquivos para a caixa de entrada de mensagens. Opcionalmente, digite uma mensagem e em seguida, pressione **ENTER** para postar.",
-  "help.attaching.limitations": "## Limitação Tamanho de Arquivo\nMattermost suporta um máximo de cinco arquivos anexados por postagem, cada um com tamanho máximo de 50Mb.",
-  "help.attaching.methods": "## Métodos de Anexar\nAnexe um arquivo arrastando e soltando ou clicando no ícone de anexar na caixa de entrada de mensagem.",
-  "help.attaching.notSupported": "Visualização de documentos (Word, Excel, PPT) não é ainda suportado.",
-  "help.attaching.pasting": "#### Colando Imagens\nNos navegadores Chrome e Edge isto é também possível para enviar arquivos colando eles a partir da área de transferência. Isto ainda não é suportado nos outros navegadores.",
-  "help.attaching.previewer": "## Visualização de Arquivo\nMattermost tem um visualizador de arquivos nativo que é usado para ver a mídia, fazer download e compartilhar links públicos. Clique na miniatura do arquivo anexado para abrir o visualizador de arquivos.",
-  "help.attaching.publicLinks": "#### Compartilhar Links Públicos\nLinks públicos permitem que você compartilhe arquivos anexados com pessoas fora da sua equipe Mattermost. Abra o visualizador de arquivo clicando na miniatura do anexo, então clique **Obter Link Público**. Isto abrirá um caixa de dialogo com um link para copiar. Quando o link for compartilhado e aberto por outro usuário, será feito download automaticamente do arquivo.",
-  "help.attaching.publicLinks2": "Se **Obter Link Público** não estiver visível no visualizador de arquivo e você prefere este recurso ativo, você pode solicitar que o Administrador do Sistema ative o recurso no Console do Sistema em **Segurança** > **Links Públicos**.",
-  "help.attaching.supported": "#### Tipos de Mídia Suportados\nSe você está tentando visualizar um tipo de mídia que não é suportado, o visualizador de arquivos vai abrir um ícone de anexo de mídia padrão. Formatos de mídia suportados dependem fortemente de seu navegador e sistema operacional, mas os seguintes formatos são suportados pelo Mattermost na maioria dos navegadores:",
-  "help.attaching.supportedList": "- Imagens: BMP, GIF, JPG, JPEG, PNG\n- Vídeo: MP4\n- Audio: MP3, M4A\n- Documentos: PDF",
-  "help.attaching.title": "# Anexando Arquivos\n_____",
-  "help.commands.builtin": "## Comandos Nativos\nOs seguintes comandos slash estão disponíveis em todas as instalações Mattermost:",
-  "help.commands.builtin2": "Comece digitando `/` e uma lista de opções de comando slash aparece acima da caixa de entrada de texto. As sugestões de preenchimento automático ajudam fornecendo um exemplo no texto preto e uma breve descrição do comando slash no texto cinza.",
-  "help.commands.custom": "## Comandos Personalizados\nComandos slash personalizados se integram com aplicações externas. Por exemplo, uma equipe pode configurar um comando slash personalizado para verificar os registros de saúde internos com `/paciente joe smith` ou verificar o clima semanal em uma cidade com `/tempo toronto semana`. Verifique com o Administrador de Sistema ou abra a lista de preenchimento automático digitando `/` para verificar se a sua equipe configurou algum comando slash personalizado.",
-  "help.commands.custom2": "Comandos slash personalizados estão desativados por padrão e podem ser ativados pelo Administrador do Sistema em **Console do Sistema** > **Integrações** > **Webhooks e Comandos**. Leia sobre como configurar comando slash personalizado em [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
-  "help.commands.intro": "Comandos slash executam operações no Mattermost digitando na caixa de entrada de texto. Digite `/` seguido por um comando e alguns argumentos para executar ações.\n\nComandos slash nativos vêm com todas as instalações Mattermost e comandos slash personalizado são configurados para interagir com aplicações externas. Saiba mais sobre a configuração de comandos slash personalizados em [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
-  "help.commands.title": "# Executando Comandos\n___",
-  "help.composing.deleting": "## Deletando uma mensagem\nDelete uma mensagem clicando no ícone **[...]** ao lado do texto da mensagem que você escreveu, em seguida, clique em **Deletar**. Administrador de Sistema e de Equipe podem excluir qualquer mensagem em seu sistema ou equipe.",
-  "help.composing.editing": "## Edição de Mensagem\nEditar uma mensagem clicando no ícone **[...]** ao lado o texto da mensagem que você compôs, em seguida, clique em **Editar**. Depois de fazer modificações no texto da mensagem, pressione **ENTER** para salvar as modificações. Edições mensagem não desencadeiam novas notificações de @menção, notificações de área de trabalho ou sons de notificação.",
-  "help.composing.linking": "## Link para uma mensagem\nO recurso **Permalink** cria um link para qualquer mensagem. Compartilhar este link com outros usuários no canal lhes permite visualizar a mensagem lincada no Arquivos de Mensagem. Os usuários que não são membros do canal onde a mensagem foi postada não podem ver o permalink. Obter o permalink de qualquer mensagem, clicando no ícone **[...]** ao lado do texto da mensagem  > **Permalink** > **Copiar Link**.",
-  "help.composing.posting": "## Postando uma Mensagem\nEscreva uma mensagem, digitando na caixa de entrada de texto, em seguida, pressione **ENTER** para enviá-la. Use **Shift + ENTER** para criar uma nova linha sem enviar uma mensagem. Para enviar mensagens pressionando **Ctrl+Enter** vá para **Menu Principal > Configurações de Conta > Enviar mensagens em Ctrl + Enter**.",
-  "help.composing.posts": "#### Posts\nPosts podem ser consideradas as mensagens principais. Eles são as mensagens que, muitas vezes iniciam uma discussão com respostas. Posts são criados e enviados a partir da caixa de entrada de texto na parte inferior do painel central.",
-  "help.composing.replies": "#### Respostas\nResponda a uma mensagem clicando no ícone de resposta ao lado de qualquer texto da mensagem. Esta ação abre a barra lateral direita, onde você pode ver as mensagens relacionadas, e escrever e enviar sua resposta. As respostas são recuada ligeiramente no painel central para indicar que eles são mensagens filha de um post pai.\n\nAo compor uma resposta no lado direito, clique no ícone de expandir/fechar com duas setas na parte superior da barra lateral para tornar as coisas mais fáceis de ler.",
-  "help.composing.title": "# Enviando Mensagens\n_____",
-  "help.composing.types": "## Tipos de Mensagem\nResponda a postagem para manter a conversa organizada em tópicos.",
-  "help.formatting.checklist": "Faça uma lista de tarefas, incluindo colchetes:",
-  "help.formatting.checklistExample": "- [ ] Item um\n- [ ] Item dois\n- [x] Item concluído",
-  "help.formatting.code": "## Bloco de Código\n\nCriar um bloco de código pelo recuo cada linha por quatro espaços, ou colocando ``` na linha acima e abaixo de seu código.",
-  "help.formatting.codeBlock": "bloco de código",
+  "get_app.openMattermost": "Open Mattermost",
+  "get_link.clipboard": " Link copied to clipboard.",
+  "get_link.close": "Close",
+  "get_link.copy": "Copy Link",
+  "get_post_link_modal.help": "The link below allows authorized users to see your post.",
+  "get_post_link_modal.title": "Copy Permalink",
+  "get_team_invite_link_modal.help": "Send teammates the link below for them to sign-up to this team site. The Team Invite Link can be shared with multiple teammates as it does not change unless it's regenerated in Team Settings by a Team Admin.",
+  "get_team_invite_link_modal.helpDisabled": "User creation has been disabled for your team. Please ask your Team Administrator for details.",
+  "get_team_invite_link_modal.title": "Team Invite Link",
+  "help.attaching.downloading": "#### Downloading Files\nDownload an attached file by clicking the download icon next to the file thumbnail or by opening the file previewer and clicking **Download**.",
+  "help.attaching.dragdrop": "#### Drag and Drop\nUpload a file or selection of files by dragging the files from your computer into the RHS or center pane. Dragging and dropping attaches the files to the message input box, then you can optionally type a message and press **ENTER** to post.",
+  "help.attaching.icon": "#### Attachment Icon\nAlternatively, upload files by clicking the grey paperclip icon inside the message input box. This opens up your system file viewer where you can navigate to the desired files and then click **Open** to upload the files to the message input box. Optionally type a message and then press **ENTER** to post.",
+  "help.attaching.limitations": "## File Size Limitations\nMattermost supports a maximum of five attached files per post, each with a maximum file size of 50Mb.",
+  "help.attaching.methods": "## Attachment Methods\nAttach a file by drag and drop or by clicking the attachment icon in the message input box.",
+  "help.attaching.notSupported": "Document preview (Word, Excel, PPT) is not yet supported.",
+  "help.attaching.pasting": "#### Pasting Images\nOn Chrome and Edge browsers, it is also possible to upload files by pasting them from the clipboard. This is not yet supported on other browsers.",
+  "help.attaching.previewer": "## File Previewer\nMattermost has a built in file previewer that is used to view media, download files and share public links. Click the thumbnail of an attached file to open it in the file previewer.",
+  "help.attaching.publicLinks": "#### Sharing Public Links\nPublic links allow you to share file attachments with people outside your Mattermost team. Open the file previewer by clicking on the thumbnail of an attachment, then click **Get Public Link**. This opens a dialog box with a link to copy. When the link is shared and opened by another user, the file will automatically download.",
+  "help.attaching.publicLinks2": "If **Get Public Link** is not visible in the file previewer and you prefer the feature enabled, you can request that your System Admin enable the feature from the System Console under **Security** > **Public Links**.",
+  "help.attaching.supported": "#### Supported Media Types\nIf you are trying to preview a media type that is not supported, the file previewer will open a standard media attachment icon. Supported media formats depend heavily on your browser and operating system, but the following formats are supported by Mattermost on most browsers:",
+  "help.attaching.supportedList": "- Images: BMP, GIF, JPG, JPEG, PNG\n- Video: MP4\n- Audio: MP3, M4A\n- Documents: PDF",
+  "help.attaching.title": "# Attaching Files\n_____",
+  "help.commands.builtin": "## Built-in Commands\nThe following slash commands are available on all Mattermost installations:",
+  "help.commands.builtin2": "Begin by typing `/` and a list of slash command options appears above the text input box. The autocomplete suggestions help by providing a format example in black text and a short description of the slash command in grey text.",
+  "help.commands.custom": "## Custom Commands\nCustom slash commands integrate with external applications. For example, a team might configure a custom slash command to check internal health records with `/patient joe smith` or check the weekly weather forcast in a city with `/weather toronto week`. Check with your System Admin or open the autocomplete list by typing `/` to determine if your team configured any custom slash commands.",
+  "help.commands.custom2": "Custom slash commands are disabled by default and can be enabled by the System Admin in the **System Console** > **Integrations** > **Webhooks and Commands**. Learn about configuring custom slash commands on the [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
+  "help.commands.intro": "Slash commands perform operations in Mattermost by typing into the text input box. Enter a `/` followed by a command and some arguments to perform actions.\n\nBuilt-in slash commands come with all Mattermost installations and custom slash commands are configurable to interact with external applications. Learn about configuring custom slash commands on the [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
+  "help.commands.title": "# Executing Commands\n___",
+  "help.composing.deleting": "## Deleting a message\nDelete a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Delete**. System and Team Admins can delete any message on their system or team.",
+  "help.composing.editing": "## Editing a Message\nEdit a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Edit**. After making modifications to the message text, press **ENTER** to save the modifications. Message edits do not trigger new @mention notifications, desktop notifications or notification sounds.",
+  "help.composing.linking": "## Linking to a message\nThe **Permalink** feature creates a link to any message. Sharing this link with other users in the channel lets them view the linked message in the Message Archives. Users who are not a member of the channel where the message was posted cannot view the permalink. Get the permalink to any message by clicking the **[...]** icon next to the message text  > **Permalink** > **Copy Link**.",
+  "help.composing.posting": "## Posting a Message\nWrite a message by typing into the text input box, then press **ENTER** to send it. Use **Shift + ENTER** to create a new line without sending a message. To send messages by pressing **CTRL+ENTER** go to **Main Menu > Account Settings > Send messages on CTRL + ENTER**.",
+  "help.composing.posts": "#### Posts\nPosts can be considered parent messages. They are the messages that often start a thread of replies. Posts are composed and sent from the text input box at the bottom of the center pane.",
+  "help.composing.replies": "#### Replies\nReply to a message by clicking the reply icon next to any message text. This action opens the right-hand-side (RHS) where you can see the message thread, then compose and send your reply. Replies are indented slightly in the center pane to indicate that they are child messages of a parent post.\n\nWhen composing a reply in the right-hand side, click the expand/collapse icon with two arrows at the top of the sidebar to make things easier to read.",
+  "help.composing.title": "# Sending Messages\n_____",
+  "help.composing.types": "## Message Types\nReply to posts to keep conversations organized in threads.",
+  "help.formatting.checklist": "Make a task list by including square brackets:",
+  "help.formatting.checklistExample": "- [ ] Item one\n- [ ] Item two\n- [x] Completed item",
+  "help.formatting.code": "## Code Block\n\nCreate a code block by indenting each line by four spaces, or by placing ``` on the line above and below your code.",
+  "help.formatting.codeBlock": "code block",
   "help.formatting.emojiExample": ":smile: :+1: :sheep:",
-  "help.formatting.emojis": "## Emojis\n\nAbra o preenchimento automático de emoji digitando `:`. A lista completa de emojis pode ser encontrada [aqui](http://www.emoji-cheat-sheet.com/). Também é possível criar seu próprio [Emoji Personalizado](http://docs.mattermost.com/help/settings/custom-emoji.html) se o emoji que pretende utilizar não existir.",
-  "help.formatting.example": "Exemplo:",
-  "help.formatting.githubTheme": "**Tema GitHub**",
-  "help.formatting.headings": "## Títulos\n\nFaça um título digitando # e um espaço antes de seu título. Para subtítulos usar mais #.",
-  "help.formatting.headings2": "Alternativamente, você pode sublinhar o texto usando `===` ou `---` para criar títulos.",
-  "help.formatting.headings2Example": "Cabeçalho Largo\n-------------",
-  "help.formatting.headingsExample": "## Cabeçalho Largo\n### Cabeçalho Menor\n#### Cabeçalho Ainda Menor",
-  "help.formatting.images": "## Imagens na Linha\n\nCrie imagens na linha usando `!` seguido do texto para imagem entre colchetes e o link entre parenteses. Adicione texto suspenso, colocando-o entre aspas após o link.",
-  "help.formatting.imagesExample": "![alt texto](link \"texto suspenso\")\n\ne\n\n[![Status Compilação](https://travis-ci.org/mattermost/platform.svg?branch=master)](https://travis-ci.org/mattermost/platform) [![Github](https://assets-cdn.github.com/favicon.ico)](https://github.com/mattermost/platform)",
-  "help.formatting.inline": "## Código na Linha\n\nCrie fonte monoespaçada na linha cercando o com acentos graves.",
-  "help.formatting.intro": "Markdown torna fácil formatar mensagens. Digite uma mensagem como faria normalmente, e use essas regras para deixa-lá com formatação especial.",
-  "help.formatting.lines": "## Linhas\n\nCrie uma linha usando três `*`, `_`, ou `-`.",
-  "help.formatting.linkEx": "[Confira Mattermost!](https://about.mattermost.com/)",
-  "help.formatting.links": "## Links\n\nCrie texto para links colocando o texto desejado entre colchetes e o link associado entre parênteses.",
-  "help.formatting.listExample": "* lista item um\n* lista item dois\n    * item dois sub-item')",
-  "help.formatting.lists": "## Listas\n\nCrie uma lista usando `*` ou `-` como marcadores. Recue um marcador adicionando dois espaços em frente.",
-  "help.formatting.monokaiTheme": "**Tema Monokai**",
-  "help.formatting.ordered": "Faça uma lista ordenada usando números:",
-  "help.formatting.orderedExample": "1. Item um\n2. Item dois",
-  "help.formatting.quotes": "## Citar Bloco\n\nCrie um bloco citado usando `>`.",
-  "help.formatting.quotesExample": "`> citar bloco` formata como:",
-  "help.formatting.quotesRender": "> citar bloco",
-  "help.formatting.renders": "Formata como:",
-  "help.formatting.solirizedDarkTheme": "**Tema Solarized Dark**",
-  "help.formatting.solirizedLightTheme": "**Tema Solarized Light**",
-  "help.formatting.style": "## Estilo do Texto\n\nVocê pode usar `_` ou `*` em volta de uma palavra para deixar itálico. Use dois para deixar negrito.\n\n* `_itálico_` formata _itálico_\n* `**negrito**` formata **negrito**\n* `**_negrito-itálico_**` formata **_negrito-itálico_**\n* `~~tachado~~` formata ~~tachado~~",
-  "help.formatting.supportedSyntax": "As linguagens suportadas são:\n`as`, `applescript`, `osascript`, `scpt`, `bash`, `sh`, `zsh`, `clj`, `boot`, `cl2`, `cljc`, `cljs`, `cljs.hl`, `cljscm`, `cljx`, `hic`, `coffee`, `_coffee`, `cake`, `cjsx`, `cson`, `iced`, `cpp`, `c`, `cc`, `h`, `c++`, `h++`, `hpp`, `cs`, `csharp`, `css`, `d`, `di`, `dart`, `delphi`, `dpr`, `dfm`, `pas`, `pascal`, `freepascal`, `lazarus`, `lpr`, `lfm`, `diff`, `django`, `jinja`, `dockerfile`, `docker`, `erl`, `f90`, `f95`, `fsharp`, `fs`, `gcode`, `nc`, `go`, `groovy`, `handlebars`, `hbs`, `html.hbs`, `html.handlebars`, `hs`, `hx`, `java`, `jsp`, `js`, `jsx`, `json`, `jl`, `kt`, `ktm`, `kts`, `less`, `lisp`, `lua`, `mk`, `mak`, `md`, `mkdown`, `mkd`, `matlab`, `m`, `mm`, `objc`, `obj-c`, `ml`, `perl`, `pl`, `php`, `php3`, `php4`, `php5`, `php6`, `ps`, `ps1`, `pp`, `py`, `gyp`, `r`, `ruby`, `rb`, `gemspec`, `podspec`, `thor`, `irb`, `rs`, `scala`, `scm`, `sld`, `scss`, `st`, `sql`, `swift`, `tex`, `vbnet`, `vb`, `bas`, `vbs`, `v`, `veo`, `xml`, `html`, `xhtml`, `rss`, `atom`, `xsl`, `plist`, `yaml`",
-  "help.formatting.syntax": "### Destaque de Sintaxe\n\nPara adicionar destaque de sintaxe, digite o idioma a ser destacado após  ``` no início do bloco de código. Mattermost também oferece quatro diferentes temas de código (GitHub, Solarized Dark, Solarized Light, Monokai) que podem ser alterados em **Configurações de Conta** > **Exibir** > **Tema** > **Tema Personalizado** > **Estilos Canal Central**",
+  "help.formatting.emojis": "## Emojis\n\nOpen the emoji autocomplete by typing `:`. A full list of emojis can be found [here](http://www.emoji-cheat-sheet.com/). It is also possible to create your own [Custom Emoji](http://docs.mattermost.com/help/settings/custom-emoji.html) if the emoji you want to use doesn't exist.",
+  "help.formatting.example": "Example:",
+  "help.formatting.githubTheme": "**GitHub Theme**",
+  "help.formatting.headings": "## Headings\n\nMake a heading by typing # and a space before your title. For smaller headings, use more #’s.",
+  "help.formatting.headings2": "Alternatively, you can underline the text using `===` or `---` to create headings.",
+  "help.formatting.headings2Example": "Large Heading\n-------------",
+  "help.formatting.headingsExample": "## Large Heading\n### Smaller Heading\n#### Even Smaller Heading",
+  "help.formatting.images": "## In-line Images\n\nCreate in-line images using an `!` followed by the alt text in square brackets and the link in normal brackets. Add hover text by placing it in quotes after the link.",
+  "help.formatting.imagesExample": "![alt text](link \"hover text\")\n\nand\n\n[![Build Status](https://travis-ci.org/mattermost/platform.svg?branch=master)](https://travis-ci.org/mattermost/platform) [![Github](https://assets-cdn.github.com/favicon.ico)](https://github.com/mattermost/platform)",
+  "help.formatting.inline": "## In-line Code\n\nCreate in-line monospaced font by surrounding it with backticks.",
+  "help.formatting.intro": "Markdown makes it easy to format messages. Type a message as you normally would, and use these rules to render it with special formatting.",
+  "help.formatting.lines": "## Lines\n\nCreate a line by using three `*`, `_`, or `-`.",
+  "help.formatting.linkEx": "[Check out Mattermost!](https://about.mattermost.com/)",
+  "help.formatting.links": "## Links\n\nCreate labeled links by putting the desired text in square brackets and the associated link in normal brackets.",
+  "help.formatting.listExample": "* list item one\n* list item two\n    * item two sub-point",
+  "help.formatting.lists": "## Lists\n\nCreate a list by using `*` or `-` as bullets. Indent a bullet point by adding two spaces in front of it.",
+  "help.formatting.monokaiTheme": "**Monokai Theme**",
+  "help.formatting.ordered": "Make it an ordered list by using numbers instead:",
+  "help.formatting.orderedExample": "1. Item one\n2. Item two",
+  "help.formatting.quotes": "## Block quotes\n\nCreate block quotes using `>`.",
+  "help.formatting.quotesExample": "`> block quotes` renders as:",
+  "help.formatting.quotesRender": "> block quotes",
+  "help.formatting.renders": "Renders as:",
+  "help.formatting.solirizedDarkTheme": "**Solarized Dark Theme**",
+  "help.formatting.solirizedLightTheme": "**Solarized Light Theme**",
+  "help.formatting.style": "## Text Style\n\nYou can use either `_` or `*` around a word to make it italic. Use two to make it bold.\n\n* `_italics_` renders as _italics_\n* `**bold**` renders as **bold**\n* `**_bold-italic_**` renders as **_bold-italics_**\n* `~~strikethrough~~` renders as ~~strikethrough~~",
+  "help.formatting.supportedSyntax": "Supported languages are:\n`as`, `applescript`, `osascript`, `scpt`, `bash`, `sh`, `zsh`, `clj`, `boot`, `cl2`, `cljc`, `cljs`, `cljs.hl`, `cljscm`, `cljx`, `hic`, `coffee`, `_coffee`, `cake`, `cjsx`, `cson`, `iced`, `cpp`, `c`, `cc`, `h`, `c++`, `h++`, `hpp`, `cs`, `csharp`, `css`, `d`, `di`, `dart`, `delphi`, `dpr`, `dfm`, `pas`, `pascal`, `freepascal`, `lazarus`, `lpr`, `lfm`, `diff`, `django`, `jinja`, `dockerfile`, `docker`, `erl`, `f90`, `f95`, `fsharp`, `fs`, `gcode`, `nc`, `go`, `groovy`, `handlebars`, `hbs`, `html.hbs`, `html.handlebars`, `hs`, `hx`, `java`, `jsp`, `js`, `jsx`, `json`, `jl`, `kt`, `ktm`, `kts`, `less`, `lisp`, `lua`, `mk`, `mak`, `md`, `mkdown`, `mkd`, `matlab`, `m`, `mm`, `objc`, `obj-c`, `ml`, `perl`, `pl`, `php`, `php3`, `php4`, `php5`, `php6`, `ps`, `ps1`, `pp`, `py`, `gyp`, `r`, `ruby`, `rb`, `gemspec`, `podspec`, `thor`, `irb`, `rs`, `scala`, `scm`, `sld`, `scss`, `st`, `sql`, `swift`, `tex`, `vbnet`, `vb`, `bas`, `vbs`, `v`, `veo`, `xml`, `html`, `xhtml`, `rss`, `atom`, `xsl`, `plist`, `yaml`",
+  "help.formatting.syntax": "### Syntax Highlighting\n\nTo add syntax highlighting, type the language to be highlighted after the ``` at the beginning of the code block. Mattermost also offers four different code themes (GitHub, Solarized Dark, Solarized Light, Monokai) that can be changed in **Account Settings** > **Display** > **Theme** > **Custom Theme** > **Center Channel Styles**",
   "help.formatting.syntaxEx": "    package main\n    import \"fmt\"\n    func main() {\n        fmt.Println(\"Hello, 世界\")\n    }",
-  "help.formatting.tableExample": "| Alinhado a Esquerda  | Centralizado  | Alinhado a Direita |\n| :------------ |:---------------:| -----:|\n| Coluna Esquerda 1 | este texto       |  $100 |\n| Coluna Esquerda 2 | é              |   $10 |\n| Coluna Esquerda 3 | centralizado    |    $1 |",
-  "help.formatting.tables": "## Tabelas\n\nCrie uma tabela, colocando uma linha tracejada abaixo da linha de cabeçalho e separando as colunas com o carácter `|`. (As colunas não precisam se alinhar exatamente para que ele funcione). Escolha como alinhar colunas da tabela incluindo dois-pontos `:` dentro da linha de cabeçalho.",
-  "help.formatting.title": "# Formatando Texto\n_____",
-  "help.learnMore": "Leai mais sobre:",
-  "help.link.attaching": "Anexando Arquivos",
-  "help.link.commands": "Executando Comandos",
-  "help.link.composing": "Compondo Mensagens e Respostas",
-  "help.link.formatting": "Formatando Mensagens usando Markdown",
-  "help.link.mentioning": "Mencionando Colegas de Equipe",
-  "help.link.messaging": "Mensagens Básicas",
-  "help.mentioning.channel": "#### @Canal\nVocê pode mencionar um canal todo digitando `@channel`. Todos os membros do canal irão receber uma menção de notificação da mesma forma que se os membros tivessem sido mencionados pessoalmente.",
-  "help.mentioning.channelExample": "@channel grande trabalho nas entrevistas está semana. Eu acho que nós encontramos alguns excelentes potenciais candidatos!",
-  "help.mentioning.mentions": "## @Menções\nUse @menção para chamar atenção de um membro específico da equipe.",
-  "help.mentioning.recent": "## Menções Recentes\nClique `@` ao lado da caixa de pesquisa para consultar suas @menções recentes e palavras que disparam menções. Clique **Pular** ao lado do resultado da busca na barra lateral direita para pular ao painel central do canal no local da mensagem com a menção.",
-  "help.mentioning.title": "# Mencionando Colegas de Equipe\n_____",
-  "help.mentioning.triggers": "## Palavras Que Disparam Menções\nAlém de ter sido notificada por @usuário e @channel, você pode personalizar as palavras que desencadeiam notificações de menção em **Configurações de Conta** > **Notificações** > **Palavras que desencadeiam menções**. Por padrão você receberá notificações de menção em seu nome, e você pode adicionar mais palavras, escrevendo-as na caixa de entrada separados por vírgulas. Isso é útil se você quiser ser notificado de todas as mensagens sobre determinados temas, por exemplo, \"entrevista\" ou \"marketing\".",
-  "help.mentioning.username": "#### @Usuário\nVocê pode mencionar um colega de equipe usando o símbolo '@' mais seu nome de usuário para enviar uma notificação menção.\n\nDigite `@` para abrir uma lista de membros da equipe que podem ser mencionados. Para filtrar a lista, digite as primeiras letras de qualquer nome de usuário, nome, sobrenome ou apelido. As teclas de seta **Cima** e **Baixo** podem então ser usada para percorrer as entradas na lista, e pressione **ENTER** para selecionar qual o usuário a mencionar. Uma vez selecionado, o nome de usuário irá substituir automaticamente o nome completo ou apelido.\nO exemplo a seguir envia uma notificação menção especial a **alice** que a alerta do canal e mensagem onde ela foi mencionada. Se **alice** está ausente do Mattermost e tem ativo [notificações de e-mail](http://docs.mattermost.com/help/getting-started/configuring-notifications.html#email-notifications), então ela vai receber um alerta de e-mail de sua menção juntamente com o texto da mensagem.",
-  "help.mentioning.usernameCont": "Se o usuário que você mencionou não pertence ao canal, uma mensagem do sistema será enviada para informá-lo. Esta é uma mensagem temporária visto apenas pela pessoa que desencadeou. Para adicionar o usuário mencionado para o canal, vá para o menu suspenso ao lado do nome do canal e selecione **Adicionar Membros**.",
-  "help.mentioning.usernameExample": "@alice como foi sua entrevista como é o novo candidato?",
-  "help.messaging.attach": "**Anexar arquivos** arrastando e soltando no Mattermost ou clicando no ícone anexo na caixa de entrada. ",
-  "help.messaging.emoji": "**Rapidamente adicione emoji** digitando \":\", que irá abrir uma lista de emoji. Se os emojis existentes não cobrem o que você quer expressar, você pode também criar seu próprio [Emoji Personalizado](http://docs.mattermost.com/help/settings/custom-emoji.html).",
-  "help.messaging.format": "**Formate suas mensagens** usando Markdown que suporta o estilo do texto, títulos, links, emojis, blocos de código, citar bloco, tabelas, listas e imagens na linha.",
-  "help.messaging.notify": "**Notificar colegas de equipe** quando eles são necessários digitando `@usuário`",
-  "help.messaging.reply": "**Responder a mensagens** clicando na seta de resposta ao lado do texto da mensagem.",
-  "help.messaging.title": "# Mensagens Básico\n_____",
-  "help.messaging.write": "**Escreva mensagens** usando a caixa de texto na parte inferior do Mattermost. Pressione **ENTER** para enviar a mensagem. Use **Shift+ENTER** para criar uma nova linha sem enviar a mensagem.",
-  "installed_command.header": "Comandos Slash",
-  "installed_commands.add": "Adicionar Comando Slash",
-  "installed_commands.empty": "Nenhum comando encotrado",
-  "installed_commands.header": "Comandos Slash",
-  "installed_commands.help": "Criar comandos slash para uso em integrações internas. Por favor veja {link} para aprender mais.",
-  "installed_commands.helpLink": "documentação",
-  "installed_commands.search": "Pesquisar Comandos Slash",
-  "installed_commands.unnamed_command": "Comando Slash sem Nome",
-  "installed_incoming_webhooks.add": "Adicionar Webhooks Entrada",
-  "installed_incoming_webhooks.empty": "Nenhum webhook de entrada encontrado",
-  "installed_incoming_webhooks.header": "Webhooks Entrada",
-  "installed_incoming_webhooks.help": "Criar URLs para webhook de entrada para uso em integrações externas. Por favor veja {link} para aprender mais.",
-  "installed_incoming_webhooks.helpLink": "documentação",
-  "installed_incoming_webhooks.search": "Pesquisar Webhooks de Entrada",
-  "installed_incoming_webhooks.unknown_channel": "Webhook Privado",
+  "help.formatting.tableExample": "| Left-Aligned  | Center Aligned  | Right Aligned |\n| :------------ |:---------------:| -----:|\n| Left column 1 | this text       |  $100 |\n| Left column 2 | is              |   $10 |\n| Left column 3 | centered        |    $1 |",
+  "help.formatting.tables": "## Tables\n\nCreate a table by placing a dashed line under the header row and separating the columns with a pipe `|`. (The columns don’t need to line up exactly for it to work). Choose how to align table columns by including colons `:` within the header row.",
+  "help.formatting.title": "# Formatting Text\n_____",
+  "help.learnMore": "Learn more about:",
+  "help.link.attaching": "Attaching Files",
+  "help.link.commands": "Executing Commands",
+  "help.link.composing": "Composing Messages and Replies",
+  "help.link.formatting": "Formatting Messages using Markdown",
+  "help.link.mentioning": "Mentioning Teammates",
+  "help.link.messaging": "Basic Messaging",
+  "help.mentioning.channel": "#### @Channel\nYou can mention an entire channel by typing `@channel`. All members of the channel will receive a mention notification that behaves the same way as if the members had been mentioned personally.",
+  "help.mentioning.channelExample": "@channel great work on interviews this week. I think we found some excellent potential candidates!",
+  "help.mentioning.mentions": "## @Mentions\nUse @mentions to get the attention of specific team members.",
+  "help.mentioning.recent": "## Recent Mentions\nClick `@` next to the search box to query for your most recent @mentions and words that trigger mentions. Click **Jump** next to a search result in the RHS to jump the center pane to the channel and location of the message with the mention.",
+  "help.mentioning.title": "# Mentioning Teammates\n_____",
+  "help.mentioning.triggers": "## Words That Trigger Mentions\nIn addition to being notified by @username and @channel, you can customize words that trigger mention notifications in **Account Settings** > **Notifications** > **Words that trigger mentions**. By default, you will receive mention notifications on your first name, and you can add more words by typing them into the input box separated by commas. This is useful if you want to be notified of all posts on certain topics, for example, “interviewing” or “marketing”.",
+  "help.mentioning.username": "#### @Username\nYou can mention a teammate by using the `@` symbol plus their username to send them a mention notification.\n\nType `@` to bring up a list of team members who can be mentioned. To filter the list, type the first few letters of any username, first name, last name, or nickname. The **Up** and **Down** arrow keys can then be used to scroll through entries in the list, and pressing **ENTER** will select which user to mention. Once selected, the username will automatically replace the full name or nickname.\nThe following example sends a special mention notification to **alice** that alerts her of the channel and message where she has been mentioned. If **alice** is away from Mattermost and has [email notifications](http://docs.mattermost.com/help/getting-started/configuring-notifications.html#email-notifications) turned on, then she will receive an email alert of her mention along with the message text.",
+  "help.mentioning.usernameCont": "If the user you mentioned does not belong to the channel, a System Message will be posted to let you know. This is a temporary message only seen by the person who triggered it. To add the mentioned user to the channel, go to the dropdown menu beside the channel name and select **Add Members**.",
+  "help.mentioning.usernameExample": "@alice how did your interview go with the new candidate?",
+  "help.messaging.attach": "**Attach files** by dragging and dropping into Mattermost or clicking the attachment icon in the text input box.",
+  "help.messaging.emoji": "**Quickly add emoji** by typing \":\", which will open an emoji autocomplete. If the existing emoji don't cover what you want to express, you can also create your own [Custom Emoji](http://docs.mattermost.com/help/settings/custom-emoji.html).",
+  "help.messaging.format": "**Format your messages** using Markdown that supports text styling, headings, links, emoticons, code blocks, block quotes, tables, lists and in-line images.",
+  "help.messaging.notify": "**Notify teammates** when they are needed by typing `@username`.",
+  "help.messaging.reply": "**Reply to messages** by clicking the reply arrow next to the message text.",
+  "help.messaging.title": "# Messaging Basics\n_____",
+  "help.messaging.write": "**Write messages** using the text input box at the bottom of Mattermost. Press **ENTER** to send a message. Use **Shift+ENTER** to create a new line without sending a message.",
+  "installed_command.header": "Slash Commands",
+  "installed_commands.add": "Add Slash Command",
+  "installed_commands.empty": "No commands found",
+  "installed_commands.header": "Slash Commands",
+  "installed_commands.help": "Create slash commands for use in external integrations. Please see the {link} to learn more.",
+  "installed_commands.helpLink": "documentation",
+  "installed_commands.search": "Search Slash Commands",
+  "installed_commands.unnamed_command": "Unnamed Slash Command",
+  "installed_incoming_webhooks.add": "Add Incoming Webhook",
+  "installed_incoming_webhooks.empty": "No incoming webhooks found",
+  "installed_incoming_webhooks.header": "Incoming Webhooks",
+  "installed_incoming_webhooks.help": "Create incoming webhook URLs for use in external integrations. Please see the {link} to learn more.",
+  "installed_incoming_webhooks.helpLink": "documentation",
+  "installed_incoming_webhooks.search": "Search Incoming Webhooks",
+  "installed_incoming_webhooks.unknown_channel": "A Private Webhook",
   "installed_integrations.callback_urls": "Callback URLs: {urls}",
-  "installed_integrations.client_id": "ID do Client: <strong>{clientId}</strong>",
-  "installed_integrations.client_secret": "Chave Secreta do Cliente: <strong>{clientSecret}</strong>",
+  "installed_integrations.client_id": "Client ID: <strong>{clientId}</strong>",
+  "installed_integrations.client_secret": "Client Secret: <strong>{clientSecret}</strong>",
   "installed_integrations.content_type": "Content-Type: {contentType}",
-  "installed_integrations.creation": "Criado por {creator} em {createAt, date, full}",
-  "installed_integrations.delete": "Deletar",
-  "installed_integrations.hideSecret": "Ocultar Segredo",
-  "installed_integrations.regenSecret": "Gerar Novamente Chave Secreta",
-  "installed_integrations.regenToken": "Re-gerar Token",
-  "installed_integrations.showSecret": "Mostrar Segredo",
+  "installed_integrations.creation": "Created by {creator} on {createAt, date, full}",
+  "installed_integrations.delete": "Delete",
+  "installed_integrations.hideSecret": "Hide Secret",
+  "installed_integrations.regenSecret": "Regenerate Secret",
+  "installed_integrations.regenToken": "Regenerate Token",
+  "installed_integrations.showSecret": "Show Secret",
   "installed_integrations.token": "Token: {token}",
-  "installed_integrations.triggerWhen": "Gatilho Quando: {triggerWhen}",
-  "installed_integrations.triggerWords": "Palavras Gatilho: {triggerWords}",
-  "installed_integrations.unnamed_oauth_app": "Aplicativo OAuth 2.0 sem nome",
+  "installed_integrations.triggerWhen": "Trigger When: {triggerWhen}",
+  "installed_integrations.triggerWords": "Trigger Words: {triggerWords}",
+  "installed_integrations.unnamed_oauth_app": "Unnamed OAuth 2.0 Application",
   "installed_integrations.url": "URL: {url}",
-  "installed_oauth_apps.add": "Adicionar Aplicativo OAuth 2.0",
-  "installed_oauth_apps.callbackUrls": "URLs Callback (Uma Por Linha)",
-  "installed_oauth_apps.cancel": "Cancelar",
-  "installed_oauth_apps.description": "Descrição",
-  "installed_oauth_apps.empty": "Nenhum Aplicativo OAuth 2.0 encontrado",
-  "installed_oauth_apps.header": "Aplicativos OAuth 2.0",
-  "installed_oauth_apps.help": "Aplicativos OAuth 2.0 estão disponíveis para todo mundo no seu servidor.",
-  "installed_oauth_apps.homepage": "Página inicial",
-  "installed_oauth_apps.iconUrl": "URL do Ícone",
-  "installed_oauth_apps.is_trusted": "É Confiável: <strong>{isTrusted}</strong>",
-  "installed_oauth_apps.name": "Nome de Exibição",
-  "installed_oauth_apps.save": "Salvar",
-  "installed_oauth_apps.search": "Pesquisar Aplicativos OAuth 2.0",
-  "installed_oauth_apps.trusted": "É Confiável",
-  "installed_oauth_apps.trusted.no": "Não",
-  "installed_oauth_apps.trusted.yes": "Sim",
-  "installed_outgoing_webhooks.add": "Adicionar Webhooks Saída",
-  "installed_outgoing_webhooks.empty": "Nenhum webhook de saída encontrado",
-  "installed_outgoing_webhooks.header": "Webhooks Saída",
-  "installed_outgoing_webhooks.help": "Criar URLs para webhook de saída para uso em integrações externas. Por favor veja {link} para aprender mais.",
-  "installed_outgoing_webhooks.helpLink": "documentação",
-  "installed_outgoing_webhooks.search": "Pesquisar Webhooks de Saída",
-  "installed_outgoing_webhooks.unknown_channel": "Webhook Privado",
-  "integrations.add": "Adicionar",
-  "integrations.command.description": "Comandos slash envia evento para integrações externas",
-  "integrations.command.title": "Comando Slash",
-  "integrations.done": "Feito",
-  "integrations.header": "Integrações",
-  "integrations.incomingWebhook.description": "Webhooks de entrada permite que integrações externas envie mensagens",
-  "integrations.incomingWebhook.title": "Webhooks Entrada",
-  "integrations.oauthApps.description": "OAuth 2.0 permite que aplicativos externos façam solicitações autorizada para a API Mattermost.",
-  "integrations.oauthApps.title": "Aplicativos OAuth 2.0",
-  "integrations.outgoingWebhook.description": "Webhooks de saída permite que integrações externas recebam e respondam a mensagens",
-  "integrations.outgoingWebhook.title": "Webhooks Saída",
-  "intro_messages.DM": "Este é o início do seu histórico de mensagens diretas com {teammate}.<br />Mensagens diretas e arquivos compartilhados aqui não são mostrados para pessoas de fora desta área.",
-  "intro_messages.anyMember": " Qualquer membro pode participar e ler este canal.",
-  "intro_messages.beginning": "Início do {name}",
-  "intro_messages.channel": "canal",
-  "intro_messages.creator": "Este é o inicio do <strong>{name}</strong> {type}, criado por <strong>{creator}</strong> em <strong>{date}</strong>",
-  "intro_messages.default": "<h4 class='channel-intro__title'>Inicio do {display_name}</h4><p class='channel-intro__content'><strong>Bem-vindo a {display_name}!</strong><br/><br/>Este é o primeiro canal que sua equipe de trabalho vê quando eles se inscrevem - use para postar atualizações que todos precisam saber.</p>",
-  "intro_messages.group": "grupos privados",
-  "intro_messages.invite": "Convidar outras pessoas para este {type}",
-  "intro_messages.inviteOthers": "Convide outros para esta equipe",
-  "intro_messages.noCreator": "Este é o início do {name} {type}, criado em {date}.",
-  "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">Início do {display_name}</h4><p class=\"channel-intro__content\">Este é o início do {display_name}, um canal para conversas não relacionadas ao trabalho<br/></p>",
-  "intro_messages.onlyInvited": " Somente membros convidados podem ver este grupo privado.",
-  "intro_messages.setHeader": "Definir um Cabeçalho",
-  "intro_messages.teammate": "Este é o início de seu histórico de mensagens com esta equipe. Mensagens diretas e arquivos compartilhados aqui não são mostrados para pessoas fora dessa área.",
-  "invite_member.addAnother": "Adicionar outro",
-  "invite_member.autoJoin": "Pessoas convidadas a participar automaticamente do canal <strong>{channel}</strong>.",
-  "invite_member.cancel": "Cancelar",
-  "invite_member.content": "E-mail está desativado para a sua equipe, e emails de convites não podem ser enviados. Contate o seu Administrador do Sistema para ativar e-mail e convites por e-mail.",
-  "invite_member.disabled": "Criação de usuários está desabilitada para sua equipe. Por favor peça ao Administrador de Equipe por detalhes.",
-  "invite_member.emailError": "Por favor entre um endereço de e-mail válido",
-  "invite_member.firstname": "Primeiro nome",
-  "invite_member.inviteLink": "Link para Convite de Equipe",
-  "invite_member.lastname": "Último nome",
-  "invite_member.modalButton": "Sim, Descartar",
-  "invite_member.modalMessage": "Você tem convites não enviados, você tem certeza que quer descartar eles?",
-  "invite_member.modalTitle": "Descartar Convites?",
-  "invite_member.newMember": "Convidar Para Equipe",
-  "invite_member.send": "Enviar Convite",
-  "invite_member.send2": "Enviar Convites",
-  "invite_member.sending": " Enviando",
-  "invite_member.teamInviteLink": "Você também pode convidar pessoas usando o {link}",
-  "ldap_signup.find": "Encontrar minhas equipes",
-  "ldap_signup.ldap": "Criar uma equipe com uma conta LDAP",
-  "ldap_signup.length_error": "O nome deve ser de 3 ou mais caracteres até um máximo de 15",
-  "ldap_signup.teamName": "Entre o nome da nova equipe",
-  "ldap_signup.team_error": "Por favor entre o nome da equipe",
-  "leave_team_modal.desc": "Você será removido de todos os canais públicos e grupos privados.  Se a equipe é privada você não será capaz de se juntar à equipe.  Você tem certeza?",
-  "leave_team_modal.no": "Não",
-  "leave_team_modal.title": "Deixar a equipe?",
-  "leave_team_modal.yes": "Sim",
-  "loading_screen.loading": "Carregando",
-  "login.changed": " Método de login alterada com sucesso",
-  "login.create": "Crie um agora",
-  "login.createTeam": "Criar uma nova equipe",
-  "login.createTeamAdminOnly": "Está opção está disponível somente para o Administrador do Sistema, e não é exibida para outros usuários.",
-  "login.email": "E-mail",
-  "login.find": "Encontre suas outras equipes",
-  "login.forgot": "Eu esqueci a minha senha",
+  "installed_oauth_apps.add": "Add OAuth 2.0 Application",
+  "installed_oauth_apps.callbackUrls": "Callback URLs (One Per Line)",
+  "installed_oauth_apps.cancel": "Cancel",
+  "installed_oauth_apps.description": "Description",
+  "installed_oauth_apps.empty": "No OAuth 2.0 Applications found",
+  "installed_oauth_apps.header": "OAuth 2.0 Applications",
+  "installed_oauth_apps.help": "OAuth 2.0 Applications are available to everyone on your server.",
+  "installed_oauth_apps.homepage": "Homepage",
+  "installed_oauth_apps.iconUrl": "Icon URL",
+  "installed_oauth_apps.is_trusted": "Is Trusted: <strong>{isTrusted}</strong>",
+  "installed_oauth_apps.name": "Display Name",
+  "installed_oauth_apps.save": "Save",
+  "installed_oauth_apps.search": "Search OAuth 2.0 Applications",
+  "installed_oauth_apps.trusted": "Is Trusted",
+  "installed_oauth_apps.trusted.no": "No",
+  "installed_oauth_apps.trusted.yes": "Yes",
+  "installed_outgoing_webhooks.add": "Add Outgoing Webhook",
+  "installed_outgoing_webhooks.empty": "No outgoing webhooks found",
+  "installed_outgoing_webhooks.header": "Outgoing Webhooks",
+  "installed_outgoing_webhooks.help": "Create outgoing webhook URLs for use in external integrations. Please see the {link} to learn more.",
+  "installed_outgoing_webhooks.helpLink": "documentation",
+  "installed_outgoing_webhooks.search": "Search Outgoing Webhooks",
+  "installed_outgoing_webhooks.unknown_channel": "A Private Webhook",
+  "integrations.add": "Add",
+  "integrations.command.description": "Slash commands send events to external integrations",
+  "integrations.command.title": "Slash Command",
+  "integrations.done": "Done",
+  "integrations.header": "Integrations",
+  "integrations.incomingWebhook.description": "Incoming webhooks allow external integrations to send messages",
+  "integrations.incomingWebhook.title": "Incoming Webhook",
+  "integrations.oauthApps.description": "OAuth 2.0 allows external applications to make authorized requests to the Mattermost API.",
+  "integrations.oauthApps.title": "OAuth 2.0 Applications",
+  "integrations.outgoingWebhook.description": "Outgoing webhooks allow external integrations to receive and respond to messages",
+  "integrations.outgoingWebhook.title": "Outgoing Webhook",
+  "integrations.successful": "Setup Successful",
+  "intro_messages.DM": "This is the start of your direct message history with {teammate}.<br />Direct messages and files shared here are not shown to people outside this area.",
+  "intro_messages.anyMember": " Any member can join and read this channel.",
+  "intro_messages.beginning": "Beginning of {name}",
+  "intro_messages.channel": "channel",
+  "intro_messages.creator": "This is the start of the <strong>{name}</strong> {type}, created by <strong>{creator}</strong> on <strong>{date}</strong>",
+  "intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.</p>",
+  "intro_messages.group": "private group",
+  "intro_messages.invite": "Invite others to this {type}",
+  "intro_messages.inviteOthers": "Invite others to this team",
+  "intro_messages.noCreator": "This is the start of the {name} {type}, created on {date}.",
+  "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">Beginning of {display_name}</h4><p class=\"channel-intro__content\">This is the start of {display_name}, a channel for non-work-related conversations.<br/></p>",
+  "intro_messages.onlyInvited": " Only invited members can see this private group.",
+  "intro_messages.setHeader": "Set a Header",
+  "intro_messages.teammate": "This is the start of your direct message history with this teammate. Direct messages and files shared here are not shown to people outside this area.",
+  "invite_member.addAnother": "Add another",
+  "invite_member.autoJoin": "People invited automatically join the <strong>{channel}</strong> channel.",
+  "invite_member.cancel": "Cancel",
+  "invite_member.content": "Email is currently disabled for your team, and email invitations cannot be sent. Contact your System Administrator to enable email and email invitations.",
+  "invite_member.disabled": "User creation has been disabled for your team. Please ask your Team Administrator for details.",
+  "invite_member.emailError": "Please enter a valid email address",
+  "invite_member.firstname": "First name",
+  "invite_member.inviteLink": "Team Invite Link",
+  "invite_member.lastname": "Last name",
+  "invite_member.modalButton": "Yes, Discard",
+  "invite_member.modalMessage": "You have unsent invitations, are you sure you want to discard them?",
+  "invite_member.modalTitle": "Discard Invitations?",
+  "invite_member.newMember": "Invite New Member",
+  "invite_member.send": "Send Invitation",
+  "invite_member.send2": "Send Invitations",
+  "invite_member.sending": " Sending",
+  "invite_member.teamInviteLink": "You can also invite people using the {link}.",
+  "ldap_signup.find": "Find my teams",
+  "ldap_signup.ldap": "Create team with AD/LDAP Account",
+  "ldap_signup.length_error": "Name must be 3 or more characters up to a maximum of 15",
+  "ldap_signup.teamName": "Enter name of new team",
+  "ldap_signup.team_error": "Please enter a team name",
+  "leave_team_modal.desc": "You will be removed from all public channels and private groups.  If the team is private you will not be able to rejoin the team.  Are you sure?",
+  "leave_team_modal.no": "No",
+  "leave_team_modal.title": "Leave the team?",
+  "leave_team_modal.yes": "Yes",
+  "loading_screen.loading": "Loading",
+  "login.changed": " Sign-in method changed successfully",
+  "login.create": "Create one now",
+  "login.createTeam": "Create a new team",
+  "login.createTeamAdminOnly": "This option is only available for System Administrators, and does not show up for other users.",
+  "login.email": "Email",
+  "login.find": "Find your other teams",
+  "login.forgot": "I forgot my password",
   "login.gitlab": "GitLab",
   "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.noEmail": "Por favor digite seu email",
-  "login.noEmailLdapUsername": "Por favor digite seu email ou {ldapUsername}",
-  "login.noEmailUsername": "Por favor digite seu email ou usuário",
-  "login.noEmailUsernameLdapUsername": "Por favor digite seu email, usuário ou {ldapUsername}",
-  "login.noLdapUsername": "Por favor digite seu {ldapUsername}",
-  "login.noMethods": "Nenhum método de login configurado. Por favor contate seu Administrador do Sistema.",
-  "login.noPassword": "Por favor digite a sua senha",
-  "login.noUsername": "Por favor digite seu usuário",
-  "login.noUsernameLdapUsername": "Por favor digite seu usuário ou {ldapUsername}",
+  "login.invalidPassword": "Your password is incorrect.",
+  "login.ldapUsername": "AD/LDAP Username",
+  "login.ldapUsernameLower": "AD/LDAP username",
+  "login.noAccount": "Don't have an account? ",
+  "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.noMethods": "No sign-in methods are enabled. Please contact your System Administrator.",
+  "login.noPassword": "Please enter your password",
+  "login.noUsername": "Please enter your username",
+  "login.noUsernameLdapUsername": "Please enter your username or {ldapUsername}",
   "login.office365": "Office 365",
-  "login.on": "no {siteName}",
-  "login.or": "ou",
-  "login.password": "Senha",
-  "login.passwordChanged": " Senha atualizada com sucesso",
-  "login.session_expired": " Sua sessão expirou. Por favor faça login novamente.",
-  "login.signIn": "Login",
-  "login.signInWith": "Login com:",
-  "login.userNotFound": "Não foi possível encontrar uma conta que corresponda com as suas credenciais de login.",
-  "login.username": "Usuário",
-  "login.verified": " Email Verificado",
-  "login_mfa.enterToken": "Para completar o login em processo, por favor entre um token do seu autenticador no smartphone",
-  "login_mfa.submit": "Enviar",
-  "login_mfa.token": "Token MFA",
-  "login_mfa.tokenReq": "Por favor entre um token MFA",
-  "member_item.makeAdmin": "Tornar Admin",
-  "member_item.member": "Membro",
-  "member_list.noUsersAdd": "Nenhum usuário para adicionar.",
-  "members_popover.msg": "Mensagem",
-  "members_popover.title": "Membros",
-  "more_channels.close": "Fechar",
-  "more_channels.create": "Criar Novo Canal",
-  "more_channels.createClick": "Clique em 'Criar Novo Canal' para fazer um novo",
-  "more_channels.join": "Participar",
-  "more_channels.noMore": "Não há mais canais para participar",
-  "more_channels.title": "Mais Canais",
-  "more_direct_channels.close": "Fechar",
-  "more_direct_channels.message": "Mensagem",
-  "more_direct_channels.title": "Mensagens Diretas",
-  "msg_typing.areTyping": "{users} e {last} estão digitando...",
-  "msg_typing.isTyping": "{user} está digitando...",
-  "msg_typing.someone": "Alguém",
-  "navbar.addMembers": "Adicionar Membros",
-  "navbar.click": "Clique aqui",
-  "navbar.delete": "Deletar Canal...",
-  "navbar.leave": "Deixar o Canal",
-  "navbar.manageMembers": "Gerenciar Membros",
-  "navbar.noHeader": "Sem cabeçalho de canal.{newline}{link} adicionar um.",
-  "navbar.preferences": "Preferências de Notificação",
-  "navbar.rename": "Renomear Canal...",
-  "navbar.setHeader": "Definir Cabeçalho do Canal...",
-  "navbar.setPurpose": "Definir Propósito do Canal...",
-  "navbar.toggle1": "Alternar barra lateral",
-  "navbar.toggle2": "Alternar barra lateral",
-  "navbar.viewInfo": "Ver Informações",
-  "navbar_dropdown.about": "Sobre o Mattermost",
-  "navbar_dropdown.accountSettings": "Definições de Conta",
-  "navbar_dropdown.console": "Console do Sistema",
-  "navbar_dropdown.create": "Criar uma Nova Equipe",
-  "navbar_dropdown.emoji": "Emoji Personalizado",
-  "navbar_dropdown.help": "Ajuda",
-  "navbar_dropdown.integrations": "Integrações",
-  "navbar_dropdown.inviteMember": "Convidar Para Equipe",
-  "navbar_dropdown.leave": "Sair da Equipe",
+  "login.on": "on {siteName}",
+  "login.or": "or",
+  "login.password": "Password",
+  "login.passwordChanged": " Password updated successfully",
+  "login.session_expired": " Your session has expired. Please login again.",
+  "login.signIn": "Sign in",
+  "login.signInWith": "Sign in with:",
+  "login.userNotFound": "We couldn't find an account matching your login credentials.",
+  "login.username": "Username",
+  "login.verified": " Email Verified",
+  "login_mfa.enterToken": "To complete the sign in process, please enter a token from your smartphone's authenticator",
+  "login_mfa.submit": "Submit",
+  "login_mfa.token": "MFA Token",
+  "login_mfa.tokenReq": "Please enter an MFA token",
+  "member_item.makeAdmin": "Make Admin",
+  "member_item.member": "Member",
+  "member_list.noUsersAdd": "No users to add.",
+  "members_popover.msg": "Message",
+  "members_popover.title": "Members",
+  "more_channels.close": "Close",
+  "more_channels.create": "Create New Channel",
+  "more_channels.createClick": "Click 'Create New Channel' to make a new one",
+  "more_channels.join": "Join",
+  "more_channels.noMore": "No more channels to join",
+  "more_channels.title": "More Channels",
+  "more_direct_channels.close": "Close",
+  "more_direct_channels.message": "Message",
+  "more_direct_channels.title": "Direct Messages",
+  "msg_typing.areTyping": "{users} and {last} are typing...",
+  "msg_typing.isTyping": "{user} is typing...",
+  "msg_typing.someone": "Someone",
+  "navbar.addMembers": "Add Members",
+  "navbar.click": "Click here",
+  "navbar.delete": "Delete Channel...",
+  "navbar.leave": "Leave Channel",
+  "navbar.manageMembers": "Manage Members",
+  "navbar.noHeader": "No channel header yet.{newline}{link} to add one.",
+  "navbar.preferences": "Notification Preferences",
+  "navbar.rename": "Rename Channel...",
+  "navbar.setHeader": "Set Channel Header...",
+  "navbar.setPurpose": "Set Channel Purpose...",
+  "navbar.toggle1": "Toggle sidebar",
+  "navbar.toggle2": "Toggle sidebar",
+  "navbar.viewInfo": "View Info",
+  "navbar_dropdown.about": "About Mattermost",
+  "navbar_dropdown.accountSettings": "Account Settings",
+  "navbar_dropdown.console": "System Console",
+  "navbar_dropdown.create": "Create a New Team",
+  "navbar_dropdown.emoji": "Custom Emoji",
+  "navbar_dropdown.help": "Help",
+  "navbar_dropdown.integrations": "Integrations",
+  "navbar_dropdown.inviteMember": "Invite New Member",
+  "navbar_dropdown.leave": "Leave Team",
   "navbar_dropdown.logout": "Logout",
-  "navbar_dropdown.manageMembers": "Gerenciar Membros",
-  "navbar_dropdown.nativeApps": "Download Mattermost Apps",
-  "navbar_dropdown.report": "Relatar um Problema",
-  "navbar_dropdown.switchTeam": "Mudar para {team}",
-  "navbar_dropdown.switchTo": "Mudar para ",
-  "navbar_dropdown.teamLink": "Obter Link Convite de Equipe",
-  "navbar_dropdown.teamSettings": "Configurações da Equipe",
-  "navbar_dropdown.viewMembers": "Ver Membros",
-  "notification.dm": "Mensagem Direta",
-  "password_form.change": "Alterar minha senha",
-  "password_form.click": "Clique <a href={url}>aqui</a> para logar.",
-  "password_form.enter": "Entre a nova senha para o sua conta {siteName}.",
-  "password_form.error": "Por favor, insira pelo menos {chars} caracteres.",
-  "password_form.pwd": "Senha",
-  "password_form.title": "Resetar Senha",
-  "password_form.update": "Sua senha foi atualizada com sucesso.",
-  "password_send.checkInbox": "Por favor verifique sua caixa de entrada.",
-  "password_send.description": "Para resetar sua senha, entre o endereço de email que você usou para se inscrever.",
-  "password_send.email": "E-mail",
-  "password_send.error": "Por favor entre um endereço de e-mail válido.",
-  "password_send.link": "<p>Um link para resetar senha foi enviado para <b>{email}</b></p>",
-  "password_send.reset": "Resetar minha senha",
-  "password_send.title": "Resetar Senha",
-  "pdf_preview.max_pages": "Visualização de PDF somente mostra as cinco primeiras páginas.",
-  "pending_post_actions.cancel": "Cancelar",
-  "pending_post_actions.retry": "Tentar novamente",
-  "permalink.error.access": "O permalink pertence a uma mensagem deletada ou a um canal o qual você não tem acesso.",
-  "post_attachment.collapse": "Mostrar menos...",
-  "post_attachment.more": "Mostrar mais...",
-  "post_body.commentedOn": "Comentado da mensagem {name}{apostrophe}: ",
-  "post_body.deleted": "(mensagem deletada)",
-  "post_body.plusMore": " mais {count} outros arquivos",
-  "post_body.plusOne": " mais 1 outro arquivo",
-  "post_delete.notPosted": "Comentário não pode ser postado",
-  "post_delete.okay": "Ok",
-  "post_delete.someone": "Alguém deletou a mensagem no qual você tentou postar um comentário.",
-  "post_focus_view.beginning": "Início do Canal de Arquivos",
-  "post_info.del": "Deletar",
-  "post_info.edit": "Editar",
-  "post_info.mobile.flag": "Marcar",
-  "post_info.mobile.unflag": "Desmarcar",
+  "navbar_dropdown.manageMembers": "Manage Members",
+  "navbar_dropdown.nativeApps": "Download Apps",
+  "navbar_dropdown.report": "Report a Problem",
+  "navbar_dropdown.switchTeam": "Switch to {team}",
+  "navbar_dropdown.switchTo": "Switch to ",
+  "navbar_dropdown.teamLink": "Get Team Invite Link",
+  "navbar_dropdown.teamSettings": "Team Settings",
+  "navbar_dropdown.viewMembers": "View Members",
+  "notification.dm": "Direct Message",
+  "password_form.change": "Change my password",
+  "password_form.click": "Click <a href={url}>here</a> to log in.",
+  "password_form.enter": "Enter a new password for your {siteName} account.",
+  "password_form.error": "Please enter at least {chars} characters.",
+  "password_form.pwd": "Password",
+  "password_form.title": "Password Reset",
+  "password_form.update": "Your password has been updated successfully.",
+  "password_send.checkInbox": "Please check your inbox.",
+  "password_send.description": "To reset your password, enter the email address you used to sign up",
+  "password_send.email": "Email",
+  "password_send.error": "Please enter a valid email address.",
+  "password_send.link": "<p>A password reset link has been sent to <b>{email}</b></p>",
+  "password_send.reset": "Reset my password",
+  "password_send.title": "Password Reset",
+  "pdf_preview.max_pages": "Download to read more pages",
+  "pending_post_actions.cancel": "Cancel",
+  "pending_post_actions.retry": "Retry",
+  "permalink.error.access": "Permalink belongs to a deleted message or to a channel to which you do not have access.",
+  "post_attachment.collapse": "Show less...",
+  "post_attachment.more": "Show more...",
+  "post_body.commentedOn": "Commented on {name}{apostrophe} message: ",
+  "post_body.deleted": "(message deleted)",
+  "post_body.plusMore": " plus {count} other files",
+  "post_body.plusOne": " plus 1 other file",
+  "post_delete.notPosted": "Comment could not be posted",
+  "post_delete.okay": "Okay",
+  "post_delete.someone": "Someone deleted the message on which you tried to post a comment.",
+  "post_focus_view.beginning": "Beginning of Channel Archives",
+  "post_info.del": "Delete",
+  "post_info.edit": "Edit",
+  "post_info.mobile.flag": "Flag",
+  "post_info.mobile.unflag": "Unflag",
   "post_info.permalink": "Permalink",
-  "post_info.reply": "Responder",
-  "posts_view.loadMore": "Carregar mais mensagens",
-  "posts_view.newMsg": "Novas Mensagens",
-  "removed_channel.channelName": "o canal",
-  "removed_channel.from": "Removido de ",
-  "removed_channel.okay": "Ok",
-  "removed_channel.remover": "{remover} removido você do {channel}",
-  "removed_channel.someone": "Alguém",
-  "rename_channel.cancel": "Cancelar",
-  "rename_channel.defaultError": " - Não pode ser alterado para o canal padrão",
-  "rename_channel.displayName": "Nome De Exibição",
-  "rename_channel.displayNameHolder": "Insira o nome de exibição",
+  "post_info.reply": "Reply",
+  "posts_view.loadMore": "Load more messages",
+  "posts_view.newMsg": "New Messages",
+  "removed_channel.channelName": "the channel",
+  "removed_channel.from": "Removed from ",
+  "removed_channel.okay": "Okay",
+  "removed_channel.remover": "{remover} removed you from {channel}",
+  "removed_channel.someone": "Someone",
+  "rename_channel.cancel": "Cancel",
+  "rename_channel.defaultError": " - Cannot be changed for the default channel",
+  "rename_channel.displayName": "Display Name",
+  "rename_channel.displayNameHolder": "Enter display name",
   "rename_channel.handle": "Handle",
-  "rename_channel.handleHolder": "alfanuméricos minúsculos somente",
-  "rename_channel.lowercase": "Tem de ser caracteres minúsculos alfanuméricos",
-  "rename_channel.maxLength": "Este campo deve ser menor do que 22 caracteres",
-  "rename_channel.required": "Este campo é obrigatório",
-  "rename_channel.save": "Salvar",
-  "rename_channel.title": "Renomear Canal",
-  "rhs_comment.comment": "Comentário",
-  "rhs_comment.del": "Deletar",
-  "rhs_comment.edit": "Editar",
-  "rhs_comment.mobile.flag": "Marcar",
-  "rhs_comment.mobile.unflag": "Desmarcar",
+  "rename_channel.handleHolder": "lowercase alphanumeric&#39;s only",
+  "rename_channel.lowercase": "Must be lowercase alphanumeric characters",
+  "rename_channel.maxLength": "This field must be less than 22 characters",
+  "rename_channel.required": "This field is required",
+  "rename_channel.save": "Save",
+  "rename_channel.title": "Rename Channel",
+  "rhs_comment.comment": "Comment",
+  "rhs_comment.del": "Delete",
+  "rhs_comment.edit": "Edit",
+  "rhs_comment.mobile.flag": "Flag",
+  "rhs_comment.mobile.unflag": "Unflag",
   "rhs_comment.permalink": "Permalink",
-  "rhs_header.backToFlaggedTooltip": "Voltar para Posts Marcados",
-  "rhs_header.backToResultsTooltip": "Voltar para os Resultados da Pesquisa",
-  "rhs_header.closeSidebarTooltip": "Fechar a Barra Lateral",
-  "rhs_header.details": "Detalhes da Mensagem",
-  "rhs_header.expandSidebarTooltip": "Expandir a Barra Lateral",
-  "rhs_header.shrinkSidebarTooltip": "Reduzir a Barra Lateral",
-  "rhs_root.del": "Deletar",
-  "rhs_root.direct": "Mensagem Direta",
-  "rhs_root.edit": "Editar",
-  "rhs_root.mobile.flag": "Marcar",
-  "rhs_root.mobile.unflag": "Desmarcar",
+  "rhs_header.backToFlaggedTooltip": "Back to Flagged Posts",
+  "rhs_header.backToResultsTooltip": "Back to Search Results",
+  "rhs_header.closeSidebarTooltip": "Close Sidebar",
+  "rhs_header.details": "Message Details",
+  "rhs_header.expandSidebarTooltip": "Expand Sidebar",
+  "rhs_header.shrinkSidebarTooltip": "Shrink Sidebar",
+  "rhs_root.del": "Delete",
+  "rhs_root.direct": "Direct Message",
+  "rhs_root.edit": "Edit",
+  "rhs_root.mobile.flag": "Flag",
+  "rhs_root.mobile.unflag": "Unflag",
   "rhs_root.permalink": "Permalink",
-  "search_bar.cancel": "Cancelar",
-  "search_bar.search": "Procurar",
-  "search_bar.usage": "<h4>Opções de Pesquisa</h4><ul><li><span>Utilize </span><b>\"aspas\"</b><span> para pesquisar frases</span></li><li><span>Use </span><b>from:</b><span> para encontrar mensagens de usuários específicos e </span><b>in:</b><span> para encontrar postagens em canais específicos</span></li></ul>",
-  "search_header.results": "Resultados da Pesquisa",
-  "search_header.title2": "Menções Recentes",
-  "search_header.title3": "Posts Marcados",
-  "search_item.direct": "Mensagem Direta",
-  "search_item.jump": "Pular",
-  "search_results.because": "<ul><li>Se você está pesquisando uma parte da frase (ex. pesquisando \"rea\", procurando por \"reagir\" ou \"reação\"), acrescente um * ao seu termo de pesquisa</li><li>Devido ao grande volume de resultados, pesquisas com duas letras e palavras comuns como \"este\", \"um\" e \"é\" não aparecerão nos resultados de pesquisa</li></ul>",
-  "search_results.noResults": "Nenhum resultado encontrado. Tentar novamente?",
-  "search_results.usage": "<ul><li>Use <b>\"aspas\"</b> para pesquisar frases</li><li>Use <b>from:</b> para encontrar mensagens de usuários específicos e <b>in:</b> para encontrar postagens em canais específicos</li></ul>",
-  "setting_item_max.cancel": "Cancelar",
-  "setting_item_max.save": "Salvar",
-  "setting_item_min.edit": "Editar",
-  "setting_picture.cancel": "Cancelar",
-  "setting_picture.help": "Enviar uma imagem do perfil no formato JPG ou PNG, com pelo menos {width}px na largura e {height}px na altura.",
-  "setting_picture.save": "Salvar",
-  "setting_picture.select": "Selecionar",
-  "setting_upload.import": "Importar",
-  "setting_upload.noFile": "Nenhum arquivo selecionado.",
-  "setting_upload.select": "Selecione o arquivo",
-  "sidebar.channels": "Canais",
-  "sidebar.createChannel": "Criar novo canal",
-  "sidebar.createGroup": "Criar um novo grupo",
-  "sidebar.direct": "Mensagens Diretas",
-  "sidebar.more": "Mais",
-  "sidebar.moreElips": "Mais...",
-  "sidebar.otherMembers": "Fora desta equipe",
-  "sidebar.pg": "Grupos Privados",
-  "sidebar.removeList": "Remover da lista",
-  "sidebar.tutorialScreen1": "<h4>Canais</h4><p><strong>Canais</strong> organizar conversas em diferentes tópicos. Eles estão abertos a todos em sua equipe. Para enviar comunicações privadas utilize <strong>Mensagens Diretas</strong> para uma única pessoa ou <strong>Grupos Privados</strong> para várias pessoas.</p>",
-  "sidebar.tutorialScreen2": "<h4>Canais \"{townsquare}\" e \"{offtopic}\"</h4><p>Aqui estão dois canais públicos para começar:</p><p><strong>{townsquare}</strong> é um lugar comunicação de toda equipe. Todo mundo em sua equipe é um membro deste canal.</p><p><strong>{offtopic}</strong> é um lugar para diversão e humor fora dos canais relacionados com o trabalho. Você e sua equipe podem decidir qual outros canais serão criados.</p>",
-  "sidebar.tutorialScreen3": "<h4>Criando e participando de Canais</h4><p>Clique em <strong>\"Mais...\"</strong> para criar um novo canal ou participar de um já existente.</p><p>Você também pode criar um novo canal ou grupo privado ao clicar em <strong>no símbolo \"+\"</strong> ao lado do canal ou grupo privado no cabeçalho.</p>",
-  "sidebar.unreadAbove": "Post(s) não lidos acima",
-  "sidebar.unreadBelow": "Post(s) não lidos abaixo",
-  "sidebar_header.tutorial": "<h4>Menu Principal</h4><p>O <strong>Menu Principal</strong> é onde você pode <strong>Convidar Para Equipe</strong>, acessar sua <strong>Definição de Conta</strong> e ajustar o seu <strong>Tema de Cores</strong>.</p><p>Administradores de equipe podem também acessar suas <strong>Configurações de Equipe</strong> a partir deste menu.</p><p>Administradores de Sistema vão encontrar em <strong>Console do Sistema</strong> opções para administrar todo o sistema.</p>",
-  "sidebar_right_menu.accountSettings": "Definições de Conta",
-  "sidebar_right_menu.console": "Console do Sistema",
-  "sidebar_right_menu.flagged": "Posts Marcados",
-  "sidebar_right_menu.help": "Ajuda",
-  "sidebar_right_menu.inviteNew": "Convidar Para Equipe",
+  "search_bar.cancel": "Cancel",
+  "search_bar.search": "Search",
+  "search_bar.usage": "<h4>Search Options</h4><ul><li><span>Use </span><b>\"quotation marks\"</b><span> to search for phrases</span></li><li><span>Use </span><b>from:</b><span> to find posts from specific users and </span><b>in:</b><span> to find posts in specific channels</span></li></ul>",
+  "search_header.results": "Search Results",
+  "search_header.title2": "Recent Mentions",
+  "search_header.title3": "Flagged Posts",
+  "search_item.direct": "Direct Message",
+  "search_item.jump": "Jump",
+  "search_results.because": "<ul><li>If you're searching a partial phrase (ex. searching \"rea\", looking for \"reach\" or \"reaction\"), append a * to your search term.</li><li>Two letter searches and common words like \"this\", \"a\" and \"is\" won't appear in search results due to excessive results returned.</li></ul>",
+  "search_results.noResults": "No results found. Try again?",
+  "search_results.usage": "<ul><li>Use <b>\"quotation marks\"</b> to search for phrases</li><li>Use <b>from:</b> to find posts from specific users and <b>in:</b> to find posts in specific channels</li></ul>",
+  "search_results.usageFlag1": "You haven't flagged any messages yet.",
+  "search_results.usageFlag2": "You can add a flag to messages and comments by clicking the ",
+  "search_results.usageFlag3": " icon next to the timestamp.",
+  "search_results.usageFlag4": "Flags are a way to mark messages for follow up. Your flags are personal, and cannot be seen by other users.",
+  "setting_item_max.cancel": "Cancel",
+  "setting_item_max.save": "Save",
+  "setting_item_min.edit": "Edit",
+  "setting_picture.cancel": "Cancel",
+  "setting_picture.help": "Upload a profile picture in either JPG or PNG format, at least {width}px in width and {height}px height.",
+  "setting_picture.save": "Save",
+  "setting_picture.select": "Select",
+  "setting_upload.import": "Import",
+  "setting_upload.noFile": "No file selected.",
+  "setting_upload.select": "Select file",
+  "sidebar.channels": "Channels",
+  "sidebar.createChannel": "Create new channel",
+  "sidebar.createGroup": "Create new group",
+  "sidebar.direct": "Direct Messages",
+  "sidebar.more": "More",
+  "sidebar.moreElips": "More...",
+  "sidebar.otherMembers": "Outside this team",
+  "sidebar.pg": "Private Groups",
+  "sidebar.removeList": "Remove from list",
+  "sidebar.tutorialScreen1": "<h4>Channels</h4><p><strong>Channels</strong> organize conversations across different topics. They’re open to everyone on your team. To send private communications use <strong>Direct Messages</strong> for a single person or <strong>Private Groups</strong> for multiple people.</p>",
+  "sidebar.tutorialScreen2": "<h4>\"{townsquare}\" and \"{offtopic}\" channels</h4><p>Here are two public channels to start:</p><p><strong>{townsquare}</strong> is a place for team-wide communication. Everyone in your team is a member of this channel.</p><p><strong>{offtopic}</strong> is a place for fun and humor outside of work-related channels. You and your team can decide what other channels to create.</p>",
+  "sidebar.tutorialScreen3": "<h4>Creating and Joining Channels</h4><p>Click <strong>\"More...\"</strong> to create a new channel or join an existing one.</p><p>You can also create a new channel or private group by clicking the <strong>\"+\" symbol</strong> next to the channel or private group header.</p>",
+  "sidebar.unreadAbove": "Unread post(s) above",
+  "sidebar.unreadBelow": "Unread post(s) below",
+  "sidebar_header.tutorial": "<h4>Main Menu</h4><p>The <strong>Main Menu</strong> is where you can <strong>Invite New Members</strong>, access your <strong>Account Settings</strong> and set your <strong>Theme Color</strong>.</p><p>Team administrators can also access their <strong>Team Settings</strong> from this menu.</p><p>System administrators will find a <strong>System Console</strong> option to administrate the entire system.</p>",
+  "sidebar_right_menu.accountSettings": "Account Settings",
+  "sidebar_right_menu.console": "System Console",
+  "sidebar_right_menu.flagged": "Flagged Posts",
+  "sidebar_right_menu.help": "Help",
+  "sidebar_right_menu.inviteNew": "Invite New Member",
   "sidebar_right_menu.logout": "Logout",
-  "sidebar_right_menu.manageMembers": "Gerenciar Membros",
-  "sidebar_right_menu.nativeApps": "Download Mattermost Apps",
-  "sidebar_right_menu.recentMentions": "Menções Recentes",
-  "sidebar_right_menu.report": "Relatar um Problema",
-  "sidebar_right_menu.switch_team": "Selecionar Equipe",
-  "sidebar_right_menu.teamLink": "Obter Link Convite de Equipe",
-  "sidebar_right_menu.teamSettings": "Configurações da Equipe",
-  "sidebar_right_menu.viewMembers": "Ver Membros",
-  "signup.email": "Email e Senha",
+  "sidebar_right_menu.manageMembers": "Manage Members",
+  "sidebar_right_menu.nativeApps": "Download Apps",
+  "sidebar_right_menu.recentMentions": "Recent Mentions",
+  "sidebar_right_menu.report": "Report a Problem",
+  "sidebar_right_menu.switch_team": "Team Selection",
+  "sidebar_right_menu.teamLink": "Get Team Invite Link",
+  "sidebar_right_menu.teamSettings": "Team Settings",
+  "sidebar_right_menu.viewMembers": "View Members",
+  "signup.email": "Email and Password",
   "signup.gitlab": "GitLab Single-Sign-On",
-  "signup.google": "Conta Google",
-  "signup.ldap": "Credenciais LDAP",
+  "signup.google": "Google Account",
+  "signup.ldap": "AD/LDAP Credentials",
   "signup.office365": "Office 365",
-  "signup.title": "Criar uma conta com:",
-  "signup_team.choose": "Suas equipes: ",
-  "signup_team.createTeam": "Ou Criar uma Equipe",
-  "signup_team.disabled": "A criação de equipe foi desativada.  Por favor, entre em contato com um administrador para o acesso.",
-  "signup_team.join_open": "Equipes que você pode se juntar: ",
-  "signup_team.noTeams": "Não existe equipes incluídas no Diretório de Equipe e a criação de equipes foi desativada.",
-  "signup_team.no_open_teams": "Nenhuma equipe disponível para se juntar. Por favor peça ao administrador por um convite.",
-  "signup_team.no_open_teams_canCreate": "Nenhuma equipe disponível para se juntar. Por favor crie uma nova equipe ou peça ao administrador por um convite.",
-  "signup_team.no_teams": "Nenhuma equipe foi criada. Por favor entre em contato com o administrador.",
-  "signup_team.no_teams_canCreate": "Nenhuma equipe foi criada. Você pode criar uma clicando \"Criar uma nova equipe\".",
-  "signup_team.none": "Nenhum método de criação da equipe foi habilitado.  Por favor, entre em contato com um administrador para o acesso.",
-  "signup_team_complete.completed": "Você já concluiu o processo de inscrição para este convite ou este convite expirou.",
-  "signup_team_confirm.checkEmail": "Por favor, verifique seu e-mail: <strong>{email}</strong><br />Seu e-mail contém um link para configurar a sua equipe",
-  "signup_team_confirm.title": "Inscrição Completa",
-  "signup_team_system_console": "Ir para Console do Sistema",
-  "signup_user_completed.choosePwd": "Escolha sua senha",
-  "signup_user_completed.chooseUser": "Escolha o seu nome de usuário",
-  "signup_user_completed.create": "Criar Conta",
-  "signup_user_completed.emailHelp": "Email valido necessário para inscrição",
-  "signup_user_completed.emailIs": "Seu endereço de e-mail é <strong>{email}</strong>. Você irá usar esse endereço para logar no {siteName}.",
-  "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": "Já tem uma conta?",
-  "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.",
-  "signup_user_completed.none": "Nenhum método de criação de equipe foi habilitado.  Por favor, entre em contato com um administrador para o acesso.",
-  "signup_user_completed.office365": "com Office 365",
-  "signup_user_completed.onSite": "no {siteName}",
-  "signup_user_completed.or": "ou",
-  "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": "Clique aqui para fazer login.",
-  "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",
-  "signup_user_completed.welcome": "Bem-vindo:",
-  "signup_user_completed.whatis": "Qual é o seu endereço de e-mail?",
-  "signup_user_completed.withLdap": "Com suas credenciais LDAP",
-  "sso_signup.find": "Encontrar minhas equipes",
-  "sso_signup.gitlab": "Criar uma equipe com uma conta GitLab",
-  "sso_signup.google": "Criar equipe com a Conta do Google Apps",
-  "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": "Notifique a todos no canal, use {townsquare} para notificar toda a equipe",
-  "suggestion.mention.channel": "Notifica todos no canal",
-  "suggestion.mention.here": "Notifica todos os conectados ao canal",
-  "suggestion.mention.members": "Membros do Canal",
-  "suggestion.mention.nonmembers": "Não no Canal",
-  "suggestion.mention.special": "Menções Especiais",
-  "suggestion.search.private": "Grupos Privados",
-  "suggestion.search.public": "Canais Públicos",
+  "signup.title": "Create an account with:",
+  "signup_team.choose": "Your teams: ",
+  "signup_team.createTeam": "Or Create a Team",
+  "signup_team.disabled": "Team creation has been disabled.  Please contact an administrator for access.",
+  "signup_team.join_open": "Teams you can join: ",
+  "signup_team.noTeams": "There are no teams included in the Team Directory and team creation has been disabled.",
+  "signup_team.no_open_teams": "No teams are available to join. Please ask your administrator for an invite.",
+  "signup_team.no_open_teams_canCreate": "No teams are available to join. Please create a new team or ask your administrator for an invite.",
+  "signup_team.no_teams": "No teams have been created. Please contact your administrator.",
+  "signup_team.no_teams_canCreate": "No teams have been created. You may create one by clicking \"Create a new team\".",
+  "signup_team.none": "No team creation method has been enabled.  Please contact an administrator for access.",
+  "signup_team_complete.completed": "You've already completed the signup process for this invitation or this invitation has expired.",
+  "signup_team_confirm.checkEmail": "Please check your email: <strong>{email}</strong><br />Your email contains a link to set up your team",
+  "signup_team_confirm.title": "Sign up Complete",
+  "signup_team_system_console": "Go to System Console",
+  "signup_user_completed.choosePwd": "Choose your password",
+  "signup_user_completed.chooseUser": "Choose your username",
+  "signup_user_completed.create": "Create Account",
+  "signup_user_completed.emailHelp": "Valid email required for sign-up",
+  "signup_user_completed.emailIs": "Your email address is <strong>{email}</strong>. You'll use this address to sign in to {siteName}.",
+  "signup_user_completed.expired": "You've already completed the signup process for this invitation or this invitation has expired.",
+  "signup_user_completed.gitlab": "with GitLab",
+  "signup_user_completed.google": "with Google",
+  "signup_user_completed.haveAccount": "Already have an account?",
+  "signup_user_completed.invalid_invite": "The invite link was invalid.  Please speak with your Administrator to receive an invitation.",
+  "signup_user_completed.lets": "Let's create your account",
+  "signup_user_completed.no_open_server": "This server does not allow open signups.  Please speak with your Administrator to receive an invitation.",
+  "signup_user_completed.none": "No user creation method has been enabled.  Please contact an administrator for access.",
+  "signup_user_completed.office365": "with Office 365",
+  "signup_user_completed.onSite": "on {siteName}",
+  "signup_user_completed.or": "or",
+  "signup_user_completed.passwordLength": "Please enter at least {min} characters",
+  "signup_user_completed.required": "This field is required",
+  "signup_user_completed.reserved": "This username is reserved, please choose a new one.",
+  "signup_user_completed.signIn": "Click here to sign in.",
+  "signup_user_completed.userHelp": "Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-' and '_'",
+  "signup_user_completed.usernameLength": "Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-' and '_'.",
+  "signup_user_completed.validEmail": "Please enter a valid email address",
+  "signup_user_completed.welcome": "Welcome to:",
+  "signup_user_completed.whatis": "What's your email address?",
+  "signup_user_completed.withLdap": "With your AD/LDAP credentials",
+  "sso_signup.find": "Find my teams",
+  "sso_signup.gitlab": "Create team with GitLab Account",
+  "sso_signup.google": "Create team with Google Apps Account",
+  "sso_signup.length_error": "Name must be 3 or more characters up to a maximum of 15",
+  "sso_signup.teamName": "Enter name of new team",
+  "sso_signup.team_error": "Please enter a team name",
+  "suggestion.mention.all": "Notifies everyone in the channel, use in {townsquare} to notify the whole team",
+  "suggestion.mention.channel": "Notifies everyone in the channel",
+  "suggestion.mention.here": "Notifies everyone in the channel and online",
+  "suggestion.mention.members": "Channel Members",
+  "suggestion.mention.nonmembers": "Not in Channel",
+  "suggestion.mention.special": "Special Mentions",
+  "suggestion.search.private": "Private Groups",
+  "suggestion.search.public": "Public Channels",
   "team_export_tab.download": "download",
-  "team_export_tab.export": "Exportar",
-  "team_export_tab.exportTeam": "Exportar sua equipe",
-  "team_export_tab.exporting": " Exportando...",
-  "team_export_tab.ready": " Pronto para ",
-  "team_export_tab.unable": " Não foi possível exportar: {error}",
-  "team_import_tab.failure": " Falha na importação: ",
-  "team_import_tab.import": "Importar",
-  "team_import_tab.importHelp": "<p>Para importar uma equipe do Slack, vá para a Slack > Definições de Equipe > Importar/Exportar Dados > Exportar > Iniciar Exportação. Slack não permite que você exporte arquivos, imagens, grupos privados ou as mensagens diretas armazenadas no Slack. Portanto, Importação Slack para Mattermost só suporta a importação de mensagens de texto dos canais públicos da sua equipe Slack.</p><p>A Importação Slack para Mattermost está em 'Beta'. Mensagens do Slack bot ainda não podem ser importadas.</p>",
-  "team_import_tab.importSlack": "Importar do Slack (Beta)",
-  "team_import_tab.importing": " Importando...",
-  "team_import_tab.successful": " Importado com sucesso: ",
-  "team_import_tab.summary": "Ver Resumo",
-  "team_member_modal.close": "Fechar",
-  "team_member_modal.members": "{team} Membros",
-  "team_members_dropdown.confirmDemoteDescription": "Se você rebaixar você mesmo de Admin de Sistema e não exista outro usuário como privilegios de Admin de Sistema, você precisa-rá re-inscrever um Admin de Sistema acessando o servidor Mattermost através do terminal e executando o seguinte comando.",
-  "team_members_dropdown.confirmDemoteRoleTitle": "Confirmar o rebaixamento de Admin Sistema",
-  "team_members_dropdown.confirmDemotion": "Confirmar Rebaixamento",
+  "team_export_tab.export": "Export",
+  "team_export_tab.exportTeam": "Export your team",
+  "team_export_tab.exporting": " Exporting...",
+  "team_export_tab.ready": " Ready for ",
+  "team_export_tab.unable": " Unable to export: {error}",
+  "team_import_tab.failure": " Import failure: ",
+  "team_import_tab.import": "Import",
+  "team_import_tab.importHelp": "<p>To import a team from Slack go to Slack > Team Settings > Import/Export Data > Export > Start Export. Slack does not allow you to export files, images, private groups or direct messages stored in Slack. Therefore, Slack import to Mattermost only supports importing of text messages in your Slack team's public channels.</p><p>The Slack import to Mattermost is in 'Beta'. Slack bot posts do not yet import.</p>",
+  "team_import_tab.importSlack": "Import from Slack (Beta)",
+  "team_import_tab.importing": " Importing...",
+  "team_import_tab.successful": " Import successful: ",
+  "team_import_tab.summary": "View Summary",
+  "team_member_modal.close": "Close",
+  "team_member_modal.members": "{team} Members",
+  "team_members_dropdown.confirmDemoteDescription": "If you demote yourself from the System Admin role and there is not another user with System Admin privileges, you'll need to re-assign a System Admin by accessing the Mattermost server through a terminal and running the following command.",
+  "team_members_dropdown.confirmDemoteRoleTitle": "Confirm demotion from System Admin role",
+  "team_members_dropdown.confirmDemotion": "Confirm Demotion",
   "team_members_dropdown.confirmDemotionCmd": "platform -assign_role -team_name=\"yourteam\" -email=\"name@yourcompany.com\" -role=\"system_admin\"",
-  "team_members_dropdown.inactive": "Inativo",
-  "team_members_dropdown.leave_team": "Remover da equipe",
-  "team_members_dropdown.makeActive": "Tornar Ativo",
-  "team_members_dropdown.makeAdmin": "Tornar Admin de Equipe",
-  "team_members_dropdown.makeInactive": "Tornar Inativo",
-  "team_members_dropdown.makeMember": "Tornar Membro",
-  "team_members_dropdown.member": "Membro",
-  "team_members_dropdown.systemAdmin": "Admin do Sistema",
-  "team_members_dropdown.teamAdmin": "Admin Equipe",
-  "team_settings_modal.exportTab": "Exportar",
-  "team_settings_modal.generalTab": "Geral",
-  "team_settings_modal.importTab": "Importar",
-  "team_settings_modal.title": "Configurações da Equipe",
-  "textbox.bold": "**negrito**",
-  "textbox.edit": "Editar mensagem",
-  "textbox.help": "Ajuda",
-  "textbox.inlinecode": "`código`",
-  "textbox.italic": "_itálico_",
-  "textbox.preformatted": "```pré-formatado```",
-  "textbox.preview": "Pré-visualização",
-  "textbox.quote": ">citar",
-  "textbox.strike": "tachado",
-  "tutorial_intro.allSet": "Está tudo pronto",
-  "tutorial_intro.end": "Clique em “Próximo” para entrar em {channel}. Este é o primeiro canal que sua equipe de trabalho vê quando eles se inscrevem. Use para postar atualizações que todos precisam saber.",
-  "tutorial_intro.invite": "Convidar pessoas para equipe",
-  "tutorial_intro.mobileApps": "Instalar os aplicativos {link} para fácil acesso e notificações em movimento.",
-  "tutorial_intro.mobileAppsLinkText": "PC, Mac, iOS e Android",
-  "tutorial_intro.next": "Próximo",
-  "tutorial_intro.screenOne": "<h3>Bem vindo ao:</h3><h1>Mattermost</h1><p>Toda comunicação da sua equipe em um só lugar, pesquisas instantâneas disponível em qualquer lugar</p><p>Mantenha sua equipe conectada para ajudá-los a conseguir o que mais importa.</p>",
-  "tutorial_intro.screenTwo": "<h3>Como Mattermost funciona:</h3><p>A comunicação acontece em canais de discussão pública, grupos privados e mensagens diretas.</p><p>Tudo é arquivado e pesquisável a partir de qualquer desktop, laptop ou telefone com suporte a web.</p>",
-  "tutorial_intro.skip": "Pular o tutorial",
-  "tutorial_intro.support": "Precisa de alguma coisa, envie um e-mail para nós no ",
-  "tutorial_intro.teamInvite": "Convidar pessoas para equipe",
-  "tutorial_intro.whenReady": " quando você estiver pronto.",
-  "tutorial_tip.next": "Próximo",
-  "tutorial_tip.ok": "Ok",
-  "tutorial_tip.out": "Recusar estas dicas.",
-  "tutorial_tip.seen": "Viu isso antes? ",
-  "upload_overlay.info": "Soltar um arquivo para enviá-lo.",
-  "user.settings.advance.embed_preview": "Mostrar pré-visualização experimental de conteúdo de link, quando disponível",
-  "user.settings.advance.embed_toggle": "Exibir mostrar/esconder para todas as pre-visualizações",
-  "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Recurso} other {Recursos}} Ativado",
-  "user.settings.advance.formattingDesc": "Se ativado, posts serão formatados para criar links, exibir emoji, estilo de texto e adicionar quebra de linhas. Por padrão é definido como ativado. Mudando está configuração será necessário recarregar a página.",
-  "user.settings.advance.formattingTitle": "Ativar Formatação de Post",
-  "user.settings.advance.joinLeaveDesc": "Quando \"On\", Mensagens do Sistema dizendo que um usuário entrou ou saiu de um canal será visível. Quando \"Off\", as Mensagens do Sistema sobre entrar ou sair de um canal serão ocultados. A mensagem ainda vai aparecer quando são adicionados a um canal, para que você possa receber uma notificação.",
-  "user.settings.advance.joinLeaveTitle": "Ativar Mensagens Juntar/Deixar",
-  "user.settings.advance.markdown_preview": "Mostrar opção pré-visualização markdown na caixa de entrada de mensagens",
-  "user.settings.advance.off": "Desligado",
+  "team_members_dropdown.inactive": "Inactive",
+  "team_members_dropdown.leave_team": "Remove From Team",
+  "team_members_dropdown.makeActive": "Make Active",
+  "team_members_dropdown.makeAdmin": "Make Team Admin",
+  "team_members_dropdown.makeInactive": "Make Inactive",
+  "team_members_dropdown.makeMember": "Make Member",
+  "team_members_dropdown.member": "Member",
+  "team_members_dropdown.systemAdmin": "System Admin",
+  "team_members_dropdown.teamAdmin": "Team Admin",
+  "team_settings_modal.exportTab": "Export",
+  "team_settings_modal.generalTab": "General",
+  "team_settings_modal.importTab": "Import",
+  "team_settings_modal.title": "Team Settings",
+  "textbox.bold": "**bold**",
+  "textbox.edit": "Edit message",
+  "textbox.help": "Help",
+  "textbox.inlinecode": "`inline code`",
+  "textbox.italic": "_italic_",
+  "textbox.preformatted": "```preformatted```",
+  "textbox.preview": "Preview",
+  "textbox.quote": ">quote",
+  "textbox.strike": "strike",
+  "tutorial_intro.allSet": "You’re all set",
+  "tutorial_intro.end": "Click “Next” to enter {channel}. This is the first channel teammates see when they sign up. Use it for posting updates everyone needs to know.",
+  "tutorial_intro.invite": "Invite teammates",
+  "tutorial_intro.mobileApps": "Install the apps for {link} for easy access and notifications on the go.",
+  "tutorial_intro.mobileAppsLinkText": "PC, Mac, iOS and Android",
+  "tutorial_intro.next": "Next",
+  "tutorial_intro.screenOne": "<h3>Welcome to:</h3><h1>Mattermost</h1><p>Your team communication all in one place, instantly searchable and available anywhere.</p><p>Keep your team connected to help them achieve what matters most.</p>",
+  "tutorial_intro.screenTwo": "<h3>How Mattermost works:</h3><p>Communication happens in public discussion channels, private groups and direct messages.</p><p>Everything is archived and searchable from any web-enabled desktop, laptop or phone.</p>",
+  "tutorial_intro.skip": "Skip tutorial",
+  "tutorial_intro.support": "Need anything, just email us at ",
+  "tutorial_intro.teamInvite": "Invite teammates",
+  "tutorial_intro.whenReady": " when you’re ready.",
+  "tutorial_tip.next": "Next",
+  "tutorial_tip.ok": "Okay",
+  "tutorial_tip.out": "Opt out of these tips.",
+  "tutorial_tip.seen": "Seen this before? ",
+  "upload_overlay.info": "Drop a file to upload it.",
+  "user.settings.advance.embed_preview": "Show experimental previews of link content, when available",
+  "user.settings.advance.embed_toggle": "Show toggle for all embed previews",
+  "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} Enabled",
+  "user.settings.advance.formattingDesc": "If enabled, posts will be formatted to create links, show emoji, style the text, and add line breaks. By default, this setting is enabled. Changing this setting requires the page to be refreshed.",
+  "user.settings.advance.formattingTitle": "Enable Post Formatting",
+  "user.settings.advance.joinLeaveDesc": "When \"On\", System Messages saying a user has joined or left a channel will be visible. When \"Off\", the System Messages about joining or leaving a channel will be hidden. A message will still show up when you are added to a channel, so you can receive a notification.",
+  "user.settings.advance.joinLeaveTitle": "Enable Join/Leave Messages",
+  "user.settings.advance.markdown_preview": "Show markdown preview option in message input box",
+  "user.settings.advance.off": "Off",
   "user.settings.advance.on": "On",
-  "user.settings.advance.preReleaseDesc": "Verifique todos os recursos de pré-lançamento que você gostaria de visualizar.  Você também pode precisar atualizar a página antes das configuração terem efeito.",
-  "user.settings.advance.preReleaseTitle": "Visualizar recursos de pré-lançamento",
-  "user.settings.advance.sendDesc": "Se habilitado 'Enter' insere uma nova linha e 'Ctrl + Enter' envia a mensagem.",
-  "user.settings.advance.sendTitle": "Enviar mensagens Ctrl + Enter",
-  "user.settings.advance.slashCmd_autocmp": "Ativar aplicação externa para autocompletar comandos slash",
-  "user.settings.advance.title": "Configurações Avançadas",
-  "user.settings.custom_theme.awayIndicator": "Indicador de Afastamento",
-  "user.settings.custom_theme.buttonBg": "Fundo Botão",
-  "user.settings.custom_theme.buttonColor": "Texto do Botão",
-  "user.settings.custom_theme.centerChannelBg": "Fundo Centro Canal",
-  "user.settings.custom_theme.centerChannelColor": "Canal Central Texto",
-  "user.settings.custom_theme.centerChannelTitle": "Estilos do Canal Central",
-  "user.settings.custom_theme.codeTheme": "Código do Tema",
-  "user.settings.custom_theme.copyPaste": "Copie e cole para compartilhar o tema de cores:",
-  "user.settings.custom_theme.linkButtonTitle": "Estilos de Links e Botões",
-  "user.settings.custom_theme.linkColor": "Cor do link",
-  "user.settings.custom_theme.mentionBj": "Fundo Menção Jewel",
-  "user.settings.custom_theme.mentionColor": "Menção Texto Jewel",
-  "user.settings.custom_theme.mentionHighlightBg": "Fundo Menção Realçar",
-  "user.settings.custom_theme.mentionHighlightLink": "Menção Realçar Link",
-  "user.settings.custom_theme.newMessageSeparator": "Novo Separador de Mensagem",
-  "user.settings.custom_theme.onlineIndicator": "Indicador Conectado",
-  "user.settings.custom_theme.sidebarBg": "Fundo Barra lateral",
-  "user.settings.custom_theme.sidebarHeaderBg": "Fundo Barra latera Cabeçalho",
-  "user.settings.custom_theme.sidebarHeaderTextColor": "Barra lateral Texto",
-  "user.settings.custom_theme.sidebarText": "Texto Barra lateral",
-  "user.settings.custom_theme.sidebarTextActiveBorder": "Barra lateral Borda Texto Ativo",
-  "user.settings.custom_theme.sidebarTextActiveColor": "Barra lateral Cor Texto Ativo",
-  "user.settings.custom_theme.sidebarTextHoverBg": "Fundo Barra lateral Sobre Texto",
-  "user.settings.custom_theme.sidebarTitle": "Estilos da Barra Lateral",
-  "user.settings.custom_theme.sidebarUnreadText": "Barra Lateral Texto Não Lido",
-  "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": "Expandir links para mostrar pré-visualização de conteúdo, quando disponível.",
-  "user.settings.display.collapseDisplay": "Visualização de Link",
-  "user.settings.display.collapseOff": "Desligado",
-  "user.settings.display.collapseOn": "Ligado",
-  "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",
-  "user.settings.display.fullScreen": "Largura inteira",
-  "user.settings.display.language": "Idioma",
-  "user.settings.display.messageDisplayClean": "Padrão",
-  "user.settings.display.messageDisplayCleanDes": "Fácil de examinar e ler.",
-  "user.settings.display.messageDisplayCompact": "Compacto",
-  "user.settings.display.messageDisplayCompactDes": "Ajustar quantas mensagens na tela que puder.",
-  "user.settings.display.messageDisplayDescription": "Selecione como as mensagens no canal podem ser mostradas.",
-  "user.settings.display.messageDisplayTitle": "Exibição de Mensagem",
-  "user.settings.display.militaryClock": "Relógio de 24 horas (exemplo: 16:00)",
-  "user.settings.display.nameOptsDesc": "Ajustar como mostrar outros nomes de usuários nas postagens e lista de Mensagens Diretas.",
-  "user.settings.display.normalClock": "Relógio de 12 horas (exemplo: 4:00 PM)",
-  "user.settings.display.preferTime": "Selecione como você prefere que a hora seja mostrada.",
-  "user.settings.display.showFullname": "Mostrar primeiro e último nome",
-  "user.settings.display.showNickname": "Mostras apelidos se um existir, caso contrário mostrar o primeiro e último nome",
-  "user.settings.display.showUsername": "Mostrar nome de usuário (padrão)",
-  "user.settings.display.teammateDisplay": "Nome de Exibição da Equipe de Trabalho",
-  "user.settings.display.theme.customTheme": "Tema Personalizado",
-  "user.settings.display.theme.describe": "Abrir para gerenciar seu tema",
-  "user.settings.display.theme.import": "Importar tema de cores do Slack",
-  "user.settings.display.theme.otherThemes": "Veja outros temas",
-  "user.settings.display.theme.themeColors": "Tema de Cores",
-  "user.settings.display.theme.title": "Tema",
-  "user.settings.display.title": "Configurações de Exibição",
-  "user.settings.general.checkEmail": "Verifique seu email em {email} para confirmar o endereço.",
-  "user.settings.general.checkEmailNoAddress": "Verifique seu email para confirmar seu novo endereço",
-  "user.settings.general.close": "Fechar",
-  "user.settings.general.confirmEmail": "Confirmar o email",
-  "user.settings.general.email": "E-mail",
-  "user.settings.general.emailGitlabCantUpdate": "Login ocorre através do GitLab. Email não pode ser atualizado. Endereço de email utilizado para notificações é {email}.",
-  "user.settings.general.emailGoogleCantUpdate": "Login ocorre através do Google. Email não pode ser atualizado. Endereço de email utilizado para notificações é {email}.",
-  "user.settings.general.emailHelp1": "Email é usado para login, notificações, e redefinição de senha. Requer verificação de email se alterado.",
-  "user.settings.general.emailHelp2": "Email foi desativado pelo seu Administrador de Sistema. Nenhuma notificação por email será enviada até isto ser habilitado.",
-  "user.settings.general.emailHelp3": "Email é usado para login, notificações e redefinição de senha.",
-  "user.settings.general.emailHelp4": "Uma verificação por email foi enviada para {email}.",
-  "user.settings.general.emailLdapCantUpdate": "Login ocorre através de LDAP. Email não pode ser atualizado. Endereço de email utilizado para notificações é {email}.",
-  "user.settings.general.emailMatch": "Os novos emails que você inseriu não correspondem.",
-  "user.settings.general.emailOffice365CantUpdate": "Login ocorre através do Office 365. Email não pode ser atualizado. Endereço de email utilizado para notificações é {email}.",
-  "user.settings.general.emailSamlCantUpdate": "Login ocorre através SAML. Email não pode ser atualizado. Endereço de email utilizado para notificações é {email}.",
-  "user.settings.general.emailUnchanged": "Seu novo endereço de email é o mesmo do seu endereço de email antigo.",
-  "user.settings.general.emptyName": "Clique 'Editar' para adicionar seu nome completo",
-  "user.settings.general.emptyNickname": "Clique 'Editar' para adicionar um apelido",
-  "user.settings.general.field_handled_externally": "Este campo é tratada pelo seu provedor de login. Se você quiser mudá-lo, você precisa fazê-lo através de seu provedor de login.",
-  "user.settings.general.firstName": "Primeiro nome",
-  "user.settings.general.fullName": "Nome Completo",
-  "user.settings.general.imageTooLarge": "Não é possível fazer upload da imagem de perfil. O arquivo é muito grande.",
-  "user.settings.general.imageUpdated": "Imagem última atualização {date}",
-  "user.settings.general.lastName": "Último Nome",
-  "user.settings.general.loginGitlab": "Login feito através do GitLab ({email})",
-  "user.settings.general.loginGoogle": "Login feito através do Google ({email})",
-  "user.settings.general.loginLdap": "Login feito através de LDAP ({email})",
-  "user.settings.general.loginOffice365": "Login feito através do Office 365 ({email})",
-  "user.settings.general.loginSaml": "Login feito através de SAML ({email})",
-  "user.settings.general.newAddress": "Novo Endereço: {email}<br />Verifique seu email para checar o endereço acima.",
-  "user.settings.general.nickname": "Apelido",
-  "user.settings.general.nicknameExtra": "Use Apelidos para um nome você pode ser chamado assim, isso é diferente de seu primeiro nome e nome de usuário. Este é mais frequentemente usado quando duas ou mais pessoas têm nomes semelhantes de usuário.",
-  "user.settings.general.notificationsExtra": "Por padrão, você receberá uma notificação de menção quando alguém digitar seu nome. Vá para definições {notify} para alterar esse padrão.",
-  "user.settings.general.notificationsLink": "Notificações",
-  "user.settings.general.primaryEmail": "Email Primário",
-  "user.settings.general.profilePicture": "Imagem do Perfil",
-  "user.settings.general.title": "Definições Gerais",
-  "user.settings.general.uploadImage": "Clique em 'Editar' para enviar uma imagem.",
-  "user.settings.general.username": "Usuário",
-  "user.settings.general.usernameInfo": "Coloque alguma coisa fácil para sua equipe reconhecer e relembrar.",
-  "user.settings.general.usernameReserved": "Este nome de usuário é reservado, por favor escolha um novo.",
-  "user.settings.general.usernameRestrictions": "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 '_'.",
-  "user.settings.general.validEmail": "Por favor entre um endereço de e-mail válido",
-  "user.settings.general.validImage": "Somente imagens em JPG ou PNG podem ser usadas como imagem do perfil",
-  "user.settings.import_theme.cancel": "Cancelar",
-  "user.settings.import_theme.importBody": "Para importar um tema, vá para uma equipe no Slack e olhe para “Preferences -> Sidebar Theme”. Abra a opção de tema personalizado, copie os valores das cores do tema e cole eles aqui:",
-  "user.settings.import_theme.importHeader": "Importar Tema Slack",
-  "user.settings.import_theme.submit": "Enviar",
-  "user.settings.import_theme.submitError": "Formato inválido, por favor tente copiar e colar novamente.",
-  "user.settings.languages.change": "Alterar o idioma da interface",
-  "user.settings.languages.promote": "Escolha qual idioma Mattermost exibirá a interface do usuário.<br /><br />Gostaria de ajudar com as traduções? Junte-se ao <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> para contribuir.",
-  "user.settings.mfa.add": "Adicionar MFA para sua conta",
-  "user.settings.mfa.addHelp": "Você pode exigir um token gerado por um smartphone, além da sua senha, para entrar no Mattermost.<br/><br/>Para ativar, faça download no seu telefone do Google Authenticator no <a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a> ou <a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a>, em seguida,<br/><br/>1. Clique no botão acima<strong>Adicionar MFA para sua conta</strong>.<br/>2. Use o Google Authenticator para scanear o QR code que aparece.<br/>3. Digite o Token gerado pelo Google Authenticator e clique em <strong>Salvar</strong>.<br/><br/>Quando o logar, você será solicitado a digitar um token do Google Authenticator, além de suas credenciais regulares.",
-  "user.settings.mfa.addHelpQr": "Por favor escanei o QR code com o app Google Authenticator no seu smartphone e preencha com o token fornecido pelo app.",
-  "user.settings.mfa.enterToken": "Token (somente números)",
-  "user.settings.mfa.qrCode": "Código de Barra",
-  "user.settings.mfa.remove": "Remover MFA da sua conta",
-  "user.settings.mfa.removeHelp": "Remoção da autenticação multi-fator significa que você não vai mais exigir um código de acesso baseado no telefone para fazer login na sua conta.",
-  "user.settings.mfa.title": "Autenticação Multi-Fator",
-  "user.settings.modal.advanced": "Avançado",
-  "user.settings.modal.confirmBtns": "Sim, Descartar",
-  "user.settings.modal.confirmMsg": "Você tem alterações não salvas, você tem certeza que quer descartar elas?",
-  "user.settings.modal.confirmTitle": "Descartar alterações?",
-  "user.settings.modal.display": "Exibição",
-  "user.settings.modal.general": "Geral",
-  "user.settings.modal.notifications": "Notificações",
-  "user.settings.modal.security": "Segurança",
-  "user.settings.modal.title": "Definições de Conta",
-  "user.settings.notifications.allActivity": "Para todas as atividades",
-  "user.settings.notifications.channelWide": "Menções para todo canal \"@channel\", \"@all\"",
-  "user.settings.notifications.close": "Fechar",
-  "user.settings.notifications.comments": "Responder notificações",
-  "user.settings.notifications.commentsAny": "Dispara notificações de mensagens em resposta a tópicos que eu iniciei ou participo",
-  "user.settings.notifications.commentsInfo": "Além de notificações para quando você for mencionado, selecione se você gostaria de receber notificações sobre respostas de tópicos.",
+  "user.settings.advance.preReleaseDesc": "Check any pre-released features you'd like to preview.  You may also need to refresh the page before the setting will take effect.",
+  "user.settings.advance.preReleaseTitle": "Preview pre-release features",
+  "user.settings.advance.sendDesc": "If enabled 'ENTER' inserts a new line and 'CTRL + ENTER' submits the message.",
+  "user.settings.advance.sendTitle": "Send messages on CTRL + ENTER",
+  "user.settings.advance.slashCmd_autocmp": "Enable external application to offer slash command autocomplete",
+  "user.settings.advance.title": "Advanced Settings",
+  "user.settings.custom_theme.awayIndicator": "Away Indicator",
+  "user.settings.custom_theme.buttonBg": "Button BG",
+  "user.settings.custom_theme.buttonColor": "Button Text",
+  "user.settings.custom_theme.centerChannelBg": "Center Channel BG",
+  "user.settings.custom_theme.centerChannelColor": "Center Channel Text",
+  "user.settings.custom_theme.centerChannelTitle": "Center Channel Styles",
+  "user.settings.custom_theme.codeTheme": "Code Theme",
+  "user.settings.custom_theme.copyPaste": "Copy and paste to share theme colors:",
+  "user.settings.custom_theme.linkButtonTitle": "Link and Button Styles",
+  "user.settings.custom_theme.linkColor": "Link Color",
+  "user.settings.custom_theme.mentionBj": "Mention Jewel BG",
+  "user.settings.custom_theme.mentionColor": "Mention Jewel Text",
+  "user.settings.custom_theme.mentionHighlightBg": "Mention Highlight BG",
+  "user.settings.custom_theme.mentionHighlightLink": "Mention Highlight Link",
+  "user.settings.custom_theme.newMessageSeparator": "New Message Separator",
+  "user.settings.custom_theme.onlineIndicator": "Online Indicator",
+  "user.settings.custom_theme.sidebarBg": "Sidebar BG",
+  "user.settings.custom_theme.sidebarHeaderBg": "Sidebar Header BG",
+  "user.settings.custom_theme.sidebarHeaderTextColor": "Sidebar Header Text",
+  "user.settings.custom_theme.sidebarText": "Sidebar Text",
+  "user.settings.custom_theme.sidebarTextActiveBorder": "Sidebar Text Active Border",
+  "user.settings.custom_theme.sidebarTextActiveColor": "Sidebar Text Active Color",
+  "user.settings.custom_theme.sidebarTextHoverBg": "Sidebar Text Hover BG",
+  "user.settings.custom_theme.sidebarTitle": "Sidebar Styles",
+  "user.settings.custom_theme.sidebarUnreadText": "Sidebar Unread Text",
+  "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": "Expand links to show a preview of content, when available.",
+  "user.settings.display.collapseDisplay": "Link 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",
+  "user.settings.display.fullScreen": "Full width",
+  "user.settings.display.language": "Language",
+  "user.settings.display.messageDisplayClean": "Standard",
+  "user.settings.display.messageDisplayCleanDes": "Easy to scan and read.",
+  "user.settings.display.messageDisplayCompact": "Compact",
+  "user.settings.display.messageDisplayCompactDes": "Fit as many messages on the screen as we can.",
+  "user.settings.display.messageDisplayDescription": "Select how messages in a channel should be displayed.",
+  "user.settings.display.messageDisplayTitle": "Message Display",
+  "user.settings.display.militaryClock": "24-hour clock (example: 16:00)",
+  "user.settings.display.nameOptsDesc": "Set how to display other user's names in posts and the Direct Messages list.",
+  "user.settings.display.normalClock": "12-hour clock (example: 4:00 PM)",
+  "user.settings.display.preferTime": "Select how you prefer time displayed.",
+  "user.settings.display.showFullname": "Show first and last name",
+  "user.settings.display.showNickname": "Show nickname if one exists, otherwise show first and last name",
+  "user.settings.display.showUsername": "Show username (default)",
+  "user.settings.display.teammateDisplay": "Teammate Name Display",
+  "user.settings.display.theme.customTheme": "Custom Theme",
+  "user.settings.display.theme.describe": "Open to manage your theme",
+  "user.settings.display.theme.import": "Import theme colors from Slack",
+  "user.settings.display.theme.otherThemes": "See other themes",
+  "user.settings.display.theme.themeColors": "Theme Colors",
+  "user.settings.display.theme.title": "Theme",
+  "user.settings.display.title": "Display Settings",
+  "user.settings.general.checkEmail": "Check your email at {email} to verify the address.",
+  "user.settings.general.checkEmailNoAddress": "Check your email to verify your new address",
+  "user.settings.general.close": "Close",
+  "user.settings.general.confirmEmail": "Confirm Email",
+  "user.settings.general.email": "Email",
+  "user.settings.general.emailGitlabCantUpdate": "Login occurs through GitLab. Email cannot be updated. Email address used for notifications is {email}.",
+  "user.settings.general.emailGoogleCantUpdate": "Login occurs through Google. Email cannot be updated. Email address used for notifications is {email}.",
+  "user.settings.general.emailHelp1": "Email is used for sign-in, notifications, and password reset. Email requires verification if changed.",
+  "user.settings.general.emailHelp2": "Email has been disabled by your System Administrator. No notification emails will be sent until it is enabled.",
+  "user.settings.general.emailHelp3": "Email is used for sign-in, notifications, and password reset.",
+  "user.settings.general.emailHelp4": "A verification email was sent to {email}.",
+  "user.settings.general.emailLdapCantUpdate": "Login occurs through AD/LDAP. Email cannot be updated. Email address used for notifications is {email}.",
+  "user.settings.general.emailMatch": "The new emails you entered do not match.",
+  "user.settings.general.emailOffice365CantUpdate": "Login occurs through Office 365. Email cannot be updated. Email address used for notifications is {email}.",
+  "user.settings.general.emailSamlCantUpdate": "Login occurs through SAML. Email cannot be updated. Email address used for notifications is {email}.",
+  "user.settings.general.emailUnchanged": "Your new email address is the same as your old email address.",
+  "user.settings.general.emptyName": "Click 'Edit' to add your full name",
+  "user.settings.general.emptyNickname": "Click 'Edit' to add a nickname",
+  "user.settings.general.field_handled_externally": "This field is handled through your login provider. If you want to change it, you need to do so through your login provider.",
+  "user.settings.general.firstName": "First Name",
+  "user.settings.general.fullName": "Full Name",
+  "user.settings.general.imageTooLarge": "Unable to upload profile image. File is too large.",
+  "user.settings.general.imageUpdated": "Image last updated {date}",
+  "user.settings.general.lastName": "Last Name",
+  "user.settings.general.loginGitlab": "Login done through GitLab ({email})",
+  "user.settings.general.loginGoogle": "Login done through Google ({email})",
+  "user.settings.general.loginLdap": "Login done through AD/LDAP ({email})",
+  "user.settings.general.loginOffice365": "Login done through Office 365 ({email})",
+  "user.settings.general.loginSaml": "Login done through SAML ({email})",
+  "user.settings.general.newAddress": "New Address: {email}<br />Check your email to verify the above address.",
+  "user.settings.general.nickname": "Nickname",
+  "user.settings.general.nicknameExtra": "Use Nickname for a name you might be called that is different from your first name and username. This is most often used when two or more people have similar sounding names and usernames.",
+  "user.settings.general.notificationsExtra": "By default, you will receive mention notifications when someone types your first name. Go to {notify} settings to change this default.",
+  "user.settings.general.notificationsLink": "Notifications",
+  "user.settings.general.primaryEmail": "Primary Email",
+  "user.settings.general.profilePicture": "Profile Picture",
+  "user.settings.general.title": "General Settings",
+  "user.settings.general.uploadImage": "Click 'Edit' to upload an image.",
+  "user.settings.general.username": "Username",
+  "user.settings.general.usernameInfo": "Pick something easy for teammates to recognize and recall.",
+  "user.settings.general.usernameReserved": "This username is reserved, please choose a new one.",
+  "user.settings.general.usernameRestrictions": "Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-', and '_'.",
+  "user.settings.general.validEmail": "Please enter a valid email address",
+  "user.settings.general.validImage": "Only JPG or PNG images may be used for profile pictures",
+  "user.settings.import_theme.cancel": "Cancel",
+  "user.settings.import_theme.importBody": "To import a theme, go to a Slack team and look for “Preferences -> Sidebar Theme”. Open the custom theme option, copy the theme color values and paste them here:",
+  "user.settings.import_theme.importHeader": "Import Slack Theme",
+  "user.settings.import_theme.submit": "Submit",
+  "user.settings.import_theme.submitError": "Invalid format, please try copying and pasting in again.",
+  "user.settings.languages.change": "Change interface language",
+  "user.settings.languages.promote": "Select which language Mattermost displays in the user interface.<br /><br />Would like to help with translations? Join the <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> to contribute.",
+  "user.settings.mfa.add": "Add MFA to your account",
+  "user.settings.mfa.addHelp": "You can require a smartphone-based token, in addition to your password, to sign into Mattermost.<br/><br/>To enable, download Google Authenticator from <a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a> or <a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a> for your phone, then<br/><br/>1. Click the <strong>Add MFA to your account</strong> button above.<br/>2. Use Google Authenticator to scan the QR code that appears.<br/>3. Type in the Token generated by Google Authenticator and click <strong>Save</strong>.<br/><br/>When logging in, you will be asked to enter a token from Google Authenticator in addition to your regular credentials.",
+  "user.settings.mfa.addHelpQr": "Please scan the bar code with the Google Authenticator app on your smartphone and fill in the token with one provided by the app.",
+  "user.settings.mfa.enterToken": "Token (numbers only)",
+  "user.settings.mfa.qrCode": "Bar Code",
+  "user.settings.mfa.remove": "Remove MFA from your account",
+  "user.settings.mfa.removeHelp": "Removing multi-factor authentication means you will no longer require a phone-based passcode to sign-in to your account.",
+  "user.settings.mfa.title": "Multi-factor Authentication",
+  "user.settings.modal.advanced": "Advanced",
+  "user.settings.modal.confirmBtns": "Yes, Discard",
+  "user.settings.modal.confirmMsg": "You have unsaved changes, are you sure you want to discard them?",
+  "user.settings.modal.confirmTitle": "Discard Changes?",
+  "user.settings.modal.display": "Display",
+  "user.settings.modal.general": "General",
+  "user.settings.modal.notifications": "Notifications",
+  "user.settings.modal.security": "Security",
+  "user.settings.modal.title": "Account Settings",
+  "user.settings.notifications.allActivity": "For all activity",
+  "user.settings.notifications.channelWide": "Channel-wide mentions \"@channel\", \"@all\"",
+  "user.settings.notifications.close": "Close",
+  "user.settings.notifications.comments": "Reply notifications",
+  "user.settings.notifications.commentsAny": "Trigger notifications on messages in reply threads that I start or participate in",
+  "user.settings.notifications.commentsInfo": "In addition to notifications for when you're mentioned, select if you would like to receive notifications on reply threads.",
   "user.settings.notifications.commentsNever": "Do not trigger notifications on messages in reply threads unless I'm mentioned",
-  "user.settings.notifications.commentsRoot": "Dispara notificações de mensagens em tópicos que eu iniciei",
-  "user.settings.notifications.desktop": "Enviar notificações de desktop",
-  "user.settings.notifications.desktop.allFirefoxForever": "Para toda atividade, mostrada indefinidamente",
-  "user.settings.notifications.desktop.allFirefoxTimed": "Para toda atividade, mostrada por {seconds} segundos",
-  "user.settings.notifications.desktop.allNoSoundForever": "Para toda atividade, sem som, mostrada indefinidamente",
-  "user.settings.notifications.desktop.allNoSoundTimed": "Para toda atividade, sem som, mostrada por {seconds} segundos",
-  "user.settings.notifications.desktop.allSoundForever": "Para toda atividade, com som, mostrada indefinidamente",
-  "user.settings.notifications.desktop.allSoundTimed": "Para toda atividade, sem som, mostrada por {seconds} segundos",
-  "user.settings.notifications.desktop.duration": "Duração da notificação",
-  "user.settings.notifications.desktop.durationInfo": "Define quanto tempo a notificação no desktop permanece na tela.",
-  "user.settings.notifications.desktop.mentionsFirefoxForever": "Para menções e mensagens diretas, mostrada indefinidamente",
-  "user.settings.notifications.desktop.mentionsFirefoxTimed": "Para menções e mensagens diretas, mostradas por {seconds} segundos",
-  "user.settings.notifications.desktop.mentionsNoSoundForever": "Para menções e mensagens diretas, sem som, mostrada indefinidamente",
-  "user.settings.notifications.desktop.mentionsNoSoundTimed": "Para menções e mensagens diretas, sem som, mostradas por {seconds} segundos",
-  "user.settings.notifications.desktop.mentionsSoundForever": "Para menções e mensagens diretas, com som, mostrada indefinidamente",
-  "user.settings.notifications.desktop.mentionsSoundTimed": "Para menções e mensagens diretas, com som, mostrada por {seconds} segundos",
-  "user.settings.notifications.desktop.seconds": "{seconds} segundos",
-  "user.settings.notifications.desktop.sound": "Som da notificação",
-  "user.settings.notifications.desktop.title": "Notificação no Desktop",
-  "user.settings.notifications.desktop.unlimited": "Ilimitado",
-  "user.settings.notifications.desktopSounds": "Som de notificação no Desktop",
-  "user.settings.notifications.emailBatchingInfo": "Notificações recebidas dentro do período de tempo selecionado são combinadas e enviadas em um único email.",
-  "user.settings.notifications.emailInfo": "Notificações de e-mail são enviadas por menções e mensagens diretas, quando você está desconectado ou ausente do {siteName} por mais de 5 minutos.",
-  "user.settings.notifications.emailNotifications": "Notificações por email",
-  "user.settings.notifications.everyHour": "Cara hora",
-  "user.settings.notifications.everyXMinutes": "Cada {count, plural, one {minuto} other {{count, number} minutos}}",
-  "user.settings.notifications.header": "Notificações",
-  "user.settings.notifications.immediately": "Imediatamente",
-  "user.settings.notifications.info": "Notificações no desktop estão disponíveis no Firefox, Safari e Chrome.",
-  "user.settings.notifications.never": "Nunca",
-  "user.settings.notifications.noWords": "Nenhuma palavra configurada",
-  "user.settings.notifications.off": "Desligado",
-  "user.settings.notifications.on": "Ligado",
-  "user.settings.notifications.onlyMentions": "Somente para menções e mensagens diretas",
-  "user.settings.notifications.push": "Notificações push móvel",
-  "user.settings.notifications.sensitiveName": "Seu primeiro nome sensível a maiúsculas e minúsculas \"{first_name}\"",
-  "user.settings.notifications.sensitiveUsername": "Seu usuário não sensível a maiúsculas \"{username}\"",
-  "user.settings.notifications.sensitiveWords": "Outras palavras não sensível a maiúscula, separadas por virgulas:",
-  "user.settings.notifications.soundConfig": "Por favor configurar sons de notificações nas configurações do seu navegador",
-  "user.settings.notifications.sounds_info": "Sons para notificações está disponível no IE11, Edge, Safari e Chrome.",
-  "user.settings.notifications.teamWide": "Mencionar toda a equipe \"@all\"",
-  "user.settings.notifications.title": "Configurações de Notificação",
-  "user.settings.notifications.usernameMention": "Seu usuário mencionado \"@{username}\"",
-  "user.settings.notifications.wordsTrigger": "Palavras que desencadeiam menções",
-  "user.settings.push_notification.allActivityAway": "Para toda atividade quando ausente ou desconectado",
-  "user.settings.push_notification.allActivityOffline": "Para toda atividade quando desconectado",
-  "user.settings.push_notification.allActivityOnline": "Para toda atividade quando conectado, ausente ou desconectado",
-  "user.settings.push_notification.away": "Ausente ou desconectado",
-  "user.settings.push_notification.disabled": "Desativado pelo Administrador do Sistema",
-  "user.settings.push_notification.disabled_long": "Notificações push para dispositivos móveis foram desativados pelo Administrador do Sistema.",
-  "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.offline": "Desconectado",
-  "user.settings.push_notification.online": "Conectado, ausente ou desconectado",
-  "user.settings.push_notification.onlyMentionsAway": "Para menções e mensagens diretas quando ausente ou desconectado",
-  "user.settings.push_notification.onlyMentionsOffline": "Para menções e mensagens diretas quando desconectado",
-  "user.settings.push_notification.onlyMentionsOnline": "Para menções e mensagens diretas quando conectado, ausente ou desconectado",
-  "user.settings.push_notification.send": "Enviar notificações push móvel",
-  "user.settings.push_notification.status": "Disparar notificações push quando",
-  "user.settings.push_notification.status_info": "Alertas de notificação só são enviados para o seu dispositivo móvel quando seu status conectado corresponder à seleção acima.",
-  "user.settings.security.close": "Fechar",
-  "user.settings.security.currentPassword": "Senha Atual",
-  "user.settings.security.currentPasswordError": "Por favor entre sua senha atual.",
-  "user.settings.security.deauthorize": "Desautorize",
-  "user.settings.security.emailPwd": "Email e Senha",
+  "user.settings.notifications.commentsRoot": "Trigger notifications on messages in threads that I start",
+  "user.settings.notifications.desktop": "Send desktop notifications",
+  "user.settings.notifications.desktop.allFirefoxForever": "For all activity, shown indefinitely",
+  "user.settings.notifications.desktop.allFirefoxTimed": "For all activity, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.allNoSoundForever": "For all activity, without sound, shown indefinitely",
+  "user.settings.notifications.desktop.allNoSoundTimed": "For all activity, without sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.allSoundForever": "For all activity, with sound, shown indefinitely",
+  "user.settings.notifications.desktop.allSoundTimed": "For all activity, with sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.duration": "Notification duration",
+  "user.settings.notifications.desktop.durationInfo": "Sets how long desktop notifications will remain on screen.",
+  "user.settings.notifications.desktop.mentionsFirefoxForever": "For mentions and direct messages, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsFirefoxTimed": "For mentions and direct messages, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.mentionsNoSoundForever": "For mentions and direct messages, without sound, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsNoSoundTimed": "For mentions and direct messages, without sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.mentionsSoundForever": "For mentions and direct messages, with sound, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsSoundTimed": "For mentions and direct messages, with sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.seconds": "{seconds} seconds",
+  "user.settings.notifications.desktop.sound": "Notification sound",
+  "user.settings.notifications.desktop.title": "Desktop notifications",
+  "user.settings.notifications.desktop.unlimited": "Unlimited",
+  "user.settings.notifications.desktopSounds": "Desktop notification sounds",
+  "user.settings.notifications.email.everyHour": "Every hour",
+  "user.settings.notifications.email.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
+  "user.settings.notifications.email.immediately": "Immediately",
+  "user.settings.notifications.email.never": "Never",
+  "user.settings.notifications.email.send": "Send email notifications",
+  "user.settings.notifications.emailBatchingInfo": "Notifications received over the time period selected are combined and sent in a single email.",
+  "user.settings.notifications.emailInfo": "Email notifications are sent for mentions and direct messages when you are offline or away from {siteName} for more than 5 minutes.",
+  "user.settings.notifications.emailNotifications": "Email notifications",
+  "user.settings.notifications.header": "Notifications",
+  "user.settings.notifications.info": "Desktop notifications are available on Firefox, Safari, and Chrome.",
+  "user.settings.notifications.noWords": "No words configured",
+  "user.settings.notifications.off": "Off",
+  "user.settings.notifications.on": "On",
+  "user.settings.notifications.onlyMentions": "Only for mentions and direct messages",
+  "user.settings.notifications.push": "Mobile push notifications",
+  "user.settings.notifications.sensitiveName": "Your case sensitive first name \"{first_name}\"",
+  "user.settings.notifications.sensitiveUsername": "Your non-case sensitive username \"{username}\"",
+  "user.settings.notifications.sensitiveWords": "Other non-case sensitive words, separated by commas:",
+  "user.settings.notifications.soundConfig": "Please configure notification sounds in your browser settings",
+  "user.settings.notifications.sounds_info": "Notification sounds are available on IE11, Edge, Safari and Chrome.",
+  "user.settings.notifications.teamWide": "Team-wide mentions \"@all\"",
+  "user.settings.notifications.title": "Notification Settings",
+  "user.settings.notifications.usernameMention": "Your username mentioned \"@{username}\"",
+  "user.settings.notifications.wordsTrigger": "Words that trigger mentions",
+  "user.settings.push_notification.allActivityAway": "For all activity when away or offline",
+  "user.settings.push_notification.allActivityOffline": "For all activity when offline",
+  "user.settings.push_notification.allActivityOnline": "For all activity when online, away or offline",
+  "user.settings.push_notification.away": "Away or offline",
+  "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.offline": "Offline",
+  "user.settings.push_notification.online": "Online, away or offline",
+  "user.settings.push_notification.onlyMentionsAway": "For mentions and direct messages when away or offline",
+  "user.settings.push_notification.onlyMentionsOffline": "For mentions and direct messages when offline",
+  "user.settings.push_notification.onlyMentionsOnline": "For mentions and direct messages when online, away or offline",
+  "user.settings.push_notification.send": "Send mobile push notifications",
+  "user.settings.push_notification.status": "Trigger push notifications when",
+  "user.settings.push_notification.status_info": "Notification alerts are only pushed to your mobile device when your online status matches the selection above.",
+  "user.settings.security.close": "Close",
+  "user.settings.security.currentPassword": "Current Password",
+  "user.settings.security.currentPasswordError": "Please enter your current password.",
+  "user.settings.security.deauthorize": "Deauthorize",
+  "user.settings.security.emailPwd": "Email and Password",
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "Google",
-  "user.settings.security.lastUpdated": "Última atualização {date} {time}",
-  "user.settings.security.ldap": "LDAP",
-  "user.settings.security.loginGitlab": "Login feito através do GitLab",
-  "user.settings.security.loginLdap": "Login feito através de LDAP",
-  "user.settings.security.logoutActiveSessions": "Ver e fazer Logout das Sessões Ativas",
-  "user.settings.security.method": "Método de Login",
-  "user.settings.security.newPassword": "Nova Senha",
-  "user.settings.security.noApps": "Nenhuma Aplicação OAuth 2.0 está autorizada.",
-  "user.settings.security.oauthApps": "Aplicativos OAuth 2.0",
-  "user.settings.security.oauthAppsDescription": "Clique 'Editar' para gerenciar sua Aplicação OAuth 2.0",
-  "user.settings.security.oauthAppsHelp": "Aplicações atuam em seu nome para acessar seus dados com base nas permissões que você conceder.",
+  "user.settings.security.lastUpdated": "Last updated {date} at {time}",
+  "user.settings.security.ldap": "AD/LDAP",
+  "user.settings.security.loginGitlab": "Login done through Gitlab",
+  "user.settings.security.loginLdap": "Login done through AD/LDAP",
+  "user.settings.security.logoutActiveSessions": "View and Logout of Active Sessions",
+  "user.settings.security.method": "Sign-in Method",
+  "user.settings.security.newPassword": "New Password",
+  "user.settings.security.noApps": "No OAuth 2.0 Applications are authorized.",
+  "user.settings.security.oauthApps": "OAuth 2.0 Applications",
+  "user.settings.security.oauthAppsDescription": "Click 'Edit' to manage your OAuth 2.0 Applications",
+  "user.settings.security.oauthAppsHelp": "Applications act on your behalf to access your data based on the permissions you grant them.",
   "user.settings.security.office365": "Office 365",
-  "user.settings.security.oneSignin": "Você pode ter somente um método de login por vez. Trocando o método de login será enviado um email de notificação se você alterar com sucesso.",
-  "user.settings.security.password": "Senha",
-  "user.settings.security.passwordError": "Sua senha deve conter pelo menos {min} caracteres.",
-  "user.settings.security.passwordErrorLowercase": "Sua senha deve conter pelo menos {min} caracteres constituídos por pelo menos uma letra minúscula.",
-  "user.settings.security.passwordErrorLowercaseNumber": "Sua senha deve conter pelo menos {min} caracteres constituídos por pelo menos uma letra minúscula e pelo menos um número.",
-  "user.settings.security.passwordErrorLowercaseNumberSymbol": "Sua senha deve conter pelo menos {min} caracteres constituídos por pelo menos uma letra minúscula, pelo menos um número, e pelo menos um símbolo (ex. \"~!@#$%^&*()\").",
-  "user.settings.security.passwordErrorLowercaseSymbol": "Sua senha deve conter pelo menos {min} caracteres constituídos por pelo menos uma letra minúscula e pelo menos um símbolo (ex. \"~!@#$%^&*()\").",
-  "user.settings.security.passwordErrorLowercaseUppercase": "Sua senha deve conter pelo menos {min} caracteres constituídos por pelo menos uma letra minúscula e pelo menos uma letra maiúscula.",
-  "user.settings.security.passwordErrorLowercaseUppercaseNumber": "Sua senha deve conter pelo menos {min} caracteres constituídos por pelo menos uma letra minúscula, pelo menos uma letra maiúscula, e pelo menos um número.",
-  "user.settings.security.passwordErrorLowercaseUppercaseNumberSymbol": "Sua senha deve conter pelo menos {min} caracteres constituídos por pelo menos uma letra minúscula, pelo menos uma letra maiúscula, pelo menos um número, e pelo menos um símbolo (ex. \"~!@#$%^&*()\").",
-  "user.settings.security.passwordErrorLowercaseUppercaseSymbol": "Sua senha deve conter pelo menos {min} caracteres constituídos por pelo menos uma letra minúscula, pelo menos uma letra maiúscula, e pelo menos um símbolo (ex. \"~!@#$%^&*()\").",
-  "user.settings.security.passwordErrorNumber": "Sua senha deve conter pelo menos {min} caracteres constituídos por pelo menos um número.",
-  "user.settings.security.passwordErrorNumberSymbol": "Sua senha deve conter pelo menos {min} caracteres constituídos por pelo menos um número e pelo menos um símbolo (ex. \"~!@#$%^&*()\").",
-  "user.settings.security.passwordErrorSymbol": "Sua senha deve conter pelo menos {min} caracteres constituídos por menos um símbolo (ex. \"~!@#$%^&*()\").",
-  "user.settings.security.passwordErrorUppercase": "Sua senha deve conter pelo menos {min} caracteres constituídos por pelo menos uma letra maiúscula.",
-  "user.settings.security.passwordErrorUppercaseNumber": "Sua senha deve conter pelo menos {min} caracteres constituídos por pelo menos uma letra maiúscula e pelo menos um número.",
-  "user.settings.security.passwordErrorUppercaseNumberSymbol": "Sua senha deve conter pelo menos {min} caracteres constituídos por pelo menos uma letra maiúscula, pelo menos um número, e pelo menos um símbolo (ex. \"~!@#$%^&*()\").",
-  "user.settings.security.passwordErrorUppercaseSymbol": "Sua senha deve conter pelo menos {min} caracteres constituídos por pelo menos uma letra maiúscula e pelo menos um símbolo (ex. \"~!@#$%^&*()\").",
-  "user.settings.security.passwordGitlabCantUpdate": "Login ocorreu através do GitLab. Senha não pode ser atualizada.",
-  "user.settings.security.passwordLdapCantUpdate": "Login ocorreu através de LDAP. Senha não pode ser atualizada.",
-  "user.settings.security.passwordMatchError": "As novas senhas que você inseriu não correspondem.",
-  "user.settings.security.passwordMinLength": "Comprimento mínimo inválido, não é possível mostrar pré-visualização.",
-  "user.settings.security.retypePassword": "Digite Novamente a nova Senha",
+  "user.settings.security.oneSignin": "You may only have one sign-in method at a time. Switching sign-in method will send an email notifying you if the change was successful.",
+  "user.settings.security.password": "Password",
+  "user.settings.security.passwordError": "Your password must contain at least {min} characters.",
+  "user.settings.security.passwordErrorLowercase": "Your password must contain at least {min} characters made up of at least one lowercase letter.",
+  "user.settings.security.passwordErrorLowercaseNumber": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one number.",
+  "user.settings.security.passwordErrorLowercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseUppercase": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one uppercase letter.",
+  "user.settings.security.passwordErrorLowercaseUppercaseNumber": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one number.",
+  "user.settings.security.passwordErrorLowercaseUppercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorNumber": "Your password must contain at least {min} characters made up of at least one number.",
+  "user.settings.security.passwordErrorNumberSymbol": "Your password must contain at least {min} characters made up of at least one number and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorSymbol": "Your password must contain at least {min} characters made up of at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorUppercase": "Your password must contain at least {min} characters made up of at least one uppercase letter.",
+  "user.settings.security.passwordErrorUppercaseNumber": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one number.",
+  "user.settings.security.passwordErrorUppercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordGitlabCantUpdate": "Login occurs through GitLab. Password cannot be updated.",
+  "user.settings.security.passwordLdapCantUpdate": "Login occurs through AD/LDAP. Password cannot be updated.",
+  "user.settings.security.passwordMatchError": "The new passwords you entered do not match.",
+  "user.settings.security.passwordMinLength": "Invalid minimum length, cannot show preview.",
+  "user.settings.security.retypePassword": "Retype New Password",
   "user.settings.security.saml": "SAML",
-  "user.settings.security.switchEmail": "Trocar para usar email e senha",
-  "user.settings.security.switchGitlab": "Trocar para usar GitLab SSO",
-  "user.settings.security.switchGoogle": "Trocar para usar Google SSO",
-  "user.settings.security.switchLdap": "Trocar para usar LDAP",
-  "user.settings.security.switchOffice365": "Mudar para usar Office 365 SSO",
-  "user.settings.security.switchSaml": "Trocar para usar SAML SSO",
-  "user.settings.security.title": "Configurações de Segurança",
-  "user.settings.security.viewHistory": "Ver Histórico de Acesso",
-  "user_list.notFound": "Nenhum usuário encontrado",
-  "view_image.loading": "Carregando ",
+  "user.settings.security.switchEmail": "Switch to using email and password",
+  "user.settings.security.switchGitlab": "Switch to using GitLab SSO",
+  "user.settings.security.switchGoogle": "Switch to using Google SSO",
+  "user.settings.security.switchLdap": "Switch to using AD/LDAP",
+  "user.settings.security.switchOffice365": "Switch to using Office 365 SSO",
+  "user.settings.security.switchSaml": "Switch to using SAML SSO",
+  "user.settings.security.title": "Security Settings",
+  "user.settings.security.viewHistory": "View Access History",
+  "user_list.notFound": "No users found",
+  "view_image.loading": "Loading ",
   "view_image_popover.download": "Download",
-  "view_image_popover.file": "Arquivo {count} de {total}",
-  "view_image_popover.publicLink": "Obter O Link Público",
-  "web.footer.about": "Sobre",
-  "web.footer.help": "Ajuda",
-  "web.footer.privacy": "Privacidade",
-  "web.footer.terms": "Termos",
-  "web.header.back": "Voltar",
-  "web.root.signup_info": "Toda comunicação em um só lugar, pesquisável e acessível em qualquer lugar",
-  "youtube_video.notFound": "Vídeo não encontrado"
+  "view_image_popover.file": "File {count} of {total}",
+  "view_image_popover.publicLink": "Get Public Link",
+  "web.footer.about": "About",
+  "web.footer.help": "Help",
+  "web.footer.privacy": "Privacy",
+  "web.footer.terms": "Terms",
+  "web.header.back": "Back",
+  "web.root.signup_info": "All team communication in one place, searchable and accessible anywhere",
+  "youtube_video.notFound": "Video not found"
 }
diff --git a/webapp/i18n/zh_CN.json b/webapp/i18n/zh_CN.json
index dbaeb13b3..905201706 100644
--- a/webapp/i18n/zh_CN.json
+++ b/webapp/i18n/zh_CN.json
@@ -217,7 +217,7 @@
   "admin.customization.enableCustomEmojiTitle": "启用自定义表情：",
   "admin.customization.iosAppDownloadLinkDesc": "添加iOS应用下载链接。用移动设备访问的用户将看到应用下载提示页面。此栏留空将不显示。",
   "admin.customization.iosAppDownloadLinkTitle": "iOS应用下载网址：",
-  "admin.customization.nativeAppLinks": "Mattermost App Links",
+  "admin.customization.nativeAppLinks": "Mattermost 应用链接",
   "admin.customization.restrictCustomEmojiCreationAdmin": "允许系统和团队管理员创建表情符号",
   "admin.customization.restrictCustomEmojiCreationAll": "允许每个人可以创建自定义表情",
   "admin.customization.restrictCustomEmojiCreationDesc": "限制某些用户创建自定义表情符号。",
@@ -229,7 +229,7 @@
   "admin.email.agreeHPNS": "我理解并同意Mattermost推送提醒服务<a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">条款</a>和<a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">隐私策略</a>。",
   "admin.email.allowEmailSignInDescription": "当设置为是时，Mattermost允许用户使用电子邮件地址和密码登入。",
   "admin.email.allowEmailSignInTitle": "开启使用邮件地址登入：",
-  "admin.email.allowSignupDescription": "当设置为是时，Mattermost允许团队创建和使用电子邮件地址和密码注册帐户。此值唯一设为否的情况是你想使用OAuth或者LADP这种单点登录服务注册。",
+  "admin.email.allowSignupDescription": "当设置为是时，Mattermost允许团队创建和使用电子邮件地址和密码注册帐户。此值唯一设为否的情况是你想使用 OAuth 或者 AD/LDAP 这种单点登录服务注册。",
   "admin.email.allowSignupTitle": "开启使用邮件地址创建帐号：",
   "admin.email.allowUsernameSignInDescription": "当设置为是时，Mattermost允许用户使用用户名和密码登录。此设置通常只用于当电子邮件验证被禁用时。",
   "admin.email.allowUsernameSignInTitle": "开启使用用户名登入：",
@@ -392,57 +392,59 @@
   "admin.image.thumbWidthTitle": "附件缩略图宽度：",
   "admin.integrations.custom": "自定义集成",
   "admin.integrations.external": "外部服务",
-  "admin.ldap.baseDesc": "Base DN 是 Mattermost 在 LADP 树中搜索用户开始的专有名称路径。",
+  "admin.ldap.baseDesc": "Base DN 是 Mattermost 在 AD/LDAP 树中搜索用户开始的专有名称路径。",
   "admin.ldap.baseEx": "例如：\"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "BaseDN：",
   "admin.ldap.bindPwdDesc": "\"绑定用户名\"的密码。",
   "admin.ldap.bindPwdTitle": "绑定密码：",
-  "admin.ldap.bindUserDesc": "用来 LDAP 搜索的用户名。通常用一个专门给 Mattermost 使用的帐号。此帐号应该只有访问 BaseDN 栏指定 LADP 树只读权限。",
+  "admin.ldap.bindUserDesc": "用来 AD/LDAP 搜索的用户名。通常用一个专门给 Mattermost 使用的帐号。此帐号应该只有访问 BaseDN 栏指定 AD/LDAP 树只读权限。",
   "admin.ldap.bindUserTitle": "绑定用户名：",
-  "admin.ldap.emailAttrDesc": "LDAP服务器中属性用于填充Mattermost用户电子邮箱地址属性。",
+  "admin.ldap.emailAttrDesc": "AD/LDAP 服务器中属性用于填充 Mattermost 用户电子邮箱地址属性。",
   "admin.ldap.emailAttrEx": "前“邮件”或“用户主名称”",
   "admin.ldap.emailAttrTitle": "电子邮箱属性：",
-  "admin.ldap.enableDesc": "当设置为是时,Mattermost允许LADP登录",
-  "admin.ldap.enableTitle": "开启LDAP登入：",
-  "admin.ldap.firstnameAttrDesc": "（可选）LDAP 服务器属性用于填充 Mattermost 用户名子。",
+  "admin.ldap.enableDesc": "当设置为是时，Mattermost 允许使用 AD/LDAP 登录",
+  "admin.ldap.enableTitle": "开启 AD/LDAP 登入：",
+  "admin.ldap.firstnameAttrDesc": "（可选）AD/LDAP 服务器属性用于填充 Mattermost 用户名子。",
   "admin.ldap.firstnameAttrEx": "例如\"givenName\"",
   "admin.ldap.firstnameAttrTitle": "姓属性",
-  "admin.ldap.idAttrDesc": "此属性在LADP服务器作为Mattermost中一个被用于做唯一标识符值。它将不可被修改，类似用户名或者用户ID。如果一个用户的ID属性被修改，它将创建一个新的Mattermost账户并且与之前的用户无关。它被用于在Mattermost登录时“LDAP用户名”字段在登录页面。一般该属性字段与上面的“用户名属性”字段相同。如果你的团队通常使用 域名\\用户名 登录到其他LDAP服务，你可以选择在本栏使用 域名\\用户名 以跟其他站点保持一致。",
+  "admin.ldap.idAttrDesc": "此属性在 AD/LDAP 服务器作为 Mattermost 中一个被用于做唯一标识符值。它将不可被修改，类似用户名或者用户ID。如果一个用户的ID属性被修改，它将创建一个新的 Mattermost 账户并且与之前的用户无关。它被用于在 Mattermost 登录时“AD/LDAP 用户名”字段在登录页面。一般该属性字段与上面的“用户名属性”字段相同。如果你的团队通常使用 域名\\用户名 登录到其他 AD/LDAP 服务，你可以选择在本栏使用 域名\\用户名 以跟其他站点保持一致。",
   "admin.ldap.idAttrEx": "例如\"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "ID属性：",
-  "admin.ldap.lastnameAttrDesc": "（可选）LDAP 服务器属性用于填充 Mattermost 用户姓氏。",
+  "admin.ldap.lastnameAttrDesc": "（可选）AD/LDAP 服务器属性用于填充 Mattermost 用户姓氏。",
   "admin.ldap.lastnameAttrEx": "例如\"sn\"",
   "admin.ldap.lastnameAttrTitle": "姓氏属性：",
-  "admin.ldap.loginNameDesc": "出现在登录页面登录框的占位符文本，默认为“LDAP用户名”。",
-  "admin.ldap.loginNameEx": "前“LDAP用户名”",
+  "admin.ldap.ldap_test_button": "AD/LDAP Test",
+  "admin.ldap.loginNameDesc": "出现在登录页面登录框的占位符文本，默认为 \"AD/LDAP 用户名\"。",
+  "admin.ldap.loginNameEx": "前 \"AD/LDAP 用户名\"",
   "admin.ldap.loginNameTitle": "域名登录：",
   "admin.ldap.maxPageSizeEx": "例如\"2000\"",
   "admin.ldap.maxPageSizeHelpText": "Mattermost 向 LDAP 服务器请求使用者资料时单次最多的数量。0表示无上限。",
   "admin.ldap.maxPageSizeTitle": "最大页面大小：",
-  "admin.ldap.nicknameAttrDesc": "（可选）在 LDAP 服务器将用于填充 Mattermost 用户名的属性。",
+  "admin.ldap.nicknameAttrDesc": "（可选）在 AD/LDAP 服务器将用于填充 Mattermost 昵称的属性。",
   "admin.ldap.nicknameAttrEx": "例如：\"昵称\"",
   "admin.ldap.nicknameAttrTitle": "昵称：",
-  "admin.ldap.noLicense": "<h4 class=\"banner__heading\">提示：</h4><p>LDAP是一个企业平台特性。您当前的证书不支持LDAP。请点击<a href=\"http://mattermost.com\" target=\"_blank\">这里</a>获取企业证书的信息和价格。</p>",
-  "admin.ldap.portDesc": "该端口将连接到LDAP服务器。默认389。",
+  "admin.ldap.noLicense": "<h4 class=\"banner__heading\">提示：</h4><p>AD/LDAP 是一个企业平台特性。您当前的证书不支持 AD/LDAP。请点击<a href=\"http://mattermost.com\" target=\"_blank\">这里</a>获取企业证书的信息和价格。</p>",
+  "admin.ldap.portDesc": "该端口将连接到 AD/LDAP 服务器。默认389。",
   "admin.ldap.portEx": "例如\"389\"",
-  "admin.ldap.portTitle": "LDAP端口：",
-  "admin.ldap.queryDesc": "查询LADP服务器超时值。增加此值如果你遇到查询一个缓慢LDAP服务器时发生超时错误。",
+  "admin.ldap.portTitle": "AD/LDAP 端口：",
+  "admin.ldap.queryDesc": "查询 AD/LDAP 服务器超时值。增加此值如果你遇到查询一个缓慢 AD/LDAP 服务器时发生超时错误。",
   "admin.ldap.queryEx": "例如\"60\"",
   "admin.ldap.queryTitle": "查询时限(秒)：",
-  "admin.ldap.serverDesc": "LDAP服务器的域名或IP地址。",
+  "admin.ldap.serverDesc": "AD/LDAP 服务器的域名或IP地址。",
   "admin.ldap.serverEx": "Ex\"10.0.0.23\"",
-  "admin.ldap.serverTitle": "LDAP服务器：",
+  "admin.ldap.serverTitle": "AD/LDAP 服务器：",
   "admin.ldap.skipCertificateVerification": "跳过证书验证：",
   "admin.ldap.skipCertificateVerificationDesc": "跳过TLS或STARTTLS连接的证书验证。不建议用在需要TLS的正式环境下。仅限测试。",
   "admin.ldap.syncFailure": "同步失败：{error}",
-  "admin.ldap.syncIntervalHelpText": "LDAP的同步机制会将Mattermost中的用户信息同步以反映在LDAP服务器上进行的更新。例如，当LDAP服务器上一个用户姓名更改时，这一改变将在Mattermost同步执行。在LDAP 服务器中删除或禁用账户时将他们的Mattermost 账号设置为\"停用\"并且已撤走会话。Mattermost会按照一定的时间频率定期进行同步。例如， 如果设置为60，那么会在每60分钟进行同步。",
+  "admin.ldap.syncIntervalHelpText": "AD/LDAP 的同步机制会将 Mattermost 中的用户信息同步以反映在 AD/LDAP 服务器上进行的更新。例如，当 AD/LDAP 服务器上一个用户姓名更改时，这一改变将在 Mattermost 同步执行。在 AD/LDAP 服务器中删除或禁用账户时将他们的 Mattermost 账号设置为\"停用\"并且已撤走会话。Mattermost 会按照一定的时间频率定期进行同步。例如， 如果设置为60，那么会在每60分钟进行同步。",
   "admin.ldap.syncIntervalTitle": "同步间隔（分钟）：",
-  "admin.ldap.syncNowHelpText": "立即启动一个LDAP同步。",
-  "admin.ldap.sync_button": "开始LDAP同步",
-  "admin.ldap.testFailure": "LDAP 测试失败：{error}",
-  "admin.ldap.testHelpText": "测试 Mattermost 服务器是否能连接到指定的 LDAP 服务器。详细错误信息请见日志文件。",
-  "admin.ldap.uernameAttrDesc": "LDAP服务器中属性用于填充Mattermost用户名属性。这可以和ID属性一致。",
-  "admin.ldap.userFilterDisc": "(可选) 输入个LDAP筛选器用在搜索用户对象。只有被查询条件选中的用户才能访问Mattermost。对于活动目录，过滤禁用用户的查询是(&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2)))。",
+  "admin.ldap.syncNowHelpText": "立即启动一个 AD/LDAP 同步。",
+  "admin.ldap.sync_button": "开始 AD/LDAP 同步",
+  "admin.ldap.testFailure": "AD/LDAP 测试失败：{error}",
+  "admin.ldap.testHelpText": "测试 Mattermost 服务器是否能连接到指定的 AD/LDAP 服务器。详细错误信息请见日志文件。",
+  "admin.ldap.testSuccess": "AD/LDAP Test Successful",
+  "admin.ldap.uernameAttrDesc": "AD/LDAP 服务器中属性用于填充 Mattermost 用户名属性。这可以和 ID 属性一致。",
+  "admin.ldap.userFilterDisc": "(可选) 输入个AD/LDAP筛选器用在搜索用户对象。只有被查询条件选中的用户才能访问 Mattermost。对于活动目录，过滤禁用用户的查询是(&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2)))。",
   "admin.ldap.userFilterEx": "例如 \"(objectClass=user)\"",
   "admin.ldap.userFilterTitle": "用户筛选器：",
   "admin.ldap.usernameAttrEx": "例如\"sAMAccountName\"",
@@ -461,6 +463,8 @@
   "admin.license.uploading": "上传许可证...",
   "admin.log.consoleDescription": "通常在正式环境中设置为是。开发人员应该设置为是来根据控制台日志级别显示日志信息到控制台。如果设置为是，服务器将消息写入到标准输出流 (stdout)。",
   "admin.log.consoleTitle": "日志输出到控制台：",
+  "admin.log.enableDiagnostics": "开启诊断和错误报告：",
+  "admin.log.enableDiagnosticsDescription": "开启此功能将发送错误报告和诊断信息到 Mattermost, Inc. 以帮助提高 Mattermost 的质量和性能。请阅读我们的<a href=\"https://about.mattermost.com/default-privacy-policy/\" target=\"_blank\">隐私政策</a>了解更多。",
   "admin.log.enableWebhookDebugging": "启用Webhook调试：",
   "admin.log.enableWebhookDebuggingDescription": "您可以设置为false来禁用所有传入的webhook请求主体的调试日志记录。",
   "admin.log.fileDescription": "通常在正式环境中设置为是。当设置为是时，日志文件写入到下面指定日志文件位置。",
@@ -563,7 +567,7 @@
   "admin.saml.enableTitle": "开启SAML登入：",
   "admin.saml.encryptDescription": "当设置为是时，Mattermost 将会使用您的服务提供商证书来解密SAML断言。",
   "admin.saml.encryptTitle": "开启加密：",
-  "admin.saml.firstnameAttrDesc": "(可选)使用SAML断言中的属性做为Mattermost中用户的昵称。",
+  "admin.saml.firstnameAttrDesc": "(可选) 使用SAML断言中的属性做为 Mattermost 中用户的昵称。",
   "admin.saml.firstnameAttrEx": "如 \"FirstName\"",
   "admin.saml.firstnameAttrTitle": "名字属性：",
   "admin.saml.idpCertificateFileDesc": "由可信任的身份认证系统提供商所提供的证书公钥",
@@ -575,7 +579,7 @@
   "admin.saml.idpUrlDesc": "Mattermost发送SAML登入启动初始网址。",
   "admin.saml.idpUrlEx": "如 \"https://idp.example.org/SAML2/SSO/Login\"",
   "admin.saml.idpUrlTitle": "SAML SSO 网址：",
-  "admin.saml.lastnameAttrDesc": "(可选)使用SAML断言中的属性做为Mattermost中用户的语言。",
+  "admin.saml.lastnameAttrDesc": "(可选) 使用SAML断言中的属性做为 Mattermost 中用户的姓氏。",
   "admin.saml.lastnameAttrEx": "如 \"LastName\"",
   "admin.saml.lastnameAttrTitle": "姓氏属性：",
   "admin.saml.localeAttrDesc": "(可选)使用SAML断言中的属性做为Mattermost中用户的语言。",
@@ -636,8 +640,8 @@
   "admin.service.iconTitle": "允许整合覆盖头像：",
   "admin.service.insecureTlsDesc": "当设为是时，所有对外的 HTTPS 请求将接受未验证，自签名的证书。例如，对外 webhooks 到任意域名用自签名 TLS 证书的服务器将被允许。注意，这会使得这些连接产生中间人攻击危险。",
   "admin.service.insecureTlsTitle": "启用不安全的对外连接：",
-  "admin.service.integrationAdmin": "限制仅团队和系统管理员可以建整合：",
-  "admin.service.integrationAdminDesc": "当设为是时，用户创建的集成只能由管理员创建。",
+  "admin.service.integrationAdmin": "限制只有管理员能管理整合：",
+  "admin.service.integrationAdminDesc": "当设为是时，webhhoks 和斜杠命令只由团队和系统管理员可以创建、修改和查看，同时只有系统管理员可以操作 OAuth 2.0 应用。整合在管理员创建后所有人可以使用。",
   "admin.service.listenAddress": "监听地址：",
   "admin.service.listenDescription": "绑定和监听地址。输入 \": 8065\" 将绑定所有接口或者您可以选择 \"127.0.0.1: 8065\" 只监听本地。修改这个设置需要重启服务器才能生效。",
   "admin.service.listenExample": "例如 \":8065\"",
@@ -658,13 +662,13 @@
   "admin.service.sessionCacheDesc": "会话在内存缓存的分钟数。",
   "admin.service.sessionDaysEx": "例如 \"30\"",
   "admin.service.siteURL": "站点网址：",
-  "admin.service.siteURLDescription": "用户访问Mattermost的包含端口和协议的网址。留空将自动根据访问请求设定。",
+  "admin.service.siteURLDescription": "用户访问 Mattermost 的包含端口和协议的网址。此栏可以留空除非您要在<b>通知 > 电子邮件</b>里设置批量邮件。当留空时，网址将自动根据访问请求设定。",
   "admin.service.siteURLExample": "如 \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "SSO会话时长 (天)：",
   "admin.service.ssoSessionDaysDesc": "从用户上一次输入他们的认证到会话过期的天数。如果验证方式时SAML或GitLab，用户将会自动登入到Mattermost如果他们已经登入到SAML或GitLab。修改此设定后，新的会话时常将在用户下一次输入认证后生效。",
   "admin.service.testingDescription": "当设为是时，/loadtest 斜杠命令能载入测试账号，数据和文字格式。修改这个设置需要重启服务器才能生效。",
   "admin.service.testingTitle": "启动测试指令：",
-  "admin.service.webSessionDays": "LDAP和电子邮件的会话时长 (天)：",
+  "admin.service.webSessionDays": "AD/LDAP 和电子邮件的会话时长 (天)：",
   "admin.service.webSessionDaysDesc": "从用户上一次输入他们的认证到会话过期的天数。修改此设定后，新的会话时常将在用户下一次输入认证后生效。",
   "admin.service.webhooksDescription": "设为是时，允许传入webhooks。为了避免钓鱼攻击，所有webhooks的帖文会标上BOT标签。参见 <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>文档</a> 了解详情。",
   "admin.service.webhooksTitle": "启用传出的 Webhooks：",
@@ -696,7 +700,7 @@
   "admin.sidebar.logging": "日志",
   "admin.sidebar.login": "登录",
   "admin.sidebar.logs": "日志",
-  "admin.sidebar.nativeAppLinks": "Mattermost App Links",
+  "admin.sidebar.nativeAppLinks": "Mattermost 应用链接",
   "admin.sidebar.notifications": "通知",
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "其他",
@@ -793,7 +797,7 @@
   "admin.team.uploading": "上传中...",
   "admin.team.userCreationDescription": "当设置为否时，创建帐户功能被禁用。点击创建账户按钮时会显示错误信息。",
   "admin.team.userCreationTitle": "开启帐号创建：",
-  "admin.team_analytics.activeUsers": "有发文的正常用户",
+  "admin.team_analytics.activeUsers": "有发信息的的正常用户",
   "admin.team_analytics.totalPosts": "信息总数",
   "admin.true": "是",
   "admin.userList.title": "用户 {team}",
@@ -829,7 +833,7 @@
   "admin.webserverModeUncompressedDescription": "Mattermost 服务器将传输未压缩过的静态文件。",
   "analytics.chart.loading": "加载中...",
   "analytics.chart.meaningful": "没有足够的数据进行有意义的表示。",
-  "analytics.system.activeUsers": "有发文的正常用户",
+  "analytics.system.activeUsers": "有发信息的的正常用户",
   "analytics.system.channelTypes": "频道类型",
   "analytics.system.expiredBanner": "企业授权已在 {date} 过期。您在即日起有15天时间更新授权，请联系 <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>。",
   "analytics.system.expiringBanner": "企业授权已在 {date} 过期。请更新授权，详情请联系 <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>。",
@@ -844,11 +848,11 @@
   "analytics.system.totalHashtagPosts": "有标签的发文",
   "analytics.system.totalIncomingWebhooks": "传入 Webhooks",
   "analytics.system.totalOutgoingWebhooks": "传出 Webhooks",
-  "analytics.system.totalPosts": "全部发文",
+  "analytics.system.totalPosts": "全部信息",
   "analytics.system.totalSessions": "会话总数",
   "analytics.system.totalTeams": "团队总数",
   "analytics.system.totalUsers": "用户总数",
-  "analytics.team.activeUsers": "有发文的正常用户",
+  "analytics.team.activeUsers": "有发信息的的正常用户",
   "analytics.team.newlyCreated": "新建的用户",
   "analytics.team.privateGroups": "私有组",
   "analytics.team.publicChannels": "公共频道",
@@ -1012,18 +1016,18 @@
   "channel_switch_modal.submit": "切换",
   "channel_switch_modal.title": "切换频道",
   "claim.account.noEmail": "没有指定电子邮件",
-  "claim.email_to_ldap.enterLdapPwd": "输入您LDAP账户的ID和密码",
+  "claim.email_to_ldap.enterLdapPwd": "输入您 AD/LDAP 账户的ID和密码",
   "claim.email_to_ldap.enterPwd": "输入你的{site}账户密码",
-  "claim.email_to_ldap.ldapId": "LDAP身份标识",
-  "claim.email_to_ldap.ldapIdError": "请输入您的LDAP ID。",
-  "claim.email_to_ldap.ldapPasswordError": "请输入您的LDAP密码。",
-  "claim.email_to_ldap.ldapPwd": "LDAP密码",
+  "claim.email_to_ldap.ldapId": "AD/LDAP ID",
+  "claim.email_to_ldap.ldapIdError": "请输入您的 AD/LDAP ID。",
+  "claim.email_to_ldap.ldapPasswordError": "请输入您的 AD/LDAP 密码。",
+  "claim.email_to_ldap.ldapPwd": "AD/LDAP 密码",
   "claim.email_to_ldap.pwd": "密码",
   "claim.email_to_ldap.pwdError": "请输入您的密码。",
-  "claim.email_to_ldap.ssoNote": "您必须已经拥有一个有效的LDAP账户",
-  "claim.email_to_ldap.ssoType": "领取您的帐号后，您只能通过 LDAP 登陆",
-  "claim.email_to_ldap.switchTo": "切换帐号到 LDAP",
-  "claim.email_to_ldap.title": "切换邮箱/密码账号到 LDAP",
+  "claim.email_to_ldap.ssoNote": "您必须已经拥有一个有效的 AD/LDAP 账户",
+  "claim.email_to_ldap.ssoType": "领取您的帐号后，您只能通过 AD/LDAP 登陆",
+  "claim.email_to_ldap.switchTo": "切换帐号到 AD/LDAP",
+  "claim.email_to_ldap.title": "切换邮箱/密码账号到 AD/LDAP",
   "claim.email_to_oauth.enterPwd": "输入你的{site}账户密码",
   "claim.email_to_oauth.pwd": "密码",
   "claim.email_to_oauth.pwdError": "请输入您的密码。",
@@ -1035,14 +1039,14 @@
   "claim.ldap_to_email.email": "您将使用电子邮件{email}登录",
   "claim.ldap_to_email.enterLdapPwd": "输入 {site} 电子邮件帐号的 {ldapPassword}",
   "claim.ldap_to_email.enterPwd": "输入您的新电子邮件帐号密码",
-  "claim.ldap_to_email.ldapPasswordError": "请输入您的 LDAP 密码。",
-  "claim.ldap_to_email.ldapPwd": "LDAP 密码",
+  "claim.ldap_to_email.ldapPasswordError": "请输入您的 AD/LDAP 密码。",
+  "claim.ldap_to_email.ldapPwd": "AD/LDAP 密码",
   "claim.ldap_to_email.pwd": "密码",
   "claim.ldap_to_email.pwdError": "请输入您的密码。",
   "claim.ldap_to_email.pwdNotMatch": "密码不匹配。",
   "claim.ldap_to_email.ssoType": "领取您的帐号后，您只能用您的电子邮箱地址和密码登入",
   "claim.ldap_to_email.switchTo": "切换到电子邮件/密码的账户",
-  "claim.ldap_to_email.title": "切换到电子邮件/密码的LDAP账户",
+  "claim.ldap_to_email.title": "切换到电子邮件/密码的 AD/LDAP 账户",
   "claim.oauth_to_email.confirm": "确认密码",
   "claim.oauth_to_email.description": "在改变您的账户类型后，您只能用您的电子邮箱地址和密码登入。",
   "claim.oauth_to_email.enterNewPwd": "输入您在 {site} 的电子邮箱账户新密码",
@@ -1061,7 +1065,7 @@
   "create_post.comment": "评论",
   "create_post.post": "发布",
   "create_post.shortcutsNotSupported": "您的设备不支持键盘快捷键。",
-  "create_post.tutorialTip": "<h4>发送信息</h4><p>键入此处写一条消息，然后按<strong>Enter键</strong>发送。</p><p>点击<strong>附件</strong>按钮上传图片或文件。</p>",
+  "create_post.tutorialTip": "<h4>发送信息</h4><p>在这输入信息并按<strong>回车</strong>发送。</p><p>点击<strong>附件</strong>按钮上传图片或文件。</p>",
   "create_post.write": "写一个消息...",
   "create_team.agreement": "如果继续创建您的帐户和使用{siteName}，您需要同意<a href='/static/help/terms.html'>服务条款</a>和<a href='/static/help/privacy.html'>隐私政策</a>。如果不同意，您将不能使用{siteName}。",
   "create_team.display_name.back": "返回上一步",
@@ -1355,6 +1359,7 @@
   "integrations.oauthApps.title": "OAuth 2.0 应用",
   "integrations.outgoingWebhook.description": "传出的网络挂接允许外部集成接收和响应信息",
   "integrations.outgoingWebhook.title": "引出Webhook",
+  "integrations.successful": "设置成功",
   "intro_messages.DM": "这是您和{teammate}私信记录的开端。<br/>此区域外的人不能看到这里共享的私信和文件。",
   "intro_messages.anyMember": " 任何成员可以加入和查看这个频道。",
   "intro_messages.beginning": "{name} 的开端",
@@ -1387,7 +1392,7 @@
   "invite_member.sending": "发送",
   "invite_member.teamInviteLink": "你可以使用链接{link}邀请别人。",
   "ldap_signup.find": "寻找我的团队",
-  "ldap_signup.ldap": "用LDAP帐号建立团队",
+  "ldap_signup.ldap": "用 AD/LDAP 帐号建立团队",
   "ldap_signup.length_error": "名称必须为3至15个字母",
   "ldap_signup.teamName": "输入新团队名",
   "ldap_signup.team_error": "请输入团队名",
@@ -1406,8 +1411,8 @@
   "login.gitlab": "GitLab",
   "login.google": "Google Apps",
   "login.invalidPassword": "您的密码是错误的。",
-  "login.ldapUsername": "LDAP用户名",
-  "login.ldapUsernameLower": "LDAP用户名",
+  "login.ldapUsername": "AD/LDAP 用户名",
+  "login.ldapUsernameLower": "AD/LDAP 用户名",
   "login.noAccount": "没有帐户吗？",
   "login.noEmail": "请输入您的电子邮件",
   "login.noEmailLdapUsername": "请输入您的电子邮件或 {ldapUsername}",
@@ -1474,7 +1479,7 @@
   "navbar_dropdown.leave": "离开团队",
   "navbar_dropdown.logout": "注销",
   "navbar_dropdown.manageMembers": "成员管理",
-  "navbar_dropdown.nativeApps": "Download Mattermost Apps",
+  "navbar_dropdown.nativeApps": "下载应用",
   "navbar_dropdown.report": "报告问题",
   "navbar_dropdown.switchTeam": "切换到{team}",
   "navbar_dropdown.switchTo": "切换到",
@@ -1496,7 +1501,7 @@
   "password_send.link": "<p>一个密码重置链接已被发送至<b>{email}</b></p>",
   "password_send.reset": "重置我的密码",
   "password_send.title": "密码重置",
-  "pdf_preview.max_pages": "PDF预览只显示前五页。",
+  "pdf_preview.max_pages": "下载以阅读更多页",
   "pending_post_actions.cancel": "取消",
   "pending_post_actions.retry": "重试",
   "permalink.error.access": "此永久链接指向已删除的消息或者您没有权限访问的频道。",
@@ -1563,6 +1568,10 @@
   "search_results.because": "<ul><li>如果您需搜索一个部分词组（例如搜索 \"rea\"，查找 \"reach\" 或 \"reaction\"），请在结尾附上 *。</li><li>由于搜索结果的数量限制，双字母的搜索和 \"this\"，\"a\" 及 \"is\" 等常用词不会出现在搜索结果中。</li></ul>",
   "search_results.noResults": "没任何结果。重试？",
   "search_results.usage": "<ul><li>使用<b>\"双引号\"</b>搜索词组</li><li>使用<b>from：</b>查找来自特定用户的信息；使用<b>in：</b>查找特定频道中的信息</li></ul>",
+  "search_results.usageFlag1": "您还没标记任何信息。",
+  "search_results.usageFlag2": "您可以点击时间戳旁的",
+  "search_results.usageFlag3": "图标来标记信息和评论。",
+  "search_results.usageFlag4": "标记信息以便之后更进。您的标记是个人的，不会被他人看到。",
   "setting_item_max.cancel": "取消",
   "setting_item_max.save": "保存",
   "setting_item_min.edit": "编辑",
@@ -1595,7 +1604,7 @@
   "sidebar_right_menu.inviteNew": "邀请新成员",
   "sidebar_right_menu.logout": "注销",
   "sidebar_right_menu.manageMembers": "成员管理",
-  "sidebar_right_menu.nativeApps": "Download Mattermost Apps",
+  "sidebar_right_menu.nativeApps": "下载应用",
   "sidebar_right_menu.recentMentions": "最近提及",
   "sidebar_right_menu.report": "报告问题",
   "sidebar_right_menu.switch_team": "团队选择",
@@ -1605,7 +1614,7 @@
   "signup.email": "电子邮箱和密码",
   "signup.gitlab": "GitLab 单一登入",
   "signup.google": "谷歌帐号",
-  "signup.ldap": "LDAP 登录身份",
+  "signup.ldap": "AD/LDAP 登录身份",
   "signup.office365": "Office 365",
   "signup.title": "创建一个账户以：",
   "signup_team.choose": "您的团队：",
@@ -1647,7 +1656,7 @@
   "signup_user_completed.validEmail": "请输入一个有效的电子邮件地址",
   "signup_user_completed.welcome": "欢迎来到：",
   "signup_user_completed.whatis": "您的电子邮箱地址是什么？",
-  "signup_user_completed.withLdap": "您的LDAP凭证",
+  "signup_user_completed.withLdap": "您的 AD/LDAP 凭证",
   "sso_signup.find": "查找我的团队",
   "sso_signup.gitlab": "用GitLabAccount建立团队",
   "sso_signup.google": "用GoogleAppsAccount建立团队",
@@ -1732,8 +1741,8 @@
   "user.settings.advance.on": "开启",
   "user.settings.advance.preReleaseDesc": "检查您想预览的任何预发布功能。在设置生效前，您可能还需要刷新页面。",
   "user.settings.advance.preReleaseTitle": "预览预发布功能",
-  "user.settings.advance.sendDesc": "如果启用“Enter”键插入一个新行，按“Ctrl+Enter”键提交消息。",
-  "user.settings.advance.sendTitle": "按Ctrl+Enter发送消息",
+  "user.settings.advance.sendDesc": "启用时，\"Enter\" 键插入行而按 \"Ctrl+Enter\" 键提交消息。",
+  "user.settings.advance.sendTitle": "按 Ctrl+Enter 发送消息",
   "user.settings.advance.slashCmd_autocmp": "启用外部应用程序提供斜杠命令的自动补全功能",
   "user.settings.advance.title": "高级设置",
   "user.settings.custom_theme.awayIndicator": "离开显示",
@@ -1805,7 +1814,7 @@
   "user.settings.general.emailHelp2": "电子邮件已被您的系统管理员禁用。未启用前将无法发送电子邮件通知。",
   "user.settings.general.emailHelp3": "电子邮件地址用于登录，通知以及密码重置。",
   "user.settings.general.emailHelp4": "验证邮件已发送到{email}。",
-  "user.settings.general.emailLdapCantUpdate": "通过LDAP进行登录。电子邮件不能被更新，用于通知的电子邮件地址是{email}。",
+  "user.settings.general.emailLdapCantUpdate": "通过 AD/LDAP 进行登录。电子邮件不能被更新，用于通知的电子邮件地址是{email}。",
   "user.settings.general.emailMatch": "您输入的新邮件不匹配。",
   "user.settings.general.emailOffice365CantUpdate": "通过Office 365进行登录。电子邮件不能被更新。用于通知的电子邮件地址是{email}。",
   "user.settings.general.emailSamlCantUpdate": "通过LDAP进行登录。电子邮件不能被更新。用于通知的电子邮件地址是{email}。",
@@ -1820,7 +1829,7 @@
   "user.settings.general.lastName": "姓氏",
   "user.settings.general.loginGitlab": "通过GitLab({email})登录",
   "user.settings.general.loginGoogle": "通过Google ({email})登录",
-  "user.settings.general.loginLdap": "通过LDAP ({email})登录",
+  "user.settings.general.loginLdap": "通过 AD/LDAP ({email}) 登录",
   "user.settings.general.loginOffice365": "通过Office 365({email})登录",
   "user.settings.general.loginSaml": "通过SAML ({email}) 登录",
   "user.settings.general.newAddress": "新地址：{email}<br/>查看您的邮箱来验证上面的地址。",
@@ -1868,7 +1877,7 @@
   "user.settings.notifications.comments": "回复通知",
   "user.settings.notifications.commentsAny": "在我开头或回复过的消息串触发通知",
   "user.settings.notifications.commentsInfo": "除了您被提及的通知外，选择如果您想收到串回复通知。",
-  "user.settings.notifications.commentsNever": "Do not trigger notifications on messages in reply threads unless I'm mentioned",
+  "user.settings.notifications.commentsNever": "回复串信息只有在我被提及时触发通知",
   "user.settings.notifications.commentsRoot": "在我开头的消息串触发通知",
   "user.settings.notifications.desktop": "发送桌面通知",
   "user.settings.notifications.desktop.allFirefoxForever": "所有活动，一直显示",
@@ -1890,15 +1899,16 @@
   "user.settings.notifications.desktop.title": "桌面通知",
   "user.settings.notifications.desktop.unlimited": "无限制",
   "user.settings.notifications.desktopSounds": "桌面通知声音",
+  "user.settings.notifications.email.everyHour": "每小时",
+  "user.settings.notifications.email.everyXMinutes": "每 {count} 分钟",
+  "user.settings.notifications.email.immediately": "立刻",
+  "user.settings.notifications.email.never": "从不",
+  "user.settings.notifications.email.send": "发送电子邮件通知",
   "user.settings.notifications.emailBatchingInfo": "一段时间内收到的通知将合并到一封电子邮件。",
   "user.settings.notifications.emailInfo": "当您离开{siteName}超过5分钟或离线，系统将发送提及和私信的电子邮件通知。",
   "user.settings.notifications.emailNotifications": "邮件通知",
-  "user.settings.notifications.everyHour": "每小时",
-  "user.settings.notifications.everyXMinutes": "每 {minute} 分钟",
   "user.settings.notifications.header": "通知",
-  "user.settings.notifications.immediately": "立刻",
   "user.settings.notifications.info": "桌面通知可在 火狐, Safari 以及 Chrome 下使用。",
-  "user.settings.notifications.never": "从不",
   "user.settings.notifications.noWords": "敏感词没有配置",
   "user.settings.notifications.off": "关闭",
   "user.settings.notifications.on": "开启",
@@ -1937,9 +1947,9 @@
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "谷歌",
   "user.settings.security.lastUpdated": "上次更新时间{date}{time}",
-  "user.settings.security.ldap": "LDAP",
+  "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "用GitLab登录",
-  "user.settings.security.loginLdap": "用LDAP登录",
+  "user.settings.security.loginLdap": "用 AD/LDAP 登录",
   "user.settings.security.logoutActiveSessions": "查看并退出正在执行的会话",
   "user.settings.security.method": "登录方式",
   "user.settings.security.newPassword": "新密码",
@@ -1967,7 +1977,7 @@
   "user.settings.security.passwordErrorUppercaseNumberSymbol": "您的密码必须包含至少 {min} 个字符且至少有一个大写字母，一个数字，以及一个符号（如\"~!@#$%^&*()\"）。",
   "user.settings.security.passwordErrorUppercaseSymbol": "您的密码必须包含至少 {min} 个字符且至少有一个大写字母以及一个符号（如\"~!@#$%^&*()\"）。",
   "user.settings.security.passwordGitlabCantUpdate": "通过GitLab登录。电子邮件不能被更新。",
-  "user.settings.security.passwordLdapCantUpdate": "通过LDAP登录。电子邮件不能被更新。",
+  "user.settings.security.passwordLdapCantUpdate": "通过 AD/LDAP 登录。密码不能被更新。",
   "user.settings.security.passwordMatchError": "您输入的新密码不一致。",
   "user.settings.security.passwordMinLength": "无效最小长度，无法显示预览。",
   "user.settings.security.retypePassword": "再次输入新密码",
@@ -1975,7 +1985,7 @@
   "user.settings.security.switchEmail": "切换到使用邮箱和密码登录",
   "user.settings.security.switchGitlab": "切换到使用 GitLab SSO",
   "user.settings.security.switchGoogle": "切换到使用 Google SSO",
-  "user.settings.security.switchLdap": "切换到使用 LDAP",
+  "user.settings.security.switchLdap": "切换到使用 AD/LDAP",
   "user.settings.security.switchOffice365": "切换到使用 Office 365 SSO",
   "user.settings.security.switchSaml": "切换到使用 SAML SSO",
   "user.settings.security.title": "安全设置",
diff --git a/webapp/i18n/zh_TW.json b/webapp/i18n/zh_TW.json
index 6f5efdaee..cc8aa74c3 100644
--- a/webapp/i18n/zh_TW.json
+++ b/webapp/i18n/zh_TW.json
@@ -217,7 +217,7 @@
   "admin.customization.enableCustomEmojiTitle": "啟用自訂繪文字：",
   "admin.customization.iosAppDownloadLinkDesc": "新增下載 iOS 應用程式的連結。用行動網頁瀏覽器存取站台的使用者將會看到提示頁面以下載應用程式。此欄留空則不會出現提示頁面。",
   "admin.customization.iosAppDownloadLinkTitle": "iOS 應用程式下載連結：",
-  "admin.customization.nativeAppLinks": "Mattermost App Links",
+  "admin.customization.nativeAppLinks": "Mattermost 應用程式連結",
   "admin.customization.restrictCustomEmojiCreationAdmin": "允許系統及團隊管理員新增自訂繪文字",
   "admin.customization.restrictCustomEmojiCreationAll": "允許所有人新增自訂繪文字",
   "admin.customization.restrictCustomEmojiCreationDesc": "限制僅特定使用者可以新增自訂繪文字。",
@@ -229,7 +229,7 @@
   "admin.email.agreeHPNS": " 我理解並接受 Mattermost Hosted 推播通知服務<a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">服務條款</a>與<a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">隱私政策</a>。",
   "admin.email.allowEmailSignInDescription": "啟用時 Mattermost 允許使用者用他們的電子郵件與密碼登入。",
   "admin.email.allowEmailSignInTitle": "啟用電子郵件登入：",
-  "admin.email.allowSignupDescription": "啟用時 Mattermost 允許團隊以電子郵件與密碼註冊帳號。應該只在想限制以 OAuth 或 LDAP 一類的單一登入服務註冊時，設為停用。",
+  "admin.email.allowSignupDescription": "啟用時 Mattermost 允許團隊以電子郵件與密碼註冊帳號。應該只在想限制以 OAuth 或 AD/LDAP 一類的單一登入服務註冊時，設為停用。",
   "admin.email.allowSignupTitle": "啟用以電子郵件建立帳號：",
   "admin.email.allowUsernameSignInDescription": "啟用時 Mattermost 允許使用者用他們的名稱與密碼登入。通常只有停用電子郵件地址驗證時才啟用。",
   "admin.email.allowUsernameSignInTitle": "啟用以使用者名稱登入：",
@@ -392,57 +392,59 @@
   "admin.image.thumbWidthTitle": "附加檔案縮圖寬：",
   "admin.integrations.custom": "自訂整合",
   "admin.integrations.external": "外部服務",
-  "admin.ldap.baseDesc": "BaseDN 是 Mattermost 在 LDAP 樹搜尋使用者的起始點的識別名。",
+  "admin.ldap.baseDesc": "BaseDN 是 Mattermost 在 AD/LDAP 樹搜尋使用者的起始點的識別名。",
   "admin.ldap.baseEx": "例如：\"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "BaseDN：",
   "admin.ldap.bindPwdDesc": "\"綁定使用者名稱\"的密碼：",
   "admin.ldap.bindPwdTitle": "綁定密碼：",
-  "admin.ldap.bindUserDesc": "LDAP 搜尋時使用的使用者名稱。一般這應該是一個專為 Mattermost 而建的帳號。這帳號應該被限制為只能讀取被 BaseDN 欄位所限定的 LDAP 樹。",
+  "admin.ldap.bindUserDesc": "AD/LDAP 搜尋時使用的使用者名稱。一般這應該是一個專為 Mattermost 而建的帳號。這帳號應該被限制為只能讀取被 BaseDN 欄位所限定的 AD/LDAP 樹。",
   "admin.ldap.bindUserTitle": "綁定使用者名稱：",
-  "admin.ldap.emailAttrDesc": "用於設定 Mattermost 使用者電子郵件位址的 LDAP 伺服器屬性。",
+  "admin.ldap.emailAttrDesc": "用於設定 Mattermost 使用者電子郵件位址的 AD/LDAP 伺服器屬性。",
   "admin.ldap.emailAttrEx": "例如：\"mail\"或\"userPrincipalName\"",
   "admin.ldap.emailAttrTitle": "電子郵件位址屬性：",
-  "admin.ldap.enableDesc": "啟用時，Mattermost 允許使用 LDAP 登入",
-  "admin.ldap.enableTitle": "啟用 LDAP 登入：",
-  "admin.ldap.firstnameAttrDesc": "(非必須) 用於設定 Mattermost 使用者名字的 LDAP 伺服器屬性。",
+  "admin.ldap.enableDesc": "啟用時，Mattermost 允許使用 AD/LDAP 登入",
+  "admin.ldap.enableTitle": "啟用 AD/LDAP 登入：",
+  "admin.ldap.firstnameAttrDesc": "(非必須) 用於設定 Mattermost 使用者名字的 AD/LDAP 伺服器屬性。",
   "admin.ldap.firstnameAttrEx": "如：\"givenName\"",
   "admin.ldap.firstnameAttrTitle": "名字屬性",
-  "admin.ldap.idAttrDesc": "此屬性在 LDAP 伺服器上的值將會被用做 Mattermost 裡獨特、唯一的識別值。該屬性值最好不會變更，例如使用者名稱 或 uid。如果一個使用者的這個屬性值有所變更，Mattermost 將會根據新值建立一個跟原本帳戶無關的新帳戶。這將是未來使用者在 Mattermost 登入頁面所要填入\"LDAP 使用者名稱\"欄位的值。通常此屬性設定成與上面的\"用戶名稱\"屬性相同。如果您的團隊習慣用 domain\\username 登入其他使用 LDAP 認證的服務，最好在本欄位填入 domain\\username 以保持一致性。",
+  "admin.ldap.idAttrDesc": "此屬性在 AD/LDAP 伺服器上的值將會被用做 Mattermost 裡獨特、唯一的識別值。該屬性值最好不會變更，例如使用者名稱 或 uid。如果一個使用者的這個屬性值有所變更，Mattermost 將會根據新值建立一個跟原本帳戶無關的新帳戶。這將是未來使用者在 Mattermost 登入頁面所要填入\"AD/LDAP 使用者名稱\"欄位的值。通常此屬性設定成與上面的\"用戶名稱\"屬性相同。如果您的團隊習慣用 domain\\username 登入其他使用 AD/LDAP 認證的服務，最好在本欄位填入 domain\\username 以保持一致性。",
   "admin.ldap.idAttrEx": "例如：\"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "ID 的屬性：",
-  "admin.ldap.lastnameAttrDesc": "(非必須) 用於設定 Mattermost 使用者姓氏的 LDAP 伺服器屬性。",
+  "admin.ldap.lastnameAttrDesc": "(非必須) 用於設定 Mattermost 使用者姓氏的 AD/LDAP 伺服器屬性。",
   "admin.ldap.lastnameAttrEx": "例如：\"sn\"",
   "admin.ldap.lastnameAttrTitle": "姓氏屬性：",
-  "admin.ldap.loginNameDesc": "顯示在登入頁面上登入欄位的提示字。預設為\"LDAP 使用者名稱\"。",
-  "admin.ldap.loginNameEx": "例如：\"LDAP 使用者名稱\"",
+  "admin.ldap.ldap_test_button": "AD/LDAP Test",
+  "admin.ldap.loginNameDesc": "顯示在登入頁面上登入欄位的提示字。預設為\"AD/LDAP 使用者名稱\"。",
+  "admin.ldap.loginNameEx": "例如：\"AD/LDAP 使用者名稱\"",
   "admin.ldap.loginNameTitle": "登入欄位名：",
   "admin.ldap.maxPageSizeEx": "例如：\"2000\"",
   "admin.ldap.maxPageSizeHelpText": "Mattermost 向 LDAP 伺服器請求使用者資料時單次最多的數量。0表示無上限。",
   "admin.ldap.maxPageSizeTitle": "最大分頁大小：",
-  "admin.ldap.nicknameAttrDesc": "(非必須) 用於設定 Mattermost 使用者暱稱的 LDAP 伺服器屬性。",
+  "admin.ldap.nicknameAttrDesc": "(非必須) 用於設定 Mattermost 使用者暱稱的 AD/LDAP 伺服器屬性。",
   "admin.ldap.nicknameAttrEx": "例如：\"匿稱\"",
   "admin.ldap.nicknameAttrTitle": "匿稱的屬性：",
-  "admin.ldap.noLicense": "<h4 class=\"banner__heading\">註：</h4><p>LDAP 為企業授權功能，您的授權不支援 LDAP。按<a href=\"http://mattermost.com\" target=\"_blank\">這裡</a>查看企業授權資訊與價格。</p>",
-  "admin.ldap.portDesc": "Masttermost 連接 LDAP 伺服器的連接埠。預設為389。",
+  "admin.ldap.noLicense": "<h4 class=\"banner__heading\">註：</h4><p>AD/LDAP 為企業授權功能，您的授權不支援 AD/LDAP。按<a href=\"http://mattermost.com\" target=\"_blank\">這裡</a>查看企業授權資訊與價格。</p>",
+  "admin.ldap.portDesc": "Masttermost 連接 AD/LDAP 伺服器的連接埠。預設為389。",
   "admin.ldap.portEx": "例如：\"389\"",
-  "admin.ldap.portTitle": "LDAP 連接埠：",
-  "admin.ldap.queryDesc": "查詢 LDAP 伺服器的逾時設定。如果因為 LDAP 伺服器太慢而出現逾時錯誤，請加大其值。",
+  "admin.ldap.portTitle": "AD/LDAP 連接埠：",
+  "admin.ldap.queryDesc": "查詢 AD/LDAP 伺服器的逾時設定。如果因為 AD/LDAP 伺服器太慢而出現逾時錯誤，請加大其值。",
   "admin.ldap.queryEx": "例如：\"60\"",
   "admin.ldap.queryTitle": "查詢逾時設定(秒)：",
-  "admin.ldap.serverDesc": "LDAP 伺服器的網域或 IP 位址。",
+  "admin.ldap.serverDesc": "AD/LDAP 伺服器的網域或 IP 位址。",
   "admin.ldap.serverEx": "例如：\"10.0.0.23\"",
-  "admin.ldap.serverTitle": "LDAP 伺服器：",
+  "admin.ldap.serverTitle": "AD/LDAP 伺服器：",
   "admin.ldap.skipCertificateVerification": "跳過驗證憑證：",
   "admin.ldap.skipCertificateVerificationDesc": "TLS 或 STARTTLS 連線時跳過驗證憑證。不建議使用於需要 TLS 的正式環境。測試用設定。",
   "admin.ldap.syncFailure": "同步失敗：{error}",
-  "admin.ldap.syncIntervalHelpText": "LDAP 同步更新 Mattermost 使用者資料以反應 LDAP 伺服器上的變更。舉例來說，當 LDAP 伺服器上一個使用者名字改變時，在執行同步的時候這個改變會更新 Mattermost。在 LDAP 伺服器上被移除或是停用的帳號，其對應的 Mattermost 帳號會被設定成“停用”，並且撤銷帳號的工作階段。Mattermost 根據輸入的間隔執行同步。如，如果輸入60，Mattermost將會每60分鐘同步一次。",
+  "admin.ldap.syncIntervalHelpText": "AD/LDAP 同步更新 Mattermost 使用者資料以反應 AD/LDAP 伺服器上的變更。舉例來說，當 AD/LDAP 伺服器上一個使用者名字改變時，在執行同步的時候這個改變會更新 Mattermost。在 AD/LDAP 伺服器上被移除或是停用的帳號，其對應的 Mattermost 帳號會被設定成“停用”，並且撤銷帳號的工作階段。Mattermost 根據輸入的間隔執行同步。如，如果輸入60，Mattermost將會每60分鐘同步一次。",
   "admin.ldap.syncIntervalTitle": "同步間隔(分)：",
-  "admin.ldap.syncNowHelpText": "立刻開始 LDAP 同步。",
-  "admin.ldap.sync_button": "開始 LDAP 同步",
-  "admin.ldap.testFailure": "LDAP 測試失敗：{error}",
-  "admin.ldap.testHelpText": "測試 Mattermost 與 LDAP 伺服器間的連線。如需詳細錯誤訊息，請參閱紀錄檔案。",
-  "admin.ldap.uernameAttrDesc": "用於設定 Mattermost 使用者名稱的 LDAP 伺服器屬性。這有可能跟 ID 為同一個屬性。",
-  "admin.ldap.userFilterDisc": "(非必須)輸入 LDAP 過濾條件用來搜尋使用者。只有該條件找出來的用戶可以存取 Mattermost。對Active Directory，排除被關閉的使用者的條件為 (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2)))。",
+  "admin.ldap.syncNowHelpText": "立刻開始 AD/LDAP 同步。",
+  "admin.ldap.sync_button": "開始 AD/LDAP 同步",
+  "admin.ldap.testFailure": "AD/LDAP 測試失敗：{error}",
+  "admin.ldap.testHelpText": "測試 Mattermost 與 AD/LDAP 伺服器間的連線。如需詳細錯誤訊息，請參閱紀錄檔案。",
+  "admin.ldap.testSuccess": "AD/LDAP Test Successful",
+  "admin.ldap.uernameAttrDesc": "用於設定 Mattermost 使用者名稱的 AD/LDAP 伺服器屬性。這有可能跟 ID 為同一個屬性。",
+  "admin.ldap.userFilterDisc": "(非必須)輸入 AD/LDAP 過濾條件用來搜尋使用者。只有該條件找出來的用戶可以存取 Mattermost。對 Active Directory，排除被關閉的使用者的條件為 (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2)))。",
   "admin.ldap.userFilterEx": "例如 \"(objectClass=user)\"",
   "admin.ldap.userFilterTitle": "使用者過濾條件：",
   "admin.ldap.usernameAttrEx": "例如：\"sAMAccountName\"",
@@ -461,6 +463,8 @@
   "admin.license.uploading": "上傳授權中...",
   "admin.log.consoleDescription": "正式環境一般設為停用。開發者可以將此設為開啟以根據控制台記錄等級輸出記錄到控制台。開啟時伺服器會將訊息寫到標準輸出(stdout)。",
   "admin.log.consoleTitle": "輸出記錄到主控台：",
+  "admin.log.enableDiagnostics": "啟用診斷與錯誤報告：",
+  "admin.log.enableDiagnosticsDescription": "啟用此功能以傳送錯誤報告以及診斷訊息給 Mattermost 公司用以改進 Mattermost 的效能跟品質。如需關於隱私政策的詳細資訊，請至 <a href=\"https://about.mattermost.com/default-privacy-policy/\" target=\"_blank\">隱私政策</a>。",
   "admin.log.enableWebhookDebugging": "啟用 Webhook 除錯：",
   "admin.log.enableWebhookDebuggingDescription": "停用這個會停止對於所有傳入的 Webhook 要求內容的除錯記錄。",
   "admin.log.fileDescription": "正式環境一般為啟用。啟用時，記錄檔案會輸出至下面的檔案位置欄位所指定的位置。",
@@ -563,7 +567,7 @@
   "admin.saml.enableTitle": "啟用 SAML 登入：",
   "admin.saml.encryptDescription": "啟用時，Mattermost 會解密利用您的服務提供者的公開憑證所加密的 SAML 宣告。",
   "admin.saml.encryptTitle": "啟用加密：",
-  "admin.saml.firstnameAttrDesc": "(非必須) 用於設定 Mattermost 使用者暱稱的 SAML 宣告屬性。",
+  "admin.saml.firstnameAttrDesc": "(非必須) 用於設定 Mattermost 使用者名字的 SAML 宣告屬性。",
   "admin.saml.firstnameAttrEx": "如 \"FirstName\"",
   "admin.saml.firstnameAttrTitle": "名字屬性：",
   "admin.saml.idpCertificateFileDesc": "身分識別提供者所簽發的公開認證憑證。",
@@ -575,7 +579,7 @@
   "admin.saml.idpUrlDesc": "Mattermost 發送 SAML 要求以開始登入程序的網址。",
   "admin.saml.idpUrlEx": "如：\"https://idp.example.org/SAML2/SSO/Login\"",
   "admin.saml.idpUrlTitle": "SAML SSO 網址：",
-  "admin.saml.lastnameAttrDesc": "(非必須) 用於設定 Mattermost 使用者暱稱的 SAML 宣告屬性。",
+  "admin.saml.lastnameAttrDesc": "(非必須) 用於設定 Mattermost 使用者姓氏的 SAML 宣告屬性。",
   "admin.saml.lastnameAttrEx": "如：\"LastName\"",
   "admin.saml.lastnameAttrTitle": "姓氏屬性：",
   "admin.saml.localeAttrDesc": "(非必須) 用於設定 Mattermost 使用者暱稱的 SAML 宣告屬性。",
@@ -636,8 +640,8 @@
   "admin.service.iconTitle": "允許外部整合功能置換個人圖像：",
   "admin.service.insecureTlsDesc": "允許時，所有的對外 HTTPS 請求將會接受未驗證、自簽章的憑證。如：將允許傳出的 Webhook 連至任意網域下使用自簽章的 TLS 憑證的伺服器。註：這樣將產生中間人攻擊的危險性。",
   "admin.service.insecureTlsTitle": "啟用不安全的對外連線：",
-  "admin.service.integrationAdmin": "限制僅團隊與系統管理者可以建立整合功能：",
-  "admin.service.integrationAdminDesc": "啟用時，只有管理員能建立整合功能。",
+  "admin.service.integrationAdmin": "限制只有管理員能管理外部整合：",
+  "admin.service.integrationAdminDesc": "啟用時，Webhook 跟斜線命令將只有團隊與系統管理員能夠建立、編輯跟觀看，OAuth 2.0 應用程式將只有系統管理員能夠操作。外部整合在被管理員建立之後將會對所有使用者開放。",
   "admin.service.listenAddress": "監聽位址：",
   "admin.service.listenDescription": "設定使用的IP位址與連接埠，輸入\":8065\"將會監聽所有界面的IP位址，或是輸入像\"127.0.0.1:8065\"只聽一個IP位址。若變更須重啟伺服器以生效。",
   "admin.service.listenExample": "例如：\":8065\"",
@@ -658,13 +662,13 @@
   "admin.service.sessionCacheDesc": "要將工作階段快取在記憶體中多久(分鐘)。",
   "admin.service.sessionDaysEx": "例如：\"30\"",
   "admin.service.siteURL": "站台網址：",
-  "admin.service.siteURLDescription": "使用者用來存取 Mattermost 的網址，應包含通訊協定跟連接埠。留白則會自動根據傳入資料設定。",
+  "admin.service.siteURLDescription": "使用者用來存取 Mattermost 的網址，應包含通訊協定跟連接埠。除非正在<b>通知 > 電子郵件</b>中設定批次郵件，否則此欄位可以留白。留白則會自動根據傳入資料設定。",
   "admin.service.siteURLExample": "如：\"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "SSO 的工作階段長度(以天計)：",
   "admin.service.ssoSessionDaysDesc": "從使用者最後一次輸入他們的認證到工作階段過期之間的天數。如果認證方式是 SAML 或 GitLab 且他們已經登入 SAML 或 GitLab，使用者將會自動再次登入 Mattermost。修改設定之後新的工作階段長度會在下次使用者輸入認證之後開始生效。",
   "admin.service.testingDescription": "啟用時，將啟用 /loadtest 斜線命令，該命令會載入測試帳號、資料以及文字格式。修改此項需要重啟伺服器以生效。",
   "admin.service.testingTitle": "啟用測試指令：",
-  "admin.service.webSessionDays": "LDAP 和電子郵件的工作階段長度(以天計)：",
+  "admin.service.webSessionDays": "AD/LDAP 和電子郵件的工作階段長度(以天計)：",
   "admin.service.webSessionDaysDesc": "從使用者最後一次輸入他們的認證到工作階段過期之間的天數。修改設定之後新的工作階段長度會在下次使用者輸入認證之後開始生效。",
   "admin.service.webhooksDescription": "啟用時，允許傳入的 Webhook。為了避免釣魚攻擊，所有來自 Webhook 的貼文都會被標上 BOT 標籤。請參閱<a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>文件</a>。",
   "admin.service.webhooksTitle": "啟用傳出的 Webhook：",
@@ -696,7 +700,7 @@
   "admin.sidebar.logging": "記錄",
   "admin.sidebar.login": "登入",
   "admin.sidebar.logs": "記錄",
-  "admin.sidebar.nativeAppLinks": "Mattermost App Links",
+  "admin.sidebar.nativeAppLinks": "Mattermost 應用程式連結",
   "admin.sidebar.notifications": "通知",
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "其它",
@@ -1012,18 +1016,18 @@
   "channel_switch_modal.submit": "切換",
   "channel_switch_modal.title": "切換頻道",
   "claim.account.noEmail": "沒有指定電子郵件",
-  "claim.email_to_ldap.enterLdapPwd": "輸入 LDAP 帳號的使用者 ID 與密碼",
+  "claim.email_to_ldap.enterLdapPwd": "輸入 AD/LDAP 帳號的使用者 ID 與密碼",
   "claim.email_to_ldap.enterPwd": "輸入 {site} 的電子郵件帳戶密碼",
-  "claim.email_to_ldap.ldapId": "LDAP ID",
-  "claim.email_to_ldap.ldapIdError": "請輸入 LDAP ID。",
-  "claim.email_to_ldap.ldapPasswordError": "請輸入 LDAP 密碼。",
-  "claim.email_to_ldap.ldapPwd": "LDAP 密碼",
+  "claim.email_to_ldap.ldapId": "AD/LDAP ID",
+  "claim.email_to_ldap.ldapIdError": "請輸入 AD/LDAP ID。",
+  "claim.email_to_ldap.ldapPasswordError": "請輸入 AD/LDAP 密碼。",
+  "claim.email_to_ldap.ldapPwd": "AD/LDAP 密碼",
   "claim.email_to_ldap.pwd": "密碼",
   "claim.email_to_ldap.pwdError": "請輸入密碼",
-  "claim.email_to_ldap.ssoNote": "您必須已經有有效的 LDAP 帳號",
-  "claim.email_to_ldap.ssoType": "設定完成後，將只能用 LDAP 登入",
-  "claim.email_to_ldap.switchTo": "切換帳號至 LDAP",
-  "claim.email_to_ldap.title": "由電子郵件地址/密碼帳號切換成 LDAP 帳號",
+  "claim.email_to_ldap.ssoNote": "您必須已經有有效的 AD/LDAP 帳號",
+  "claim.email_to_ldap.ssoType": "設定完成後，將只能用 AD/LDAP 登入",
+  "claim.email_to_ldap.switchTo": "切換帳號至 AD/LDAP",
+  "claim.email_to_ldap.title": "由電子郵件地址/密碼帳號切換成 AD/LDAP 帳號",
   "claim.email_to_oauth.enterPwd": "輸入 {site} 帳戶的密碼",
   "claim.email_to_oauth.pwd": "密碼",
   "claim.email_to_oauth.pwdError": "請輸入密碼",
@@ -1035,14 +1039,14 @@
   "claim.ldap_to_email.email": "用電子郵件地址 {email} 登入",
   "claim.ldap_to_email.enterLdapPwd": "輸入 {site} 電子郵件帳戶的 {ldapPassword}",
   "claim.ldap_to_email.enterPwd": "輸入電子郵件帳戶新密碼",
-  "claim.ldap_to_email.ldapPasswordError": "請輸入 LDAP 密碼。",
-  "claim.ldap_to_email.ldapPwd": "LDAP 密碼",
+  "claim.ldap_to_email.ldapPasswordError": "請輸入 AD/LDAP 密碼。",
+  "claim.ldap_to_email.ldapPwd": "AD/LDAP 密碼",
   "claim.ldap_to_email.pwd": "密碼",
   "claim.ldap_to_email.pwdError": "請輸入密碼。",
   "claim.ldap_to_email.pwdNotMatch": "密碼不相符。",
   "claim.ldap_to_email.ssoType": "設定完成後，將只能用電子郵件地址/密碼登入",
   "claim.ldap_to_email.switchTo": "切換帳戶到電子郵件地址/密碼",
-  "claim.ldap_to_email.title": "切換 LDAP 帳戶到電子郵件地址/密碼",
+  "claim.ldap_to_email.title": "切換 AD/LDAP 帳戶到電子郵件地址/密碼",
   "claim.oauth_to_email.confirm": "密碼確認",
   "claim.oauth_to_email.description": "更改帳號類別後，將只能用電子郵件地址/密碼登入。",
   "claim.oauth_to_email.enterNewPwd": "為 {site} 的電子郵件帳戶輸入新密碼",
@@ -1355,6 +1359,7 @@
   "integrations.oauthApps.title": "OAuth 2.0 應用程式",
   "integrations.outgoingWebhook.description": "傳出的 Webhook 讓外部整合功能可以收訊並回應",
   "integrations.outgoingWebhook.title": "傳出的 Webhook",
+  "integrations.successful": "設定成功",
   "intro_messages.DM": "這是跟{teammate}之間直接訊息的起頭。<br />直接訊息跟在這邊分享的檔案除了在此處以外的人都看不到。",
   "intro_messages.anyMember": " 任何成員可以加入並閱讀此頻道。",
   "intro_messages.beginning": "{name}的開頭",
@@ -1387,7 +1392,7 @@
   "invite_member.sending": " 傳送中",
   "invite_member.teamInviteLink": "可以用{link}來邀請他人。",
   "ldap_signup.find": "尋找我的團隊",
-  "ldap_signup.ldap": "用 LDAP 帳號建立團隊",
+  "ldap_signup.ldap": "用 AD/LDAP 帳號建立團隊",
   "ldap_signup.length_error": "名稱長度為3到15字元",
   "ldap_signup.teamName": "輸入新團隊名稱",
   "ldap_signup.team_error": "請輸入團隊名稱",
@@ -1406,8 +1411,8 @@
   "login.gitlab": "GitLab",
   "login.google": "用 Google Apps 登入",
   "login.invalidPassword": "密碼不正確。",
-  "login.ldapUsername": "LDAP 使用者名稱",
-  "login.ldapUsernameLower": "LDAP 使用者名稱",
+  "login.ldapUsername": "AD/LDAP 使用者名稱",
+  "login.ldapUsernameLower": "AD/LDAP 使用者名稱",
   "login.noAccount": "沒有帳號嘛？",
   "login.noEmail": "請輸入電子郵件地址",
   "login.noEmailLdapUsername": "請輸入電子郵件地址或{ldapUsername}",
@@ -1474,7 +1479,7 @@
   "navbar_dropdown.leave": "離開團隊",
   "navbar_dropdown.logout": "登出",
   "navbar_dropdown.manageMembers": "會員管理",
-  "navbar_dropdown.nativeApps": "Download Mattermost Apps",
+  "navbar_dropdown.nativeApps": "下載應用程式",
   "navbar_dropdown.report": "回報錯誤",
   "navbar_dropdown.switchTeam": "切換至 {team}",
   "navbar_dropdown.switchTo": "切換至：",
@@ -1496,7 +1501,7 @@
   "password_send.link": "<p>已寄送密碼重置連結到<b>{email}</b></p>",
   "password_send.reset": "重置我的密碼",
   "password_send.title": "密碼重設",
-  "pdf_preview.max_pages": "PDF 預覽只顯示前五頁。",
+  "pdf_preview.max_pages": "請下載以閱讀更多頁",
   "pending_post_actions.cancel": "取消",
   "pending_post_actions.retry": "重試",
   "permalink.error.access": "此永久連結通往被刪除的訊息或是您沒有觀看權限的頻道。",
@@ -1563,6 +1568,10 @@
   "search_results.because": "<ul><li>如果要搜尋部份語句(如搜尋\"rea\"以尋找\"reach\"或\"reaction\")，請在搜尋詞尾附上*。</li><li>為了減少收尋結果，兩個字母的搜尋跟常用字像\"this\"、\"a\"跟\"is\"不會顯示在結果當中。</li></ul>",
   "search_results.noResults": "沒有任何結果。再嘗試一次？",
   "search_results.usage": "<ul><li>用<b>\"雙引號\"</b>來搜尋語句</li><li>用<b>from:</b>來搜尋特定使用者的訊息，用<b>in:</b>來搜尋特定頻道</li></ul>",
+  "search_results.usageFlag1": "尚未標記任何訊息。",
+  "search_results.usageFlag2": "可以藉由按下位於時間戳記旁邊的這 ",
+  "search_results.usageFlag3": " 圖示來標記訊息跟註解。",
+  "search_results.usageFlag4": "標記是標注訊息以追蹤後續的功能。您的標記是屬於個人的，不會被其他使用者看到。",
   "setting_item_max.cancel": "取消",
   "setting_item_max.save": "儲存",
   "setting_item_min.edit": "編輯",
@@ -1595,7 +1604,7 @@
   "sidebar_right_menu.inviteNew": "邀請新成員",
   "sidebar_right_menu.logout": "登出",
   "sidebar_right_menu.manageMembers": "成員管理",
-  "sidebar_right_menu.nativeApps": "Download Mattermost Apps",
+  "sidebar_right_menu.nativeApps": "下載應用程式",
   "sidebar_right_menu.recentMentions": "最近提及",
   "sidebar_right_menu.report": "回報錯誤",
   "sidebar_right_menu.switch_team": "選擇團隊",
@@ -1605,7 +1614,7 @@
   "signup.email": "電子郵件跟密碼",
   "signup.gitlab": "GitLab 單一登入",
   "signup.google": "Google 帳號",
-  "signup.ldap": "LDAP 認證",
+  "signup.ldap": "AD/LDAP 認證",
   "signup.office365": "Office 365",
   "signup.title": "用下列之一建立帳號：",
   "signup_team.choose": "您所屬的團隊：",
@@ -1647,7 +1656,7 @@
   "signup_user_completed.validEmail": "請輸入一個有效的電子郵件位址",
   "signup_user_completed.welcome": "歡迎使用：",
   "signup_user_completed.whatis": "您的電子郵件地址是？",
-  "signup_user_completed.withLdap": "使用 LDAP 認證",
+  "signup_user_completed.withLdap": "使用 AD/LDAP 認證",
   "sso_signup.find": "尋找我的團隊",
   "sso_signup.gitlab": "用 GitLab 帳號建立團隊",
   "sso_signup.google": "用 Google Apps 帳號建立團隊",
@@ -1732,7 +1741,7 @@
   "user.settings.advance.on": "啟用",
   "user.settings.advance.preReleaseDesc": "選用任何想預覽的預先發佈功能。更改後可能需要重新讀取頁面以生效。",
   "user.settings.advance.preReleaseTitle": "預覽預先發佈功能",
-  "user.settings.advance.sendDesc": "啟用時，'Enter'是插入新行而'Ctrl + Enter'是貼文。",
+  "user.settings.advance.sendDesc": "啟用時，'Enter' 是插入新行而 'Ctrl + Enter' 是貼文。",
   "user.settings.advance.sendTitle": "用 Ctrl + Enter 貼文",
   "user.settings.advance.slashCmd_autocmp": "啟用外部程式以提供自動完成斜線命令",
   "user.settings.advance.title": "進階設定",
@@ -1805,7 +1814,7 @@
   "user.settings.general.emailHelp2": "系統管理員已停用電子郵件。在被啟用之前將不會有通知郵件寄出。",
   "user.settings.general.emailHelp3": "電子郵件地址將會用在登入、通知跟重置密碼。",
   "user.settings.general.emailHelp4": "驗證用電子郵件已寄出到 {email} 。",
-  "user.settings.general.emailLdapCantUpdate": "經由 LDAP 登入。無法變更電子郵件地址。通知將會寄送到 {email}。",
+  "user.settings.general.emailLdapCantUpdate": "經由 AD/LDAP 登入。無法變更電子郵件地址。通知將會寄送到 {email}。",
   "user.settings.general.emailMatch": "您輸入的新電子郵件地址不一致。",
   "user.settings.general.emailOffice365CantUpdate": "經由 Office 365 登入。無法變更電子郵件地址。通知將會寄送到 {email}。",
   "user.settings.general.emailSamlCantUpdate": "經由 SAML 登入。無法變更電子郵件地址。通知將會寄送到 {email}。",
@@ -1820,7 +1829,7 @@
   "user.settings.general.lastName": "姓氏",
   "user.settings.general.loginGitlab": "已經由 GitLab 登入 ({email})",
   "user.settings.general.loginGoogle": "已經由 Google 登入 ({email})",
-  "user.settings.general.loginLdap": "已經由 LDAP 登入 ({email})",
+  "user.settings.general.loginLdap": "已經由 AD/LDAP 登入 ({email})",
   "user.settings.general.loginOffice365": "已經由 Office 365 登入 ({email})",
   "user.settings.general.loginSaml": "已經由 SAML 登入 ({email})",
   "user.settings.general.newAddress": "新電子郵件地址：{email}<br />請檢查電子郵件信箱以驗證上面的地址。",
@@ -1868,7 +1877,7 @@
   "user.settings.notifications.comments": "回覆通知",
   "user.settings.notifications.commentsAny": "我開啟或是有參與的討論串有回覆時觸發通知",
   "user.settings.notifications.commentsInfo": "除了被提及的時候通知外，選擇是否要接受討論串回覆通知。",
-  "user.settings.notifications.commentsNever": "Do not trigger notifications on messages in reply threads unless I'm mentioned",
+  "user.settings.notifications.commentsNever": "回覆串訊息只有在提及時觸發通知。",
   "user.settings.notifications.commentsRoot": "我開啟的討論串有訊息時觸發通知",
   "user.settings.notifications.desktop": "發送桌面通知",
   "user.settings.notifications.desktop.allFirefoxForever": "所有的活動，一直顯示",
@@ -1890,15 +1899,16 @@
   "user.settings.notifications.desktop.title": "桌面通知",
   "user.settings.notifications.desktop.unlimited": "無限制",
   "user.settings.notifications.desktopSounds": "桌面通知音效",
+  "user.settings.notifications.email.everyHour": "每小時",
+  "user.settings.notifications.email.everyXMinutes": "每 {count} 分鐘",
+  "user.settings.notifications.email.immediately": "立即",
+  "user.settings.notifications.email.never": "永不",
+  "user.settings.notifications.email.send": "發送電子郵件通知",
   "user.settings.notifications.emailBatchingInfo": "於所選的時間間隔內收到的通知將被合併成一封電子郵件寄送。",
   "user.settings.notifications.emailInfo": "在離線或是離開 {siteName} 超過 5 分鐘時，會發送電子郵件以通知關於您的提及與直接訊息。",
   "user.settings.notifications.emailNotifications": "電子郵件通知",
-  "user.settings.notifications.everyHour": "每小時",
-  "user.settings.notifications.everyXMinutes": "每 {count} 分鐘",
   "user.settings.notifications.header": "通知",
-  "user.settings.notifications.immediately": "立即",
   "user.settings.notifications.info": "Firefox、Safari、Chrome 可以使用桌面通知。",
-  "user.settings.notifications.never": "永不",
   "user.settings.notifications.noWords": "沒有設定單字",
   "user.settings.notifications.off": "關閉",
   "user.settings.notifications.on": "啟用",
@@ -1937,9 +1947,9 @@
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "Google",
   "user.settings.security.lastUpdated": "最後一次更新於 {date} {time}",
-  "user.settings.security.ldap": "LDAP",
+  "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "已經由 GitLab 登入",
-  "user.settings.security.loginLdap": "已經由 LDAP 登入",
+  "user.settings.security.loginLdap": "已經由 AD/LDAP 登入",
   "user.settings.security.logoutActiveSessions": "觀看並登出使用中的工作階段",
   "user.settings.security.method": "登入方式",
   "user.settings.security.newPassword": "新密碼",
@@ -1967,7 +1977,7 @@
   "user.settings.security.passwordErrorUppercaseNumberSymbol": "密碼最短必須有{min}個字元且至少有一個大寫英文字母、一個數字和一個符號(\"~!@#$%^&*()\")。",
   "user.settings.security.passwordErrorUppercaseSymbol": "密碼最短必須有{min}個字元且至少有一個大寫英文字母和一個符號(\"~!@#$%^&*()\")。",
   "user.settings.security.passwordGitlabCantUpdate": "經由 GitLab 登入。無法變更密碼。",
-  "user.settings.security.passwordLdapCantUpdate": "經由 LDAP 登入。無法變更密碼。",
+  "user.settings.security.passwordLdapCantUpdate": "經由 AD/LDAP 登入。無法變更密碼。",
   "user.settings.security.passwordMatchError": "輸入的新密碼不一致。",
   "user.settings.security.passwordMinLength": "無效的最短長度，無法顯示預覽。",
   "user.settings.security.retypePassword": "再次輸入新密碼",
@@ -1975,7 +1985,7 @@
   "user.settings.security.switchEmail": "切換至電子郵件地址及密碼",
   "user.settings.security.switchGitlab": "改為使用 GitLab SSO",
   "user.settings.security.switchGoogle": "改為使用 Google SSO",
-  "user.settings.security.switchLdap": "改為使用 LDAP",
+  "user.settings.security.switchLdap": "改為使用 AD/LDAP",
   "user.settings.security.switchOffice365": "改為使用 Office 365 SSO",
   "user.settings.security.switchSaml": "改為使用 SAML SSO",
   "user.settings.security.title": "安全性設定",