translations PR 20170904 (#7371)

14 files changed, 1413 insertions, 251 deletions

diff --git a/webapp/i18n/de.json b/webapp/i18n/de.json
index ec5e9ec2b..89e597ce0 100644
--- a/webapp/i18n/de.json
+++ b/webapp/i18n/de.json
@@ -9,6 +9,7 @@
   "about.hash": "Build Hash:",
   "about.hashee": "EE Build Hash:",
   "about.licensed": "Lizenziert durch:",
+  "about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
   "about.number": "Build Nummer:",
   "about.teamEditionLearn": "Schließen Sie sich der Mattermost Community an auf ",
   "about.teamEditionSt": "Ihre gesamte Team-Kommunikation an einem Ort, sofort durchsuchbar und überall verfügbar.",
@@ -28,8 +29,10 @@
   "activity_log.sessionsDescription": "Sitzungen werden erstellt, sobald Sie sich in einem neuen Browser eines Gerätes anmelden. Sitzungen ermöglichen es Ihnen Mattermost ohne erneutes Anmelden nach einer vom System Administrator definierten Zeit zu verwenden. Um sich früher abzumelden, verwenden Sie den 'Abmelden'-Button unten, um die Sitzung zu beenden.",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "Native Android-App",
+  "activity_log_modal.androidNativeClassicApp": "Android Native Classic App",
   "activity_log_modal.desktop": "Native Desktop-App",
   "activity_log_modal.iphoneNativeApp": "Native iPhone-App",
+  "activity_log_modal.iphoneNativeClassicApp": "iPhone Native Classic App",
   "add_command.autocomplete": "Auto-Vervollständigung",
   "add_command.autocomplete.help": "(Optional) Zeige Slash-Befehle in Autovervollständigungsliste.",
   "add_command.autocompleteDescription": "Autovervollständigung Beschreibung",
@@ -49,7 +52,7 @@
   "add_command.iconUrl.placeholder": "https://www.beispiel.de/meinsymbol.png",
   "add_command.method": "Anforderungsmethode",
   "add_command.method.get": "GET",
-  "add_command.method.help": "Der Typ des an die Anfrage-URL gesendeten Anfragekommandos.",
+  "add_command.method.help": "Der Typ des an die Anfrage-URL gesendeten Anfragebefehls.",
   "add_command.method.post": "POST",
   "add_command.save": "Speichern",
   "add_command.token": "<b>Token</b>: {token}",
@@ -146,8 +149,20 @@
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
-  "admin.authentication.saml": "SAML",
+  "admin.authentication.saml": "SAML 2.0",
   "admin.banner.heading": "Notiz:",
+  "admin.client_versions.androidLatestVersion": "Latest Android Version",
+  "admin.client_versions.androidLatestVersionHelp": "The latest released Android version",
+  "admin.client_versions.androidMinVersion": "Minimum Android Version",
+  "admin.client_versions.androidMinVersionHelp": "The minimum compliant Android version",
+  "admin.client_versions.desktopLatestVersion": "Latest Desktop Version",
+  "admin.client_versions.desktopLatestVersionHelp": "The latest released Desktop version",
+  "admin.client_versions.desktopMinVersion": "Minimum Destop Version",
+  "admin.client_versions.desktopMinVersionHelp": "The minimum compliant Desktop version",
+  "admin.client_versions.iosLatestVersion": "Latest IOS Version",
+  "admin.client_versions.iosLatestVersionHelp": "The latest released IOS version",
+  "admin.client_versions.iosMinVersion": "Minimum IOS Version",
+  "admin.client_versions.iosMinVersionHelp": "The minimum compliant IOS version",
   "admin.cluster.enableDescription": "Wenn wahr, wird Mattermost im High-Availability-Modus laufen. Bitte sehen Sie sich die <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target='_blank'>Dokumentation</a> an um mehr über die High-Availability-Konfiguration für Mattermost zu lernen.",
   "admin.cluster.enableTitle": "High-Availability-Modus aktivieren:",
   "admin.cluster.interNodeListenAddressDesc": "Die Adresse auf die der Server für die Kommunikation mit anderen Servern horchen wird.",
@@ -260,7 +275,7 @@
   "admin.elasticsearch.sniffDescription": "Wenn wahr, findet und verbindet Sniffing alle Data-Nodes in ihrem Cluster automatisch.",
   "admin.elasticsearch.sniffTitle": "Cluster-Sniffing aktivieren:",
   "admin.elasticsearch.testConfigSuccess": "Test erfolgreich. Konfiguration gespeichert.",
-  "admin.elasticsearch.testHelpText": "Testet, ob der Mattermost-Server sich mit dem spezifizierten Elasticsearch-Server verbinden kann. Das Testen der Verbindung speichert die Einstellungen nur wenn sie erfolgreich war. Sehen Sie sich die Log-Datei für detailliertere Fehlermeldungen an.",
+  "admin.elasticsearch.testHelpText": "Testet, ob der Mattermost-Server sich mit dem spezifizierten Elasticsearch-Server verbinden kann. Das Testen der Verbindung speichert die Einstellungen nur, wenn der Test erfolgreich war. Sehen Sie sich die Log-Datei für detailliertere Fehlermeldungen an.",
   "admin.elasticsearch.title": "Elasticsearch (Beta)",
   "admin.elasticsearch.usernameDescription": "(Optional) Der Benutzername zur Authentifizierung am Elasticsearch-Server.",
   "admin.elasticsearch.usernameExample": "Z.B.: \"elastic\"",
@@ -289,7 +304,7 @@
   "admin.email.allowUsernameSignInDescription": "Wenn wahr, können sich Benutzer mit E-Mail-Anmeldung mit Benutzername und Passwort anmelden. Diese Einstellung beeinflusst die AD/LDAP-Anmeldung nicht.",
   "admin.email.allowUsernameSignInTitle": "Erlaube Login mit Benutzernamen: ",
   "admin.email.connectionSecurityTest": "Verbindung testen",
-  "admin.email.easHelp": "Erfahren Sie mehr über das Erstellen und Ausrollen Ihrer eigenen mobilen App aus einem <a href=\"https://about.mattermost.com/default-enterprise-app-store\" target='_blank'>Enterprise App Store</a>.",
+  "admin.email.easHelp": "Erfahren Sie mehr über das Erstellen und Ausrollen Ihrer eigenen mobilen App aus einem <a href=\"https://about.mattermost.com/default-enterprise-app-store\" target='_blank'>Enterprise-App-Store</a>.",
   "admin.email.emailFail": "Verbindung nicht erfolgreich: {error}",
   "admin.email.emailSuccess": "Es wurden keine Fehler beim Sendern der E-Mail gemeldet.  Bitte überprüfen Sie Ihr Postfach, um sicherzugehen.",
   "admin.email.enableEmailBatching.clusterEnabled": "E-Mail-Stapelverarbeitung kann nicht aktiviert werden, wenn High-Availability-Modus aktiviert ist.",
@@ -305,14 +320,14 @@
   "admin.email.inviteSaltExample": "Z.B.: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.inviteSaltTitle": "Salt für E-Mail-Einladung:",
   "admin.email.mhpns": "Benutze verschlüsselte, production-quality HPNS Verbindung zu iOS und Android Apps",
-  "admin.email.mhpnsHelp": "<a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS-App</a> bei iTunes herunterladen. <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android-App</a> bei Google Play herunterladen. Erfahren Sie mehr über <a href=\"https://about.mattermost.com/default-hpns\" target='_blank'>TPNS</a>.",
+  "admin.email.mhpnsHelp": "<a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS-App</a> bei iTunes herunterladen. <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android-App</a> bei Google Play herunterladen. Erfahren Sie mehr über <a href=\"https://about.mattermost.com/default-hpns\" target='_blank'>HPNS</a>.",
   "admin.email.mtpns": "Benutze iOS und Android Apps von iTunes und Google Play mit TPNS",
-  "admin.email.mtpnsHelp": "<a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS-App</a> bei iTunes herunterladen. <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android-App</a> bei Google Play herunterladen. Erfahren Sie mehr über <a href=\"https://about.mattermost.com/default-tpns/\" target='_blank'>TPNS</a>.",
+  "admin.email.mtpnsHelp": "<a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS-App</a> bei iTunes herunterladen. <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android-App</a> bei Google Play herunterladen. Erfahren Sie mehr über <a href=\"https://about.mattermost.com/default-tpns/\" target='_blank'>HPNS</a>.",
   "admin.email.nofificationOrganizationExample": "Z.B. \"© Musterfirma GmbH, Musterstraße 23, 59424 Musterhausen, Deutschland\"",
   "admin.email.notification.contents.full": "Sende kompletten Nachrichteninhalt",
-  "admin.email.notification.contents.full.description": "Benutzername und Kanal werden in E-Mail-Benachrichtigungen angezeigt.</br>Typisch verwendet aus Compliance-Gründen wenn Mattermost vertrauliche Informationen enthält und die Richtlinien vorschreiben das diese nicht in E-Mails gespeichert werden dürfen.",
+  "admin.email.notification.contents.full.description": "Benutzername und Kanal werden in E-Mail-Benachrichtigungen angezeigt.</br>Typisch verwendet aus Compliance-Gründen, wenn Mattermost vertrauliche Informationen enthält und die Richtlinien vorschreiben, dass diese nicht in E-Mails gespeichert werden dürfen.",
   "admin.email.notification.contents.generic": "Sende allgemeine Beschreibung nur mit Benutzername",
-  "admin.email.notification.contents.generic.description": "Nur der Name der Person, die die Nachricht versendet, ohne weitere Informationen über den Kanal oder den Nachrichteninhalt in der E-Mail-Benachrichtigung.</br>Typisch verwendet aus Compliance-Gründen wenn Mattermost vertrauliche Informationen enthält und die Richtlinien vorschreiben das diese nicht in E-Mails gespeichert werden dürfen.",
+  "admin.email.notification.contents.generic.description": "Nur der Name der Person, die die Nachricht versendet, ohne weitere Informationen über den Kanal oder den Nachrichteninhalt sind in der E-Mail-Benachrichtigung enthalten.</br>Typisch verwendet aus Compliance-Gründen, wenn Mattermost vertrauliche Informationen enthält und die Richtlinien vorschreiben, dass diese nicht in E-Mails gespeichert werden dürfen.",
   "admin.email.notification.contents.title": "E-Mail-Benachrichtigungsinhalt: ",
   "admin.email.notificationDisplayDescription": "Anzeigename des E-Mail-Kontos, welches zum Senden von Benachrichtigungsmails von Mattermost verwendet wird.",
   "admin.email.notificationDisplayExample": "Z.B.: \"Mattermost-Nachricht\", \"System\", \"No-Reply\"",
@@ -328,7 +343,7 @@
   "admin.email.passwordSaltDescription": "32 Zeichen langer Salt der zum Signieren von Passwort zurücksetzen E-Mails hinzugefügt wird. Zufallsgeneriert bei Installation. \"Neu generieren\" klicken um einen neuen Salt zu erstellen.",
   "admin.email.passwordSaltExample": "Z.B.: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "Passwort zurücksetzen Salt:",
-  "admin.email.pushContentDesc": "\"Sende allgemeine Beschreibung nur mit Benutzername\" enthält nur den Namen des Absenders der Nachricht in Push-Benachrichtigungen, ohne weitere Informationen über den Kanalnamen oder Nachrichteninhalt.<br /><br />\"Sende allgemeine Beschreibung mit Benutzer- und Kanalnamen\" enthält den Namen des Absenders der Nachricht und den Kanal in dem sie versendet wurde, aber nicht den Nachrichteninhalt.<br /><br />\"Sende kompletten Nachrichtenausschnitt\" enthält einen Nachrichtenauszug in der Push-Benachrichtigung, welche eventuell vertrauliche Informationen aus der Nachricht enthält. Wenn sich Ihr Push-Benachrichtigungsdienst außerhalb der Firewall befindet ist es *sehr empfohlen* diese Option nur mit dem \"https\" Protokoll zu verwenden, um die Verbindung zu verschlüsseln.",
+  "admin.email.pushContentDesc": "\"Sende allgemeine Beschreibung nur mit Benutzername\" enthält nur den Namen des Absenders der Nachricht in Push-Benachrichtigungen, ohne weitere Informationen über den Kanalnamen oder Nachrichteninhalt.<br /><br />\"Sende allgemeine Beschreibung mit Benutzer- und Kanalnamen\" enthält den Namen des Absenders der Nachricht und den Kanal, in dem sie versendet wurde, aber nicht den Nachrichteninhalt.<br /><br />\"Sende kompletten Nachrichtenausschnitt\" enthält einen Nachrichtenauszug in der Push-Benachrichtigung, welche eventuell vertrauliche Informationen aus der Nachricht enthält. Wenn sich Ihr Push-Benachrichtigungsdienst außerhalb der Firewall befindet ist es *sehr empfohlen* diese Option nur mit dem \"https\"-Protokoll zu verwenden, um die Verbindung zu verschlüsseln.",
   "admin.email.pushContentTitle": "Push-Mitteilungs-Inhalt:",
   "admin.email.pushDesc": "Normalerweise wahr in Produktionsumgebungen. Wenn wahr, versucht Mattermost iOS- und Android-Push-Nachrichten über den Push Notification Server zu versenden.",
   "admin.email.pushOff": "Keine Benachrichtigungen senden",
@@ -463,9 +478,9 @@
   "admin.image.amazonS3RegionDescription": "AWS Region Ihres S3 Bucket.",
   "admin.image.amazonS3RegionExample": "Z.B.: \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Amazon S3 Region:",
-  "admin.image.amazonS3SSEDescription": "Wenn wahr, werden Dateien in Amazon S3 mit serverseitiger Verschlüsselung mit Amazon S3-verwalteten Schlüsseln verschlüsselt. Schauen Sie in die <a href=\"https://about.mattermost.com/default-server-side-encryption\">Dokumentation</a> um mehr zu erfahren.",
+  "admin.image.amazonS3SSEDescription": "Wenn wahr, werden Dateien in Amazon S3 mit serverseitiger Verschlüsselung mit Amazon S3-verwalteten Schlüsseln verschlüsselt. Schauen Sie in die <a href=\"https://about.mattermost.com/default-server-side-encryption\">Dokumentation</a>, um mehr zu erfahren.",
   "admin.image.amazonS3SSEExample": "Z.B.: \"false\"",
-  "admin.image.amazonS3SSETitle": "Serverseitige Verschlüsselung von Amazon S3 aktivieren:",
+  "admin.image.amazonS3SSETitle": "Serverseitige Verschlüsselung für Amazon S3 aktivieren:",
   "admin.image.amazonS3SSLDescription": "Wenn falsch, werden unsichere Verbindungen zu Amazon S3 erlaubt. Standardmäßig werden nur sichere Verbindungen verwendet.",
   "admin.image.amazonS3SSLExample": "Z.B.: \"wahr\"",
   "admin.image.amazonS3SSLTitle": "Aktiviere sichere Amazon S3 Verbindungen:",
@@ -587,11 +602,11 @@
   "admin.log.locationPlaceholder": "Einen Dateiort eingeben",
   "admin.log.locationTitle": "Log-Verzeichnis:",
   "admin.log.logSettings": "Protokoll-Einstellungen",
-  "admin.logs.bannerDesc": "Um Benutzer nach Benutzer-ID zu suchen, wechseln Sie zu Reporting > Benutzer und fügen die ID in den Suchfilter ein.",
+  "admin.logs.bannerDesc": "Um Benutzer nach Benutzer-ID oder Token-ID zu suchen, wechseln Sie zu Reporting > Benutzer und fügen die ID in den Suchfilter ein.",
   "admin.logs.reload": "Erneut laden",
   "admin.logs.title": "Serverprotokoll",
   "admin.manage_roles.additionalRoles": "Weitere Berechtigungen für das Konto auswählen. <a href=\"https://about.mattermost.com/default-permissions\" target=\"_blank\">Mehr über Rollen und Berechtigungen lesen</a>.",
-  "admin.manage_roles.allowUserAccessTokens": "Diesem Konto erlauben, <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Benutzer-Zugriffs-Token</a> zu generieren.",
+  "admin.manage_roles.allowUserAccessTokens": "Diesem Konto erlauben, <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">persönliche Zugriffs-Token</a> zu generieren.",
   "admin.manage_roles.cancel": "Abbrechen",
   "admin.manage_roles.manageRolesTitle": "Rollen verwalten",
   "admin.manage_roles.postAllPublicRole": "Zugriff zum Senden in alle öffentlichen Mattermost-Kanäle.",
@@ -602,9 +617,9 @@
   "admin.manage_roles.saveError": "Rollen konnten nicht gepeichert werden.",
   "admin.manage_roles.systemAdmin": "Systemadministrator",
   "admin.manage_roles.systemMember": "Mitglied",
-  "admin.manage_tokens.manageTokensTitle": "Benutzer-Zugriffs-Token verwalten",
-  "admin.manage_tokens.userAccessTokensDescription": "Benutzer-Zugriffs-Token funktionieren ähnlich wie Sitzungs-Token und können von Integrationen zur <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">Interaktion mit diesem Mattermost Server</a> verwendet werden. Lernen Sie mehr über <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Benutzer-Zugriffs-Token</a>.",
-  "admin.manage_tokens.userAccessTokensNone": "Keine Benutzer-Zugriffs-Token.",
+  "admin.manage_tokens.manageTokensTitle": "Persönliche Zugriffs-Token verwalten",
+  "admin.manage_tokens.userAccessTokensDescription": "Persönliche Zugriffs-Token funktionieren ähnlich wie Sitzungs-Token und können von Integrationen zur <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">Interaktion mit diesem Mattermost Server</a> verwendet werden. Lernen Sie mehr über <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Benutzer-Zugriffs-Token</a>.",
+  "admin.manage_tokens.userAccessTokensNone": "Keine persönlichen Zugriffs-Token.",
   "admin.metrics.enableDescription": "Wenn wahr, wird Mattermost Performance-Daten sammeln und profilieren. Bitte schauen Sie in die <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>Dokumentation</a> um mehr über die Konfiguration von Performanceüberwachung für Mattermost zu erfahren.",
   "admin.metrics.enableTitle": "Performance Monitoring aktivieren:",
   "admin.metrics.listenAddressDesc": "Die Adresse auf die der Server hören wird um die Performancemetriken auszugeben.",
@@ -651,15 +666,15 @@
   "admin.password.symbol": "Mindestens ein Symbol (wie \"~!@#$%^&*()\")",
   "admin.password.uppercase": "Mindestens ein Großbuchstabe",
   "admin.plugins.jira": "JIRA (Beta)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "kanalname",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelurl",
   "admin.plugins.jira.enabledDescription": "Wenn wahr, können Sie JIRA-Webhooks konfigurieren um Nachrichten an Mattermost zu senden. Um Phishing-Angriffe zu vermeiden, werden alle Beiträge durch ein BOT-Tag markiert.",
-  "admin.plugins.jira.enabledLabel": "Aktiviert:",
+  "admin.plugins.jira.enabledLabel": "Enable JIRA:",
   "admin.plugins.jira.secretDescription": "Dieses Geheimnis wird zur Authentifizierung gegenüber Mattermost verwendet.",
-  "admin.plugins.jira.secretLabel": "Schlüssel",
+  "admin.plugins.jira.secretLabel": "Schlüssel:",
   "admin.plugins.jira.secretParamPlaceholder": "Schlüssel",
   "admin.plugins.jira.secretRegenerateDescription": "Regeneriert das Geheimnis für den Webhooks-URL-Endpunkt. Dadurch werden ihre existierenden JIRA-Integrationen ungültig.",
   "admin.plugins.jira.setupDescription": "Benutzen Sie diese Webhook-URL, um die JIRA-Integration einzurichten. {webhookDocsLink} ansehen, um mehr zu lernen.",
-  "admin.plugins.jira.teamParamPlaceholder": "teamname",
+  "admin.plugins.jira.teamParamPlaceholder": "teamurl",
   "admin.plugins.jira.userDescription": "Benutzernamen auswählen, mit dem die Integration verbunden ist.",
   "admin.plugins.jira.userLabel": "Benutzer:",
   "admin.plugins.jira.webhookDocsLink": "Dokumentation",
@@ -719,8 +734,8 @@
   "admin.saml.emailAttrDesc": "Das Attribut des LDAP-Servers, welches benutzt wird um die E-Mail-Adressen der Nutzer in Mattermost auszufüllen.",
   "admin.saml.emailAttrEx": "Z.B.: \"Email\" oder \"PrimaryEmail\"",
   "admin.saml.emailAttrTitle": "E-Mail-Attribut:",
-  "admin.saml.enableDescription": "Wenn wahr, erlaubt Mattermost Login mit SAML. Bitte sehen Sie sich die <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>Dokumentation</a> an um mehr über die SAML-Konfiguration für Mattermost zu lernen.",
-  "admin.saml.enableTitle": "Erlaube Login mit SAML:",
+  "admin.saml.enableDescription": "Wenn wahr, erlaubt Mattermost Login mit SAML 2.0. Bitte sehen Sie sich die <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>Dokumentation</a> an um mehr über die SAML-Konfiguration für Mattermost zu lernen.",
+  "admin.saml.enableTitle": "Erlaube Login mit SAML 2.0:",
   "admin.saml.encryptDescription": "Wenn falsch wird Mattermost nicht die verschlüsselten SAML Assertions mit dem öffentlichen Zertifikat des Service Providers entschlüsseln. Nicht empfohlen für Produktionsumgebungen. Nur für Testzwecke.",
   "admin.saml.encryptTitle": "Verschlüsselung aktivieren:",
   "admin.saml.firstnameAttrDesc": "(Optional) Das Attribut in der SAML-Erklärung, welches benutzt wird um den Vornamen des Nutzers in Mattermost auszufüllen.",
@@ -807,6 +822,9 @@
   "admin.service.insecureTlsTitle": "Erlaube unsichere ausgehende Verbindungen: ",
   "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 und OAuth-2.0-Anwendungen nur durch Systemadministratoren. Integrationen stehen allen Benutzern zur Verfügung nachdem ein Systemadministrator sie erstellt hat.",
+  "admin.service.internalConnectionsDesc": "Benutzen Sie diese Einstellung in Testumgebungen dazu, wie bei der lokalen Entwicklung von Integrationen auf einer Entwicklungsmaschine, Domains, IP-Adressen oder CIDR-Notationen zu spezifizieren um interne Verbindungen zu erlauben. <b>Nicht empfohlen für die Verwendung in der Produktion</b>, da dies Nutzern erlauben kann, vertrauliche Daten aus ihrem internen Netzwerk zu extrahieren.<br /><br />Per Standard wird durch Benutzer zur Verfügung gestellten URLs, wie für Open-Graph-Metadaten, Webhooks oder Slash-Befehle verwendet, nicht erlaubt, sich mit reservierten IP-Adressen inklusive Loopback oder link-lokalen Adressen zu verbinden, die durch interne Netzwerke verwendet werden.Push-Benachrichtigungs-, Oauth-2.0- und WebRTC-Server-URLs sind vertrauenswürdig und werden durch diese Einstellung nicht beeinflusst.",
+  "admin.service.internalConnectionsEx": "webhooks.intern.beispiel.de 127.0.0.1 10.0.16.0/28",
+  "admin.service.internalConnectionsTitle": "Erlaube ungesicherte interne Verbindungen zu: ",
   "admin.service.letsEncryptCertificateCacheFile": "Let's Encrylt Zertifikat Cache Datei:",
   "admin.service.letsEncryptCertificateCacheFileDescription": "Zertifikate und andere Daten über den Let's Encrypt Dienst werden in dieser Datei gespeichert.",
   "admin.service.listenAddress": "Empfangs-Adresse:",
@@ -833,7 +851,7 @@
   "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 /test Slash-Befehl aktiviert, um Testkonten, -daten und Textformatierungen zu laden. Änderung erfordern einen Server-Neustart, bevor sie in Kraft treten.",
-  "admin.service.testingTitle": "Aktiviere Testkommandos: ",
+  "admin.service.testingTitle": "Aktiviere Testbefehle: ",
   "admin.service.tlsCertFile": "TLS Zertifikatsdatei:",
   "admin.service.tlsCertFileDescription": "Das zu verwendende Zertifikat.",
   "admin.service.tlsKeyFile": "TLS Schlüsseldatei:",
@@ -841,9 +859,9 @@
   "admin.service.useLetsEncrypt": "Let's Encrypt verwenden:",
   "admin.service.useLetsEncryptDescription": "Aktiviere automatischen Abruf von Zertifikaten über Let's Encrypt. Das Zertifikat wird abgerufen wenn ein Client versucht von einer neuen Domains zuzugreifen. Dies funktioniert mit mehreren Domains.",
   "admin.service.userAccessTokensDescLabel": "Name: ",
-  "admin.service.userAccessTokensDescription": "Wenn wahr, können Benutzer <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Benutzer-Zugriffs-Token</a> für Integrationen in <strong>Kontoeinstellungen > Sicherheit</strong> erstellen. Sie können zur Authentifizierung gegenüber der API verwendet werden und geben vollen Zugriff auf das Konto.<br/><br/>Um zu verwalten, wer Benutzer-Zugriffs-Token erstellen kann, gehen Sie zur Seite <strong>Systemkonsole > Benutzer</strong>.",
+  "admin.service.userAccessTokensDescription": "Wenn wahr, können Benutzer <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">persönliche Zugriffs-Token</a> für Integrationen in <strong>Kontoeinstellungen > Sicherheit</strong> erstellen. Sie können zur Authentifizierung gegenüber der API verwendet werden und geben vollen Zugriff auf das Konto.<br/><br/>Um zu verwalten, wer persönliche Zugriffs-Token erstellen kann, gehen Sie zur Seite <strong>Systemkonsole > Benutzer</strong>.",
   "admin.service.userAccessTokensIdLabel": "Token-ID: ",
-  "admin.service.userAccessTokensTitle": "Benutzer-Zugriffs-Token aktivieren: ",
+  "admin.service.userAccessTokensTitle": "Persönliche Zugriffs-Token aktivieren: ",
   "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.",
@@ -853,6 +871,7 @@
   "admin.sidebar.advanced": "Erweitert",
   "admin.sidebar.audits": "Compliance und Prüfung",
   "admin.sidebar.authentication": "Authentifizierung",
+  "admin.sidebar.client_versions": "Client Versions",
   "admin.sidebar.cluster": "Hochverfügbarkeit",
   "admin.sidebar.compliance": "Compliance",
   "admin.sidebar.configuration": "Konfiguration",
@@ -892,7 +911,7 @@
   "admin.sidebar.push": "Mobil Push",
   "admin.sidebar.rateLimiting": "Geschwindigkeitsbegrenzung",
   "admin.sidebar.reports": "REPORTING",
-  "admin.sidebar.saml": "SAML",
+  "admin.sidebar.saml": "SAML 2.0",
   "admin.sidebar.security": "Sicherheit",
   "admin.sidebar.sessions": "Sitzungen",
   "admin.sidebar.settings": "EINSTELLUNGEN",
@@ -979,7 +998,7 @@
   "admin.team.restrict_direct_message_any": "Jeder Nutzer auf dem Mattermost Server",
   "admin.team.restrict_direct_message_team": "Jedes Mitglied des Teams",
   "admin.team.showFullname": "Zeige Vor- und Nachname",
-  "admin.team.showNickname": "Zeige Spitzname wenn verfügbar, sonst zeige Vor- und Nachname",
+  "admin.team.showNickname": "Zeige Spitzname, wenn verfügbar, sonst zeige Vor- und Nachname",
   "admin.team.showUsername": "Zeige Benutzername (Standard)",
   "admin.team.siteNameDescription": "Name des Dienstes, der auf der Anmeldeseite und der Seiten angezeigt wird.",
   "admin.team.siteNameExample": "Z.B.: \"Mattermost\"",
@@ -999,7 +1018,7 @@
   "admin.true": "wahr",
   "admin.user_item.authServiceEmail": "<strong>Anmelde-Methode:</strong> E-Mail-Adresse",
   "admin.user_item.authServiceNotEmail": "<strong>Anmelde-Methode:</strong> {service}",
-  "admin.user_item.confirmDemoteDescription": "Wenn Sie sich selbst die Systemadministrations-Rolle entziehen und es gibt keinen weitere Benutzer mit der Systemadministrations-Rolle, müssen Sie einen Systemadministrator über den Mattermost-Server in einer Terminal-Sitzung mit folgendem Kommando festlegen.",
+  "admin.user_item.confirmDemoteDescription": "Wenn Sie sich selbst die Systemadministrations-Rolle entziehen und es gibt keinen weitere Benutzer mit der Systemadministrations-Rolle, müssen Sie einen Systemadministrator über den Mattermost-Server in einer Terminal-Sitzung mit folgendem Befehl festlegen.",
   "admin.user_item.confirmDemoteRoleTitle": "Bestätigung des Entziehens der Systemadministrations-Rolle",
   "admin.user_item.confirmDemotion": "Bestätigung des Entziehens",
   "admin.user_item.confirmDemotionCmd": "platform roles system_admin {username}",
@@ -1023,7 +1042,7 @@
   "admin.user_item.teamAdmin": "Teamadministrator",
   "admin.user_item.userAccessTokenPostAll": "(mit post:all Benutzer-Zugriffs-Token)",
   "admin.user_item.userAccessTokenPostAllPublic": "(mit post:channels Benutzer-Zugriffs-Token)",
-  "admin.user_item.userAccessTokenYes": "(mit Benutzer-Zugriffs-Token)",
+  "admin.user_item.userAccessTokenYes": "(mit persönlichen Zugriffs-Token)",
   "admin.webrtc.enableDescription": "Wenn wahr, erlaubt Mattermost die Erstellung von <strong>eins-zu-eins</strong> Videokonferenzen. WebRTC Anrufe sind in Chrome, Firefox und Mattermost Desktop Anwendungen verfügbar.",
   "admin.webrtc.enableTitle": "Aktiviere Mattermost WebRTC: ",
   "admin.webrtc.gatewayAdminSecretDescription": "Geben Sie ihr geheimes Admin Passwort ein, um die Gateway Admin URL aufzurufen.",
@@ -1068,7 +1087,7 @@
   "analytics.system.textPosts": "Nur-Text Beiträge",
   "analytics.system.title": "System Statistiken",
   "analytics.system.totalChannels": "Kanäle Gesamt",
-  "analytics.system.totalCommands": "Kommandos Gesamt",
+  "analytics.system.totalCommands": "Befehle Gesamt",
   "analytics.system.totalFilePosts": "Beiträge mit Dateien",
   "analytics.system.totalHashtagPosts": "Beiträge mit Hashtags",
   "analytics.system.totalIncomingWebhooks": "Eingehende Webhooks",
@@ -1098,7 +1117,7 @@
   "api.channel.post_update_channel_header_message_and_forget.removed": "{username} hat die Kanalüberschrift entfernt (war: {old})",
   "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} hat die Kanalüberschrift aktualisiert von: {old} auf: {new}",
   "api.channel.post_update_channel_header_message_and_forget.updated_to": "{username} hat die Kanalüberschrift geändert zu: {new}",
-  "api.channel.remove_member.removed": "{removedUsername} wurde vom Kanal entfernt",
+  "api.channel.remove_member.removed": "{removedUsername} wurde aus dem Kanal entfernt",
   "app.channel.post_update_channel_purpose_message.removed": "{username} hat den Kanalzweck entfernt (war: {old})",
   "app.channel.post_update_channel_purpose_message.updated_from": "{username} hat den Kanalzweck aktualisiert von: {old} auf: {new}",
   "app.channel.post_update_channel_purpose_message.updated_to": "{username} hat den Kanalzweck geändert zu: {new}",
@@ -1294,15 +1313,14 @@
   "claim.email_to_oauth.switchTo": "Konto zu {uiType} wechseln",
   "claim.email_to_oauth.title": "Konto von E-Mail/Passwort auf {uiType} wechseln",
   "claim.ldap_to_email.confirm": "Passwort bestätigen",
-  "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 das {site} E-Mail-Konto ein",
-  "claim.ldap_to_email.enterPwd": "Geben Sie ein neues Passwort für Ihr E-Mail-Konto ein",
+  "claim.ldap_to_email.email": "After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "New email login password:",
   "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 Ihr Konto 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": "AD/LDAP Zugang auf E-Mail-Adresse/Passwort umstellen",
   "claim.oauth_to_email.confirm": "Passwort bestätigen",
@@ -1761,7 +1779,7 @@
   "member_list.noUsersAdd": "Keine Benutzer zum Hinzufügen.",
   "members_popover.manageMembers": "Mitglieder verwalten",
   "members_popover.msg": "Nachricht",
-  "members_popover.title": "Mitglieder",
+  "members_popover.title": "Kanalmitglieder",
   "members_popover.viewMembers": "Zeige Mitglieder",
   "mfa.confirm.complete": "<strong>Einrichtung abgeschlossen!</strong>",
   "mfa.confirm.okay": "OK",
@@ -1829,6 +1847,15 @@
   "mobile.custom_list.no_results": "Keine Ergebnisse",
   "mobile.drawer.teamsTitle": "Teams",
   "mobile.edit_post.title": "Nachricht bearbeiten",
+  "mobile.emoji_picker.activity": "ACTIVITY",
+  "mobile.emoji_picker.custom": "CUSTOM",
+  "mobile.emoji_picker.flags": "FLAGS",
+  "mobile.emoji_picker.foods": "FOODS",
+  "mobile.emoji_picker.nature": "NATURE",
+  "mobile.emoji_picker.objects": "OBJECTS",
+  "mobile.emoji_picker.people": "PEOPLE",
+  "mobile.emoji_picker.places": "PLACES",
+  "mobile.emoji_picker.symbols": "SYMBOLS",
   "mobile.error_handler.button": "Neustarten",
   "mobile.error_handler.description": "\nKlicken Sie auf Neustarten um die App neu zu öffnen. Nach dem Neustart können Sie das Problem über das Einstellungsmenü melden.\n",
   "mobile.error_handler.title": "Ein unerwarteter Fehler ist aufgetreten",
@@ -1837,6 +1864,7 @@
   "mobile.file_upload.more": "Mehr",
   "mobile.file_upload.video": "Videobibliothek",
   "mobile.help.title": "Hilfe",
+  "mobile.image_preview.save": "Save Image",
   "mobile.intro_messages.DM": "Dies ist der Start der Privatnachrichten mit {teammate}. Privatnachrichten und hier geteilte Dateien sind für Personen außerhalb dieses Bereichs nicht sichtbar.",
   "mobile.intro_messages.default_message": "Dies ist der Kanal, den Teammitglieder sehen, wenn sie sich anmelden - benutzen Sie ihn zum Veröffentlichen von Aktualisierungen, die jeder kennen muss.",
   "mobile.intro_messages.default_welcome": "Willkommen bei {name}!",
@@ -1845,6 +1873,11 @@
   "mobile.loading_members": "Lade Mitglieder...",
   "mobile.loading_posts": "Lade Mitteilungen...",
   "mobile.login_options.choose_title": "Wählen Sie Ihre Anmeldemethode",
+  "mobile.managed.blocked_by": "Blockiert durch {vendor}",
+  "mobile.managed.exit": "Beenden",
+  "mobile.managed.jailbreak": "Geräten mit Jailbreak wird von {vendor} nicht vertraut, bitte beenden Sie die App.",
+  "mobile.managed.secured_by": "Gesichert durch {vendor}",
+  "mobile.markdown.code.plusMoreLines": "+{count, number} more lines",
   "mobile.more_dms.start": "Start",
   "mobile.more_dms.title": "Neue Konversation",
   "mobile.notice_mobile_link": "mobile Apps",
@@ -1863,6 +1896,7 @@
   "mobile.post.failed_retry": "Erneut versuchen",
   "mobile.post.failed_title": "Ihre Nachricht konnte nicht gesendet werden",
   "mobile.post.retry": "Aktualisieren",
+  "mobile.post_info.add_reaction": "Add Reaction",
   "mobile.request.invalid_response": "Ungültige Antwort vom Server erhalten.",
   "mobile.routes.channelInfo": "Info",
   "mobile.routes.channelInfo.createdBy": "Erstellt durch {creator} am ",
@@ -1872,6 +1906,8 @@
   "mobile.routes.channel_members.action_message": "Sie müssen mindestens ein Mitglied auswählen.",
   "mobile.routes.channel_members.action_message_confirm": "Sind Sie sicher, dass Sie die ausgewählten Mitglieder vom Kanal löschen möchten?",
   "mobile.routes.channels": "Kanäle",
+  "mobile.routes.code": "{language} Code",
+  "mobile.routes.code.noLanguage": "Code",
   "mobile.routes.enterServerUrl": "Geben Sie die Server-URL ein",
   "mobile.routes.login": "Anmelden",
   "mobile.routes.loginOptions": "Loginauswahl",
@@ -1924,6 +1960,7 @@
   "msg_typing.someone": "Jemand",
   "multiselect.add": "Hinzufügen",
   "multiselect.go": "Los",
+  "multiselect.list.notFound": "Keine Elemente gefunden",
   "multiselect.numPeopleRemaining": "Verwenden Sie ↑↓ zum Navigieren, ↵ zur Auswahl. Sie können {num, number} weitere {num, plural, one {Person} other {Personen}} hinzufügen. ",
   "multiselect.numRemaining": "Sie können {num, number} weitere hinzufügen",
   "multiselect.placeholder": "Mitglieder suchen und hinzufügen",
@@ -2044,6 +2081,7 @@
   "rename_channel.handleHolder": "Kleinbuchstaben oder Ziffern",
   "rename_channel.lowercase": "Dürfen nur Kleinbuchstaben oder Ziffern sein",
   "rename_channel.maxLength": "Dieses Feld muss kleiner als {maxLength, number} Zeichen sein",
+  "rename_channel.minLength": "Channel name must be {minLength, number} or more characters",
   "rename_channel.required": "Dieses Feld wird erforderlich",
   "rename_channel.save": "Speichern",
   "rename_channel.title": "Kanal umbenennen",
@@ -2102,11 +2140,61 @@
   "setting_upload.import": "Importieren",
   "setting_upload.noFile": "Keine Datei ausgewählt.",
   "setting_upload.select": "Datei auswählen",
+  "shortcuts.browser.channel_next": "Forward in history:\tAlt|Right",
+  "shortcuts.browser.channel_next.mac": "Forward in history:\t⌘|]",
+  "shortcuts.browser.channel_prev": "Back in history:\tAlt|Left",
+  "shortcuts.browser.channel_prev.mac": "Back in history:\t⌘|[",
+  "shortcuts.browser.font_decrease": "Zoom out:\tCtrl|-",
+  "shortcuts.browser.font_decrease.mac": "Zoom out:\t⌘|-",
+  "shortcuts.browser.font_increase": "Zoom in:\tCtrl|+",
+  "shortcuts.browser.font_increase.mac": "Zoom in:\t⌘|+",
+  "shortcuts.browser.header": "Built-in Browser Commands",
+  "shortcuts.browser.highlight_next": "Highlight text to the next line:\tShift|Down",
+  "shortcuts.browser.highlight_prev": "Highlight text to the previous line:\tShift|Up",
+  "shortcuts.browser.input.header": "Funktioniert in einem leeren Eingabefeld",
+  "shortcuts.browser.newline": "Create a new line:\tShift|Enter",
+  "shortcuts.files.header": "Dateien",
+  "shortcuts.files.upload": "Upload files:\tCtrl|U",
+  "shortcuts.files.upload.mac": "Upload files:\t⌘|U",
+  "shortcuts.header": "Tastaturkürzel",
+  "shortcuts.info": "Begin a message with / for a list of all the commands at your disposal.",
+  "shortcuts.msgs.comp.channel": "Channel:\t~|[a-z]|Tab",
+  "shortcuts.msgs.comp.emoji": "Emoji:\t:|[a-z]|Tab",
+  "shortcuts.msgs.comp.header": "Auto-Vervollständigung",
+  "shortcuts.msgs.comp.username": "Username:\t@|[a-z]|Tab",
+  "shortcuts.msgs.edit": "Edit last message in channel:\tUp",
+  "shortcuts.msgs.header": "Nachrichten",
+  "shortcuts.msgs.input.header": "Funktioniert in einem leeren Eingabefeld",
+  "shortcuts.msgs.mark_as_read": "Mark current channel as read:\tEsc",
+  "shortcuts.msgs.reply": "Reply to last message in channel:\tShift|Up",
+  "shortcuts.msgs.reprint_next": "Reprint next message:\tCtrl|Down",
+  "shortcuts.msgs.reprint_next.mac": "Reprint next message:\t⌘|Down",
+  "shortcuts.msgs.reprint_prev": "Reprint previous message:\tCtrl|Up",
+  "shortcuts.msgs.reprint_prev.mac": "Reprint previous message:\t⌘|Up",
+  "shortcuts.nav.direct_messages_menu": "Direct messages menu:\tCtrl|Shift|K",
+  "shortcuts.nav.direct_messages_menu.mac": "Direct messages menu:\t⌘|Shift|K",
+  "shortcuts.nav.header": "Navigation",
+  "shortcuts.nav.next": "Next channel:\tAlt|Down",
+  "shortcuts.nav.next.mac": "Next channel:\t⌥|Down",
+  "shortcuts.nav.prev": "Previous channel:\tAlt|Up",
+  "shortcuts.nav.prev.mac": "Previous channel:\t⌥|Up",
+  "shortcuts.nav.recent_mentions": "Recent mentions:\tCtrl|Shift|M",
+  "shortcuts.nav.recent_mentions.mac": "Recent mentions:\t⌘|Shift|M",
+  "shortcuts.nav.settings": "Account settings:\tCtrl|Shift|A",
+  "shortcuts.nav.settings.mac": "Account settings:\t⌘|Shift|A",
+  "shortcuts.nav.switcher": "Quick channel switcher:\tCtrl|K",
+  "shortcuts.nav.switcher.mac": "Quick channel switcher:\t⌘|K",
+  "shortcuts.nav.unread_next": "Next unread channel:\tAlt|Shift|Down",
+  "shortcuts.nav.unread_next.mac": "Next unread channel:\t⌥|Shift|Down",
+  "shortcuts.nav.unread_prev": "Previous unread channel:\tAlt|Shift|Up",
+  "shortcuts.nav.unread_prev.mac": "Previous unread channel:\t⌥|Shift|Up",
   "sidebar.channels": "ÖFFENTLICHE KANÄLE",
   "sidebar.createChannel": "Einen neuen öffentlichen Kanal erstellen",
   "sidebar.createGroup": "Einen neuen privaten Kanal erstellen",
   "sidebar.direct": "DIREKTNACHRICHTEN",
   "sidebar.favorite": "KANALFAVORITEN",
+  "sidebar.leave": "Kanal verlassen",
+  "sidebar.mainMenu": "Main Menu",
   "sidebar.more": "Mehr",
   "sidebar.moreElips": "Mehr...",
   "sidebar.otherMembers": "Außerhalb dieses Teams",
@@ -2221,7 +2309,7 @@
   "team_import_tab.summary": "Zusammenfassung anzeigen",
   "team_member_modal.close": "Schließen",
   "team_member_modal.members": "{team} Mitglieder",
-  "team_members_dropdown.confirmDemoteDescription": "Wenn Sie sich selbst die Systemadministrations-Rolle entziehen und es gibt keinen weitere Benutzer mit der Systemadministrations-Rolle, müssen Sie einen Systemadministrator über den Mattermost-Server in einer Terminal-Sitzung mit folgendem Kommando festlegen.",
+  "team_members_dropdown.confirmDemoteDescription": "Wenn Sie sich selbst die Systemadministrations-Rolle entziehen und es gibt keinen weitere Benutzer mit der Systemadministrations-Rolle, müssen Sie einen Systemadministrator über den Mattermost-Server in einer Terminal-Sitzung mit folgendem Befehl festlegen.",
   "team_members_dropdown.confirmDemoteRoleTitle": "Bestätigung des Entziehens der Systemadministrations-Rolle",
   "team_members_dropdown.confirmDemotion": "Bestätigung des Entziehens",
   "team_members_dropdown.confirmDemotionCmd": "platform roles system_admin {username}",
@@ -2556,24 +2644,24 @@
   "user.settings.security.title": "Sicherheitseinstellungen",
   "user.settings.security.viewHistory": "Zeige Zugriffshistorie",
   "user.settings.tokens.cancel": "Abbrechen",
-  "user.settings.tokens.clickToEdit": "Klicken Sie 'Bearbeiten', um ihre Benutzer-Zugriffs-Token zu verwalten",
+  "user.settings.tokens.clickToEdit": "Klicken Sie 'Bearbeiten', um ihre persönlichen Zugriffs-Token zu verwalten",
   "user.settings.tokens.confirmCreateButton": "Ja, erstellen",
-  "user.settings.tokens.confirmCreateMessage": "Sie generieren einen Benutzer-Zugriffs-Token mit Systemadministrator-Berechtigungen. Sind Sie sicher, dass Sie dieses Token erstellen wollen?",
-  "user.settings.tokens.confirmCreateTitle": "Systemadministrator-Benutzer-Zugriffs-Token erstellen",
+  "user.settings.tokens.confirmCreateMessage": "Sie generieren einen persönlichen Zugriffs-Token mit Systemadministrator-Berechtigungen. Sind Sie sicher, dass Sie dieses Token erstellen wollen?",
+  "user.settings.tokens.confirmCreateTitle": "Persönlichen Systemadministrator-Zugriffs-Token erstellen",
   "user.settings.tokens.confirmDeleteButton": "Ja, löschen",
   "user.settings.tokens.confirmDeleteMessage": "Alle Integrationen, die dieses Token verwenden, werden nicht weiter in der Lage sein auf die Mattermost-API zuzugreifen. Diese Aktion kann nicht rückgängig gemacht werden.<br /><br />Sind Sie sicher, dass sie das Token <strong>{description}</strong> löschen möchten?",
   "user.settings.tokens.confirmDeleteTitle": "Token löschen?",
-  "user.settings.tokens.copy": "Bitte kopieren Sie den unten stehenden Token. Sie werden ihn nicht erneut ansehen können!",
+  "user.settings.tokens.copy": "Bitte kopieren Sie das unten stehende Token. Sie werden es nicht erneut ansehen können!",
   "user.settings.tokens.create": "Neues Token erstellen",
   "user.settings.tokens.delete": "Löschen",
-  "user.settings.tokens.description": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Benutzer-Zugriffs-Token</a> funktionieren ähnlich wie Sitzungs-Token und können von Integrationen zur <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">Authentifizierung gegenüber der REST-API</a> verwendet werden.",
-  "user.settings.tokens.description_mobile": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Benutzer-Zugriffs-Token</a> funktionieren ähnlich wie Sitzungs-Token und können von Integrationen zur <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">Authentifizierung gegenüber der REST-API</a> verwendet werden. Erstellen Sie neue Token auf ihrem Desktop.",
+  "user.settings.tokens.description": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Persönliche Zugriffs-Token</a> funktionieren ähnlich wie Sitzungs-Token und können von Integrationen zur <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">Authentifizierung gegenüber der REST-API</a> verwendet werden.",
+  "user.settings.tokens.description_mobile": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Persönliche Zugriffs-Token</a> funktionieren ähnlich wie Sitzungs-Token und können von Integrationen zur <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">Authentifizierung gegenüber der REST-API</a> verwendet werden. Erstellen Sie neue Token auf ihrem Desktop.",
   "user.settings.tokens.id": "Token-ID: ",
   "user.settings.tokens.name": "Token-Beschreibung: ",
-  "user.settings.tokens.nameHelp": "Geben Sie eine Beschreibung für Ihr Token ein, um sich zu Merken was es tut.",
+  "user.settings.tokens.nameHelp": "Geben Sie eine Beschreibung für Ihr Token ein, um sich zu merken, was es tut.",
   "user.settings.tokens.nameRequired": "Bitte geben Sie eine Beschreibung ein.",
   "user.settings.tokens.save": "Speichern",
-  "user.settings.tokens.title": "Benutzer-Zugriffs-Token",
+  "user.settings.tokens.title": "Persönliche Zugriffs-Token",
   "user.settings.tokens.token": "Zugriffs-Token: ",
   "user.settings.tokens.tokenId": "Token-ID: ",
   "user.settings.tokens.userAccessTokensNone": "Keine Benutzer-Zugriffs-Token.",
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index d53559826..635c619a3 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -820,11 +820,11 @@
   "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.internalConnectionsDesc": "In testing environments, such as when developing integrations locally on a development machine, use this setting to specify domains, IP addresses, or CIDR notations to allow internal connections. <b>Not recommended for use in production</b>, since this can allow a user to extract confidential data from your server or internal network.<br /><br />By default, user-supplied URLs such as those used for Open Graph metadata, webhooks, or slash commands will not be allowed to connect to reserved IP addresses including loopback or link-local addresses used for internal networks. Push notification, OAuth 2.0 and WebRTC server URLs are trusted and not affected by this setting.",
-  "admin.service.internalConnectionsTitle": "Allow untrusted internal connections to: ",
-  "admin.service.internalConnectionsEx": "webhooks.internal.example.com 127.0.0.1 10.0.16.0/28",
   "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.internalConnectionsDesc": "In testing environments, such as when developing integrations locally on a development machine, use this setting to specify domains, IP addresses, or CIDR notations to allow internal connections. <b>Not recommended for use in production</b>, since this can allow a user to extract confidential data from your server or internal network.<br /><br />By default, user-supplied URLs such as those used for Open Graph metadata, webhooks, or slash commands will not be allowed to connect to reserved IP addresses including loopback or link-local addresses used for internal networks. Push notification, OAuth 2.0 and WebRTC server URLs are trusted and not affected by this setting.",
+  "admin.service.internalConnectionsEx": "webhooks.internal.example.com 127.0.0.1 10.0.16.0/28",
+  "admin.service.internalConnectionsTitle": "Allow untrusted internal connections to: ",
   "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:",
   "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
   "admin.service.listenAddress": "Listen Address:",
@@ -1847,6 +1847,15 @@
   "mobile.custom_list.no_results": "No Results",
   "mobile.drawer.teamsTitle": "Teams",
   "mobile.edit_post.title": "Editing Message",
+  "mobile.emoji_picker.activity": "ACTIVITY",
+  "mobile.emoji_picker.custom": "CUSTOM",
+  "mobile.emoji_picker.flags": "FLAGS",
+  "mobile.emoji_picker.foods": "FOODS",
+  "mobile.emoji_picker.nature": "NATURE",
+  "mobile.emoji_picker.objects": "OBJECTS",
+  "mobile.emoji_picker.people": "PEOPLE",
+  "mobile.emoji_picker.places": "PLACES",
+  "mobile.emoji_picker.symbols": "SYMBOLS",
   "mobile.error_handler.button": "Relaunch",
   "mobile.error_handler.description": "\nClick relaunch to open the app again. After restart, you can report the problem from the settings menu.\n",
   "mobile.error_handler.title": "Unexpected error occurred",
@@ -1855,6 +1864,7 @@
   "mobile.file_upload.more": "More",
   "mobile.file_upload.video": "Video Library",
   "mobile.help.title": "Help",
+  "mobile.image_preview.save": "Save Image",
   "mobile.intro_messages.DM": "This is the start of your direct message history with {teammate}. Direct messages and files shared here are not shown to people outside this area.",
   "mobile.intro_messages.default_message": "This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.",
   "mobile.intro_messages.default_welcome": "Welcome to {name}!",
@@ -1863,6 +1873,11 @@
   "mobile.loading_members": "Loading Members...",
   "mobile.loading_posts": "Loading Messages...",
   "mobile.login_options.choose_title": "Choose your login method",
+  "mobile.managed.blocked_by": "Blocked by {vendor}",
+  "mobile.managed.exit": "Exit",
+  "mobile.managed.jailbreak": "Jailbroken devices are not trusted by {vendor}, please exit the app.",
+  "mobile.managed.secured_by": "Secured by {vendor}",
+  "mobile.markdown.code.plusMoreLines": "+{count, number} more lines",
   "mobile.more_dms.start": "Start",
   "mobile.more_dms.title": "New Conversation",
   "mobile.notice_mobile_link": "mobile apps",
@@ -1881,6 +1896,7 @@
   "mobile.post.failed_retry": "Try Again",
   "mobile.post.failed_title": "Unable to send your message",
   "mobile.post.retry": "Refresh",
+  "mobile.post_info.add_reaction": "Add Reaction",
   "mobile.request.invalid_response": "Received invalid response from the server.",
   "mobile.routes.channelInfo": "Info",
   "mobile.routes.channelInfo.createdBy": "Created by {creator} on ",
@@ -1890,6 +1906,8 @@
   "mobile.routes.channel_members.action_message": "You must select at least one member to remove from the channel.",
   "mobile.routes.channel_members.action_message_confirm": "Are you sure you want to remove the selected members from the channel?",
   "mobile.routes.channels": "Channels",
+  "mobile.routes.code": "{language} Code",
+  "mobile.routes.code.noLanguage": "Code",
   "mobile.routes.enterServerUrl": "Enter Server URL",
   "mobile.routes.login": "Login",
   "mobile.routes.loginOptions": "Login Chooser",
@@ -2122,61 +2140,61 @@
   "setting_upload.import": "Import",
   "setting_upload.noFile": "No file selected.",
   "setting_upload.select": "Select file",
-  "shortcuts.info": "Begin a message with / for a list of all the commands at your disposal.",
-  "shortcuts.header": "Keyboard Shortcuts",
-  "shortcuts.nav.header": "Navigation",
-  "shortcuts.nav.prev": "Previous channel:\tAlt|Up",
-  "shortcuts.nav.prev.mac": "Previous channel:\t⌥|Up",
-  "shortcuts.nav.next": "Next channel:\tAlt|Down",
-  "shortcuts.nav.next.mac": "Next channel:\t⌥|Down",
-  "shortcuts.nav.unread_prev": "Previous unread channel:\tAlt|Shift|Up",
-  "shortcuts.nav.unread_prev.mac": "Previous unread channel:\t⌥|Shift|Up",
-  "shortcuts.nav.unread_next": "Next unread channel:\tAlt|Shift|Down",
-  "shortcuts.nav.unread_next.mac": "Next unread channel:\t⌥|Shift|Down",
-  "shortcuts.nav.switcher": "Quick channel switcher:\tCtrl|K",
-  "shortcuts.nav.switcher.mac": "Quick channel switcher:\t⌘|K",
-  "shortcuts.nav.direct_messages_menu": "Direct messages menu:\tCtrl|Shift|K",
-  "shortcuts.nav.direct_messages_menu.mac": "Direct messages menu:\t⌘|Shift|K",
-  "shortcuts.nav.settings": "Account settings:\tCtrl|Shift|A",
-  "shortcuts.nav.settings.mac": "Account settings:\t⌘|Shift|A",
-  "shortcuts.nav.recent_mentions": "Recent mentions:\tCtrl|Shift|M",
-  "shortcuts.nav.recent_mentions.mac": "Recent mentions:\t⌘|Shift|M",
-  "shortcuts.msgs.header": "Messages",
-  "shortcuts.msgs.mark_as_read": "Mark current channel as read:\tEsc",
-  "shortcuts.msgs.input.header": "Works inside an empty input field",
-  "shortcuts.msgs.edit": "Edit last message in channel:\tUp",
-  "shortcuts.msgs.reply": "Reply to last message in channel:\tShift|Up",
-  "shortcuts.msgs.reprint_prev": "Reprint previous message:\tCtrl|Up",
-  "shortcuts.msgs.reprint_prev.mac": "Reprint previous message:\t⌘|Up",
-  "shortcuts.msgs.reprint_next": "Reprint next message:\tCtrl|Down",
-  "shortcuts.msgs.reprint_next.mac": "Reprint next message:\t⌘|Down",
-  "shortcuts.msgs.comp.header": "Autocomplete",
-  "shortcuts.msgs.comp.username": "Username:\t@|[a-z]|Tab",
-  "shortcuts.msgs.comp.channel": "Channel:\t~|[a-z]|Tab",
-  "shortcuts.msgs.comp.emoji": "Emoji:\t:|[a-z]|Tab",
-  "shortcuts.files.header": "Files",
-  "shortcuts.files.upload": "Upload files:\tCtrl|U",
-  "shortcuts.files.upload.mac": "Upload files:\t⌘|U",
-  "shortcuts.browser.header": "Built-in Browser Commands",
-  "shortcuts.browser.channel_prev": "Back in history:\tAlt|Left",
-  "shortcuts.browser.channel_prev.mac": "Back in history:\t⌘|[",
   "shortcuts.browser.channel_next": "Forward in history:\tAlt|Right",
   "shortcuts.browser.channel_next.mac": "Forward in history:\t⌘|]",
-  "shortcuts.browser.font_increase": "Zoom in:\tCtrl|+",
-  "shortcuts.browser.font_increase.mac": "Zoom in:\t⌘|+",
+  "shortcuts.browser.channel_prev": "Back in history:\tAlt|Left",
+  "shortcuts.browser.channel_prev.mac": "Back in history:\t⌘|[",
   "shortcuts.browser.font_decrease": "Zoom out:\tCtrl|-",
   "shortcuts.browser.font_decrease.mac": "Zoom out:\t⌘|-",
-  "shortcuts.browser.input.header": "Works inside an input field",
-  "shortcuts.browser.highlight_prev": "Highlight text to the previous line:\tShift|Up",
+  "shortcuts.browser.font_increase": "Zoom in:\tCtrl|+",
+  "shortcuts.browser.font_increase.mac": "Zoom in:\t⌘|+",
+  "shortcuts.browser.header": "Built-in Browser Commands",
   "shortcuts.browser.highlight_next": "Highlight text to the next line:\tShift|Down",
+  "shortcuts.browser.highlight_prev": "Highlight text to the previous line:\tShift|Up",
+  "shortcuts.browser.input.header": "Works inside an input field",
   "shortcuts.browser.newline": "Create a new line:\tShift|Enter",
+  "shortcuts.files.header": "Files",
+  "shortcuts.files.upload": "Upload files:\tCtrl|U",
+  "shortcuts.files.upload.mac": "Upload files:\t⌘|U",
+  "shortcuts.header": "Keyboard Shortcuts",
+  "shortcuts.info": "Begin a message with / for a list of all the commands at your disposal.",
+  "shortcuts.msgs.comp.channel": "Channel:\t~|[a-z]|Tab",
+  "shortcuts.msgs.comp.emoji": "Emoji:\t:|[a-z]|Tab",
+  "shortcuts.msgs.comp.header": "Autocomplete",
+  "shortcuts.msgs.comp.username": "Username:\t@|[a-z]|Tab",
+  "shortcuts.msgs.edit": "Edit last message in channel:\tUp",
+  "shortcuts.msgs.header": "Messages",
+  "shortcuts.msgs.input.header": "Works inside an empty input field",
+  "shortcuts.msgs.mark_as_read": "Mark current channel as read:\tEsc",
+  "shortcuts.msgs.reply": "Reply to last message in channel:\tShift|Up",
+  "shortcuts.msgs.reprint_next": "Reprint next message:\tCtrl|Down",
+  "shortcuts.msgs.reprint_next.mac": "Reprint next message:\t⌘|Down",
+  "shortcuts.msgs.reprint_prev": "Reprint previous message:\tCtrl|Up",
+  "shortcuts.msgs.reprint_prev.mac": "Reprint previous message:\t⌘|Up",
+  "shortcuts.nav.direct_messages_menu": "Direct messages menu:\tCtrl|Shift|K",
+  "shortcuts.nav.direct_messages_menu.mac": "Direct messages menu:\t⌘|Shift|K",
+  "shortcuts.nav.header": "Navigation",
+  "shortcuts.nav.next": "Next channel:\tAlt|Down",
+  "shortcuts.nav.next.mac": "Next channel:\t⌥|Down",
+  "shortcuts.nav.prev": "Previous channel:\tAlt|Up",
+  "shortcuts.nav.prev.mac": "Previous channel:\t⌥|Up",
+  "shortcuts.nav.recent_mentions": "Recent mentions:\tCtrl|Shift|M",
+  "shortcuts.nav.recent_mentions.mac": "Recent mentions:\t⌘|Shift|M",
+  "shortcuts.nav.settings": "Account settings:\tCtrl|Shift|A",
+  "shortcuts.nav.settings.mac": "Account settings:\t⌘|Shift|A",
+  "shortcuts.nav.switcher": "Quick channel switcher:\tCtrl|K",
+  "shortcuts.nav.switcher.mac": "Quick channel switcher:\t⌘|K",
+  "shortcuts.nav.unread_next": "Next unread channel:\tAlt|Shift|Down",
+  "shortcuts.nav.unread_next.mac": "Next unread channel:\t⌥|Shift|Down",
+  "shortcuts.nav.unread_prev": "Previous unread channel:\tAlt|Shift|Up",
+  "shortcuts.nav.unread_prev.mac": "Previous unread channel:\t⌥|Shift|Up",
   "sidebar.channels": "PUBLIC CHANNELS",
-  "sidebar.mainMenu": "Main Menu",
   "sidebar.createChannel": "Create new public channel",
   "sidebar.createGroup": "Create new private channel",
   "sidebar.direct": "DIRECT MESSAGES",
   "sidebar.favorite": "FAVORITE CHANNELS",
   "sidebar.leave": "Leave channel",
+  "sidebar.mainMenu": "Main Menu",
   "sidebar.more": "More",
   "sidebar.moreElips": "More...",
   "sidebar.otherMembers": "Outside this team",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index 2095079b1..a1bf9e768 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -9,6 +9,7 @@
   "about.hash": "Hash de compilación:",
   "about.hashee": "Hash de compilación de EE:",
   "about.licensed": "Licenciado a:",
+  "about.notice": "Mattermost es hecho posible con software de código abierto utilizado en nuestra <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>plataforma</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>aplicación de escritorio</a> y <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>aplicaciones móviles</a>.",
   "about.number": "Número de compilación:",
   "about.teamEditionLearn": "Únete a la comunidad Mattermost en ",
   "about.teamEditionSt": "Todas las comunicaciones de tu equipo en un solo lugar, con búsquedas instantáneas y accesible de todas partes.",
@@ -28,8 +29,10 @@
   "activity_log.sessionsDescription": "Las sesiones son creadas cuando inicias sesión desde un nuevo navegador en un dispositivo. Las Sesiones te permiten utilizar Mattermost sin tener que volver a iniciar sesión por un período de tiempo especificado por el Administrador de Sistema. Si deseas cerrar sesión antes de que se cumpla este tiempo, Utiliza el botón de 'Cerrar Sesión' en la parte de abajo.",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "Android App Nativa",
+  "activity_log_modal.androidNativeClassicApp": "App Clásica Nativa de Android",
   "activity_log_modal.desktop": "App Nativa de Escritorio",
   "activity_log_modal.iphoneNativeApp": "iPhone App Nativa",
+  "activity_log_modal.iphoneNativeClassicApp": "App Clásica Nativa de iPhone",
   "add_command.autocomplete": "Autocompletar",
   "add_command.autocomplete.help": "(Opcional) Mostrar el comando de barra en la lista de autocompletado.",
   "add_command.autocompleteDescription": "Descripción del Autocompletado",
@@ -146,8 +149,20 @@
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
-  "admin.authentication.saml": "SAML",
+  "admin.authentication.saml": "SAML 2.0",
   "admin.banner.heading": "Nota:",
+  "admin.client_versions.androidLatestVersion": "Última Versión de Android",
+  "admin.client_versions.androidLatestVersionHelp": "La última versión de Android liberada",
+  "admin.client_versions.androidMinVersion": "Mínima versión de Android",
+  "admin.client_versions.androidMinVersionHelp": "La mínima versión compatible de Android",
+  "admin.client_versions.desktopLatestVersion": "Última versión de Escritorio",
+  "admin.client_versions.desktopLatestVersionHelp": "La última versión de Escritorio liberada",
+  "admin.client_versions.desktopMinVersion": "Mínima versión de Escritorio",
+  "admin.client_versions.desktopMinVersionHelp": "La mínima version compatible de Escritorio",
+  "admin.client_versions.iosLatestVersion": "Última versión de IOS",
+  "admin.client_versions.iosLatestVersionHelp": "La última versión de IOS liberada",
+  "admin.client_versions.iosMinVersion": "Mínima versión de IOS",
+  "admin.client_versions.iosMinVersionHelp": "La mínima versión compatible de IOS",
   "admin.cluster.enableDescription": "Cuando es verdadero, Mattermost se ejecutará en modo de Alta Disponibilidad. Por favor, consulta la <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target='_blank'>documentación</a> para obtener más información acerca de la configuración de Alta Disponibilidad para Mattermost.",
   "admin.cluster.enableTitle": "Habilitar el Modo De Alta Disponibilidad:",
   "admin.cluster.interNodeListenAddressDesc": "La dirección en la que escuchará el servidor para comunicarse con otros servidores.",
@@ -587,7 +602,7 @@
   "admin.log.locationPlaceholder": "Ingresar locación de archivo",
   "admin.log.locationTitle": "Directorio del Archivo de Registro:",
   "admin.log.logSettings": "Configuración de registro",
-  "admin.logs.bannerDesc": "Para buscar usuarios  por ID del usuario, Ve a Reportes > Usuarios y copia el ID en el filtro de búsqueda.",
+  "admin.logs.bannerDesc": "Para buscar usuarios por ID del usuario o ID del Token, dirigete a Reportes > Usuarios y copia el ID en el filtro de búsqueda.",
   "admin.logs.reload": "Recargar",
   "admin.logs.title": "Servidor de registros",
   "admin.manage_roles.additionalRoles": "Selecciona permisos adicionales para la cuenta. <a href=\"https://about.mattermost.com/default-permissions\" target=\"_blank\">Conoce más acerca de roles y permisos</a>.",
@@ -651,15 +666,15 @@
   "admin.password.symbol": "Al menos un símbolo (por ejemplo,\"~!@#$%^&*()\")",
   "admin.password.uppercase": "Al menos una letra en mayúscula",
   "admin.plugins.jira": "JIRA (Beta)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "nombre del canal",
+  "admin.plugins.jira.channelParamNamePlaceholder": "URL del canal",
   "admin.plugins.jira.enabledDescription": "Cuando es verdadero, se puede configurar JIRA webhooks para publicar mensajes en Mattermost. Para ayudar a combatir los ataques de phishing, todos los mensajes están marcados por una  etiqueta BOT.",
-  "admin.plugins.jira.enabledLabel": "Habilitado:",
+  "admin.plugins.jira.enabledLabel": "Habilitar JIRA:",
   "admin.plugins.jira.secretDescription": "Esta clave secreta se utiliza para autenticar a Mattermost.",
   "admin.plugins.jira.secretLabel": "Clave Secreta:",
   "admin.plugins.jira.secretParamPlaceholder": "clave secreta",
   "admin.plugins.jira.secretRegenerateDescription": "Regenera la clave secreta para la de dirección URL del webhook. La regeneración de la clave secreta invalida su actual integración de JIRA.",
   "admin.plugins.jira.setupDescription": "Utiliza esta URL del webhook para configurar la integración de JIRA. Ver {webhookDocsLink} para obtener más información.",
-  "admin.plugins.jira.teamParamPlaceholder": "nombre del equipo",
+  "admin.plugins.jira.teamParamPlaceholder": "URL del equipo",
   "admin.plugins.jira.userDescription": "Seleccione el nombre de usuario que será utilizado por esta integración.",
   "admin.plugins.jira.userLabel": "Usuario:",
   "admin.plugins.jira.webhookDocsLink": "documentación",
@@ -719,8 +734,8 @@
   "admin.saml.emailAttrDesc": "El atributo de la Aserción SAML que se utilizará para rellenar las direcciones de correo electrónico de los usuarios en Mattermost.",
   "admin.saml.emailAttrEx": "Ej.: \"Email\" o \"PrimaryEmail\"",
   "admin.saml.emailAttrTitle": "Atributo de Correo Electrónico:",
-  "admin.saml.enableDescription": "Cuando es verdadero, Mattermost permite el inicio de sesión mediante SAML. Por favor, consulte la <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentation</a> para obtener más información acerca de la configuración de SAML para Mattermost.",
-  "admin.saml.enableTitle": "Habilitar el inicio de Sesión con SAML:",
+  "admin.saml.enableDescription": "Cuando es verdadero, Mattermost permite el inicio de sesión mediante SAML 2.0. Por favor, consulte la <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentation</a> para obtener más información acerca de la configuración de SAML para Mattermost.",
+  "admin.saml.enableTitle": "Habilitar el inicio de Sesión con SAML 2.0:",
   "admin.saml.encryptDescription": "Si es falso, Mattermost no se descifrará las Aserciones SAML cifrados con su el Certificado Público del Proveedor de Servicio. No se recomienda para entornos de producción. Solo para probar.",
   "admin.saml.encryptTitle": "Habilitar el Cifrado:",
   "admin.saml.firstnameAttrDesc": "(Opcional) El atributo de la Aserción SAML que se utilizará para rellenar el nombre de los usuarios en Mattermost.",
@@ -807,6 +822,9 @@
   "admin.service.insecureTlsTitle": "Habilitar Conexiones de Salida Inseguras: ",
   "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.internalConnectionsDesc": "En los entornos de pruebas, tales como cuando se desarrolla integraciones localmente en un computador de desarrollo, utilice este ajuste para especificar los dominios, direcciones IP, o notaciones CIDR para permitir las conexiones internas. <b>No se recomienda para su uso en producción</b>, ya que esto puede permitir a un usuario extraer datos confidenciales de su servidor o de la red interna.<br /><br />Por defecto, URLs suministradas por el usuario, tales como los utilizados por metadatos de Open Graph, webhooks, o comandos de barra no se podrán conectarse a direcciones IP reservadas incluyendo loopback o direcciones locales utilizadadas para las redes internas. Las direcciones URL para las notificaciones Push, OAuth 2.0 y WebRTC son de confianza y no se ven afectadas por este ajuste.",
+  "admin.service.internalConnectionsEx": "webhooks.internal.example.com 127.0.0.1 10.0.16.0/28",
+  "admin.service.internalConnectionsTitle": "Permitir conexiones internas no son de confianza: ",
   "admin.service.letsEncryptCertificateCacheFile": "Archivo de Caché de Let's Encrypt:",
   "admin.service.letsEncryptCertificateCacheFileDescription": "Certificados recuperados y otros datos del servicio de Let's Encrypt serán almacenados en este archivo.",
   "admin.service.listenAddress": "Dirección de escucha:",
@@ -841,7 +859,7 @@
   "admin.service.useLetsEncrypt": "Utilizar Let's Encrypt:",
   "admin.service.useLetsEncryptDescription": "Habilitar la recuperación automática de certificados del servicio Let's Encrypt. El certificado será recuperado cuando un cliente intenta conectarse desde un nuevo dominio. Esto permite que funcione con multiples dominios.",
   "admin.service.userAccessTokensDescLabel": "Nombre: ",
-  "admin.service.userAccessTokensDescription": "Cuando es verdadero, los usuarios pueden crear <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">tokens de acceso personales</a> para integraciones en <strong>Configuración de la Cuenta > Seguridad</strong>. Pueden ser utilizados para autenticar contra la API, y dar acceso completo a la cuenta.<br/><br/>Para administrar quién puede crear tokens de acceso personales, dirígete a <strong>Consola del Sistema > Usuarios</strong>.",
+  "admin.service.userAccessTokensDescription": "Cuando es verdadero, los usuarios pueden crear <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">tokens de acceso personales</a> para integraciones en <strong>Configuración de la Cuenta > Seguridad</strong>. Pueden ser utilizados para autenticar contra la API, y dar acceso completo a la cuenta.<br/><br/>Para administrar quién puede crear tokens de acceso personales, dirígete a la página <strong>Consola del Sistema > Usuarios</strong>.",
   "admin.service.userAccessTokensIdLabel": "Token ID: ",
   "admin.service.userAccessTokensTitle": "Habilitar Tokens de Acceso Personales: ",
   "admin.service.webSessionDays": "Duración de la sesión para AD/LDAP y correo electrónico (días):",
@@ -853,6 +871,7 @@
   "admin.sidebar.advanced": "Avanzado",
   "admin.sidebar.audits": "Auditorías",
   "admin.sidebar.authentication": "Autenticación",
+  "admin.sidebar.client_versions": "Versión de Clientes",
   "admin.sidebar.cluster": "Alta disponibilidad",
   "admin.sidebar.compliance": "Cumplimiento",
   "admin.sidebar.configuration": "Configuración",
@@ -892,7 +911,7 @@
   "admin.sidebar.push": "Push a Móvil",
   "admin.sidebar.rateLimiting": "Límite de Velocidad",
   "admin.sidebar.reports": "INFORMES",
-  "admin.sidebar.saml": "SAML",
+  "admin.sidebar.saml": "SAML 2.0",
   "admin.sidebar.security": "Seguridad",
   "admin.sidebar.sessions": "Sesiones",
   "admin.sidebar.settings": "CONFIGURACIONES",
@@ -1294,15 +1313,14 @@
   "claim.email_to_oauth.switchTo": "Cambiar cuenta a {uiType}",
   "claim.email_to_oauth.title": "Cambiar Cuenta de Correo/Contraseña a {uiType}",
   "claim.ldap_to_email.confirm": "Confirmar Contraseña",
-  "claim.ldap_to_email.email": "Para iniciar sesión debes utilizar el correo electrónico {email}",
-  "claim.ldap_to_email.enterLdapPwd": "Ingresa tu {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.email": "Después de cambiar el método de autenticación, utilizarás {email} para iniciar sesión. Tus credenciales de AD/LDAP ya no permitirán el acceso a Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "Nueva contraseña de inicio de sesión con correo electrónico:",
   "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 AD/LDAP a Correo/Contraseña",
   "claim.oauth_to_email.confirm": "Confirmar Contraseña",
@@ -1761,7 +1779,7 @@
   "member_list.noUsersAdd": "No hay usuarios que agregar.",
   "members_popover.manageMembers": "Administrar Miembros",
   "members_popover.msg": "Mensaje",
-  "members_popover.title": "Miembros",
+  "members_popover.title": "Miembros del Canal",
   "members_popover.viewMembers": "Ver Miembros",
   "mfa.confirm.complete": "<strong>¡Configuración completada!</strong>",
   "mfa.confirm.okay": "Aceptar",
@@ -1829,6 +1847,15 @@
   "mobile.custom_list.no_results": "Sin resultados",
   "mobile.drawer.teamsTitle": "Equipos",
   "mobile.edit_post.title": "Editando Mensaje",
+  "mobile.emoji_picker.activity": "ACTIVIDAD",
+  "mobile.emoji_picker.custom": "PERSONALIZADO",
+  "mobile.emoji_picker.flags": "BANDERAS",
+  "mobile.emoji_picker.foods": "COMIDA",
+  "mobile.emoji_picker.nature": "NATURALEZA",
+  "mobile.emoji_picker.objects": "OBJETOS",
+  "mobile.emoji_picker.people": "PERSONAS",
+  "mobile.emoji_picker.places": "LUGARES",
+  "mobile.emoji_picker.symbols": "SIMBOLOS",
   "mobile.error_handler.button": "Reiniciar",
   "mobile.error_handler.description": "\nPresiona reiniciar para abrir la aplicación de nuevo. Después de reiniciar, puedes reportar el problema desde el menú de configuración.\n",
   "mobile.error_handler.title": "Ocurrió un error inesperado.",
@@ -1837,6 +1864,7 @@
   "mobile.file_upload.more": "Más",
   "mobile.file_upload.video": "Librería de Videos",
   "mobile.help.title": "Ayuda",
+  "mobile.image_preview.save": "Guardar imagen",
   "mobile.intro_messages.DM": "Este es el inicio de tu historial de mensajes directos con {teammate}.Los mensajes directos y archivos que se comparten aquí no son mostrados a personas fuera de esta área.",
   "mobile.intro_messages.default_message": "Es es el primer canal que tus compañeros ven cuando se registran - puedes utilizarlo para enviar mensajes que todos deben leer.",
   "mobile.intro_messages.default_welcome": "¡Bienvenido a {name}!",
@@ -1845,6 +1873,11 @@
   "mobile.loading_members": "Cargando Miembros...",
   "mobile.loading_posts": "Cargando Mensajes...",
   "mobile.login_options.choose_title": "Selecciona un método para iniciar sesión",
+  "mobile.managed.blocked_by": "Bloqueado por {vendor}",
+  "mobile.managed.exit": "Salir",
+  "mobile.managed.jailbreak": "{vendor} no confía en los dispositivos con jailbreak, por favor, salga de la aplicación.",
+  "mobile.managed.secured_by": "Asegurado por {vendor}",
+  "mobile.markdown.code.plusMoreLines": "+{count, number} más líneas",
   "mobile.more_dms.start": "Comenzar",
   "mobile.more_dms.title": "Nueva Conversación",
   "mobile.notice_mobile_link": "aplicaciones móviles",
@@ -1863,6 +1896,7 @@
   "mobile.post.failed_retry": "Intentar de nuevo",
   "mobile.post.failed_title": "No se pudo enviar el mensaje",
   "mobile.post.retry": "Actualizar",
+  "mobile.post_info.add_reaction": "Reaccionar",
   "mobile.request.invalid_response": "Se recibió una respuesta no válida del servidor.",
   "mobile.routes.channelInfo": "Información",
   "mobile.routes.channelInfo.createdBy": "Creado por {creator} el ",
@@ -1872,6 +1906,8 @@
   "mobile.routes.channel_members.action_message": "Debes seleccionar al menos un miembro a ser removido del canal.",
   "mobile.routes.channel_members.action_message_confirm": "¿Seguro quieres remover al miembro seleccionado del canal?",
   "mobile.routes.channels": "Canales",
+  "mobile.routes.code": "Código {language}",
+  "mobile.routes.code.noLanguage": "Código",
   "mobile.routes.enterServerUrl": "URL del servidor",
   "mobile.routes.login": "Inicio de Sesión",
   "mobile.routes.loginOptions": "Selector Inicio de Sesión",
@@ -1924,6 +1960,7 @@
   "msg_typing.someone": "Alguien",
   "multiselect.add": "Agregar",
   "multiselect.go": "Ir",
+  "multiselect.list.notFound": "No se encontraron elementos",
   "multiselect.numPeopleRemaining": "Utiliza ↑↓ para navegar, ↵ para seleccionar. Puedes agregar {num, number} {num, plural, one {persona} other {personas}} más. ",
   "multiselect.numRemaining": "Puedes agregar {num, number} más",
   "multiselect.placeholder": "Buscar y agregar miembros",
@@ -2044,6 +2081,7 @@
   "rename_channel.handleHolder": "Debe tener caracteres alfanuméricos y en minúscula",
   "rename_channel.lowercase": "Debe tener caracteres alfanumericos y minúscula",
   "rename_channel.maxLength": "Este campo debe tener menos de {maxLength, number} caracteres",
+  "rename_channel.minLength": "Nombre del canal debe ser de {minLength, number} o más caracteres",
   "rename_channel.required": "Este campo es obligatorio",
   "rename_channel.save": "Guardar",
   "rename_channel.title": "Renombrar Canal",
@@ -2102,11 +2140,61 @@
   "setting_upload.import": "Importar",
   "setting_upload.noFile": "No ha seleccionado un archivo",
   "setting_upload.select": "Selecciona un archivo",
+  "shortcuts.browser.channel_next": "Adelante en la historia:\tAlt|Derecha",
+  "shortcuts.browser.channel_next.mac": "Adelante en la historia::\t⌘|]",
+  "shortcuts.browser.channel_prev": "Atrás en la historia:\tAlt|Izquierda",
+  "shortcuts.browser.channel_prev.mac": "Atrás en la historia:\t⌘|[",
+  "shortcuts.browser.font_decrease": "Alejar zoom:\tCtrl|-",
+  "shortcuts.browser.font_decrease.mac": "Alejar zoom:\t⌘|-",
+  "shortcuts.browser.font_increase": "Acercar zoom:\tCtrl|+",
+  "shortcuts.browser.font_increase.mac": "Acercar zoom:\t⌘|+",
+  "shortcuts.browser.header": "Comandos del navegador Incorporados",
+  "shortcuts.browser.highlight_next": "Resaltar el texto en la línea siguiente:\tShift|Abajo",
+  "shortcuts.browser.highlight_prev": "Resaltar el texto en la línea anterior:\tShift|Hasta",
+  "shortcuts.browser.input.header": "Funcionan en el interior de un campo de entrada",
+  "shortcuts.browser.newline": "Crea una nueva linea:\tShift|Retorno",
+  "shortcuts.files.header": "Archivos",
+  "shortcuts.files.upload": "Subir archivos:\tCtrl|U",
+  "shortcuts.files.upload.mac": "Subir archivos:\t⌘|U",
+  "shortcuts.header": "Atajos de teclado",
+  "shortcuts.info": "Comienza un mensaje con / para una lista de comandos a tu disposición.",
+  "shortcuts.msgs.comp.channel": "Canal:\t~|[a-z]|Tab",
+  "shortcuts.msgs.comp.emoji": "Emoticon:\t:|[a-z]|Tab",
+  "shortcuts.msgs.comp.header": "Autocompletar",
+  "shortcuts.msgs.comp.username": "Nombre de usuario:\t@|[a-z]|tab",
+  "shortcuts.msgs.edit": "Editar el ultimo mensaje en el canal:\tArriba",
+  "shortcuts.msgs.header": "Mensajes",
+  "shortcuts.msgs.input.header": "Funciona dentro de un campo de entrada vacío",
+  "shortcuts.msgs.mark_as_read": "Marca el canal actual como leído:\tEsc",
+  "shortcuts.msgs.reply": "Responder al último mensaje en el canal:\tShift|Arriba",
+  "shortcuts.msgs.reprint_next": "Vuelve a imprimir el siguiente mensaje:\tCtrl|Abajo",
+  "shortcuts.msgs.reprint_next.mac": "Vuelve a imprimir el siguiente mensaje:\t⌘|Abajo",
+  "shortcuts.msgs.reprint_prev": "Vuelve a imprimir el mensaje anterior:\tCtrl|Arriba",
+  "shortcuts.msgs.reprint_prev.mac": "Vuelve a imprimir el mensaje anterior:\t⌘|Arriba",
+  "shortcuts.nav.direct_messages_menu": "Menú de mensajes directos:\tCtrl|Shift|K",
+  "shortcuts.nav.direct_messages_menu.mac": "Menú de mensajes directos:\t⌘|Shift|K",
+  "shortcuts.nav.header": "Navegación",
+  "shortcuts.nav.next": "Canal siguiente:\tAlt|Abajo",
+  "shortcuts.nav.next.mac": "Canal siguiente:\t⌥|Abajo",
+  "shortcuts.nav.prev": "Canal anterior:\tAlt|Arriba",
+  "shortcuts.nav.prev.mac": "Canal anterior:\t⌥|Arriba",
+  "shortcuts.nav.recent_mentions": "Menciones recientes:\tCtrl|Shift|M",
+  "shortcuts.nav.recent_mentions.mac": "Menciones recientes:\t⌘|Shift|M",
+  "shortcuts.nav.settings": "Configuración de la cuenta:\tCtrl|Shift|A",
+  "shortcuts.nav.settings.mac": "Configuración de la cuenta:\t⌘|Shift|A",
+  "shortcuts.nav.switcher": "Cambio rápido de canal:\tCtrl|K",
+  "shortcuts.nav.switcher.mac": "Cambio rápido de canal:\t⌘|K",
+  "shortcuts.nav.unread_next": "Próximo canal no leído:\tAlt|Shit|Abajo",
+  "shortcuts.nav.unread_next.mac": "Próximo canal no leído:\t⌥|Shift|Abajo",
+  "shortcuts.nav.unread_prev": "Canal no leído anterior:\tAlt|Shift|Arriba",
+  "shortcuts.nav.unread_prev.mac": "Canal no leído anterior:\t⌥|Shift|Arriba",
   "sidebar.channels": "CANALES PÚBLICOS",
   "sidebar.createChannel": "Crear nuevo canal público",
   "sidebar.createGroup": "Crear nuevo canal privado",
   "sidebar.direct": "MENSAJES DIRECTOS",
   "sidebar.favorite": "FAVORITOS",
+  "sidebar.leave": "Abandonar Canal",
+  "sidebar.mainMenu": "Menú principal",
   "sidebar.more": "Más",
   "sidebar.moreElips": "Más...",
   "sidebar.otherMembers": "Fuera de este equipo",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index 70b98e83e..1402cb53e 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -9,6 +9,7 @@
   "about.hash": "Hash de version :",
   "about.hashee": "Hash de version EE :",
   "about.licensed": "Licence accordée à :",
+  "about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
   "about.number": "Numéro de compilation :",
   "about.teamEditionLearn": "Rejoignez la communauté Mattermost sur ",
   "about.teamEditionSt": "Toute la communication de votre équipe en un seul endroit, consultable instantanément et accessible de partout.",
@@ -28,8 +29,10 @@
   "activity_log.sessionsDescription": "Les sessions sont créées lorsque vous vous connectez depuis un nouveau navigateur. Les sessions vous permettent d'utiliser Mattermost sans devoir vous connecter à nouveau durant un temps défini par l'administrateur système. Si vous souhaitez vous déconnecter plus tôt, utilisez le bouton \"Se déconnecter\" ci-dessous pour mettre fin à votre session.",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "Application Android",
+  "activity_log_modal.androidNativeClassicApp": "Android Native Classic App",
   "activity_log_modal.desktop": "Application de bureau native",
   "activity_log_modal.iphoneNativeApp": "Application pour iPhone",
+  "activity_log_modal.iphoneNativeClassicApp": "iPhone Native Classic App",
   "add_command.autocomplete": "Auto-complétion",
   "add_command.autocomplete.help": "(Facultatif) Afficher les commandes slash dans la liste d'auto-complétion.",
   "add_command.autocompleteDescription": "Description de l'auto-complétion",
@@ -146,8 +149,20 @@
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
-  "admin.authentication.saml": "SAML",
+  "admin.authentication.saml": "SAML 2.0",
   "admin.banner.heading": "Remarque :",
+  "admin.client_versions.androidLatestVersion": "Latest Android Version",
+  "admin.client_versions.androidLatestVersionHelp": "The latest released Android version",
+  "admin.client_versions.androidMinVersion": "Minimum Android Version",
+  "admin.client_versions.androidMinVersionHelp": "The minimum compliant Android version",
+  "admin.client_versions.desktopLatestVersion": "Latest Desktop Version",
+  "admin.client_versions.desktopLatestVersionHelp": "The latest released Desktop version",
+  "admin.client_versions.desktopMinVersion": "Minimum Destop Version",
+  "admin.client_versions.desktopMinVersionHelp": "The minimum compliant Desktop version",
+  "admin.client_versions.iosLatestVersion": "Latest IOS Version",
+  "admin.client_versions.iosLatestVersionHelp": "The latest released IOS version",
+  "admin.client_versions.iosMinVersion": "Minimum IOS Version",
+  "admin.client_versions.iosMinVersionHelp": "The minimum compliant IOS version",
   "admin.cluster.enableDescription": "Lorsqu'activé, Mattermost est lancé en mode haute disponibilité. Consultez la <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> pour en savoir 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.",
@@ -651,15 +666,15 @@
   "admin.password.symbol": "Au moins un symbole (ex :  \"~!@#$%^&*()\")",
   "admin.password.uppercase": "Au moins une majuscule",
   "admin.plugins.jira": "JIRA (Beta)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "nomducanal",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelurl",
   "admin.plugins.jira.enabledDescription": "Lorsqu'activé, vous pouvez configurer les webhooks de JIRA à publier un message dans Mattermost. Pour aider à lutter contre les attaques de phishing, tous les messages sont étiquetées par l'indicateur BOT.",
-  "admin.plugins.jira.enabledLabel": "Activer :",
+  "admin.plugins.jira.enabledLabel": "Enable JIRA:",
   "admin.plugins.jira.secretDescription": "Cette clé secrète est utilisée pour s'authentifier à Mattermost.",
   "admin.plugins.jira.secretLabel": "Clé secrète :",
   "admin.plugins.jira.secretParamPlaceholder": "secret",
   "admin.plugins.jira.secretRegenerateDescription": "Régénère la clé secrète pour l'URL du nœud du webhook. La régénération de la clé secrète invalide vos intégrations JIRA existantes.",
   "admin.plugins.jira.setupDescription": "Utilisez cette URL de webhook pour configurer l'intégration JIRA. Rendez-vous dans la {webhookDocsLink} pour en savoir davantage.",
-  "admin.plugins.jira.teamParamPlaceholder": "nomdéquipe",
+  "admin.plugins.jira.teamParamPlaceholder": "teamurl",
   "admin.plugins.jira.userDescription": "Spécifiez le nom d'utilisateur auquel cette intégration est liée.",
   "admin.plugins.jira.userLabel": "Utilisateur :",
   "admin.plugins.jira.webhookDocsLink": "documentation",
@@ -807,6 +822,9 @@
   "admin.service.insecureTlsTitle": "Autoriser les connexions sortantes non-sécurisées : ",
   "admin.service.integrationAdmin": "Restreindre la gestion des intégrations aux administrateurs :",
   "admin.service.integrationAdminDesc": "Lorsqu'activé, les webhooks et commandes slash peuvent seulement être créées, éditées et vues par les administrateurs systèmes et d'équipe, et par les applications OAuth 2.0 des administrateurs systèmes. Les intégrations sont disponibles à tous les utilisateurs après qu'elles aient été créées par l'administrateur.",
+  "admin.service.internalConnectionsDesc": "In testing environments, such as when developing integrations locally on a development machine, use this setting to specify domains, IP addresses, or CIDR notations to allow internal connections. <b>Not recommended for use in production</b>, since this can allow a user to extract confidential data from your server or internal network.<br /><br />By default, user-supplied URLs such as those used for Open Graph metadata, webhooks, or slash commands will not be allowed to connect to reserved IP addresses including loopback or link-local addresses used for internal networks. Push notification, OAuth 2.0 and WebRTC server URLs are trusted and not affected by this setting.",
+  "admin.service.internalConnectionsEx": "webhooks.internal.example.com 127.0.0.1 10.0.16.0/28",
+  "admin.service.internalConnectionsTitle": "Allow untrusted internal connections to: ",
   "admin.service.letsEncryptCertificateCacheFile": "Fichier de cache du certificat \"Let's Encrypt\"",
   "admin.service.letsEncryptCertificateCacheFileDescription": "Les certificats reçus et les autres données en rapport avec le service Let's Encrypt seront enregistrés dans ce fichier.",
   "admin.service.listenAddress": "Adresse IP du serveur :",
@@ -853,6 +871,7 @@
   "admin.sidebar.advanced": "Options avancées",
   "admin.sidebar.audits": "Conformité et vérification",
   "admin.sidebar.authentication": "authentification",
+  "admin.sidebar.client_versions": "Client Versions",
   "admin.sidebar.cluster": "Haute disponibilité",
   "admin.sidebar.compliance": "Conformité",
   "admin.sidebar.configuration": "Configuration",
@@ -892,7 +911,7 @@
   "admin.sidebar.push": "Push mobile",
   "admin.sidebar.rateLimiting": "Limitation de débit",
   "admin.sidebar.reports": "RAPPORTS",
-  "admin.sidebar.saml": "SAML",
+  "admin.sidebar.saml": "SAML 2.0",
   "admin.sidebar.security": "Sécurité",
   "admin.sidebar.sessions": "Sessions",
   "admin.sidebar.settings": "REGLAGES",
@@ -1294,15 +1313,14 @@
   "claim.email_to_oauth.switchTo": "Changer de compte pour {uiType}",
   "claim.email_to_oauth.title": "Changer l'adresse e-mail/mot de passe pour {uiType}",
   "claim.ldap_to_email.confirm": "Confirmer le mot de passe",
-  "claim.ldap_to_email.email": "Vous devrez utiliser l'adresse e-mail {email} pour vous connecter.",
-  "claim.ldap_to_email.enterLdapPwd": "Veuillez spécifier votre {ldapPassword} pour votre compte {site}",
-  "claim.ldap_to_email.enterPwd": "Veuillez spécifier un nouveau mot de passe pour votre compte",
+  "claim.ldap_to_email.email": "After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "New email login password:",
   "claim.ldap_to_email.ldapPasswordError": "Veuillez spécifier votre mot de passe AD/LDAP.",
   "claim.ldap_to_email.ldapPwd": "Mot de passe AD/LDAP",
   "claim.ldap_to_email.pwd": "Mot de passe",
   "claim.ldap_to_email.pwdError": "Veuillez spécifier votre mot de passe.",
   "claim.ldap_to_email.pwdNotMatch": "Les mots de passe ne correspondent pas.",
-  "claim.ldap_to_email.ssoType": "Une fois votre compte modifié, vous ne pourrez plus vous connecter qu'avec votre adresse e-mail et votre mot de passe.",
   "claim.ldap_to_email.switchTo": "Basculez le type de connexion de votre compte sur le couple adresse e-mail / mot de passe",
   "claim.ldap_to_email.title": "Basculer le type de connexion de votre compte de AD/LDAP vers le couple adresse e-mail / mot de passe",
   "claim.oauth_to_email.confirm": "Confirmez le mot de passe",
@@ -1761,7 +1779,7 @@
   "member_list.noUsersAdd": "Aucun utilisateur à ajouter.",
   "members_popover.manageMembers": "Gérer les membres",
   "members_popover.msg": "Envoyer un message",
-  "members_popover.title": "Membres",
+  "members_popover.title": "Membres du canal",
   "members_popover.viewMembers": "Voir les membres",
   "mfa.confirm.complete": "<strong>Installation terminée !</strong>",
   "mfa.confirm.okay": "OK",
@@ -1829,6 +1847,15 @@
   "mobile.custom_list.no_results": "Aucun résultat",
   "mobile.drawer.teamsTitle": "Équipes",
   "mobile.edit_post.title": "Edition du message",
+  "mobile.emoji_picker.activity": "ACTIVITY",
+  "mobile.emoji_picker.custom": "CUSTOM",
+  "mobile.emoji_picker.flags": "FLAGS",
+  "mobile.emoji_picker.foods": "FOODS",
+  "mobile.emoji_picker.nature": "NATURE",
+  "mobile.emoji_picker.objects": "OBJECTS",
+  "mobile.emoji_picker.people": "PEOPLE",
+  "mobile.emoji_picker.places": "PLACES",
+  "mobile.emoji_picker.symbols": "SYMBOLS",
   "mobile.error_handler.button": "Relancer",
   "mobile.error_handler.description": "\nCliquez sur relancer pour ouvrir l'application à nouveau. Après le redémarrage, vous pouvez signaler le problème à partir du menu paramètres.\n",
   "mobile.error_handler.title": "Une erreur inattendue s'est produite",
@@ -1837,6 +1864,7 @@
   "mobile.file_upload.more": "Plus…",
   "mobile.file_upload.video": "Bibliothèque vidéo",
   "mobile.help.title": "Aide",
+  "mobile.image_preview.save": "Save Image",
   "mobile.intro_messages.DM": "Vous êtes au début de votre historique de messages avec {teammate}. Les messages privés et les fichiers partagés ici ne sont pas visibles par les autres utilisateurs.",
   "mobile.intro_messages.default_message": "Il s'agit du premier canal que les utilisateurs voient lorsqu'ils s'inscrivent. Utilisez‑le pour poster des informations que tout le monde devrait connaître.",
   "mobile.intro_messages.default_welcome": "Bienvenue {name} !",
@@ -1845,6 +1873,11 @@
   "mobile.loading_members": "Chargement des membres...",
   "mobile.loading_posts": "Chargement des messages...",
   "mobile.login_options.choose_title": "Spécifiez votre méthode de connexion",
+  "mobile.managed.blocked_by": "Blocked by {vendor}",
+  "mobile.managed.exit": "Modifier",
+  "mobile.managed.jailbreak": "Jailbroken devices are not trusted by {vendor}, please exit the app.",
+  "mobile.managed.secured_by": "Secured by {vendor}",
+  "mobile.markdown.code.plusMoreLines": "+{count, number} more lines",
   "mobile.more_dms.start": "Démarrer",
   "mobile.more_dms.title": "Nouvelle conversation",
   "mobile.notice_mobile_link": "applications mobiles",
@@ -1863,6 +1896,7 @@
   "mobile.post.failed_retry": "Essayez à nouveau",
   "mobile.post.failed_title": "Impossible d'envoyer votre message",
   "mobile.post.retry": "Rafraîchir",
+  "mobile.post_info.add_reaction": "Add Reaction",
   "mobile.request.invalid_response": "Réponse invalide reçue du serveur.",
   "mobile.routes.channelInfo": "Information",
   "mobile.routes.channelInfo.createdBy": "Créé par {creator} le ",
@@ -1872,6 +1906,8 @@
   "mobile.routes.channel_members.action_message": "Vous devez sélectionner au moins un membre à supprimer de ce canal.",
   "mobile.routes.channel_members.action_message_confirm": "Voulez-vous vraiment supprimer les membres sélectionnés du canal ?",
   "mobile.routes.channels": "Canaux",
+  "mobile.routes.code": "{language} Code",
+  "mobile.routes.code.noLanguage": "Code",
   "mobile.routes.enterServerUrl": "Spécifiez l'URL du serveur",
   "mobile.routes.login": "Se connecter",
   "mobile.routes.loginOptions": "Sélecteur de connexion",
@@ -1924,6 +1960,7 @@
   "msg_typing.someone": "Quelqu'un",
   "multiselect.add": "Ajouter",
   "multiselect.go": "Aller à",
+  "multiselect.list.notFound": "Aucun utilisateur trouvé.",
   "multiselect.numPeopleRemaining": "Utilisez les flèches ↑↓ pour parcourir, ↵ pour sélectionner. Vous pouvez encore ajouter {num, number} {num, plural, one {personne} other {personnes}}. ",
   "multiselect.numRemaining": "Vous pouvez encore en ajouter {num, number} en plus",
   "multiselect.placeholder": "Rechercher et ajouter des membres",
@@ -2044,6 +2081,7 @@
   "rename_channel.handleHolder": "caractères alphanumériques minuscules",
   "rename_channel.lowercase": "Doit être en caractères alphanumériques minuscules",
   "rename_channel.maxLength": "Ce champ doit être inférieur à {maxLength, number} caractères",
+  "rename_channel.minLength": "Channel name must be {minLength, number} or more characters",
   "rename_channel.required": "Ce champ est obligatoire",
   "rename_channel.save": "Enregistrer",
   "rename_channel.title": "Renommer le canal",
@@ -2102,11 +2140,61 @@
   "setting_upload.import": "Importer",
   "setting_upload.noFile": "Aucun fichier sélectionné.",
   "setting_upload.select": "Parcourir",
+  "shortcuts.browser.channel_next": "Forward in history:\tAlt|Right",
+  "shortcuts.browser.channel_next.mac": "Forward in history:\t⌘|]",
+  "shortcuts.browser.channel_prev": "Back in history:\tAlt|Left",
+  "shortcuts.browser.channel_prev.mac": "Back in history:\t⌘|[",
+  "shortcuts.browser.font_decrease": "Zoom out:\tCtrl|-",
+  "shortcuts.browser.font_decrease.mac": "Zoom out:\t⌘|-",
+  "shortcuts.browser.font_increase": "Zoom in:\tCtrl|+",
+  "shortcuts.browser.font_increase.mac": "Zoom in:\t⌘|+",
+  "shortcuts.browser.header": "Built-in Browser Commands",
+  "shortcuts.browser.highlight_next": "Highlight text to the next line:\tShift|Down",
+  "shortcuts.browser.highlight_prev": "Highlight text to the previous line:\tShift|Up",
+  "shortcuts.browser.input.header": "Works inside an input field",
+  "shortcuts.browser.newline": "Create a new line:\tShift|Enter",
+  "shortcuts.files.header": "Fichiers",
+  "shortcuts.files.upload": "Upload files:\tCtrl|U",
+  "shortcuts.files.upload.mac": "Upload files:\t⌘|U",
+  "shortcuts.header": "Raccourcis clavier",
+  "shortcuts.info": "Begin a message with / for a list of all the commands at your disposal.",
+  "shortcuts.msgs.comp.channel": "Channel:\t~|[a-z]|Tab",
+  "shortcuts.msgs.comp.emoji": "Emoji:\t:|[a-z]|Tab",
+  "shortcuts.msgs.comp.header": "Auto-complétion",
+  "shortcuts.msgs.comp.username": "Username:\t@|[a-z]|Tab",
+  "shortcuts.msgs.edit": "Edit last message in channel:\tUp",
+  "shortcuts.msgs.header": "Message",
+  "shortcuts.msgs.input.header": "Works inside an empty input field",
+  "shortcuts.msgs.mark_as_read": "Mark current channel as read:\tEsc",
+  "shortcuts.msgs.reply": "Reply to last message in channel:\tShift|Up",
+  "shortcuts.msgs.reprint_next": "Reprint next message:\tCtrl|Down",
+  "shortcuts.msgs.reprint_next.mac": "Reprint next message:\t⌘|Down",
+  "shortcuts.msgs.reprint_prev": "Reprint previous message:\tCtrl|Up",
+  "shortcuts.msgs.reprint_prev.mac": "Reprint previous message:\t⌘|Up",
+  "shortcuts.nav.direct_messages_menu": "Direct messages menu:\tCtrl|Shift|K",
+  "shortcuts.nav.direct_messages_menu.mac": "Direct messages menu:\t⌘|Shift|K",
+  "shortcuts.nav.header": "Navigation",
+  "shortcuts.nav.next": "Next channel:\tAlt|Down",
+  "shortcuts.nav.next.mac": "Next channel:\t⌥|Down",
+  "shortcuts.nav.prev": "Previous channel:\tAlt|Up",
+  "shortcuts.nav.prev.mac": "Previous channel:\t⌥|Up",
+  "shortcuts.nav.recent_mentions": "Recent mentions:\tCtrl|Shift|M",
+  "shortcuts.nav.recent_mentions.mac": "Recent mentions:\t⌘|Shift|M",
+  "shortcuts.nav.settings": "Account settings:\tCtrl|Shift|A",
+  "shortcuts.nav.settings.mac": "Account settings:\t⌘|Shift|A",
+  "shortcuts.nav.switcher": "Quick channel switcher:\tCtrl|K",
+  "shortcuts.nav.switcher.mac": "Quick channel switcher:\t⌘|K",
+  "shortcuts.nav.unread_next": "Next unread channel:\tAlt|Shift|Down",
+  "shortcuts.nav.unread_next.mac": "Next unread channel:\t⌥|Shift|Down",
+  "shortcuts.nav.unread_prev": "Previous unread channel:\tAlt|Shift|Up",
+  "shortcuts.nav.unread_prev.mac": "Previous unread channel:\t⌥|Shift|Up",
   "sidebar.channels": "CANAUX PUBLICS",
   "sidebar.createChannel": "Créer un nouveau canal public",
   "sidebar.createGroup": "Créer un nouveau canal privé",
   "sidebar.direct": "MESSAGES PRIVÉS",
   "sidebar.favorite": "CANAUX FAVORIS",
+  "sidebar.leave": "Quitter le canal",
+  "sidebar.mainMenu": "Main Menu",
   "sidebar.more": "Plus…",
   "sidebar.moreElips": "Plus...",
   "sidebar.otherMembers": "En dehors de l’équipe",
diff --git a/webapp/i18n/it.json b/webapp/i18n/it.json
index 328c4d9a2..a32841506 100644
--- a/webapp/i18n/it.json
+++ b/webapp/i18n/it.json
@@ -9,6 +9,7 @@
   "about.hash": "Hash di compilazione:",
   "about.hashee": "Hash di compilazione EE:",
   "about.licensed": "Licenziato a:",
+  "about.notice": "Mattermost è stato possibile grazie al software open source usato dalla nostra <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>piattaforma</a>, dall'app <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> e dalle app <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a>.",
   "about.number": "Numero di compilazione:",
   "about.teamEditionLearn": "Entra nella comunità Mattermost su ",
   "about.teamEditionSt": "Tutte le tue comunicazioni in un posto, instantaneamente ricercabili e accessibili ovunque.",
@@ -28,8 +29,10 @@
   "activity_log.sessionsDescription": "Una sessione è creata quando viene eseguito l'accesso utilizzando un browser. Le sessioni permettono al sistema di non chiedere ripetutamente agli utenti di effettuare l'accesso per un periodo specificato dall'Amministratore di Sistema. Per uscire e terminare una sessione è possibile utilizzare il pulsante 'Esci'.",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "Applicazione nativa Android",
+  "activity_log_modal.androidNativeClassicApp": "App Android Native Classic",
   "activity_log_modal.desktop": "Applicazione nativa Desktop",
   "activity_log_modal.iphoneNativeApp": "Applicazione nativa iPhone",
+  "activity_log_modal.iphoneNativeClassicApp": "App iPhone Native Classic",
   "add_command.autocomplete": "Completamento automatico",
   "add_command.autocomplete.help": "(Opzionale) Visualizza i comandi slash nella lista di auto-completamento.",
   "add_command.autocompleteDescription": "Descrizione Autocompletamento",
@@ -146,8 +149,20 @@
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
-  "admin.authentication.saml": "SAML",
+  "admin.authentication.saml": "SAML 2.0",
   "admin.banner.heading": "Attenzione:",
+  "admin.client_versions.androidLatestVersion": "Ultima Versione Android",
+  "admin.client_versions.androidLatestVersionHelp": "L'ultima versione rilasciata di Android",
+  "admin.client_versions.androidMinVersion": "Versione Minima di Android",
+  "admin.client_versions.androidMinVersionHelp": "La versione minima di Android richiesta",
+  "admin.client_versions.desktopLatestVersion": "Ultima Versione Desktop",
+  "admin.client_versions.desktopLatestVersionHelp": "L'ultima versione Desktop rilasciata",
+  "admin.client_versions.desktopMinVersion": "Versione Minima Desktop",
+  "admin.client_versions.desktopMinVersionHelp": "La versione minima Desktop richiesta",
+  "admin.client_versions.iosLatestVersion": "Ultima versione IOS",
+  "admin.client_versions.iosLatestVersionHelp": "L'ultima versione rilasciata per IOS",
+  "admin.client_versions.iosMinVersion": "Versione minima per IOS",
+  "admin.client_versions.iosMinVersionHelp": "La versione minima per IOS richiesta",
   "admin.cluster.enableDescription": "Quando abilitato, Mattermost funzionerà in modalità Alta disponibilità. Vedi la <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target='_blank'>documentazione</a> per altri particolari sulla configurazione dell'alta disponibilità di Mattermost.",
   "admin.cluster.enableTitle": "Abilita modalità Alta disponibilità:",
   "admin.cluster.interNodeListenAddressDesc": "Indirizzo a cui il server si metterà in ascolto per comunicare con altri server.",
@@ -309,11 +324,11 @@
   "admin.email.mtpns": "Usare le app iOS e Android su iTunes e Google Play con TPNS",
   "admin.email.mtpnsHelp": "Scarica <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost per iOS</a> da iTunes. Scarica <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost per Android</a> da Google Play. Scopri di più su <a href=\"https://about.mattermost.com/default-tpns/\" target='_blank'>TPNS</a>.",
   "admin.email.nofificationOrganizationExample": "Es. \"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\"",
-  "admin.email.notification.contents.full": "Send full message contents",
-  "admin.email.notification.contents.full.description": "Sender name and channel are included in email notifications.</br>Typically used for compliance reasons if Mattermost contains confidential information and policy dictates it cannot be stored in email.",
+  "admin.email.notification.contents.full": "Invia il contenuto completo del messaggio",
+  "admin.email.notification.contents.full.description": "Il nome del mittente e del canale sono inclusi nelle notifiche email.</br>Tipicamente utilizzato per ragioni di conformità se Mattermost contiene informazioni confidenziale e la politica sulla privacy indica che non possono essere memorizzate nelle email.",
   "admin.email.notification.contents.generic": "Invia una descrizione generica solo con il mittente",
-  "admin.email.notification.contents.generic.description": "Only the name of the person who sent the message, with no information about channel name or message contents are included in email notifications.</br>Typically used for compliance reasons if Mattermost contains confidential information and policy dictates it cannot be stored in email.",
-  "admin.email.notification.contents.title": "Contenuto Notifiche Push:",
+  "admin.email.notification.contents.generic.description": "Solo il nome del mittente, senza informazioni sul canale o sul contenuto del messaggio.</br>Tipicamente utilizzato per ragioni di conformità se Mattermost contiene informazioni confidenziali e la politica sulla privacy indica che non possono essere memorizzate nelle email.",
+  "admin.email.notification.contents.title": "Contenuto Notifiche Email: ",
   "admin.email.notificationDisplayDescription": "Nome visualizzato nell'account di posta, usato per le email di notifica di Mattermost.",
   "admin.email.notificationDisplayExample": "Es: \"Notifica Mattermost\", \"System\", \"No-Reply\"",
   "admin.email.notificationDisplayTitle": "Nome visualizzato nelle notifiche:",
@@ -463,9 +478,9 @@
   "admin.image.amazonS3RegionDescription": "Regione AWS selezionata per la creazione del tuo bucket S3.",
   "admin.image.amazonS3RegionExample": "Es.: \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Regione Amazon S3:",
-  "admin.image.amazonS3SSEDescription": "When true, encrypt files in Amazon S3 using server-side encryption with Amazon S3-managed keys. See <a href=\"https://about.mattermost.com/default-server-side-encryption\">documentation</a> to learn more.",
-  "admin.image.amazonS3SSEExample": "Es.: \"Role\"",
-  "admin.image.amazonS3SSETitle": "Enable Server-Side Encryption for Amazon S3:",
+  "admin.image.amazonS3SSEDescription": "Se vero, codifica i file su Amazon S3 utilizzando la codifica lato server con le chiavi gestite da Amazon S3. Vedere la <a href=\"https://about.mattermost.com/default-server-side-encryption\">documentazione</a> per ulteriori dettagli.",
+  "admin.image.amazonS3SSEExample": "Es.: \"falso\"",
+  "admin.image.amazonS3SSETitle": "Abilita la codifica lato server di Amazon S3:",
   "admin.image.amazonS3SSLDescription": "Quando disabilitato, ammette connessioni insicure ad Amazon S3. L'Impostazione predefinita ammette solo connessioni sicure.",
   "admin.image.amazonS3SSLExample": "Es.: \"true\"",
   "admin.image.amazonS3SSLTitle": "Abilita Connessioni Sicure ad Amazon S3:",
@@ -587,7 +602,7 @@
   "admin.log.locationPlaceholder": "Immetti la posizione del tuo file",
   "admin.log.locationTitle": "Cartella file di log:",
   "admin.log.logSettings": "Impostazioni di Log",
-  "admin.logs.bannerDesc": "Per cercare gli utenti tramite ID, andare in Reportistica > Utenti ed incollare l'ID nel campo di ricerca.",
+  "admin.logs.bannerDesc": "Per cercare gli utenti tramite ID utente o token di accesso, andare in Reportistica > Utenti ed incollare l'ID nel campo di ricerca.",
   "admin.logs.reload": "Ricarica",
   "admin.logs.title": "Log del Server",
   "admin.manage_roles.additionalRoles": "Seleziona permessi addizionali per l'account. <a href=\"https://about.mattermost.com/default-permissions\" target=\"_blank\">Scopri di più su ruoli e permessi</a>.",
@@ -651,15 +666,15 @@
   "admin.password.symbol": "Almeno un simbolo (es. \"~!@#$%^&*()\")",
   "admin.password.uppercase": "Almeno una lettera maiuscola",
   "admin.plugins.jira": "JIRA (Beta)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "channelname",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelurl",
   "admin.plugins.jira.enabledDescription": "Se vero, puoi configurare i webhook JIRA per inviare messaggi in Mattermost. Per aiutare a combattere i tentativi di phishing, tutte le pubblicazioni saranno etichettate come BOT.",
-  "admin.plugins.jira.enabledLabel": "Abilitato:",
+  "admin.plugins.jira.enabledLabel": "Attiva JIRA:",
   "admin.plugins.jira.secretDescription": "Questo segreto è utilizzato per autenticarsi in Mattermost.",
   "admin.plugins.jira.secretLabel": "Segreto:",
   "admin.plugins.jira.secretParamPlaceholder": "segreto",
   "admin.plugins.jira.secretRegenerateDescription": "Rigenera il segreto per il webhook. Rigenerare il segreto invalida tutte le integrazioni JIRA esistenti.",
   "admin.plugins.jira.setupDescription": "Utilizza questo webhook per configurare l'integrazione con JIRA. Vedere {webhookDocsLink} per ulteriori informazioni.",
-  "admin.plugins.jira.teamParamPlaceholder": "teamname",
+  "admin.plugins.jira.teamParamPlaceholder": "teamurl",
   "admin.plugins.jira.userDescription": "Seleziona il nome utente utilizzato dall'integrazione.",
   "admin.plugins.jira.userLabel": "Utente:",
   "admin.plugins.jira.webhookDocsLink": "documentazione",
@@ -719,8 +734,8 @@
   "admin.saml.emailAttrDesc": "L'attributo nell'asserzione SAML che verrà usato per popolare il campo indirizzo email degli utenti in Mattermost.",
   "admin.saml.emailAttrEx": "Es.: \"Email\" or \"PrimaryEmail\"",
   "admin.saml.emailAttrTitle": "Attributo Email:",
-  "admin.saml.enableDescription": "Quando abilitato, Mattermost permette il login usando SAML. Vedi la <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentazione</a> per altri particolari sulla configurazione SAML di Mattermost.",
-  "admin.saml.enableTitle": "Abilita accesso con SAML:",
+  "admin.saml.enableDescription": "Quando abilitato, Mattermost permette il login usando SAML 2.0. Vedi la <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentazione</a> per altri particolari sulla configurazione SAML di Mattermost.",
+  "admin.saml.enableTitle": "Abilita accesso con SAML 2.0:",
   "admin.saml.encryptDescription": "Se falso, Mattermost non decodificherà le Asserzioni SAML codificate con il tuo Service Provider Public Certificate. Sconsigliato in ambienti di produzione. Solo per test.",
   "admin.saml.encryptTitle": "Abilita Codifica:",
   "admin.saml.firstnameAttrDesc": "(Opzionale) L'attributo nell'asserzione SAML che verrà usato per popolare il campo nome degli utenti in Mattermost.",
@@ -807,6 +822,9 @@
   "admin.service.insecureTlsTitle": "Abilita Connessioni in Uscita Non Sicure:  ",
   "admin.service.integrationAdmin": "Abilita restrizioni nella gestione delle integrazione da parte degli Amministratori:",
   "admin.service.integrationAdminDesc": "Quando vero, webhooks e comandi slash possono solo essere creati, modificati e visualizzati da Amministratori di Sistema, di gruppo, Applicazioni di OAuth 2.0 di Amministratori di Sistema. Le integrazione sono disponibili a tutti gli utenti dopo essere state create dagli Amministratori.",
+  "admin.service.internalConnectionsDesc": "In ambiente di test, come nel caso di sviluppo di integrazioni locali, utilizzare questo parametro per specificare il dominio, gli indirizzi IP o la notazione CIDR per permettere connessioni interni.<b>Non raccomandato l'utilizzo in produzione</b> poiché può essere permesso agli utenti di estrarre dati confidenziali dal server o dalla rete interna.<br /><br />Per impostazione predefinita, gli URL forniti dall'utente come quelli utilizzati per Open Graph, i webhook o i comandi slash non sono autorizzati a connettersi a indirizzi riservati, inclusi gli indirizzi di loopback i gli indirizzi locali utilizzati per la rete interna. Le notifiche push, OAuth 2.0 e WebRTC sono verificati e non vengono influenzati da questa impostazione.",
+  "admin.service.internalConnectionsEx": "webhooks.interno.esempio.com 127.0.0.1 10.10.16.0/28",
+  "admin.service.internalConnectionsTitle": "Consenti connessioni interne non verificate a: ",
   "admin.service.letsEncryptCertificateCacheFile": "File di Cache del certificato Let's Encrypt:",
   "admin.service.letsEncryptCertificateCacheFileDescription": "Il certificato ottenuto ed altri dati relativi al servizio Let's Encrypt saranno immagazzinate in questo file.",
   "admin.service.listenAddress": "Indirizzo di ascolto:",
@@ -841,7 +859,7 @@
   "admin.service.useLetsEncrypt": "Utilizza Let's Encrypt:",
   "admin.service.useLetsEncryptDescription": "Attiva il recupero automatico dei certificati da Let's Encrypt. Il certificato verrà recuperato quando un client cerca di connettersi da un nuovo dominio. Funziona con più domini.",
   "admin.service.userAccessTokensDescLabel": "Nome: ",
-  "admin.service.userAccessTokensDescription": "Quando importato su \"vero\", gli utenti possono creare <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">token di accesso</a> per le integrazioni in <strong>Impostazioni Account > Sicurezza</strong>. I token possono essere utilizzati per autenticarsi con le API e ottenere pieno accesso all'account.<br/><br/>Per gestire chi può creare token di accesso, andare alla pagina <strong>Console di Sistema > Utenti</strong>.",
+  "admin.service.userAccessTokensDescription": "Se vero, gli utenti possono creare <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">token di accesso</a> per le integrazioni in <strong>Impostazioni account > Sicurezza</strong>. Possono essere utilizzati per autenticarsi verso le API e consentire pieno accesso all'account.<br/><br/>Per gestire chi può creare token di accesso o per cercare un utente per ID del token, andare nella pagina <strong>Console di Sistema > Utenti</strong>.",
   "admin.service.userAccessTokensIdLabel": "ID token: ",
   "admin.service.userAccessTokensTitle": "Attiva Token di Accesso: ",
   "admin.service.webSessionDays": "Durata session AD/LDAP e email (giorni):",
@@ -853,6 +871,7 @@
   "admin.sidebar.advanced": "Avanzate",
   "admin.sidebar.audits": "Conformità e Controllo",
   "admin.sidebar.authentication": "Autenticazione",
+  "admin.sidebar.client_versions": "Versioni del client",
   "admin.sidebar.cluster": "Alta Disponibilità (HA)",
   "admin.sidebar.compliance": "Conformità",
   "admin.sidebar.configuration": "Configurazione",
@@ -892,7 +911,7 @@
   "admin.sidebar.push": "Notifiche Mobile",
   "admin.sidebar.rateLimiting": "Limite di velocità",
   "admin.sidebar.reports": "REPORTISTICA",
-  "admin.sidebar.saml": "SAML",
+  "admin.sidebar.saml": "SAML 2.0",
   "admin.sidebar.security": "Sicurezza",
   "admin.sidebar.sessions": "Sessioni",
   "admin.sidebar.settings": "IMPOSTAZIONI",
@@ -1294,15 +1313,14 @@
   "claim.email_to_oauth.switchTo": "Cambia account to {uiType}",
   "claim.email_to_oauth.title": "Cambia account Email/Password a {uiType}",
   "claim.ldap_to_email.confirm": "Conferma password",
-  "claim.ldap_to_email.email": "Devi usare la email {email} per accedere",
-  "claim.ldap_to_email.enterLdapPwd": "Inserisci la tua {ldapPassword} per il tuo account email {site}",
-  "claim.ldap_to_email.enterPwd": "Inserisci una nuova password per il tuo account email",
+  "claim.ldap_to_email.email": "Dopo aver cambiato il metodo di autenticazione, userai {email} per autenticarti. Le credenziali AD/LDAP non daranno più accesso a Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "Nuova password per login tramite email:",
   "claim.ldap_to_email.ldapPasswordError": "Inserisci la tua password AD/LDAP.",
   "claim.ldap_to_email.ldapPwd": "Password AD/LDAP",
   "claim.ldap_to_email.pwd": "Password",
   "claim.ldap_to_email.pwdError": "Inserisci la tua password.",
   "claim.ldap_to_email.pwdNotMatch": "Le password non corrispondono.",
-  "claim.ldap_to_email.ssoType": "Dopo aver convalidato il tuo account, potrai accedere solo con la tua email e password",
   "claim.ldap_to_email.switchTo": "Cambia account a email/password",
   "claim.ldap_to_email.title": "Cambia account AD/LDAP a Email/Password",
   "claim.oauth_to_email.confirm": "Conferma password",
@@ -1761,7 +1779,7 @@
   "member_list.noUsersAdd": "Nessun utente da aggiungere.",
   "members_popover.manageMembers": "Gestione Membri",
   "members_popover.msg": "Messaggio",
-  "members_popover.title": "Membri",
+  "members_popover.title": "Membri del canale",
   "members_popover.viewMembers": "Visualizza membri",
   "mfa.confirm.complete": "<strong>Configurazione completata!</strong>",
   "mfa.confirm.okay": "Okay",
@@ -1829,6 +1847,15 @@
   "mobile.custom_list.no_results": "Nessun risultato",
   "mobile.drawer.teamsTitle": "Gruppi",
   "mobile.edit_post.title": "Modifica Messaggio",
+  "mobile.emoji_picker.activity": "ATTIVITA'",
+  "mobile.emoji_picker.custom": "PERSONALIZZATO",
+  "mobile.emoji_picker.flags": "BANDIERE",
+  "mobile.emoji_picker.foods": "CIBI",
+  "mobile.emoji_picker.nature": "NATURA",
+  "mobile.emoji_picker.objects": "OGGETTI",
+  "mobile.emoji_picker.people": "PERSONE",
+  "mobile.emoji_picker.places": "LUOGHI",
+  "mobile.emoji_picker.symbols": "SIMBOLI",
   "mobile.error_handler.button": "Riavvia",
   "mobile.error_handler.description": "\nClicca riavvia per aprire di nuovo l'app. Dopo il riavvio, puoi segnalare il problema dal menu impostazioni.\n",
   "mobile.error_handler.title": "Rilevato errore non previsto",
@@ -1837,6 +1864,7 @@
   "mobile.file_upload.more": "Più",
   "mobile.file_upload.video": "Libreria video",
   "mobile.help.title": "Aiuto",
+  "mobile.image_preview.save": "Salva Immagine",
   "mobile.intro_messages.DM": "Questo è l'inizio della tua conversazione privata con {teammate}. Messaggi diretti e file condivisi qui non saranno accessibili ad altre persone.",
   "mobile.intro_messages.default_message": "Questo è il primo canale che i colleghi vedranno una volta effettuato l'accesso - usalo per comunicare aggiornamenti che chiunque dovrebbe conoscere.",
   "mobile.intro_messages.default_welcome": "Benvenuto a {name}!",
@@ -1845,6 +1873,11 @@
   "mobile.loading_members": "Caricamento Membri...",
   "mobile.loading_posts": "Caricamento Messaggi...",
   "mobile.login_options.choose_title": "Seleziona il tuo metodo di login",
+  "mobile.managed.blocked_by": "Bloccati da {vendor}",
+  "mobile.managed.exit": "Esci",
+  "mobile.managed.jailbreak": "Dispositivi con jailbreak considerati non sicuri da {vendor}, per favore uscire dall'app.",
+  "mobile.managed.secured_by": "Verificato da {vendor}",
+  "mobile.markdown.code.plusMoreLines": "+{count, number} più righe",
   "mobile.more_dms.start": "Inizio",
   "mobile.more_dms.title": "Nuova Conversazione",
   "mobile.notice_mobile_link": "apps per smartphone",
@@ -1863,6 +1896,7 @@
   "mobile.post.failed_retry": "Riprova",
   "mobile.post.failed_title": "Impossibile inviare il messaggio",
   "mobile.post.retry": "Aggiorna",
+  "mobile.post_info.add_reaction": "Aggiungi reazione",
   "mobile.request.invalid_response": "Risposta non valida ricevuta dal server.",
   "mobile.routes.channelInfo": "Informazioni",
   "mobile.routes.channelInfo.createdBy": "Creato da {creator} il  ",
@@ -1872,6 +1906,8 @@
   "mobile.routes.channel_members.action_message": "Devi selezionare almeno un membro da rimuovere dal canale.",
   "mobile.routes.channel_members.action_message_confirm": "Sei sicuro di voler rimuovere i membri selezionati dal canale?",
   "mobile.routes.channels": "Canale",
+  "mobile.routes.code": "{language} codice",
+  "mobile.routes.code.noLanguage": "Codice",
   "mobile.routes.enterServerUrl": "Immettere l'URL del server",
   "mobile.routes.login": "Login",
   "mobile.routes.loginOptions": "Selezionatore Login",
@@ -1924,6 +1960,7 @@
   "msg_typing.someone": "Qualcuno",
   "multiselect.add": "Aggiungi",
   "multiselect.go": "Vai",
+  "multiselect.list.notFound": "Nessun elemento trovato",
   "multiselect.numPeopleRemaining": "Usa ↑↓ per navigare, ↵ per scegliere. Puoi aggiungere {num, number} più {num, plural, one {person} altre {people}}. ",
   "multiselect.numRemaining": "Si possono ancora aggiungere {num, number}",
   "multiselect.placeholder": "Cercare ed aggiungere membri",
@@ -2044,6 +2081,7 @@
   "rename_channel.handleHolder": "caratteri alfanumerici minuscoli",
   "rename_channel.lowercase": "Devono essere caratteri alfanumerici minuscoli",
   "rename_channel.maxLength": "Questo campo può essere al massimo di {maxLength, number} caratteri",
+  "rename_channel.minLength": "Il nome del canale deve essere lungo almeno {minLength, number} caratteri",
   "rename_channel.required": "Il campo è richiesto",
   "rename_channel.save": "Salva",
   "rename_channel.title": "Rinomina Canale",
@@ -2102,11 +2140,61 @@
   "setting_upload.import": "Importa",
   "setting_upload.noFile": "Nessun file selezionato.",
   "setting_upload.select": "Seleziona file",
+  "shortcuts.browser.channel_next": "Avanti nella cronologia:\tAlt|Right",
+  "shortcuts.browser.channel_next.mac": "Avanti nella cronologia:\t⌘|]",
+  "shortcuts.browser.channel_prev": "Indietro nella cronologia:\tAlt|Left",
+  "shortcuts.browser.channel_prev.mac": "Indietro nella cronologia:\t⌘|[",
+  "shortcuts.browser.font_decrease": "Zoom indietro:\tCtrl|-",
+  "shortcuts.browser.font_decrease.mac": "Zoom indietro:\t⌘|-",
+  "shortcuts.browser.font_increase": "Zoom avanti:\tCtrl|+",
+  "shortcuts.browser.font_increase.mac": "Zoom avanti:\t⌘|+",
+  "shortcuts.browser.header": "Comandi integrati nel browser",
+  "shortcuts.browser.highlight_next": "Evidenzia il testo sulla riga successiva:\tShift|Down",
+  "shortcuts.browser.highlight_prev": "Evidenzia il testo sulla riga precedente:\tShift|Up",
+  "shortcuts.browser.input.header": "Lavoro all'interno di un campo testo",
+  "shortcuts.browser.newline": "Crea una nuova riga:\tShift|Enter",
+  "shortcuts.files.header": "File",
+  "shortcuts.files.upload": "Carica file:\tCtrl|U",
+  "shortcuts.files.upload.mac": "Carica file:\t⌘|U",
+  "shortcuts.header": "Scorciatoie da tastiera",
+  "shortcuts.info": "Inizia un messaggio con / per una lista dei comandi disponibili.",
+  "shortcuts.msgs.comp.channel": "Canale:\t~|[a-z]|Tab",
+  "shortcuts.msgs.comp.emoji": "Emoji:\t:|[a-z]|Tab",
+  "shortcuts.msgs.comp.header": "Completamento automatico",
+  "shortcuts.msgs.comp.username": "Nome utente:\t@|[a-z]|Tab",
+  "shortcuts.msgs.edit": "Modifica l'ultimo messaggio del canale:\tUp",
+  "shortcuts.msgs.header": "Messaggi",
+  "shortcuts.msgs.input.header": "Lavora all'interno di un campo di testo",
+  "shortcuts.msgs.mark_as_read": "Segna il canale corrente come letto:\tEsc",
+  "shortcuts.msgs.reply": "Rispondi all'ultimo messaggio nel canale:\tShift|Up",
+  "shortcuts.msgs.reprint_next": "Ristampa il prossimo messaggio:\tCtrl|Down",
+  "shortcuts.msgs.reprint_next.mac": "Ristampa il prossimo messaggio:\t⌘|Down",
+  "shortcuts.msgs.reprint_prev": "Ristampa il messaggio precedente:\tCtrl|Up",
+  "shortcuts.msgs.reprint_prev.mac": "Ristampa il messaggio precedente:\t⌘|Up",
+  "shortcuts.nav.direct_messages_menu": "Menu messaggio diretto:\tCtrl|Shift|K",
+  "shortcuts.nav.direct_messages_menu.mac": "Menu messaggio diretto:\t⌘|Shift|K",
+  "shortcuts.nav.header": "Navigazione",
+  "shortcuts.nav.next": "Prossimo canale:\tAlt|Down",
+  "shortcuts.nav.next.mac": "Prossimo canale:\t⌥|Down",
+  "shortcuts.nav.prev": "Canale precedente:\tAlt|Up",
+  "shortcuts.nav.prev.mac": "Canale precedente:\t⌥|Up",
+  "shortcuts.nav.recent_mentions": "Citazioni recenti:\tCtrl|Shift|M",
+  "shortcuts.nav.recent_mentions.mac": "Citazioni recenti:\t⌘|Shift|M",
+  "shortcuts.nav.settings": "Impostazioni account:\tCtrl|Shift|A",
+  "shortcuts.nav.settings.mac": "Impostazioni account:\t⌘|Shift|A",
+  "shortcuts.nav.switcher": "Selezione rapida del canale:\tCtrl|K",
+  "shortcuts.nav.switcher.mac": "Selezione rapida del canale:\t⌘|K",
+  "shortcuts.nav.unread_next": "Prossimo canale da leggere:\tAlt|Shift|Down",
+  "shortcuts.nav.unread_next.mac": "Prossimo canale da leggere:\t⌥|Shift|Down",
+  "shortcuts.nav.unread_prev": "Canale da leggere precedente:\tAlt|Shift|Up",
+  "shortcuts.nav.unread_prev.mac": "Canale da leggere precedente:\t⌥|Shift|Up",
   "sidebar.channels": "CANALI PUBBLICI",
   "sidebar.createChannel": "Crea un canale pubblico",
   "sidebar.createGroup": "Crea un canale privato",
   "sidebar.direct": "MESSAGGI DIRETTI",
   "sidebar.favorite": "CANALI PREFERITI",
+  "sidebar.leave": "Abbandona canale",
+  "sidebar.mainMenu": "Menu principale",
   "sidebar.more": "Più",
   "sidebar.moreElips": "Più...",
   "sidebar.otherMembers": "Fuori da questo gruppo",
@@ -2188,7 +2276,7 @@
   "suggestion.loading": "Caricamento...",
   "suggestion.mention.all": "ATTENZIONE: Questo citerà tutti nel canale",
   "suggestion.mention.channel": "Notifica tutti nel canale",
-  "suggestion.mention.channels": "Mie canali",
+  "suggestion.mention.channels": "Miei canali",
   "suggestion.mention.here": "Notifica tutti gli utenti online nel canale",
   "suggestion.mention.in_channel": "Canali",
   "suggestion.mention.members": "Membri del canale",
@@ -2570,13 +2658,13 @@
   "user.settings.tokens.description_mobile": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">I Token di accesso</a> sono simili ai Token di sessione e possono essere usati dalle integrazioni per <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">autenticarsi con le API REST</a>. Crea nuovi token sul tuo desktop.",
   "user.settings.tokens.id": "ID Token: ",
   "user.settings.tokens.name": "Descrizione del Token: ",
-  "user.settings.tokens.nameHelp": "Inserire una descrizione del Token, per ricordare il suo scopo.",
+  "user.settings.tokens.nameHelp": "Inserire una descrizione del token, per ricordare il suo scopo.",
   "user.settings.tokens.nameRequired": "Per favore, inserire una descrizione.",
   "user.settings.tokens.save": "Salva",
   "user.settings.tokens.title": "Gestisci Token di Accesso personali",
   "user.settings.tokens.token": "Token di Accesso: ",
   "user.settings.tokens.tokenId": "Token ID: ",
-  "user.settings.tokens.userAccessTokensNone": "Nessun Token di accesso personale.",
+  "user.settings.tokens.userAccessTokensNone": "Nessun token di accesso personale.",
   "user_list.notFound": "Nessun utente trovato",
   "user_profile.send.dm": "Invia messaggio",
   "user_profile.webrtc.call": "Avvia videochiamata",
diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json
index 945e294a5..dc3116e79 100644
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -9,6 +9,7 @@
   "about.hash": "ビルドハッシュ値:",
   "about.hashee": "EEビルドハッシュ値:",
   "about.licensed": "ライセンス供給先:",
+  "about.notice": "Mattermostは我々の<a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a>, <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a>でオープンソース・ソフトウェアとして利用可能です。",
   "about.number": "ビルド番号:",
   "about.teamEditionLearn": "Mattermostコミュニティーに参加する: ",
   "about.teamEditionSt": "あなたのチームの全てのコミュニケーションを一箇所で、すぐに検索可能で、どこからでもアクセスできるものにします。",
@@ -28,8 +29,10 @@
   "activity_log.sessionsDescription": "セッションは新しいブラウザーまたはデバイスからログインからログインした時に作成されます。Mattermostはシステム管理者が指定した期間内であればログインし直すことなく使用できます。すぐにログアウトしたい場合には、「ログアウト」ボタンを使用することで、セッションを終了させることができます。",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "Androidネイティブアプリ",
+  "activity_log_modal.androidNativeClassicApp": "Androidネイティブクラシックアプリ",
   "activity_log_modal.desktop": "ネイティブデスクトップアプリ",
   "activity_log_modal.iphoneNativeApp": "iPhoneネイティブアプリ",
+  "activity_log_modal.iphoneNativeClassicApp": "iPhoneネイティブクラシックアプリ",
   "add_command.autocomplete": "自動補完",
   "add_command.autocomplete.help": "(オプション) 自動補完リストにスラッシュコマンドを表示する。",
   "add_command.autocompleteDescription": "自動補完の説明",
@@ -146,8 +149,20 @@
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
-  "admin.authentication.saml": "SAML",
+  "admin.authentication.saml": "SAML 2.0",
   "admin.banner.heading": "注意:",
+  "admin.client_versions.androidLatestVersion": "最新のAndroidバージョン",
+  "admin.client_versions.androidLatestVersionHelp": "最新リリースのAndroidバージョン",
+  "admin.client_versions.androidMinVersion": "最小のAndroidバージョン",
+  "admin.client_versions.androidMinVersionHelp": "最小の対応Androidバージョン",
+  "admin.client_versions.desktopLatestVersion": "最新のデスクトップバージョン",
+  "admin.client_versions.desktopLatestVersionHelp": "最新リリースのデスクトップバージョン",
+  "admin.client_versions.desktopMinVersion": "最小のデスクトップバージョン",
+  "admin.client_versions.desktopMinVersionHelp": "最小の対応デスクトップバージョン",
+  "admin.client_versions.iosLatestVersion": "最新のiOSバージョン",
+  "admin.client_versions.iosLatestVersionHelp": "最新リリースのiOSバージョン",
+  "admin.client_versions.iosMinVersion": "最小iOSバージョン",
+  "admin.client_versions.iosMinVersionHelp": "最小の対応iOSバージョン",
   "admin.cluster.enableDescription": "有効な場合、Mattermostは高可用モードで動作するようになります。高可用モードの設定について詳しくは、<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target='_blank'>説明文書</a>を参照してください。",
   "admin.cluster.enableTitle": "高可用モードを有効にする:",
   "admin.cluster.interNodeListenAddressDesc": "他のサーバーと通信するための接続待ちアドレスです。",
@@ -587,7 +602,7 @@
   "admin.log.locationPlaceholder": "ファイルの場所を入力してください",
   "admin.log.locationTitle": "ログファイルの出力ディレクトリー:",
   "admin.log.logSettings": "LDAPの設定",
-  "admin.logs.bannerDesc": "ユーザーIDでユーザーを検索するには、リポート > ユーザーへ行き検索フィルターにIDをペーストしてください。",
+  "admin.logs.bannerDesc": "ユーザーIDかトークンIDでユーザーを検索するには、リポート > ユーザーへ行き検索フィルターにIDをペーストしてください。",
   "admin.logs.reload": "再読み込み",
   "admin.logs.title": "サーバーログ",
   "admin.manage_roles.additionalRoles": "アカウントに関する追加の権限を選択してください。 <a href=\"https://about.mattermost.com/default-permissions\" target=\"_blank\">役割と権限の詳細</a>.",
@@ -651,15 +666,15 @@
   "admin.password.symbol": "少なくとも1つの記号が必要です(例: \"~!@#$%^&*()\")",
   "admin.password.uppercase": "少なくとも1つの英大文字が必要です",
   "admin.plugins.jira": "JIRA (ベータ)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "チャンネル名",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelurl",
   "admin.plugins.jira.enabledDescription": "有効な場合、Mattermostへのメッセージ投稿のためのJIRAウェブフックを設定できるようになります。フィッシング攻撃対策のため、全ての投稿にはBOTタグが表示されます。",
-  "admin.plugins.jira.enabledLabel": "有効:",
+  "admin.plugins.jira.enabledLabel": "JIRAを有効にする:",
   "admin.plugins.jira.secretDescription": "この秘密情報はMattermostへの認証に使われます。",
   "admin.plugins.jira.secretLabel": "秘密情報:",
   "admin.plugins.jira.secretParamPlaceholder": "秘密情報",
   "admin.plugins.jira.secretRegenerateDescription": "ウェブフックURLエンドポイントの秘密情報を再生成する。秘密情報の再生成は既存のJIRA統合機能を無効化します。",
   "admin.plugins.jira.setupDescription": "JIRA統合機能のセットアップには、このウェブフックURLを使用してください。詳しくは {webhookDocsLink} を参照してください。",
-  "admin.plugins.jira.teamParamPlaceholder": "チーム名",
+  "admin.plugins.jira.teamParamPlaceholder": "teamurl",
   "admin.plugins.jira.userDescription": "この統合機能が付与されるユーザー名を選択してください。",
   "admin.plugins.jira.userLabel": "ユーザー:",
   "admin.plugins.jira.webhookDocsLink": "説明文書",
@@ -719,8 +734,8 @@
   "admin.saml.emailAttrDesc": "Mattermostのユーザーの電子メールアドレスを設定するために使用されるSAMLアサーションの属性値です。",
   "admin.saml.emailAttrEx": "例: \"Email\"または\"PrimaryEmail\"",
   "admin.saml.emailAttrTitle": "電子メール属性値:",
-  "admin.saml.enableDescription": "有効にした場合、MattermostへSAMLを使ったログインが可能になります。詳しくは、<a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>説明文書</a>を参照してください。",
-  "admin.saml.enableTitle": "SAMLでのログインを有効にする:",
+  "admin.saml.enableDescription": "有効な場合、MattermostはSAML 2.0 を使ったログインができるようになります。SAMLの設定について、詳しくは、<a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>説明文書</a>を参照してください。",
+  "admin.saml.enableTitle": "SAML 2.0 でのログインを有効にする:",
   "admin.saml.encryptDescription": "無効な場合、Mattermostはサービスプロバイダーの公開証明書で暗号化されたSAML Assertionを複合しなくなります。",
   "admin.saml.encryptTitle": "暗号化を有効にする:",
   "admin.saml.firstnameAttrDesc": "(オプション) Mattermostのユーザーの名前(ファーストネーム)を設定するために使用されるSAMLアサーションの属性値です。",
@@ -807,6 +822,9 @@
   "admin.service.insecureTlsTitle": "安全でない外向きの接続を有効にする: ",
   "admin.service.integrationAdmin": "統合機能の管理を管理者のみに制限する:",
   "admin.service.integrationAdminDesc": "有効な場合、ウェブフックとスラッシュコマンドはチーム管理者とシステム管理者のみが、OAuth 2.0アプリケーションはシステム管理者のみが作成、編集、閲覧できるようになります。統合機能は管理者によって作成された後、全てのユーザーが利用できます。",
+  "admin.service.internalConnectionsDesc": "開発者マシンでローカルに統合機能を開発する場合などのテスト環境では、内部接続を許可するためにドメイン、IPアドレス、CIDR表記を指定するこの設定を使用してください。この設定により、ユーザーがあなたのサーバーや内部ネットワークから秘密情報を取り出すことができるようになるため、<b>本番環境での使用は推奨しません</b>。<br /><br />デフォルトでは、オープングラフメタデータやウェブフック、スラッシュコマンドのようなユーザーから提供されたURLは、内部ネットワークに使われるループバックやリンクローカルアドレスを含むリバースIPアドレスへの接続が許可されません。プッシュ通知やOAuth 2.0、WebRTCサーバーのURLは信頼されており、この設定による影響はありません。",
+  "admin.service.internalConnectionsEx": "webhooks.internal.example.com 127.0.0.1 10.0.16.0/28",
+  "admin.service.internalConnectionsTitle": "信頼されていない内部接続を許可する: ",
   "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt証明書キャッシュファイル:",
   "admin.service.letsEncryptCertificateCacheFileDescription": "検索された証明書やその他のLet's Encryptサービスに関するデータはこのファイルに保存されます。",
   "admin.service.listenAddress": "接続待ちアドレス:",
@@ -841,7 +859,7 @@
   "admin.service.useLetsEncrypt": "Let's Encryptを使用する:",
   "admin.service.useLetsEncryptDescription": "Let's Encryptからの証明書自動検出を有効にします。証明書はクライアントが新しいドメインから接続しようとした場合に検出されます。これは複数のドメインで動作します。",
   "admin.service.userAccessTokensDescLabel": "名前: ",
-  "admin.service.userAccessTokensDescription": "有効な場合、ユーザーは統合機能のための<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">パーソナルアクセストークン</a>を<strong>アカウント設定 > セキュリティ</strong> から生成できます。トークンはアカウントへAPIに対する認証に利用することができ、フルアクセスを与えることができます。<br/><br/>パーソナルアクセストークンを生成できるアカウントを管理するために、<strong>システムコンソール > ユーザー</strong>ページを確認してください。",
+  "admin.service.userAccessTokensDescription": "有効な場合、ユーザーは統合機能のための<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">パーソナルアクセストークン</a>を<strong>アカウント設定 > セキュリティ</strong> から生成できます。トークンはアカウントへAPIに対する認証に利用することができ、フルアクセスを与えることができます。<br/><br/>パーソナルアクセストークンを生成できるアカウントを管理したり、トークンIDでユーザーを検索したい場合は、<strong>システムコンソール > ユーザー</strong>ページを確認してください。",
   "admin.service.userAccessTokensIdLabel": "チームID: ",
   "admin.service.userAccessTokensTitle": "パーソナルアクセストークンを有効にする: ",
   "admin.service.webSessionDays": "AD/LDAPと電子メールのセッション維持期間 (日数):",
@@ -853,6 +871,7 @@
   "admin.sidebar.advanced": "詳細",
   "admin.sidebar.audits": "コンプライアンスと監査",
   "admin.sidebar.authentication": "認証",
+  "admin.sidebar.client_versions": "クライアントバージョン",
   "admin.sidebar.cluster": "高可用",
   "admin.sidebar.compliance": "コンプライアンス",
   "admin.sidebar.configuration": "設定",
@@ -892,7 +911,7 @@
   "admin.sidebar.push": "モバイルプッシュ",
   "admin.sidebar.rateLimiting": "投稿頻度制限",
   "admin.sidebar.reports": "リポート",
-  "admin.sidebar.saml": "SAML",
+  "admin.sidebar.saml": "SAML 2.0",
   "admin.sidebar.security": "セキュリティー",
   "admin.sidebar.sessions": "セッション",
   "admin.sidebar.settings": "設定",
@@ -1294,15 +1313,14 @@
   "claim.email_to_oauth.switchTo": "アカウントを{uiType}に切り替える",
   "claim.email_to_oauth.title": "電子メールアドレスとパスワードによるログインのアカウントを{uiType}に切り替える",
   "claim.ldap_to_email.confirm": "パスワードをもう一度入力してください",
-  "claim.ldap_to_email.email": "電子メールアドレス{email}をログインに使用します",
-  "claim.ldap_to_email.enterLdapPwd": "{site}電子メールアカウントの{ldapPassword}を入力してください",
-  "claim.ldap_to_email.enterPwd": "電子メールアカウントの新しいパスワードを入力してください",
+  "claim.ldap_to_email.email": "認証方法の切り替え後は、{email}でログインするようになります。AD/LDAP認証情報はMattermstへのアクセスに利用できなくなります。",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "新しい電子メールログイン用パスワード:",
   "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": "AD/LDAPアカウントを電子メールアドレス/パスワードに切り替える",
   "claim.oauth_to_email.confirm": "パスワードをもう一度入力してください",
@@ -1761,7 +1779,7 @@
   "member_list.noUsersAdd": "ユーザーは追加されません。",
   "members_popover.manageMembers": "メンバーを管理する",
   "members_popover.msg": "メッセージ",
-  "members_popover.title": "メンバー",
+  "members_popover.title": "チャンネルのメンバー",
   "members_popover.viewMembers": "メンバーを見る",
   "mfa.confirm.complete": "<strong>セットアップが完了しました!</strong>",
   "mfa.confirm.okay": "OK",
@@ -1829,6 +1847,15 @@
   "mobile.custom_list.no_results": "該当するものはありません",
   "mobile.drawer.teamsTitle": "チーム",
   "mobile.edit_post.title": "メッセージ編集中",
+  "mobile.emoji_picker.activity": "アクティビティ",
+  "mobile.emoji_picker.custom": "カスタム",
+  "mobile.emoji_picker.flags": "国旗",
+  "mobile.emoji_picker.foods": "食べ物",
+  "mobile.emoji_picker.nature": "自然",
+  "mobile.emoji_picker.objects": "オブジェクト",
+  "mobile.emoji_picker.people": "人々",
+  "mobile.emoji_picker.places": "場所",
+  "mobile.emoji_picker.symbols": "シンボル",
   "mobile.error_handler.button": "再起動",
   "mobile.error_handler.description": "\nアプリケーションを再開するために再起動をクリックしてください。再起動した後、設定メニューから問題を報告してください。\n",
   "mobile.error_handler.title": "予期しないエラーが発生しました。",
@@ -1837,6 +1864,7 @@
   "mobile.file_upload.more": "もっと",
   "mobile.file_upload.video": "ビデオライブラリー",
   "mobile.help.title": "ヘルプ",
+  "mobile.image_preview.save": "画像の保存",
   "mobile.intro_messages.DM": "{teammate}とのダイレクトメッセージの履歴の最初です。ダイレクトメッセージとそこで共有されているファイルは、この領域の外のユーザーからは見ることができません。",
   "mobile.intro_messages.default_message": "ここはチームメイトが利用登録した際に最初に見るチャンネルです - みんなが知るべき情報を投稿してください。",
   "mobile.intro_messages.default_welcome": "{name}へようこそ!",
@@ -1845,6 +1873,11 @@
   "mobile.loading_members": "メンバーをロード中...",
   "mobile.loading_posts": "メッセージをロード中...",
   "mobile.login_options.choose_title": "ログイン方法を選択してください",
+  "mobile.managed.blocked_by": "{vendor}によりブロックされました",
+  "mobile.managed.exit": "終了",
+  "mobile.managed.jailbreak": "Jailbrokenデバイスは{vendor}から信頼されていません。アプリを終了してください。",
+  "mobile.managed.secured_by": "{vendor}により保護されました",
+  "mobile.markdown.code.plusMoreLines": "+{count, number}行",
   "mobile.more_dms.start": "先頭",
   "mobile.more_dms.title": "新しい会話",
   "mobile.notice_mobile_link": "モバイルアプリ",
@@ -1863,6 +1896,7 @@
   "mobile.post.failed_retry": "再実行",
   "mobile.post.failed_title": "メッセージを送信できませんでした",
   "mobile.post.retry": "更新",
+  "mobile.post_info.add_reaction": "リアクションを追加する",
   "mobile.request.invalid_response": "サーバーから不正なレスポンスを受け取りました。",
   "mobile.routes.channelInfo": "情報",
   "mobile.routes.channelInfo.createdBy": "{creator} によって作成 ",
@@ -1872,6 +1906,8 @@
   "mobile.routes.channel_members.action_message": "チャンネルから削除するメンバーを少なくとも一人選択してください。",
   "mobile.routes.channel_members.action_message_confirm": "本当に選択したメンバーをチャンネルから削除しますか?",
   "mobile.routes.channels": "チャンネル",
+  "mobile.routes.code": "{language} コード",
+  "mobile.routes.code.noLanguage": "コード",
   "mobile.routes.enterServerUrl": "サーバーURLを入力してください",
   "mobile.routes.login": "ログイン",
   "mobile.routes.loginOptions": "ログイン選択",
@@ -1924,6 +1960,7 @@
   "msg_typing.someone": "誰か",
   "multiselect.add": "追加",
   "multiselect.go": "ジャンプ",
+  "multiselect.list.notFound": "アイテムが見付かりません",
   "multiselect.numPeopleRemaining": "↑↓で閲覧、 ↵で選択。あと{num, number} {num, plural, one {person} other {people}} 追加できます。 ",
   "multiselect.numRemaining": "あと{num, number}人追加できます",
   "multiselect.placeholder": "メンバーを検索し追加します",
@@ -2044,6 +2081,7 @@
   "rename_channel.handleHolder": "小文字の英数字にしてください",
   "rename_channel.lowercase": "小文字の英数字にしてください",
   "rename_channel.maxLength": "このフィールドは {maxLength, number} 文字未満でなくてはなりません",
+  "rename_channel.minLength": "チャンネル名は {minLength, number} 文字以上でなくてはなりません",
   "rename_channel.required": "この項目は必須です",
   "rename_channel.save": "保存する",
   "rename_channel.title": "チャンネル名を変更する",
@@ -2102,11 +2140,61 @@
   "setting_upload.import": "インポートする",
   "setting_upload.noFile": "ファイルが選択されていません。",
   "setting_upload.select": "ファイルを選択してください",
+  "shortcuts.browser.channel_next": "履歴の次へ:\tAlt|Right",
+  "shortcuts.browser.channel_next.mac": "履歴の次へ:\t⌘|]",
+  "shortcuts.browser.channel_prev": "履歴の前へ:\tAlt|Left",
+  "shortcuts.browser.channel_prev.mac": "履歴の前へ:\t⌘|[",
+  "shortcuts.browser.font_decrease": "ズームアウト:\tCtrl|-",
+  "shortcuts.browser.font_decrease.mac": "ズームアウト:\t⌘|-",
+  "shortcuts.browser.font_increase": "ズームイン:\tCtrl|+",
+  "shortcuts.browser.font_increase.mac": "ズームイン:\t⌘|+",
+  "shortcuts.browser.header": "内蔵ブラウザコマンド",
+  "shortcuts.browser.highlight_next": "次の行のテキストをハイライトする:\tShift|Down",
+  "shortcuts.browser.highlight_prev": "前の行のテキストをハイライトする:\tShift|Up",
+  "shortcuts.browser.input.header": "入力欄で動作する",
+  "shortcuts.browser.newline": "改行する:\tShift|Enter",
+  "shortcuts.files.header": "ファイル",
+  "shortcuts.files.upload": "ファイルをアップロードする:\tCtrl|U",
+  "shortcuts.files.upload.mac": "ファイルをアップロードする:\t⌘|U",
+  "shortcuts.header": "ショートカット",
+  "shortcuts.info": "全コマンドのリストを表示するにはメッセージを / で開始してください",
+  "shortcuts.msgs.comp.channel": "チャンネル:\t~|[a-z]|Tab",
+  "shortcuts.msgs.comp.emoji": "絵文字:\t:|[a-z]|Tab",
+  "shortcuts.msgs.comp.header": "自動補完",
+  "shortcuts.msgs.comp.username": "ユーザー名:\t@|[a-z]|Tab",
+  "shortcuts.msgs.edit": "チャンネルの最新メッセージを編集する:\tUp",
+  "shortcuts.msgs.header": "メッセージ",
+  "shortcuts.msgs.input.header": "空の入力欄で動作する",
+  "shortcuts.msgs.mark_as_read": "現在のチャンネルを既読にする:\tEsc",
+  "shortcuts.msgs.reply": "チャンネルの最新メッセージに返信する:\tShift|Up",
+  "shortcuts.msgs.reprint_next": "次のメッセージを再表示する:\tCtrl|Down",
+  "shortcuts.msgs.reprint_next.mac": "次のメッセージを再表示する:\t⌘|Down",
+  "shortcuts.msgs.reprint_prev": "前のメッセージを再表示する:\tCtrl|Up",
+  "shortcuts.msgs.reprint_prev.mac": "前のメッセージを再表示する:\t⌘|Up",
+  "shortcuts.nav.direct_messages_menu": "ダイレクトメッセージメニュー:\tCtrl|Shift|K",
+  "shortcuts.nav.direct_messages_menu.mac": "ダイレクトメッセージメニュー:\t⌘|Shift|K",
+  "shortcuts.nav.header": "ナビゲーション",
+  "shortcuts.nav.next": "次のチャンネル:\tAlt|Down",
+  "shortcuts.nav.next.mac": "次のチャンネル:\t⌥|Down",
+  "shortcuts.nav.prev": "前のチャンネル:\tAlt|Up",
+  "shortcuts.nav.prev.mac": "前のチャンネル:\t⌥|Up",
+  "shortcuts.nav.recent_mentions": "最近のあなたについての投稿:\tCtrl|Shift|M",
+  "shortcuts.nav.recent_mentions.mac": "最近のあなたについての投稿:\t⌘|Shift|M",
+  "shortcuts.nav.settings": "アカウント設定:\tCtrl|Shift|A",
+  "shortcuts.nav.settings.mac": "アカウント設定:\t⌘|Shift|A",
+  "shortcuts.nav.switcher": "クイックチャンネル切替:\tCtrl|K",
+  "shortcuts.nav.switcher.mac": "クイックチャンネル切替:\t⌘|K",
+  "shortcuts.nav.unread_next": "次の未読チャンネル:\tAlt|Shift|Down",
+  "shortcuts.nav.unread_next.mac": "次の未読チャンネル:\t⌥|Shift|Down",
+  "shortcuts.nav.unread_prev": "前の未読チャンネル:\tAlt|Shift|Up",
+  "shortcuts.nav.unread_prev.mac": "前の未読チャンネル:\t⌥|Shift|Up",
   "sidebar.channels": "公開チャンネル",
   "sidebar.createChannel": "新しい公開チャンネルを作成する",
   "sidebar.createGroup": "新しい非公開チャンネルを作成する",
   "sidebar.direct": "ダイレクトメッセージ",
   "sidebar.favorite": "お気に入りチャンネル",
+  "sidebar.leave": "チャンネルから脱退する",
+  "sidebar.mainMenu": "メインメニュー",
   "sidebar.more": "もっと",
   "sidebar.moreElips": "もっと…",
   "sidebar.otherMembers": "このチームの外側",
diff --git a/webapp/i18n/ko.json b/webapp/i18n/ko.json
index fc59f5235..22948f7f0 100644
--- a/webapp/i18n/ko.json
+++ b/webapp/i18n/ko.json
@@ -9,6 +9,7 @@
   "about.hash": "빌드 해쉬:",
   "about.hashee": "EE 빌드 해쉬:",
   "about.licensed": "다음 사용자에게 허가되었습니다:",
+  "about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
   "about.number": "빌드 넘버:",
   "about.teamEditionLearn": "Mattermost 커뮤니티에 참여 ",
   "about.teamEditionSt": "모든 팀 커뮤니케이션 활동을 한 곳에 모아 빠르게 찾고 공유할 수 있습니다.",
@@ -28,8 +29,10 @@
   "activity_log.sessionsDescription": "세션은 기기의 새 브라우저로 로그인할때 생성됩니다. 세션을 사용하면 시스템에서 정한 시간동안은 다시 로그인할 필요가 없습니다. '로그아웃' 버튼을 사용해서 세션을 종료할 수 있습니다.",
   "activity_log_modal.android": "안드로이드",
   "activity_log_modal.androidNativeApp": "안드로이드 앱",
+  "activity_log_modal.androidNativeClassicApp": "Android Native Classic App",
   "activity_log_modal.desktop": "Native Desktop App",
   "activity_log_modal.iphoneNativeApp": "아이폰 앱",
+  "activity_log_modal.iphoneNativeClassicApp": "iPhone Native Classic App",
   "add_command.autocomplete": "자동완성",
   "add_command.autocomplete.help": "(선택사항) 명령어가 자동완성 목록에서 보이게 합니다.",
   "add_command.autocompleteDescription": "자동완성 설명",
@@ -146,8 +149,20 @@
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
-  "admin.authentication.saml": "SAML",
+  "admin.authentication.saml": "SAML 2.0",
   "admin.banner.heading": "Note:",
+  "admin.client_versions.androidLatestVersion": "Latest Android Version",
+  "admin.client_versions.androidLatestVersionHelp": "The latest released Android version",
+  "admin.client_versions.androidMinVersion": "Minimum Android Version",
+  "admin.client_versions.androidMinVersionHelp": "The minimum compliant Android version",
+  "admin.client_versions.desktopLatestVersion": "Latest Desktop Version",
+  "admin.client_versions.desktopLatestVersionHelp": "The latest released Desktop version",
+  "admin.client_versions.desktopMinVersion": "Minimum Destop Version",
+  "admin.client_versions.desktopMinVersionHelp": "The minimum compliant Desktop version",
+  "admin.client_versions.iosLatestVersion": "Latest IOS Version",
+  "admin.client_versions.iosLatestVersionHelp": "The latest released IOS version",
+  "admin.client_versions.iosMinVersion": "Minimum IOS Version",
+  "admin.client_versions.iosMinVersionHelp": "The minimum compliant IOS version",
   "admin.cluster.enableDescription": "활성화 하면 Mattermost가 고 가용성 모드로 동작합니다. 고 가용성 모드 설정에 대한 자세한 내용은 이 <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">문서</a>를 참고하세요.",
   "admin.cluster.enableTitle": "고 가용성 모드:",
   "admin.cluster.interNodeListenAddressDesc": "The address the server will listen on for communicating with other servers.",
@@ -587,7 +602,7 @@
   "admin.log.locationPlaceholder": "파일 위치를 지정하세요.",
   "admin.log.locationTitle": "파일 로그 경로:",
   "admin.log.logSettings": "로그 설정",
-  "admin.logs.bannerDesc": "To look up users by User ID, go to Reporting > Users and paste the ID into the search filter.",
+  "admin.logs.bannerDesc": "To look up users by User ID or Token ID, go to Reporting > Users and paste the ID into the search filter.",
   "admin.logs.reload": "새로 고침",
   "admin.logs.title": "서버 로그",
   "admin.manage_roles.additionalRoles": "Select additional permissions for the account. <a href=\"https://about.mattermost.com/default-permissions\" target=\"_blank\">Read more about roles and permissions</a>.",
@@ -651,15 +666,15 @@
   "admin.password.symbol": "At least one symbol (예시 \"~!@#$%^&*()\")",
   "admin.password.uppercase": "At least one uppercase letter",
   "admin.plugins.jira": "JIRA (Beta)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "channelname",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelurl",
   "admin.plugins.jira.enabledDescription": "When true, you can configure JIRA webhooks to post message in Mattermost. To help combat phishing attacks, all posts are labelled by a BOT tag.",
-  "admin.plugins.jira.enabledLabel": "Enabled:",
+  "admin.plugins.jira.enabledLabel": "Enable JIRA:",
   "admin.plugins.jira.secretDescription": "This secret is used to authenticate to Mattermost.",
   "admin.plugins.jira.secretLabel": "보안",
   "admin.plugins.jira.secretParamPlaceholder": "보안",
   "admin.plugins.jira.secretRegenerateDescription": "Regenerates the secret for the webhook URL endpoint. Regenerating the secret invalidates your existing JIRA integrations.",
   "admin.plugins.jira.setupDescription": "Use this webhook URL to set up the JIRA integration. See {webhookDocsLink} to learn more.",
-  "admin.plugins.jira.teamParamPlaceholder": "teamname",
+  "admin.plugins.jira.teamParamPlaceholder": "teamurl",
   "admin.plugins.jira.userDescription": "Select the username that this integration is attached to.",
   "admin.plugins.jira.userLabel": "사용자",
   "admin.plugins.jira.webhookDocsLink": "문서",
@@ -807,6 +822,9 @@
   "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.internalConnectionsDesc": "In testing environments, such as when developing integrations locally on a development machine, use this setting to specify domains, IP addresses, or CIDR notations to allow internal connections. <b>Not recommended for use in production</b>, since this can allow a user to extract confidential data from your server or internal network.<br /><br />By default, user-supplied URLs such as those used for Open Graph metadata, webhooks, or slash commands will not be allowed to connect to reserved IP addresses including loopback or link-local addresses used for internal networks. Push notification, OAuth 2.0 and WebRTC server URLs are trusted and not affected by this setting.",
+  "admin.service.internalConnectionsEx": "webhooks.internal.example.com 127.0.0.1 10.0.16.0/28",
+  "admin.service.internalConnectionsTitle": "Allow untrusted internal connections to: ",
   "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:",
   "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
   "admin.service.listenAddress": "Listen Address:",
@@ -841,7 +859,7 @@
   "admin.service.useLetsEncrypt": "Use Let's Encrypt:",
   "admin.service.useLetsEncryptDescription": "Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.",
   "admin.service.userAccessTokensDescLabel": "이름:",
-  "admin.service.userAccessTokensDescription": "When true, users can create <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a> for integrations in <strong>Account Settings > Security</strong>. They can be used to authenticate against the API and give full access to the account.<br/><br/>To manage who can create personal access tokens, go to the <strong>System Console > Users</strong> page.",
+  "admin.service.userAccessTokensDescription": "When true, users can create <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a> for integrations in <strong>Account Settings > Security</strong>. They can be used to authenticate against the API and give full access to the account.<br/><br/>To manage who can create personal access tokens or to search users by token ID, go to the <strong>System Console > Users</strong> page.",
   "admin.service.userAccessTokensIdLabel": "Token ID: ",
   "admin.service.userAccessTokensTitle": "Enable Personal Access Tokens: ",
   "admin.service.webSessionDays": "Session length LDAP and email (days):",
@@ -853,6 +871,7 @@
   "admin.sidebar.advanced": "고급",
   "admin.sidebar.audits": "활동",
   "admin.sidebar.authentication": "인증",
+  "admin.sidebar.client_versions": "Client Versions",
   "admin.sidebar.cluster": "High Availability",
   "admin.sidebar.compliance": "감사",
   "admin.sidebar.configuration": "환경설정",
@@ -892,7 +911,7 @@
   "admin.sidebar.push": "모바일 푸시",
   "admin.sidebar.rateLimiting": "Rate Limiting",
   "admin.sidebar.reports": "보고",
-  "admin.sidebar.saml": "SAML",
+  "admin.sidebar.saml": "SAML 2.0",
   "admin.sidebar.security": "보안",
   "admin.sidebar.sessions": "세션",
   "admin.sidebar.settings": "설정",
@@ -1294,15 +1313,14 @@
   "claim.email_to_oauth.switchTo": "Switch account to {uiType}",
   "claim.email_to_oauth.title": "이메일/패스워드 계정을 {uiType} 계정으로 변경",
   "claim.ldap_to_email.confirm": "패스워드 확인",
-  "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.email": "After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "New email login password:",
   "claim.ldap_to_email.ldapPasswordError": "LDAP 패스워드를 입력하세요.",
   "claim.ldap_to_email.ldapPwd": "LDAP 패스워드",
   "claim.ldap_to_email.pwd": "패스워드",
   "claim.ldap_to_email.pwdError": "패스워드를 입력하세요.",
   "claim.ldap_to_email.pwdNotMatch": "패스워드가 일치하지 않습니다.",
-  "claim.ldap_to_email.ssoType": "Upon claiming your account, you will only be able to login with your email and password",
   "claim.ldap_to_email.switchTo": "Switch account to email/password",
   "claim.ldap_to_email.title": "Switch LDAP Account to Email/Password",
   "claim.oauth_to_email.confirm": "패스워드 확인",
@@ -1761,7 +1779,7 @@
   "member_list.noUsersAdd": "추가할 유저가 없습니다.",
   "members_popover.manageMembers": "회원 관리",
   "members_popover.msg": "메시지",
-  "members_popover.title": "회원",
+  "members_popover.title": "채널 회원",
   "members_popover.viewMembers": "회원 보기",
   "mfa.confirm.complete": "<strong>Set up complete!</strong>",
   "mfa.confirm.okay": "확인",
@@ -1829,6 +1847,15 @@
   "mobile.custom_list.no_results": "No Results",
   "mobile.drawer.teamsTitle": "서비스 약관",
   "mobile.edit_post.title": "Editing Message",
+  "mobile.emoji_picker.activity": "ACTIVITY",
+  "mobile.emoji_picker.custom": "CUSTOM",
+  "mobile.emoji_picker.flags": "FLAGS",
+  "mobile.emoji_picker.foods": "FOODS",
+  "mobile.emoji_picker.nature": "NATURE",
+  "mobile.emoji_picker.objects": "OBJECTS",
+  "mobile.emoji_picker.people": "PEOPLE",
+  "mobile.emoji_picker.places": "PLACES",
+  "mobile.emoji_picker.symbols": "SYMBOLS",
   "mobile.error_handler.button": "Relaunch",
   "mobile.error_handler.description": "\nClick relaunch to open the app again. After restart, you can report the problem from the settings menu.\n",
   "mobile.error_handler.title": "Unexpected error occurred",
@@ -1837,6 +1864,7 @@
   "mobile.file_upload.more": "더 보기",
   "mobile.file_upload.video": "Video Library",
   "mobile.help.title": "도움말",
+  "mobile.image_preview.save": "Save Image",
   "mobile.intro_messages.DM": "{teammate}와 개인 메시지의 시작입니다. 개인 메시지나 여기서 공유된 파일들은 외부에서 보여지지 않습니다.",
   "mobile.intro_messages.default_message": "This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.",
   "mobile.intro_messages.default_welcome": "Welcome to {name}!",
@@ -1845,6 +1873,11 @@
   "mobile.loading_members": "Loading Members...",
   "mobile.loading_posts": "메시지 더 보기",
   "mobile.login_options.choose_title": "Choose your login method",
+  "mobile.managed.blocked_by": "Blocked by {vendor}",
+  "mobile.managed.exit": "편집",
+  "mobile.managed.jailbreak": "Jailbroken devices are not trusted by {vendor}, please exit the app.",
+  "mobile.managed.secured_by": "Secured by {vendor}",
+  "mobile.markdown.code.plusMoreLines": "+{count, number} more lines",
   "mobile.more_dms.start": "Start",
   "mobile.more_dms.title": "New Conversation",
   "mobile.notice_mobile_link": "mobile apps",
@@ -1863,6 +1896,7 @@
   "mobile.post.failed_retry": "Try Again",
   "mobile.post.failed_title": "Unable to send your message",
   "mobile.post.retry": "Refresh",
+  "mobile.post_info.add_reaction": "Add Reaction",
   "mobile.request.invalid_response": "Received invalid response from the server.",
   "mobile.routes.channelInfo": "Info",
   "mobile.routes.channelInfo.createdBy": "Created by {creator} on ",
@@ -1872,6 +1906,8 @@
   "mobile.routes.channel_members.action_message": "You must select at least one member to remove from the channel.",
   "mobile.routes.channel_members.action_message_confirm": "Are you sure you want to remove the selected members from the channel?",
   "mobile.routes.channels": "채널",
+  "mobile.routes.code": "{language} Code",
+  "mobile.routes.code.noLanguage": "Code",
   "mobile.routes.enterServerUrl": "Enter Server URL",
   "mobile.routes.login": "로그인",
   "mobile.routes.loginOptions": "Login Chooser",
@@ -1924,6 +1960,7 @@
   "msg_typing.someone": "Someone",
   "multiselect.add": "추가",
   "multiselect.go": "Go",
+  "multiselect.list.notFound": "사용자를 찾을 수 없습니다 :(",
   "multiselect.numPeopleRemaining": "Use ↑↓ to browse, ↵ to select. You can add {num, number} more {num, plural, one {person} other {people}}. ",
   "multiselect.numRemaining": "You can add {num, number} more",
   "multiselect.placeholder": "Search and add members",
@@ -2044,6 +2081,7 @@
   "rename_channel.handleHolder": "Must be lowercase alphanumeric characters",
   "rename_channel.lowercase": "Must be lowercase alphanumeric characters",
   "rename_channel.maxLength": "This field must be less than {maxLength, number} characters",
+  "rename_channel.minLength": "Channel name must be {minLength, number} or more characters",
   "rename_channel.required": "필수 항목입니다.",
   "rename_channel.save": "저장",
   "rename_channel.title": "채널 이름 변경",
@@ -2102,11 +2140,61 @@
   "setting_upload.import": "가져오기",
   "setting_upload.noFile": "파일이 선택되지 않았습니다.",
   "setting_upload.select": "파일 선택",
+  "shortcuts.browser.channel_next": "Forward in history:\tAlt|Right",
+  "shortcuts.browser.channel_next.mac": "Forward in history:\t⌘|]",
+  "shortcuts.browser.channel_prev": "Back in history:\tAlt|Left",
+  "shortcuts.browser.channel_prev.mac": "Back in history:\t⌘|[",
+  "shortcuts.browser.font_decrease": "Zoom out:\tCtrl|-",
+  "shortcuts.browser.font_decrease.mac": "Zoom out:\t⌘|-",
+  "shortcuts.browser.font_increase": "Zoom in:\tCtrl|+",
+  "shortcuts.browser.font_increase.mac": "Zoom in:\t⌘|+",
+  "shortcuts.browser.header": "Built-in Browser Commands",
+  "shortcuts.browser.highlight_next": "Highlight text to the next line:\tShift|Down",
+  "shortcuts.browser.highlight_prev": "Highlight text to the previous line:\tShift|Up",
+  "shortcuts.browser.input.header": "Works inside an input field",
+  "shortcuts.browser.newline": "Create a new line:\tShift|Enter",
+  "shortcuts.files.header": "파일",
+  "shortcuts.files.upload": "Upload files:\tCtrl|U",
+  "shortcuts.files.upload.mac": "Upload files:\t⌘|U",
+  "shortcuts.header": "키보드 단축키",
+  "shortcuts.info": "Begin a message with / for a list of all the commands at your disposal.",
+  "shortcuts.msgs.comp.channel": "Channel:\t~|[a-z]|Tab",
+  "shortcuts.msgs.comp.emoji": "Emoji:\t:|[a-z]|Tab",
+  "shortcuts.msgs.comp.header": "자동완성",
+  "shortcuts.msgs.comp.username": "Username:\t@|[a-z]|Tab",
+  "shortcuts.msgs.edit": "Edit last message in channel:\tUp",
+  "shortcuts.msgs.header": "메시지",
+  "shortcuts.msgs.input.header": "Works inside an empty input field",
+  "shortcuts.msgs.mark_as_read": "Mark current channel as read:\tEsc",
+  "shortcuts.msgs.reply": "Reply to last message in channel:\tShift|Up",
+  "shortcuts.msgs.reprint_next": "Reprint next message:\tCtrl|Down",
+  "shortcuts.msgs.reprint_next.mac": "Reprint next message:\t⌘|Down",
+  "shortcuts.msgs.reprint_prev": "Reprint previous message:\tCtrl|Up",
+  "shortcuts.msgs.reprint_prev.mac": "Reprint previous message:\t⌘|Up",
+  "shortcuts.nav.direct_messages_menu": "Direct messages menu:\tCtrl|Shift|K",
+  "shortcuts.nav.direct_messages_menu.mac": "Direct messages menu:\t⌘|Shift|K",
+  "shortcuts.nav.header": "Navigation",
+  "shortcuts.nav.next": "Next channel:\tAlt|Down",
+  "shortcuts.nav.next.mac": "Next channel:\t⌥|Down",
+  "shortcuts.nav.prev": "Previous channel:\tAlt|Up",
+  "shortcuts.nav.prev.mac": "Previous channel:\t⌥|Up",
+  "shortcuts.nav.recent_mentions": "Recent mentions:\tCtrl|Shift|M",
+  "shortcuts.nav.recent_mentions.mac": "Recent mentions:\t⌘|Shift|M",
+  "shortcuts.nav.settings": "Account settings:\tCtrl|Shift|A",
+  "shortcuts.nav.settings.mac": "Account settings:\t⌘|Shift|A",
+  "shortcuts.nav.switcher": "Quick channel switcher:\tCtrl|K",
+  "shortcuts.nav.switcher.mac": "Quick channel switcher:\t⌘|K",
+  "shortcuts.nav.unread_next": "Next unread channel:\tAlt|Shift|Down",
+  "shortcuts.nav.unread_next.mac": "Next unread channel:\t⌥|Shift|Down",
+  "shortcuts.nav.unread_prev": "Previous unread channel:\tAlt|Shift|Up",
+  "shortcuts.nav.unread_prev.mac": "Previous unread channel:\t⌥|Shift|Up",
   "sidebar.channels": "PUBLIC CHANNELS",
   "sidebar.createChannel": "공개 채널 만들기",
   "sidebar.createGroup": "공개 채널 만들기",
   "sidebar.direct": "DIRECT MESSAGES",
   "sidebar.favorite": "FAVORITE CHANNELS",
+  "sidebar.leave": "채널 떠나기",
+  "sidebar.mainMenu": "Main Menu",
   "sidebar.more": "더 보기",
   "sidebar.moreElips": "더 보기...",
   "sidebar.otherMembers": "팀 외부",
diff --git a/webapp/i18n/nl.json b/webapp/i18n/nl.json
index ce373eddf..f6beaf779 100644
--- a/webapp/i18n/nl.json
+++ b/webapp/i18n/nl.json
@@ -9,6 +9,7 @@
   "about.hash": "Compilatiehash:",
   "about.hashee": "EE Compilatiehash:",
   "about.licensed": "Licentie verleend aan:",
+  "about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
   "about.number": "Compilatienummer:",
   "about.teamEditionLearn": "Kom bij de Mattermost-gemeenschap op ",
   "about.teamEditionSt": "Alle team-communicatie op één plaats, doorzoekbaar en van overal bereikbaar.",
@@ -28,8 +29,10 @@
   "activity_log.sessionsDescription": "Sessies worden gemaakt wanneer je inlogt met een nieuwe webbrowser. Met een sessie kan Mattermost je gebruiken zonder dat je opnieuw hoeft in te loggen tijdens de ingestelde periode. Om eerder uit te loggen, gebruik je de 'Afmelden'-knop hieronder.",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "Android-applicatie",
+  "activity_log_modal.androidNativeClassicApp": "Android Native Classic App",
   "activity_log_modal.desktop": "Native Desktop App",
   "activity_log_modal.iphoneNativeApp": "iPhone-app",
+  "activity_log_modal.iphoneNativeClassicApp": "iPhone Native Classic App",
   "add_command.autocomplete": "Automatisch aanvullen",
   "add_command.autocomplete.help": "(Optioneel) Toon slash-commando's bij het automatisch aanvullen.",
   "add_command.autocompleteDescription": "Automatisch aanvullen omgeschrijving",
@@ -146,8 +149,20 @@
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
-  "admin.authentication.saml": "SAML",
+  "admin.authentication.saml": "SAML 2.0",
   "admin.banner.heading": "Opmerking:",
+  "admin.client_versions.androidLatestVersion": "Latest Android Version",
+  "admin.client_versions.androidLatestVersionHelp": "The latest released Android version",
+  "admin.client_versions.androidMinVersion": "Minimum Android Version",
+  "admin.client_versions.androidMinVersionHelp": "The minimum compliant Android version",
+  "admin.client_versions.desktopLatestVersion": "Latest Desktop Version",
+  "admin.client_versions.desktopLatestVersionHelp": "The latest released Desktop version",
+  "admin.client_versions.desktopMinVersion": "Minimum Destop Version",
+  "admin.client_versions.desktopMinVersionHelp": "The minimum compliant Desktop version",
+  "admin.client_versions.iosLatestVersion": "Latest IOS Version",
+  "admin.client_versions.iosLatestVersionHelp": "The latest released IOS version",
+  "admin.client_versions.iosMinVersion": "Minimum IOS Version",
+  "admin.client_versions.iosMinVersionHelp": "The minimum compliant IOS version",
   "admin.cluster.enableDescription": "Mattermost SAML logins toestaan. Lees hier de <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentatie</a> over het configureren van SAML voor Mattermost.",
   "admin.cluster.enableTitle": "High Availability modus aanzetten:",
   "admin.cluster.interNodeListenAddressDesc": "Het adres waarop de server zal luisteren voor communicatie met andere servers.",
@@ -587,7 +602,7 @@
   "admin.log.locationPlaceholder": "Voer uw bestand locatie in",
   "admin.log.locationTitle": "Map voor logs:",
   "admin.log.logSettings": "Log instellingen",
-  "admin.logs.bannerDesc": "To look up users by User ID, go to Reporting > Users and paste the ID into the search filter.",
+  "admin.logs.bannerDesc": "To look up users by User ID or Token ID, go to Reporting > Users and paste the ID into the search filter.",
   "admin.logs.reload": "Herladen",
   "admin.logs.title": "Server Logs",
   "admin.manage_roles.additionalRoles": "Select additional permissions for the account. <a href=\"https://about.mattermost.com/default-permissions\" target=\"_blank\">Read more about roles and permissions</a>.",
@@ -651,15 +666,15 @@
   "admin.password.symbol": "Ten minstens een van de volgende symbolen:  \"~!@#$%^&*()\"",
   "admin.password.uppercase": "Minimaal 1 hoofdletter",
   "admin.plugins.jira": "JIRA (Beta)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "channelname",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelurl",
   "admin.plugins.jira.enabledDescription": "When true, you can configure JIRA webhooks to post message in Mattermost. To help combat phishing attacks, all posts are labelled by a BOT tag.",
-  "admin.plugins.jira.enabledLabel": "ingeschakeld",
+  "admin.plugins.jira.enabledLabel": "Enable JIRA:",
   "admin.plugins.jira.secretDescription": "This secret is used to authenticate to Mattermost.",
   "admin.plugins.jira.secretLabel": "Geheim:",
   "admin.plugins.jira.secretParamPlaceholder": "Geheim:",
   "admin.plugins.jira.secretRegenerateDescription": "Regenerates the secret for the webhook URL endpoint. Regenerating the secret invalidates your existing JIRA integrations.",
   "admin.plugins.jira.setupDescription": "Use this webhook URL to set up the JIRA integration. See {webhookDocsLink} to learn more.",
-  "admin.plugins.jira.teamParamPlaceholder": "teamname",
+  "admin.plugins.jira.teamParamPlaceholder": "teamurl",
   "admin.plugins.jira.userDescription": "Select the username that this integration is attached to.",
   "admin.plugins.jira.userLabel": "Gebruikers",
   "admin.plugins.jira.webhookDocsLink": "documentatie",
@@ -807,6 +822,9 @@
   "admin.service.insecureTlsTitle": "Schakel onbeveiligde uitgaande verbindingen in: ",
   "admin.service.integrationAdmin": "Beperk beheer van integraties alleen voor Admins:",
   "admin.service.integrationAdminDesc": "Wanneer aangezet, webhooks en slash commando's kunnen alleen gemaakt, bewerkt en bekeken worden door Team en Systeem Beheerders, en OAuth 2.0 applicaties door Systeem Beheerders. Integraties zijn beschikbaar voor alle gebruikers als ze zijn gemaakt door de Beheerder.",
+  "admin.service.internalConnectionsDesc": "In testing environments, such as when developing integrations locally on a development machine, use this setting to specify domains, IP addresses, or CIDR notations to allow internal connections. <b>Not recommended for use in production</b>, since this can allow a user to extract confidential data from your server or internal network.<br /><br />By default, user-supplied URLs such as those used for Open Graph metadata, webhooks, or slash commands will not be allowed to connect to reserved IP addresses including loopback or link-local addresses used for internal networks. Push notification, OAuth 2.0 and WebRTC server URLs are trusted and not affected by this setting.",
+  "admin.service.internalConnectionsEx": "webhooks.internal.example.com 127.0.0.1 10.0.16.0/28",
+  "admin.service.internalConnectionsTitle": "Allow untrusted internal connections to: ",
   "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:",
   "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
   "admin.service.listenAddress": "Luister Adres:",
@@ -841,7 +859,7 @@
   "admin.service.useLetsEncrypt": "Use Let's Encrypt:",
   "admin.service.useLetsEncryptDescription": "Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.",
   "admin.service.userAccessTokensDescLabel": "Naam:",
-  "admin.service.userAccessTokensDescription": "When true, users can create <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a> for integrations in <strong>Account Settings > Security</strong>. They can be used to authenticate against the API and give full access to the account.<br/><br/>To manage who can create personal access tokens, go to the <strong>System Console > Users</strong> page.",
+  "admin.service.userAccessTokensDescription": "When true, users can create <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a> for integrations in <strong>Account Settings > Security</strong>. They can be used to authenticate against the API and give full access to the account.<br/><br/>To manage who can create personal access tokens or to search users by token ID, go to the <strong>System Console > Users</strong> page.",
   "admin.service.userAccessTokensIdLabel": "Token ID: ",
   "admin.service.userAccessTokensTitle": "Enable Personal Access Tokens: ",
   "admin.service.webSessionDays": "Sessie duur voor AD/LDAP en email (dagen):",
@@ -853,6 +871,7 @@
   "admin.sidebar.advanced": "Geavanceerd",
   "admin.sidebar.audits": "Compliance en Auditing",
   "admin.sidebar.authentication": "Authenticatie",
+  "admin.sidebar.client_versions": "Client Versions",
   "admin.sidebar.cluster": "High Availability",
   "admin.sidebar.compliance": "Voldoet aan",
   "admin.sidebar.configuration": "Configuratie",
@@ -892,7 +911,7 @@
   "admin.sidebar.push": "Mobiele meldingen",
   "admin.sidebar.rateLimiting": "Snelheidsbeperking",
   "admin.sidebar.reports": "RAPPORTEREN",
-  "admin.sidebar.saml": "SAML",
+  "admin.sidebar.saml": "SAML 2.0",
   "admin.sidebar.security": "Beveiliging",
   "admin.sidebar.sessions": "Sessies",
   "admin.sidebar.settings": "INSTELLINGEN",
@@ -1294,15 +1313,14 @@
   "claim.email_to_oauth.switchTo": "Wissel account naar {uiType}",
   "claim.email_to_oauth.title": "Wissel e-mail/wachtwoord account naar {uiType}",
   "claim.ldap_to_email.confirm": "Bevestig het wachtwoord",
-  "claim.ldap_to_email.email": "Je zult het e-mail adres {email} gebruik om in te loggen",
-  "claim.ldap_to_email.enterLdapPwd": "Voer uw {ldapPassword} in voor uw {site} e-mail account",
-  "claim.ldap_to_email.enterPwd": "Voer een nieuw wachtwoord in voor uw e-mail account",
+  "claim.ldap_to_email.email": "After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "New email login password:",
   "claim.ldap_to_email.ldapPasswordError": "Voer uw AD/LDAP wachtwoord in.",
   "claim.ldap_to_email.ldapPwd": "AD/LDAP wachtwoord",
   "claim.ldap_to_email.pwd": "Wachtwoord",
   "claim.ldap_to_email.pwdError": "Voer uw wachtwoord in.",
   "claim.ldap_to_email.pwdNotMatch": "De wachtwoorden zijn niet gelijk.",
-  "claim.ldap_to_email.ssoType": "Wanneer je je account claimt, kan je alleen inloggen met je emailadres en wachtwoord.",
   "claim.ldap_to_email.switchTo": "Schakel account naar e-mail/wachtwoord",
   "claim.ldap_to_email.title": "Schakel AD/LDAP account naar e-mail/wachtwoord",
   "claim.oauth_to_email.confirm": "Bevestig uw wachtwoord",
@@ -1761,7 +1779,7 @@
   "member_list.noUsersAdd": "Geen gebruikers om toe te voegen.",
   "members_popover.manageMembers": "Leden beheren",
   "members_popover.msg": "Bericht",
-  "members_popover.title": " Leden",
+  "members_popover.title": "Kanaal Leden",
   "members_popover.viewMembers": "Bekijk Leden",
   "mfa.confirm.complete": "<strong>Set up complete!</strong>",
   "mfa.confirm.okay": "OK",
@@ -1829,6 +1847,15 @@
   "mobile.custom_list.no_results": "No Results",
   "mobile.drawer.teamsTitle": "Termen",
   "mobile.edit_post.title": "Editing Message",
+  "mobile.emoji_picker.activity": "ACTIVITY",
+  "mobile.emoji_picker.custom": "CUSTOM",
+  "mobile.emoji_picker.flags": "FLAGS",
+  "mobile.emoji_picker.foods": "FOODS",
+  "mobile.emoji_picker.nature": "NATURE",
+  "mobile.emoji_picker.objects": "OBJECTS",
+  "mobile.emoji_picker.people": "PEOPLE",
+  "mobile.emoji_picker.places": "PLACES",
+  "mobile.emoji_picker.symbols": "SYMBOLS",
   "mobile.error_handler.button": "Relaunch",
   "mobile.error_handler.description": "\nClick relaunch to open the app again. After restart, you can report the problem from the settings menu.\n",
   "mobile.error_handler.title": "Unexpected error occurred",
@@ -1837,6 +1864,7 @@
   "mobile.file_upload.more": "Meer",
   "mobile.file_upload.video": "Video Library",
   "mobile.help.title": "Help",
+  "mobile.image_preview.save": "Save Image",
   "mobile.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.",
   "mobile.intro_messages.default_message": "This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.",
   "mobile.intro_messages.default_welcome": "Welcome to {name}!",
@@ -1845,6 +1873,11 @@
   "mobile.loading_members": "Loading Members...",
   "mobile.loading_posts": "Laad meer berichten",
   "mobile.login_options.choose_title": "Choose your login method",
+  "mobile.managed.blocked_by": "Blocked by {vendor}",
+  "mobile.managed.exit": "Bewerken",
+  "mobile.managed.jailbreak": "Jailbroken devices are not trusted by {vendor}, please exit the app.",
+  "mobile.managed.secured_by": "Secured by {vendor}",
+  "mobile.markdown.code.plusMoreLines": "+{count, number} more lines",
   "mobile.more_dms.start": "Start",
   "mobile.more_dms.title": "New Conversation",
   "mobile.notice_mobile_link": "mobile apps",
@@ -1863,6 +1896,7 @@
   "mobile.post.failed_retry": "Try Again",
   "mobile.post.failed_title": "Unable to send your message",
   "mobile.post.retry": "Refresh",
+  "mobile.post_info.add_reaction": "Add Reaction",
   "mobile.request.invalid_response": "Received invalid response from the server.",
   "mobile.routes.channelInfo": "Info",
   "mobile.routes.channelInfo.createdBy": "Created by {creator} on ",
@@ -1872,6 +1906,8 @@
   "mobile.routes.channel_members.action_message": "You must select at least one member to remove from the channel.",
   "mobile.routes.channel_members.action_message_confirm": "Are you sure you want to remove the selected members from the channel?",
   "mobile.routes.channels": "Kanalen",
+  "mobile.routes.code": "{language} Code",
+  "mobile.routes.code.noLanguage": "Code",
   "mobile.routes.enterServerUrl": "Enter Server URL",
   "mobile.routes.login": "Inloggen",
   "mobile.routes.loginOptions": "Login Chooser",
@@ -1924,6 +1960,7 @@
   "msg_typing.someone": "Iemand",
   "multiselect.add": "Toevoegen",
   "multiselect.go": "Go",
+  "multiselect.list.notFound": "Geen gebruikers gevonden",
   "multiselect.numPeopleRemaining": "Use ↑↓ to browse, ↵ to select. You can add {num, number} more {num, plural, one {person} other {people}}. ",
   "multiselect.numRemaining": "You can add {num, number} more",
   "multiselect.placeholder": "Search and add members",
@@ -2044,6 +2081,7 @@
   "rename_channel.handleHolder": "Kan enkel kleine letters en nummers zijn",
   "rename_channel.lowercase": "Kan enkel kleine letters en nummers zijn",
   "rename_channel.maxLength": "This field must be less than {maxLength, number} characters",
+  "rename_channel.minLength": "Channel name must be {minLength, number} or more characters",
   "rename_channel.required": "Dit veld is verplicht",
   "rename_channel.save": "Opslaan",
   "rename_channel.title": "Hernoem kanaal...",
@@ -2102,11 +2140,61 @@
   "setting_upload.import": "Importeer",
   "setting_upload.noFile": "Geen bestand geselecteerd.",
   "setting_upload.select": "Selecteer een bestand",
+  "shortcuts.browser.channel_next": "Forward in history:\tAlt|Right",
+  "shortcuts.browser.channel_next.mac": "Forward in history:\t⌘|]",
+  "shortcuts.browser.channel_prev": "Back in history:\tAlt|Left",
+  "shortcuts.browser.channel_prev.mac": "Back in history:\t⌘|[",
+  "shortcuts.browser.font_decrease": "Zoom out:\tCtrl|-",
+  "shortcuts.browser.font_decrease.mac": "Zoom out:\t⌘|-",
+  "shortcuts.browser.font_increase": "Zoom in:\tCtrl|+",
+  "shortcuts.browser.font_increase.mac": "Zoom in:\t⌘|+",
+  "shortcuts.browser.header": "Built-in Browser Commands",
+  "shortcuts.browser.highlight_next": "Highlight text to the next line:\tShift|Down",
+  "shortcuts.browser.highlight_prev": "Highlight text to the previous line:\tShift|Up",
+  "shortcuts.browser.input.header": "Works inside an input field",
+  "shortcuts.browser.newline": "Create a new line:\tShift|Enter",
+  "shortcuts.files.header": "Bestanden",
+  "shortcuts.files.upload": "Upload files:\tCtrl|U",
+  "shortcuts.files.upload.mac": "Upload files:\t⌘|U",
+  "shortcuts.header": "Keyboard Shortcuts",
+  "shortcuts.info": "Begin a message with / for a list of all the commands at your disposal.",
+  "shortcuts.msgs.comp.channel": "Channel:\t~|[a-z]|Tab",
+  "shortcuts.msgs.comp.emoji": "Emoji:\t:|[a-z]|Tab",
+  "shortcuts.msgs.comp.header": "Automatisch aanvullen",
+  "shortcuts.msgs.comp.username": "Username:\t@|[a-z]|Tab",
+  "shortcuts.msgs.edit": "Edit last message in channel:\tUp",
+  "shortcuts.msgs.header": "Bericht",
+  "shortcuts.msgs.input.header": "Works inside an empty input field",
+  "shortcuts.msgs.mark_as_read": "Mark current channel as read:\tEsc",
+  "shortcuts.msgs.reply": "Reply to last message in channel:\tShift|Up",
+  "shortcuts.msgs.reprint_next": "Reprint next message:\tCtrl|Down",
+  "shortcuts.msgs.reprint_next.mac": "Reprint next message:\t⌘|Down",
+  "shortcuts.msgs.reprint_prev": "Reprint previous message:\tCtrl|Up",
+  "shortcuts.msgs.reprint_prev.mac": "Reprint previous message:\t⌘|Up",
+  "shortcuts.nav.direct_messages_menu": "Direct messages menu:\tCtrl|Shift|K",
+  "shortcuts.nav.direct_messages_menu.mac": "Direct messages menu:\t⌘|Shift|K",
+  "shortcuts.nav.header": "Navigation",
+  "shortcuts.nav.next": "Next channel:\tAlt|Down",
+  "shortcuts.nav.next.mac": "Next channel:\t⌥|Down",
+  "shortcuts.nav.prev": "Previous channel:\tAlt|Up",
+  "shortcuts.nav.prev.mac": "Previous channel:\t⌥|Up",
+  "shortcuts.nav.recent_mentions": "Recent mentions:\tCtrl|Shift|M",
+  "shortcuts.nav.recent_mentions.mac": "Recent mentions:\t⌘|Shift|M",
+  "shortcuts.nav.settings": "Account settings:\tCtrl|Shift|A",
+  "shortcuts.nav.settings.mac": "Account settings:\t⌘|Shift|A",
+  "shortcuts.nav.switcher": "Quick channel switcher:\tCtrl|K",
+  "shortcuts.nav.switcher.mac": "Quick channel switcher:\t⌘|K",
+  "shortcuts.nav.unread_next": "Next unread channel:\tAlt|Shift|Down",
+  "shortcuts.nav.unread_next.mac": "Next unread channel:\t⌥|Shift|Down",
+  "shortcuts.nav.unread_prev": "Previous unread channel:\tAlt|Shift|Up",
+  "shortcuts.nav.unread_prev.mac": "Previous unread channel:\t⌥|Shift|Up",
   "sidebar.channels": "PUBLIC CHANNELS",
   "sidebar.createChannel": "Maak een publiek kanaal",
   "sidebar.createGroup": "Maak een publiek kanaal",
   "sidebar.direct": "DIRECT MESSAGES",
   "sidebar.favorite": "FAVORITE CHANNELS",
+  "sidebar.leave": "Verlaat kanaal",
+  "sidebar.mainMenu": "Main Menu",
   "sidebar.more": "Meer",
   "sidebar.moreElips": "Meer...",
   "sidebar.otherMembers": "Buiten dit team",
diff --git a/webapp/i18n/pl.json b/webapp/i18n/pl.json
index b32900d7f..e66c8869a 100644
--- a/webapp/i18n/pl.json
+++ b/webapp/i18n/pl.json
@@ -9,6 +9,7 @@
   "about.hash": "Wartość skrótu kompilacji",
   "about.hashee": "Build Hash wersji enterprise:",
   "about.licensed": "Licencjonowany dla:",
+  "about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
   "about.number": "Numer kompilacji:",
   "about.teamEditionLearn": "Dołącz do społeczności Mattermost na stronie ",
   "about.teamEditionSt": "Cała komunikacja Twojego zespołu w jednym miejscu, z natychmiastowym przeszukiwaniem i dostępna z każdego miejsca.",
@@ -28,8 +29,10 @@
   "activity_log.sessionsDescription": "Sesje tworzone są w momencie logowania w nowej przeglądarce na danym urządzeniu. Sesje pozwalają korzystać z Mattermost bez potrzeby ponownego logowania się przez czas określony przez Administratora systemu. Jeśli chcesz wylogować się wcześniej, użyj przycisku \"Wyloguj\" poniżej, co zakończy sesję.",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "Natywna aplikacja dla Android",
+  "activity_log_modal.androidNativeClassicApp": "Android Native Classic App",
   "activity_log_modal.desktop": "Natywna aplikacja desktopowa",
   "activity_log_modal.iphoneNativeApp": "Natywna aplikacja dla iPhone",
+  "activity_log_modal.iphoneNativeClassicApp": "iPhone Native Classic App",
   "add_command.autocomplete": "Automatyczne uzupełnianie",
   "add_command.autocomplete.help": "(Opcjonalnie) Pokaż polecenia w liście autouzupełniania.",
   "add_command.autocompleteDescription": "Opis do listy autouzupełniania",
@@ -146,8 +149,20 @@
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
-  "admin.authentication.saml": "SAML",
+  "admin.authentication.saml": "SAML 2.0",
   "admin.banner.heading": "Uwaga:",
+  "admin.client_versions.androidLatestVersion": "Latest Android Version",
+  "admin.client_versions.androidLatestVersionHelp": "The latest released Android version",
+  "admin.client_versions.androidMinVersion": "Minimum Android Version",
+  "admin.client_versions.androidMinVersionHelp": "The minimum compliant Android version",
+  "admin.client_versions.desktopLatestVersion": "Latest Desktop Version",
+  "admin.client_versions.desktopLatestVersionHelp": "The latest released Desktop version",
+  "admin.client_versions.desktopMinVersion": "Minimum Destop Version",
+  "admin.client_versions.desktopMinVersionHelp": "The minimum compliant Desktop version",
+  "admin.client_versions.iosLatestVersion": "Latest IOS Version",
+  "admin.client_versions.iosLatestVersionHelp": "The latest released IOS version",
+  "admin.client_versions.iosMinVersion": "Minimum IOS Version",
+  "admin.client_versions.iosMinVersionHelp": "The minimum compliant IOS version",
   "admin.cluster.enableDescription": "Gdy włączone, Mattermost będzie działał w trybie Wysokiej Dostępności (HA). Proszę przeczytać  <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">dokumentację (język angielski)</a> żeby dowiedzieć się więcej o konfiguracji trybu Wysokiej Dostępności w Mattermost.",
   "admin.cluster.enableTitle": "Włącz tryb Wysokiej Dostępności:",
   "admin.cluster.interNodeListenAddressDesc": "Adres, którego ten serwer będzie używał do komunikacji z innymi serwerami.",
@@ -651,15 +666,15 @@
   "admin.password.symbol": "Co najmniej jeden symbol (np. \"~!@#$%^&*()\")",
   "admin.password.uppercase": "Przynajmniej jedna wielka litera",
   "admin.plugins.jira": "JIRA (Beta)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "channelname",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelurl",
   "admin.plugins.jira.enabledDescription": "When true, you can configure JIRA webhooks to post message in Mattermost. To help combat phishing attacks, all posts are labelled by a BOT tag.",
-  "admin.plugins.jira.enabledLabel": "Enabled:",
+  "admin.plugins.jira.enabledLabel": "Enable JIRA:",
   "admin.plugins.jira.secretDescription": "This secret is used to authenticate to Mattermost.",
   "admin.plugins.jira.secretLabel": "Hasło",
   "admin.plugins.jira.secretParamPlaceholder": "Hasło",
   "admin.plugins.jira.secretRegenerateDescription": "Regenerates the secret for the webhook URL endpoint. Regenerating the secret invalidates your existing JIRA integrations.",
   "admin.plugins.jira.setupDescription": "Use this webhook URL to set up the JIRA integration. See {webhookDocsLink} to learn more.",
-  "admin.plugins.jira.teamParamPlaceholder": "teamname",
+  "admin.plugins.jira.teamParamPlaceholder": "teamurl",
   "admin.plugins.jira.userDescription": "Select the username that this integration is attached to.",
   "admin.plugins.jira.userLabel": "Użytkownicy",
   "admin.plugins.jira.webhookDocsLink": "dokumentacja",
@@ -719,7 +734,7 @@
   "admin.saml.emailAttrDesc": "Atrybut SAML który będzie używany do wypełnienia adresu email użytkowników w Mattermost.",
   "admin.saml.emailAttrEx": "Np.: \"Email\" lub \"PrimaryEmail\"",
   "admin.saml.emailAttrTitle": "Atrybut Email:",
-  "admin.saml.enableDescription": "Gdy włączone, Mattermost będzie działał w trybie Wysokiej Dostępności (HA). Proszę przeczytać <a href='http://docs.mattermost.com/deployment/cluster.html' target='_blank'>dokumentację (język angielski)</a> żeby dowiedzieć się więcej o konfiguracji trybu Wysokiej Dostępności w Mattermost.",
+  "admin.saml.enableDescription": "Gdy włączone, Mattermost pozwoli na logowanie przy użyciu SAML 2.0. Proszę przeczytać <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>dokumentację</a> (j. angielski), aby dowiedzieć się więcej o konfiguracji SAML w Mattermost.",
   "admin.saml.enableTitle": "Pozwól zalogować się z SAML:",
   "admin.saml.encryptDescription": "When false, Mattermost will not decrypt SAML Assertions encrypted with your Service Provider Public Certificate. Not recommended for production environments. For testing only.",
   "admin.saml.encryptTitle": "Włącz Szyfrowanie:",
@@ -807,6 +822,9 @@
   "admin.service.insecureTlsTitle": "Włącz Niezabezpieczone Wychodzące Połączenia:",
   "admin.service.integrationAdmin": "Ogranicz zarządzanie integracjami tylko do Adminów:",
   "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.internalConnectionsDesc": "In testing environments, such as when developing integrations locally on a development machine, use this setting to specify domains, IP addresses, or CIDR notations to allow internal connections. <b>Not recommended for use in production</b>, since this can allow a user to extract confidential data from your server or internal network.<br /><br />By default, user-supplied URLs such as those used for Open Graph metadata, webhooks, or slash commands will not be allowed to connect to reserved IP addresses including loopback or link-local addresses used for internal networks. Push notification, OAuth 2.0 and WebRTC server URLs are trusted and not affected by this setting.",
+  "admin.service.internalConnectionsEx": "webhooks.internal.example.com 127.0.0.1 10.0.16.0/28",
+  "admin.service.internalConnectionsTitle": "Allow untrusted internal connections to: ",
   "admin.service.letsEncryptCertificateCacheFile": "Plik Pamięci Podręcznej Certyfikatu Let's Encrypt:",
   "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
   "admin.service.listenAddress": "Adres nasłuchiwania:",
@@ -841,7 +859,7 @@
   "admin.service.useLetsEncrypt": "Użyj Let's Encrypt:",
   "admin.service.useLetsEncryptDescription": "Włącz automatyczne pobieranie certyfikatów z Let's Encrypt. Certyfikaty będą pobrane gdy klient spróbuje się połączyć z nowej domeny. Będzie to działało z wieloma domenami.",
   "admin.service.userAccessTokensDescLabel": "Nazwa:",
-  "admin.service.userAccessTokensDescription": "When true, users can create <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a> for integrations in <strong>Account Settings > Security</strong>. They can be used to authenticate against the API and give full access to the account.<br/><br/>To manage who can create personal access tokens, go to the <strong>System Console > Users</strong> page.",
+  "admin.service.userAccessTokensDescription": "When true, users can create <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a> for integrations in <strong>Account Settings > Security</strong>. They can be used to authenticate against the API and give full access to the account.<br/><br/>To manage who can create personal access tokens or to search users by token ID, go to the <strong>System Console > Users</strong> page.",
   "admin.service.userAccessTokensIdLabel": "Token ID: ",
   "admin.service.userAccessTokensTitle": "Enable Personal Access Tokens: ",
   "admin.service.webSessionDays": "Długość sesji AD/LDAP i email (dni):",
@@ -853,6 +871,7 @@
   "admin.sidebar.advanced": "Zaawansowane",
   "admin.sidebar.audits": "Zgodność i Audyt",
   "admin.sidebar.authentication": "Uwierzytelnianie",
+  "admin.sidebar.client_versions": "Client Versions",
   "admin.sidebar.cluster": "Wysoka dostępność",
   "admin.sidebar.compliance": "Zgodność",
   "admin.sidebar.configuration": "Konfiguracja",
@@ -892,7 +911,7 @@
   "admin.sidebar.push": "Powiadomienia Push",
   "admin.sidebar.rateLimiting": "Ograniczenia Prędkości",
   "admin.sidebar.reports": "RAPORTOWANIE",
-  "admin.sidebar.saml": "SAML",
+  "admin.sidebar.saml": "SAML 2.0",
   "admin.sidebar.security": "Bezpieczeństwo",
   "admin.sidebar.sessions": "Sesje",
   "admin.sidebar.settings": "USTAWIENIA",
@@ -1294,15 +1313,14 @@
   "claim.email_to_oauth.switchTo": "Przełącz konto na {uiType}",
   "claim.email_to_oauth.title": "Przełącz konto Email/hasło na {uiType}",
   "claim.ldap_to_email.confirm": "Potwierdź hasło",
-  "claim.ldap_to_email.email": "Będziesz używał emaila {email} do logowania",
-  "claim.ldap_to_email.enterLdapPwd": "Podaj hasło do {ldapPassword} dla {site}",
-  "claim.ldap_to_email.enterPwd": "Wprowadź nowe hasło dla Twojego konta e-mail",
+  "claim.ldap_to_email.email": "After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "New email login password:",
   "claim.ldap_to_email.ldapPasswordError": "Proszę wprowadzić hasło AD/LDAP.",
   "claim.ldap_to_email.ldapPwd": "Hasło AD/LDAP",
   "claim.ldap_to_email.pwd": "Hasło",
   "claim.ldap_to_email.pwdError": "Proszę wprowadzić hasło.",
   "claim.ldap_to_email.pwdNotMatch": "Hasła nie zgadzają się.",
-  "claim.ldap_to_email.ssoType": "Po założeniu konta, będziesz mógł się zalogować tylko za pomocą twojego emaila i hasła",
   "claim.ldap_to_email.switchTo": "Przełącz na adres e-mail/hasło",
   "claim.ldap_to_email.title": "Przełącz konto AD/LDAP na adres e-mail/hasło",
   "claim.oauth_to_email.confirm": "Potwierdź hasło",
@@ -1761,7 +1779,7 @@
   "member_list.noUsersAdd": "Brak użytkowników do dodania.",
   "members_popover.manageMembers": "Zarządzaj użytkownikami",
   "members_popover.msg": "Wiadomość",
-  "members_popover.title": "Członkowie",
+  "members_popover.title": "Członkowie kanału",
   "members_popover.viewMembers": "Wyświetl użytkowników",
   "mfa.confirm.complete": "<strong>Konfiguracja ukończona!</strong>",
   "mfa.confirm.okay": "OK",
@@ -1829,6 +1847,15 @@
   "mobile.custom_list.no_results": "Brak wyników",
   "mobile.drawer.teamsTitle": "Zespoły",
   "mobile.edit_post.title": "Edycja Wiadomości",
+  "mobile.emoji_picker.activity": "ACTIVITY",
+  "mobile.emoji_picker.custom": "CUSTOM",
+  "mobile.emoji_picker.flags": "FLAGS",
+  "mobile.emoji_picker.foods": "FOODS",
+  "mobile.emoji_picker.nature": "NATURE",
+  "mobile.emoji_picker.objects": "OBJECTS",
+  "mobile.emoji_picker.people": "PEOPLE",
+  "mobile.emoji_picker.places": "PLACES",
+  "mobile.emoji_picker.symbols": "SYMBOLS",
   "mobile.error_handler.button": "Relaunch",
   "mobile.error_handler.description": "\nClick relaunch to open the app again. After restart, you can report the problem from the settings menu.\n",
   "mobile.error_handler.title": "Unexpected error occurred",
@@ -1837,6 +1864,7 @@
   "mobile.file_upload.more": "Więcej",
   "mobile.file_upload.video": "Biblioteka wideo",
   "mobile.help.title": "Pomoc",
+  "mobile.image_preview.save": "Save Image",
   "mobile.intro_messages.DM": "To początek historii wiadomości z użytkownikiem {teammate}. Bezpośrednie wiadomości i wysłane w nich pliki nie są widoczne dla osób spoza tego obszaru.",
   "mobile.intro_messages.default_message": "To jest pierwszy kanał który zobaczą członkowie zespołu po zarejestrowaniu się - używaj go do publikowania informacji, o których wszyscy muszą wiedzieć.",
   "mobile.intro_messages.default_welcome": "Witaj w {name}!",
@@ -1845,6 +1873,11 @@
   "mobile.loading_members": "Wczytuję członków...",
   "mobile.loading_posts": "Wczytuję wiadomości...",
   "mobile.login_options.choose_title": "Wybierz metodę logowania",
+  "mobile.managed.blocked_by": "Blocked by {vendor}",
+  "mobile.managed.exit": "Edycja",
+  "mobile.managed.jailbreak": "Jailbroken devices are not trusted by {vendor}, please exit the app.",
+  "mobile.managed.secured_by": "Secured by {vendor}",
+  "mobile.markdown.code.plusMoreLines": "+{count, number} more lines",
   "mobile.more_dms.start": "Start",
   "mobile.more_dms.title": "New Conversation",
   "mobile.notice_mobile_link": "mobile apps",
@@ -1863,6 +1896,7 @@
   "mobile.post.failed_retry": "Spróbuj ponownie",
   "mobile.post.failed_title": "Nie można wysłać wiadomości",
   "mobile.post.retry": "Odśwież",
+  "mobile.post_info.add_reaction": "Add Reaction",
   "mobile.request.invalid_response": "Nieprawidłowa odpowiedź od serwera.",
   "mobile.routes.channelInfo": "Informacje",
   "mobile.routes.channelInfo.createdBy": "Utworzono przez {creator}, dnia ",
@@ -1872,6 +1906,8 @@
   "mobile.routes.channel_members.action_message": "Musisz wybrać co najmniej jednego użytkownika, który ma zostać usunięty z kanału.",
   "mobile.routes.channel_members.action_message_confirm": "Czy na pewno chcesz usunąć wybranych użytkowników z kanału?",
   "mobile.routes.channels": "Kanały",
+  "mobile.routes.code": "{language} Code",
+  "mobile.routes.code.noLanguage": "Code",
   "mobile.routes.enterServerUrl": "Wprowadź adres URL serwera",
   "mobile.routes.login": "Logowanie",
   "mobile.routes.loginOptions": "Wybór logowania",
@@ -1924,6 +1960,7 @@
   "msg_typing.someone": "Ktoś",
   "multiselect.add": "Dodaj",
   "multiselect.go": "Przejdź",
+  "multiselect.list.notFound": "Nie odnaleziono użytkowników",
   "multiselect.numPeopleRemaining": "Use ↑↓ to browse, ↵ to select. You can add {num, number} more {num, plural, one {person} other {people}}. ",
   "multiselect.numRemaining": "Możesz dodać {num, number} więcej",
   "multiselect.placeholder": "Wyszukiwanie i dodawanie użytkowników",
@@ -2044,6 +2081,7 @@
   "rename_channel.handleHolder": "alfanumeryczne znaki z małej litery",
   "rename_channel.lowercase": "Musi składać się z alfanumerycznych znaków z małej litery",
   "rename_channel.maxLength": "This field must be less than {maxLength, number} characters",
+  "rename_channel.minLength": "Channel name must be {minLength, number} or more characters",
   "rename_channel.required": "To pole jest wymagane",
   "rename_channel.save": "Zapisz",
   "rename_channel.title": "Zmień nazwę kanału",
@@ -2102,11 +2140,61 @@
   "setting_upload.import": "Zaimportuj",
   "setting_upload.noFile": "Nie wybrano pliku.",
   "setting_upload.select": "Wybierz plik",
+  "shortcuts.browser.channel_next": "Forward in history:\tAlt|Right",
+  "shortcuts.browser.channel_next.mac": "Forward in history:\t⌘|]",
+  "shortcuts.browser.channel_prev": "Back in history:\tAlt|Left",
+  "shortcuts.browser.channel_prev.mac": "Back in history:\t⌘|[",
+  "shortcuts.browser.font_decrease": "Zoom out:\tCtrl|-",
+  "shortcuts.browser.font_decrease.mac": "Zoom out:\t⌘|-",
+  "shortcuts.browser.font_increase": "Zoom in:\tCtrl|+",
+  "shortcuts.browser.font_increase.mac": "Zoom in:\t⌘|+",
+  "shortcuts.browser.header": "Built-in Browser Commands",
+  "shortcuts.browser.highlight_next": "Highlight text to the next line:\tShift|Down",
+  "shortcuts.browser.highlight_prev": "Highlight text to the previous line:\tShift|Up",
+  "shortcuts.browser.input.header": "Works inside an input field",
+  "shortcuts.browser.newline": "Create a new line:\tShift|Enter",
+  "shortcuts.files.header": "Pliki",
+  "shortcuts.files.upload": "Upload files:\tCtrl|U",
+  "shortcuts.files.upload.mac": "Upload files:\t⌘|U",
+  "shortcuts.header": "Skróty klawiszowe",
+  "shortcuts.info": "Begin a message with / for a list of all the commands at your disposal.",
+  "shortcuts.msgs.comp.channel": "Channel:\t~|[a-z]|Tab",
+  "shortcuts.msgs.comp.emoji": "Emoji:\t:|[a-z]|Tab",
+  "shortcuts.msgs.comp.header": "Automatyczne uzupełnianie",
+  "shortcuts.msgs.comp.username": "Username:\t@|[a-z]|Tab",
+  "shortcuts.msgs.edit": "Edit last message in channel:\tUp",
+  "shortcuts.msgs.header": "Wiadomość",
+  "shortcuts.msgs.input.header": "Works inside an empty input field",
+  "shortcuts.msgs.mark_as_read": "Mark current channel as read:\tEsc",
+  "shortcuts.msgs.reply": "Reply to last message in channel:\tShift|Up",
+  "shortcuts.msgs.reprint_next": "Reprint next message:\tCtrl|Down",
+  "shortcuts.msgs.reprint_next.mac": "Reprint next message:\t⌘|Down",
+  "shortcuts.msgs.reprint_prev": "Reprint previous message:\tCtrl|Up",
+  "shortcuts.msgs.reprint_prev.mac": "Reprint previous message:\t⌘|Up",
+  "shortcuts.nav.direct_messages_menu": "Direct messages menu:\tCtrl|Shift|K",
+  "shortcuts.nav.direct_messages_menu.mac": "Direct messages menu:\t⌘|Shift|K",
+  "shortcuts.nav.header": "Navigation",
+  "shortcuts.nav.next": "Next channel:\tAlt|Down",
+  "shortcuts.nav.next.mac": "Next channel:\t⌥|Down",
+  "shortcuts.nav.prev": "Previous channel:\tAlt|Up",
+  "shortcuts.nav.prev.mac": "Previous channel:\t⌥|Up",
+  "shortcuts.nav.recent_mentions": "Recent mentions:\tCtrl|Shift|M",
+  "shortcuts.nav.recent_mentions.mac": "Recent mentions:\t⌘|Shift|M",
+  "shortcuts.nav.settings": "Account settings:\tCtrl|Shift|A",
+  "shortcuts.nav.settings.mac": "Account settings:\t⌘|Shift|A",
+  "shortcuts.nav.switcher": "Quick channel switcher:\tCtrl|K",
+  "shortcuts.nav.switcher.mac": "Quick channel switcher:\t⌘|K",
+  "shortcuts.nav.unread_next": "Next unread channel:\tAlt|Shift|Down",
+  "shortcuts.nav.unread_next.mac": "Next unread channel:\t⌥|Shift|Down",
+  "shortcuts.nav.unread_prev": "Previous unread channel:\tAlt|Shift|Up",
+  "shortcuts.nav.unread_prev.mac": "Previous unread channel:\t⌥|Shift|Up",
   "sidebar.channels": "PUBLIC CHANNELS",
   "sidebar.createChannel": "Stwórz nowy kanał publiczny",
   "sidebar.createGroup": "Stwórz nowy kanał prywatny",
   "sidebar.direct": "DIRECT MESSAGES",
   "sidebar.favorite": "FAVORITE CHANNELS",
+  "sidebar.leave": "Opuść kanał",
+  "sidebar.mainMenu": "Main Menu",
   "sidebar.more": "Więcej",
   "sidebar.moreElips": "Więcej...",
   "sidebar.otherMembers": "Poza tym zespołem",
diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json
index 7e3049b73..3179a0de8 100644
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -9,6 +9,7 @@
   "about.hash": "Hash de Compilação:",
   "about.hashee": "Hash de Compilação EE:",
   "about.licensed": "Licenciado para:",
+  "about.notice": "Mattermost é possível graças ao software de código aberto usado na nossa <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platforma</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> e app <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>móvel</a>.",
   "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.",
@@ -28,8 +29,10 @@
   "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_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "App Nativo para Android",
+  "activity_log_modal.androidNativeClassicApp": "App Clássico Android Nativo",
   "activity_log_modal.desktop": "Aplicativo Nativo Desktop",
   "activity_log_modal.iphoneNativeApp": "App Nativo para iPhone",
+  "activity_log_modal.iphoneNativeClassicApp": "App Clássico iPhone Nativo",
   "add_command.autocomplete": "Autocompletar",
   "add_command.autocomplete.help": "(Opcional) Exibir comandos slash na lista de auto preenchimento.",
   "add_command.autocompleteDescription": "Autocompletar Descrição: ",
@@ -146,8 +149,20 @@
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
-  "admin.authentication.saml": "SAML",
+  "admin.authentication.saml": "SAML 2.0",
   "admin.banner.heading": "Nota:",
+  "admin.client_versions.androidLatestVersion": "Última Versão Android",
+  "admin.client_versions.androidLatestVersionHelp": "A versão mais recente lançada para Android",
+  "admin.client_versions.androidMinVersion": "Versão Mínima Android",
+  "admin.client_versions.androidMinVersionHelp": "A versão Android miníma compatível",
+  "admin.client_versions.desktopLatestVersion": "Ultima Versão Desktop",
+  "admin.client_versions.desktopLatestVersionHelp": "A versão mais recente lançada para Desktop",
+  "admin.client_versions.desktopMinVersion": "Versão Mínima Desktop",
+  "admin.client_versions.desktopMinVersionHelp": "A versão Desktop miníma compatível",
+  "admin.client_versions.iosLatestVersion": "Última Versão IOS",
+  "admin.client_versions.iosLatestVersionHelp": "A versão mais recente lançada para IOS",
+  "admin.client_versions.iosMinVersion": "Versão Mínima IOS",
+  "admin.client_versions.iosMinVersionHelp": "A versão IOS miníma compatível",
   "admin.cluster.enableDescription": "Quando verdadeiro, Mattermost irá executar no modo de Alta Disponibilidade. Por favor leia <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.",
@@ -587,7 +602,7 @@
   "admin.log.locationPlaceholder": "Entre a localização do seu arquivo",
   "admin.log.locationTitle": "Diretório de Arquivo de Log:",
   "admin.log.logSettings": "Configurações de Log",
-  "admin.logs.bannerDesc": "Para procurar por usuário pelo ID do usuário, vá em Relatórios > Usuários e cole o ID no filtro de busca.",
+  "admin.logs.bannerDesc": "Para procurar por usuário pelo ID do usuário ou token, vá em Relatórios > Usuários e cole o ID no filtro de busca.",
   "admin.logs.reload": "Recarregar",
   "admin.logs.title": "Log do Servidor",
   "admin.manage_roles.additionalRoles": "Selecione permissões adicionais para a conta.<a href=\"https://about.mattermost.com/default-permissions\" target=\"_blank\">Leia mais sobre funções e permissões</a>",
@@ -651,15 +666,15 @@
   "admin.password.symbol": "Pelo menos um símbolo (ex. \"~!@#$%^&*()\")",
   "admin.password.uppercase": "Pelo menos uma letra maiuscula",
   "admin.plugins.jira": "JIRA (Beta)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "channelname",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelurl",
   "admin.plugins.jira.enabledDescription": "Quando verdadeiro, você pode configurar os webhooks do JIRA para postar mensagens no Mattermost. Para ajudar a combater ataques de phishing, todas as postagens são rotuladas por uma tag BOT.",
-  "admin.plugins.jira.enabledLabel": "Habilitado:",
+  "admin.plugins.jira.enabledLabel": "Ativar JIRA:",
   "admin.plugins.jira.secretDescription": "Está chave secreta é usada para autenticar no Mattermost.",
   "admin.plugins.jira.secretLabel": "Chave Secreta:",
   "admin.plugins.jira.secretParamPlaceholder": "chave secreta",
   "admin.plugins.jira.secretRegenerateDescription": "Gerar novamente a chave secreta para a URL do webhook. Gerando uma nova chave secreta invalida suas integrações com o JIRA.",
   "admin.plugins.jira.setupDescription": "Use esta URL do webhook para configurar a integração do JIRA. Veja {webhookDocsLink} para saber mais.",
-  "admin.plugins.jira.teamParamPlaceholder": "teamname",
+  "admin.plugins.jira.teamParamPlaceholder": "teamurl",
   "admin.plugins.jira.userDescription": "Selecione o nome de usuário para o qual essa integração está anexada.",
   "admin.plugins.jira.userLabel": "Usuário:",
   "admin.plugins.jira.webhookDocsLink": "documentação",
@@ -719,8 +734,8 @@
   "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.enableDescription": "Quando verdadeiro, Mattermost irá permitir login usando SAML 2.0. 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 2.0:",
   "admin.saml.encryptDescription": "Quando falso, Mattermost não irá descriptografar o SAML Assertions encriptado com o seu Provedor de Serviço de Certificado Público. Não recomendado para ambientes de produção. Apenas para teste.",
   "admin.saml.encryptTitle": "Ativar Criptografia:",
   "admin.saml.firstnameAttrDesc": "(Opcional) O atributo em SAML Assertion que será usado para preencher o nome dos usuários no Mattermost.",
@@ -807,6 +822,9 @@
   "admin.service.insecureTlsTitle": "Ativar Conexões de Saída Inseguras: ",
   "admin.service.integrationAdmin": "Restringir gerenciamento de integrações aos Administradores:",
   "admin.service.integrationAdminDesc": "Quando verdadeiro, webhooks e comandos slash podem somente ser criados, editados e visualizados pelos Administradores de Equipe e Sistema, e aplicações OAuth 2.0 pelos Administradores de Sistema. Integrações estão disponíveis para todos os usuários depois delas terem sido criadas pelo Administrador.",
+  "admin.service.internalConnectionsDesc": "Em ambientes de testes, como quando em desenvolvimento local de integrações em uma máquina de desenvolvimento, utilize esta configuração para especificar domínios, endereços de IP ou CIDR para habilitar conexões internas. <b>Não recomendado para uso em produção</b>, porque isto pode deixar um usuário extrair informações confidenciais do seu servidor ou rede interna.<br /><br />Por padrão, URL fornecido por usuários como as utilizadas pelo metadata do Open Graph, webhooks ou comandos de slash não será permitido conectar a endereços de IP reservados incluíndo loopbacks ou endereço link-local utilizado por redes internas. Notificação de push, OAuth 2.0 e URLs de servidores WebRTC são confiáveis e não são afetadas por esta configuração.",
+  "admin.service.internalConnectionsEx": "webhooks.internal.example.com 127.0.0.1 10.0.16.0/28",
+  "admin.service.internalConnectionsTitle": "Permitir conexão interna não confiável: ",
   "admin.service.letsEncryptCertificateCacheFile": "Arquivo de Cache de Certificado Let's Encrypt:",
   "admin.service.letsEncryptCertificateCacheFileDescription": "Os certificados obtidos e outros dados sobre o serviço Let's Encrypt serão armazenados nesse arquivo.",
   "admin.service.listenAddress": "Endereço à Escutar:",
@@ -853,6 +871,7 @@
   "admin.sidebar.advanced": "Avançado",
   "admin.sidebar.audits": "Conformidade e Auditoria",
   "admin.sidebar.authentication": "Autenticação",
+  "admin.sidebar.client_versions": "Versões dos Clientes",
   "admin.sidebar.cluster": "Alta Disponibilidade",
   "admin.sidebar.compliance": "Conformidade",
   "admin.sidebar.configuration": "Configuração",
@@ -892,7 +911,7 @@
   "admin.sidebar.push": "Notificação Móvel",
   "admin.sidebar.rateLimiting": "Limite de Velocidade",
   "admin.sidebar.reports": "REPORTANDO",
-  "admin.sidebar.saml": "SAML",
+  "admin.sidebar.saml": "SAML 2.0",
   "admin.sidebar.security": "Segurança",
   "admin.sidebar.sessions": "Sessões",
   "admin.sidebar.settings": "CONFIGURAÇÕES",
@@ -1294,15 +1313,14 @@
   "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.email": "Depois de alterar o seu método de autenticação, você vai usar {email} para logar. Suas credenciais AD/LDAP deixarão de permitir o acesso ao Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "Nova senha de login por e-mail:",
   "claim.ldap_to_email.ldapPasswordError": "Por favor digite a sua senha AD/LDAP.",
   "claim.ldap_to_email.ldapPwd": "Senha AD/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": "Alternar Conta AD/LDAP para E-mail/Senha",
   "claim.oauth_to_email.confirm": "Confirmar Senha",
@@ -1761,7 +1779,7 @@
   "member_list.noUsersAdd": "Nenhum usuário para adicionar.",
   "members_popover.manageMembers": "Gerenciar Membros",
   "members_popover.msg": "Mensagem",
-  "members_popover.title": "Membros",
+  "members_popover.title": "Membros do Canal",
   "members_popover.viewMembers": "Ver Membros",
   "mfa.confirm.complete": "<strong>Configuração completa!</strong>",
   "mfa.confirm.okay": "Ok",
@@ -1829,6 +1847,15 @@
   "mobile.custom_list.no_results": "Nenhum Resultado",
   "mobile.drawer.teamsTitle": "Equipes",
   "mobile.edit_post.title": "Editando a Mensagem",
+  "mobile.emoji_picker.activity": "ATIVIDADE",
+  "mobile.emoji_picker.custom": "PERSONALIZADO",
+  "mobile.emoji_picker.flags": "BANDEIRAS",
+  "mobile.emoji_picker.foods": "COMIDAS",
+  "mobile.emoji_picker.nature": "NATUREZA",
+  "mobile.emoji_picker.objects": "OBJETOS",
+  "mobile.emoji_picker.people": "PESSOAS",
+  "mobile.emoji_picker.places": "LUGARES",
+  "mobile.emoji_picker.symbols": "SIMBOLOS",
   "mobile.error_handler.button": "Relançar",
   "mobile.error_handler.description": "\nClique relançar para abrir a app novamente. Após o reinício, você pode relatar o problema no menu the configuração.\n",
   "mobile.error_handler.title": "Ocorreu um erro inesperado",
@@ -1837,6 +1864,7 @@
   "mobile.file_upload.more": "Mais",
   "mobile.file_upload.video": "Galeria de Videos",
   "mobile.help.title": "Ajuda",
+  "mobile.image_preview.save": "Salvar imagem",
   "mobile.intro_messages.DM": "Este é o início do seu histórico de mensagens diretas com {teammate}. Mensagens diretas e arquivos compartilhados aqui não são mostrados para pessoas de fora desta área.",
   "mobile.intro_messages.default_message": "Este é o primeiro canal da equipe veja quando eles se registrarem - use para postar atualizações que todos devem saber.",
   "mobile.intro_messages.default_welcome": "Bem-vindo ao {name}!",
@@ -1845,6 +1873,11 @@
   "mobile.loading_members": "Carregando Membros...",
   "mobile.loading_posts": "Carregando Mensagens...",
   "mobile.login_options.choose_title": "Escolha seu método de login",
+  "mobile.managed.blocked_by": "Bloqueado por {vendor}",
+  "mobile.managed.exit": "Editar",
+  "mobile.managed.jailbreak": "Os dispositivos com Jailbroken não são confiáveis ​​para {vendor}, por favor saia do aplicativo.",
+  "mobile.managed.secured_by": "Garantido por {vendor} ",
+  "mobile.markdown.code.plusMoreLines": "mais +{count, number} linhas",
   "mobile.more_dms.start": "Início",
   "mobile.more_dms.title": "Nova Conversa",
   "mobile.notice_mobile_link": "aplicativos móveis",
@@ -1863,6 +1896,7 @@
   "mobile.post.failed_retry": "Tentar novamente",
   "mobile.post.failed_title": "Não foi possível enviar sua mensagem",
   "mobile.post.retry": "Atualizar",
+  "mobile.post_info.add_reaction": "Adicionar Reação",
   "mobile.request.invalid_response": "Recebido uma resposta inválida do servidor.",
   "mobile.routes.channelInfo": "Informações",
   "mobile.routes.channelInfo.createdBy": "Criado por {creator} em ",
@@ -1872,6 +1906,8 @@
   "mobile.routes.channel_members.action_message": "Você deve selecionar pelo menos um membro para remover do canal.",
   "mobile.routes.channel_members.action_message_confirm": "Você tem certeza que quer remover o membro selecionado do canal?",
   "mobile.routes.channels": "Canais",
+  "mobile.routes.code": "{language} Código",
+  "mobile.routes.code.noLanguage": "Código",
   "mobile.routes.enterServerUrl": "Informe a URL do Servidor",
   "mobile.routes.login": "Login",
   "mobile.routes.loginOptions": "Selecionador de Login",
@@ -1924,6 +1960,7 @@
   "msg_typing.someone": "Alguém",
   "multiselect.add": "Adicionar",
   "multiselect.go": "Ir",
+  "multiselect.list.notFound": "Nenhum item encontrado",
   "multiselect.numPeopleRemaining": "Utilize ↑↓ para navegar, ↵ para selecionar. Você pode adicionar mais {num, number}{num, plural, one {pessoa} other {pessoas}}. ",
   "multiselect.numRemaining": "Você pode adicionar mais {num, number}",
   "multiselect.placeholder": "Procura e adiciona membros",
@@ -2044,6 +2081,7 @@
   "rename_channel.handleHolder": "caracteres minúsculos alfanuméricos",
   "rename_channel.lowercase": "Tem de ser caracteres minúsculos alfanuméricos",
   "rename_channel.maxLength": "Este campo precisa ter menos de {maxLength, number} caracteres",
+  "rename_channel.minLength": "Nome do canal deve ter {minLength, number} caracteres ou mais",
   "rename_channel.required": "Este campo é obrigatório",
   "rename_channel.save": "Salvar",
   "rename_channel.title": "Renomear Canal",
@@ -2102,11 +2140,61 @@
   "setting_upload.import": "Importar",
   "setting_upload.noFile": "Nenhum arquivo selecionado.",
   "setting_upload.select": "Selecione o arquivo",
+  "shortcuts.browser.channel_next": "Avançar no histórico:\tAlt|Direita",
+  "shortcuts.browser.channel_next.mac": "Avançar no histórico:\t⌘|]",
+  "shortcuts.browser.channel_prev": "Voltar no histórico:\tAlt|Esquerda",
+  "shortcuts.browser.channel_prev.mac": "Voltar no histórico:\t⌘|[",
+  "shortcuts.browser.font_decrease": "Menos zoom:\tCtrl|-",
+  "shortcuts.browser.font_decrease.mac": "Menos zoom:\t⌘|-",
+  "shortcuts.browser.font_increase": "Mais zoom:\tCtrl|+",
+  "shortcuts.browser.font_increase.mac": "Mais zoom:\t⌘|+",
+  "shortcuts.browser.header": "Comandos Nativos do Navegador",
+  "shortcuts.browser.highlight_next": "Selecionar texto na próxima linha:\tShift|Baixo",
+  "shortcuts.browser.highlight_prev": "Selecionar texto na linha anterior:\tShift|Cima",
+  "shortcuts.browser.input.header": "Funciona dentro do campo de entrada",
+  "shortcuts.browser.newline": "Cria uma nova linha:\tShift|Enter",
+  "shortcuts.files.header": "Arquivos",
+  "shortcuts.files.upload": "Enviar arquivos:\tCtrl|U",
+  "shortcuts.files.upload.mac": "Enviar arquivos:\t⌘|U",
+  "shortcuts.header": "Atalhos do teclado",
+  "shortcuts.info": "Comece uma mensagem com / para listar todos os comandos à sua disposição.",
+  "shortcuts.msgs.comp.channel": "Canal:\t~|[a-z]|Tab",
+  "shortcuts.msgs.comp.emoji": "Emoji:\t:|[a-z]|Tab",
+  "shortcuts.msgs.comp.header": "Autocompletar",
+  "shortcuts.msgs.comp.username": "Usuário:\t@|[a-z]|Tab",
+  "shortcuts.msgs.edit": "Editar a última mensagem no canal:\tUp",
+  "shortcuts.msgs.header": "Mensagem",
+  "shortcuts.msgs.input.header": "Funciona dentro de um campo de entrada vazio",
+  "shortcuts.msgs.mark_as_read": "Marcar o canal atual como lido:\tEsc",
+  "shortcuts.msgs.reply": "Responder a última mensagem no canal:\tShift|Cima",
+  "shortcuts.msgs.reprint_next": "Reimprimir próxima mensagem:\tCtrl|Baixo",
+  "shortcuts.msgs.reprint_next.mac": "Reimprimir próxima mensagem:\t⌘|Baixo",
+  "shortcuts.msgs.reprint_prev": "Reimprimir a mensagem anterior:\tCtrl|Cima",
+  "shortcuts.msgs.reprint_prev.mac": "Reimprimir a mensagem anterior:\t⌘|Cima",
+  "shortcuts.nav.direct_messages_menu": "Menu de mensagens diretas:\tCtrl|Shift|K",
+  "shortcuts.nav.direct_messages_menu.mac": "Menu de mensagens diretas:\t⌘|Shift|K",
+  "shortcuts.nav.header": "Navegação",
+  "shortcuts.nav.next": "Próximo canal:\tAlt|Baixo",
+  "shortcuts.nav.next.mac": "Próximo canal:\t⌥|Baixo",
+  "shortcuts.nav.prev": "Canal anterior:\tAlt|Cima",
+  "shortcuts.nav.prev.mac": "Canal anterior:\t⌥|Cima",
+  "shortcuts.nav.recent_mentions": "Menções recentes:\tCtrl|Shift|M",
+  "shortcuts.nav.recent_mentions.mac": "Menções recentes:\t⌘|Shift|M",
+  "shortcuts.nav.settings": "Configurações de conta:\tCtrl|Shift|A",
+  "shortcuts.nav.settings.mac": "Configurações de conta:\t⌘|Shift|A",
+  "shortcuts.nav.switcher": "Troca rápida de canal:\tCtrl|K",
+  "shortcuts.nav.switcher.mac": "Troca rápida de canal:\t⌘|K",
+  "shortcuts.nav.unread_next": "Próximo canal não lido:\tAlt|Shift|Baixo",
+  "shortcuts.nav.unread_next.mac": "Próximo canal não lido:\t⌥|Shift|Baixo",
+  "shortcuts.nav.unread_prev": "Canal anterior não lido:\tAlt|Shift|Cima",
+  "shortcuts.nav.unread_prev.mac": "Canal anterior não lido:\t⌥|Shift|Cima",
   "sidebar.channels": "CANAIS PÚBLICOS",
   "sidebar.createChannel": "Criar um novo canal público",
   "sidebar.createGroup": "Criar um novo canal privado",
   "sidebar.direct": "MENSAGENS DIRETAS",
   "sidebar.favorite": "CANAIS FAVORITOS",
+  "sidebar.leave": "Deixar o canal",
+  "sidebar.mainMenu": "Menu Principal",
   "sidebar.more": "Mais",
   "sidebar.moreElips": "Mais...",
   "sidebar.otherMembers": "Fora desta equipe",
diff --git a/webapp/i18n/ru.json b/webapp/i18n/ru.json
index 905e94f07..f111638be 100644
--- a/webapp/i18n/ru.json
+++ b/webapp/i18n/ru.json
@@ -9,6 +9,7 @@
   "about.hash": "Хэш сборки:",
   "about.hashee": "Хэш сборки EE:",
   "about.licensed": "Лицензия зарегистрирована на:",
+  "about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
   "about.number": "Номер сборки:",
   "about.teamEditionLearn": "Присоединяйтесь к сообществу Mattermost на ",
   "about.teamEditionSt": "Всё общение вашей команды собрано в одном месте, с мгновенным поиском и доступом отовсюду.",
@@ -28,8 +29,10 @@
   "activity_log.sessionsDescription": "Создание сессии происходит при входе с нового браузера или устройства. Они позволяют использовать Mattermost без необходимости повторного входа на протяжении времени, установленного Администратором системы. Если вы хотите завершить сессию, нажмите кнопку 'Выйти'.",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "Приложение для Android",
+  "activity_log_modal.androidNativeClassicApp": "Android Native Classic App",
   "activity_log_modal.desktop": "Приложение для ПК",
   "activity_log_modal.iphoneNativeApp": "Приложение для iPhone",
+  "activity_log_modal.iphoneNativeClassicApp": "iPhone Native Classic App",
   "add_command.autocomplete": "Автодополнение",
   "add_command.autocomplete.help": "(Необязательно) Показывать слэш-команду в списке автодополнения.",
   "add_command.autocompleteDescription": "Описание для автодополнения",
@@ -146,8 +149,20 @@
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
-  "admin.authentication.saml": "SAML",
+  "admin.authentication.saml": "SAML 2.0",
   "admin.banner.heading": "Заметка:",
+  "admin.client_versions.androidLatestVersion": "Latest Android Version",
+  "admin.client_versions.androidLatestVersionHelp": "The latest released Android version",
+  "admin.client_versions.androidMinVersion": "Minimum Android Version",
+  "admin.client_versions.androidMinVersionHelp": "The minimum compliant Android version",
+  "admin.client_versions.desktopLatestVersion": "Latest Desktop Version",
+  "admin.client_versions.desktopLatestVersionHelp": "The latest released Desktop version",
+  "admin.client_versions.desktopMinVersion": "Minimum Destop Version",
+  "admin.client_versions.desktopMinVersionHelp": "The minimum compliant Desktop version",
+  "admin.client_versions.iosLatestVersion": "Latest IOS Version",
+  "admin.client_versions.iosLatestVersionHelp": "The latest released IOS version",
+  "admin.client_versions.iosMinVersion": "Minimum IOS Version",
+  "admin.client_versions.iosMinVersionHelp": "The minimum compliant IOS version",
   "admin.cluster.enableDescription": "Если включено, Mattermost запустится в режиме высокой доступности. Пожалуйста, обратитесь к <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target='_blank'>документации</a>для получения сведений по настройкам режима High Availability.",
   "admin.cluster.enableTitle": "Включить режим высокой доступности:",
   "admin.cluster.interNodeListenAddressDesc": "Адрес интерфейса, используемого для связи с другими серверами.",
@@ -587,7 +602,7 @@
   "admin.log.locationPlaceholder": "Укажите расположение файла",
   "admin.log.locationTitle": "Каталог с файлом журнала:",
   "admin.log.logSettings": "Настройки журнала",
-  "admin.logs.bannerDesc": "To look up users by User ID, go to Reporting > Users and paste the ID into the search filter.",
+  "admin.logs.bannerDesc": "To look up users by User ID or Token ID, go to Reporting > Users and paste the ID into the search filter.",
   "admin.logs.reload": "Перезагрузить",
   "admin.logs.title": "Серверные логи",
   "admin.manage_roles.additionalRoles": "Select additional permissions for the account. <a href=\"https://about.mattermost.com/default-permissions\" target=\"_blank\">Read more about roles and permissions</a>.",
@@ -651,15 +666,15 @@
   "admin.password.symbol": "Хотя бы один символ (\"~!@#$%^&*()\")",
   "admin.password.uppercase": "Хотя бы одна заглавная буква",
   "admin.plugins.jira": "JIRA (Beta)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "channelname",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelurl",
   "admin.plugins.jira.enabledDescription": "When true, you can configure JIRA webhooks to post message in Mattermost. To help combat phishing attacks, all posts are labelled by a BOT tag.",
-  "admin.plugins.jira.enabledLabel": "Enabled:",
+  "admin.plugins.jira.enabledLabel": "Enable JIRA:",
   "admin.plugins.jira.secretDescription": "This secret is used to authenticate to Mattermost.",
   "admin.plugins.jira.secretLabel": "Секрет",
   "admin.plugins.jira.secretParamPlaceholder": "Секрет",
   "admin.plugins.jira.secretRegenerateDescription": "Regenerates the secret for the webhook URL endpoint. Regenerating the secret invalidates your existing JIRA integrations.",
   "admin.plugins.jira.setupDescription": "Use this webhook URL to set up the JIRA integration. See {webhookDocsLink} to learn more.",
-  "admin.plugins.jira.teamParamPlaceholder": "teamname",
+  "admin.plugins.jira.teamParamPlaceholder": "teamurl",
   "admin.plugins.jira.userDescription": "Select the username that this integration is attached to.",
   "admin.plugins.jira.userLabel": "Пользователи",
   "admin.plugins.jira.webhookDocsLink": "документация",
@@ -807,6 +822,9 @@
   "admin.service.insecureTlsTitle": "Разрешить Небезопасные Исходящие Соединения: ",
   "admin.service.integrationAdmin": "Ограничить управление интеграцией для администраторов:",
   "admin.service.integrationAdminDesc": "Если истина, вебхуки и слэш-команды могут быть созданы, изменены и просмотрены только командными и системными админами, а приложения OAuth 2.0 - системными админами. После того, как интеграции созданы админом, они становятся доступны всем пользователям.",
+  "admin.service.internalConnectionsDesc": "In testing environments, such as when developing integrations locally on a development machine, use this setting to specify domains, IP addresses, or CIDR notations to allow internal connections. <b>Not recommended for use in production</b>, since this can allow a user to extract confidential data from your server or internal network.<br /><br />By default, user-supplied URLs such as those used for Open Graph metadata, webhooks, or slash commands will not be allowed to connect to reserved IP addresses including loopback or link-local addresses used for internal networks. Push notification, OAuth 2.0 and WebRTC server URLs are trusted and not affected by this setting.",
+  "admin.service.internalConnectionsEx": "webhooks.internal.example.com 127.0.0.1 10.0.16.0/28",
+  "admin.service.internalConnectionsTitle": "Allow untrusted internal connections to: ",
   "admin.service.letsEncryptCertificateCacheFile": "Файл кэша сертификата Let's Encrypt:",
   "admin.service.letsEncryptCertificateCacheFileDescription": "Полученные сертификаты и данные от Let's Encrypt будут храниться в этом файле.",
   "admin.service.listenAddress": "Прослушиваемый адрес:",
@@ -841,7 +859,7 @@
   "admin.service.useLetsEncrypt": "Использовать Let's Encrypt:",
   "admin.service.useLetsEncryptDescription": "Включить автоматическое получение сертификатов от Let's Encrypt. Сертификат будет получен, когда клиент попытается установить соединение с нового домена. Это будет работать для множества разных доменов.",
   "admin.service.userAccessTokensDescLabel": "Имя:",
-  "admin.service.userAccessTokensDescription": "When true, users can create <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a> for integrations in <strong>Account Settings > Security</strong>. They can be used to authenticate against the API and give full access to the account.<br/><br/>To manage who can create personal access tokens, go to the <strong>System Console > Users</strong> page.",
+  "admin.service.userAccessTokensDescription": "When true, users can create <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a> for integrations in <strong>Account Settings > Security</strong>. They can be used to authenticate against the API and give full access to the account.<br/><br/>To manage who can create personal access tokens or to search users by token ID, go to the <strong>System Console > Users</strong> page.",
   "admin.service.userAccessTokensIdLabel": "Token ID: ",
   "admin.service.userAccessTokensTitle": "Enable Personal Access Tokens: ",
   "admin.service.webSessionDays": "Продолжительность сессии AD/LDAP и электронной почты (в днях):",
@@ -853,6 +871,7 @@
   "admin.sidebar.advanced": "Дополнительно",
   "admin.sidebar.audits": "Аудит",
   "admin.sidebar.authentication": "Аутентификация",
+  "admin.sidebar.client_versions": "Client Versions",
   "admin.sidebar.cluster": "Высокая доступность (HA)",
   "admin.sidebar.compliance": "Соответствие стандартам",
   "admin.sidebar.configuration": "Конфигурация",
@@ -892,7 +911,7 @@
   "admin.sidebar.push": "Мобильные Push-уведомления",
   "admin.sidebar.rateLimiting": "Ограничение скорости",
   "admin.sidebar.reports": "ОТЧЁТЫ",
-  "admin.sidebar.saml": "SAML",
+  "admin.sidebar.saml": "SAML 2.0",
   "admin.sidebar.security": "Безопасность",
   "admin.sidebar.sessions": "Сеансы",
   "admin.sidebar.settings": "НАСТРОЙКИ",
@@ -1294,15 +1313,14 @@
   "claim.email_to_oauth.switchTo": "Переключить аккаунт на {uiType}",
   "claim.email_to_oauth.title": "Переключить E-Mail/Пароль аккаунт на {uiType}",
   "claim.ldap_to_email.confirm": "Подтвердить пароль",
-  "claim.ldap_to_email.email": "Вы будете использовать email {email} для входа в систему",
-  "claim.ldap_to_email.enterLdapPwd": "Введите ваш {ldapPassword} для вашего почтового аккаунта {site}",
-  "claim.ldap_to_email.enterPwd": "Введите новый пароль для вашего почтового аккаунта",
+  "claim.ldap_to_email.email": "After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "New email login password:",
   "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": "Upon claiming your account, you will only be able to login with your email and password",
   "claim.ldap_to_email.switchTo": "Переключить аккаунт на email/пароль",
   "claim.ldap_to_email.title": "Переключить AD/LDAP на Email/Password",
   "claim.oauth_to_email.confirm": "Подтвердить пароль",
@@ -1761,7 +1779,7 @@
   "member_list.noUsersAdd": "Нет пользователей для добавления.",
   "members_popover.manageMembers": "Управление участниками",
   "members_popover.msg": "Сообщение",
-  "members_popover.title": "Участники",
+  "members_popover.title": "Участники канала",
   "members_popover.viewMembers": "Просмотреть список участников",
   "mfa.confirm.complete": "<strong>Настройка завершена!</strong>",
   "mfa.confirm.okay": "Понятно",
@@ -1829,6 +1847,15 @@
   "mobile.custom_list.no_results": "Нет результатов",
   "mobile.drawer.teamsTitle": "Команды",
   "mobile.edit_post.title": "Редактирование сообщения",
+  "mobile.emoji_picker.activity": "ACTIVITY",
+  "mobile.emoji_picker.custom": "CUSTOM",
+  "mobile.emoji_picker.flags": "FLAGS",
+  "mobile.emoji_picker.foods": "FOODS",
+  "mobile.emoji_picker.nature": "NATURE",
+  "mobile.emoji_picker.objects": "OBJECTS",
+  "mobile.emoji_picker.people": "PEOPLE",
+  "mobile.emoji_picker.places": "PLACES",
+  "mobile.emoji_picker.symbols": "SYMBOLS",
   "mobile.error_handler.button": "Перезапустить",
   "mobile.error_handler.description": "\nНажмите на кнопку Перезапустить, чтобы открыть приложение заново. После запуска, вы можете сообщить о проблеме через меню настроек.\n",
   "mobile.error_handler.title": "Произошла непредвиденная ошибка",
@@ -1837,6 +1864,7 @@
   "mobile.file_upload.more": "Еще",
   "mobile.file_upload.video": "Библиотека видео",
   "mobile.help.title": "Помощь",
+  "mobile.image_preview.save": "Save Image",
   "mobile.intro_messages.DM": "Начало истории личных сообщений с {teammate}. Личные сообщения и файлы доступны здесь и не видны за пределами этой области.",
   "mobile.intro_messages.default_message": "Это первый канал, который видит новый участник группы - используйте его для отправки сообщений, которые должны увидеть все.",
   "mobile.intro_messages.default_welcome": "Добро пожаловать в {name}!",
@@ -1845,6 +1873,11 @@
   "mobile.loading_members": "Загрузка списка участников...",
   "mobile.loading_posts": "Загрузка сообщений...",
   "mobile.login_options.choose_title": "Выберите метод входа",
+  "mobile.managed.blocked_by": "Blocked by {vendor}",
+  "mobile.managed.exit": "Изменить",
+  "mobile.managed.jailbreak": "Jailbroken devices are not trusted by {vendor}, please exit the app.",
+  "mobile.managed.secured_by": "Secured by {vendor}",
+  "mobile.markdown.code.plusMoreLines": "+{count, number} more lines",
   "mobile.more_dms.start": "Start",
   "mobile.more_dms.title": "New Conversation",
   "mobile.notice_mobile_link": "mobile apps",
@@ -1863,6 +1896,7 @@
   "mobile.post.failed_retry": "Попробовать ещё раз",
   "mobile.post.failed_title": "Не удалось отправить сообщение",
   "mobile.post.retry": "Обновить",
+  "mobile.post_info.add_reaction": "Add Reaction",
   "mobile.request.invalid_response": "Получен неверный ответ от сервера",
   "mobile.routes.channelInfo": "Информация",
   "mobile.routes.channelInfo.createdBy": "Создан {creator} в ",
@@ -1872,6 +1906,8 @@
   "mobile.routes.channel_members.action_message": "Вы должны выбрать хотя бы одного участника для удаления с канала.",
   "mobile.routes.channel_members.action_message_confirm": "Вы уверены, что хотите удалить выбранных участников с канала?",
   "mobile.routes.channels": "Каналы",
+  "mobile.routes.code": "{language} Code",
+  "mobile.routes.code.noLanguage": "Code",
   "mobile.routes.enterServerUrl": "Введите адрес сервера",
   "mobile.routes.login": "Вход",
   "mobile.routes.loginOptions": "Login Chooser",
@@ -1924,6 +1960,7 @@
   "msg_typing.someone": "Кто-то",
   "multiselect.add": "Добавить",
   "multiselect.go": "Перейти",
+  "multiselect.list.notFound": "Пользователи не найдены",
   "multiselect.numPeopleRemaining": "Use ↑↓ to browse, ↵ to select. You can add {num, number} more {num, plural, one {person} other {people}}. ",
   "multiselect.numRemaining": "Вы можете добавить ещё {num, number}",
   "multiselect.placeholder": "Найти и добавить участников",
@@ -2044,6 +2081,7 @@
   "rename_channel.handleHolder": "буквы или цифры в нижнем регистре",
   "rename_channel.lowercase": "Должны быть буквы или цифры в нижнем регистре",
   "rename_channel.maxLength": "This field must be less than {maxLength, number} characters",
+  "rename_channel.minLength": "Channel name must be {minLength, number} or more characters",
   "rename_channel.required": "Обязательное поле",
   "rename_channel.save": "Сохранить",
   "rename_channel.title": "Переименовать канал",
@@ -2102,11 +2140,61 @@
   "setting_upload.import": "Импорт",
   "setting_upload.noFile": "Файл не выбран.",
   "setting_upload.select": "Выбрать файл",
+  "shortcuts.browser.channel_next": "Forward in history:\tAlt|Right",
+  "shortcuts.browser.channel_next.mac": "Forward in history:\t⌘|]",
+  "shortcuts.browser.channel_prev": "Back in history:\tAlt|Left",
+  "shortcuts.browser.channel_prev.mac": "Back in history:\t⌘|[",
+  "shortcuts.browser.font_decrease": "Zoom out:\tCtrl|-",
+  "shortcuts.browser.font_decrease.mac": "Zoom out:\t⌘|-",
+  "shortcuts.browser.font_increase": "Zoom in:\tCtrl|+",
+  "shortcuts.browser.font_increase.mac": "Zoom in:\t⌘|+",
+  "shortcuts.browser.header": "Built-in Browser Commands",
+  "shortcuts.browser.highlight_next": "Highlight text to the next line:\tShift|Down",
+  "shortcuts.browser.highlight_prev": "Highlight text to the previous line:\tShift|Up",
+  "shortcuts.browser.input.header": "Works inside an input field",
+  "shortcuts.browser.newline": "Create a new line:\tShift|Enter",
+  "shortcuts.files.header": "Файлы",
+  "shortcuts.files.upload": "Upload files:\tCtrl|U",
+  "shortcuts.files.upload.mac": "Upload files:\t⌘|U",
+  "shortcuts.header": "Горячие клавиши",
+  "shortcuts.info": "Begin a message with / for a list of all the commands at your disposal.",
+  "shortcuts.msgs.comp.channel": "Channel:\t~|[a-z]|Tab",
+  "shortcuts.msgs.comp.emoji": "Emoji:\t:|[a-z]|Tab",
+  "shortcuts.msgs.comp.header": "Автодополнение",
+  "shortcuts.msgs.comp.username": "Username:\t@|[a-z]|Tab",
+  "shortcuts.msgs.edit": "Edit last message in channel:\tUp",
+  "shortcuts.msgs.header": "Сообщение",
+  "shortcuts.msgs.input.header": "Works inside an empty input field",
+  "shortcuts.msgs.mark_as_read": "Mark current channel as read:\tEsc",
+  "shortcuts.msgs.reply": "Reply to last message in channel:\tShift|Up",
+  "shortcuts.msgs.reprint_next": "Reprint next message:\tCtrl|Down",
+  "shortcuts.msgs.reprint_next.mac": "Reprint next message:\t⌘|Down",
+  "shortcuts.msgs.reprint_prev": "Reprint previous message:\tCtrl|Up",
+  "shortcuts.msgs.reprint_prev.mac": "Reprint previous message:\t⌘|Up",
+  "shortcuts.nav.direct_messages_menu": "Direct messages menu:\tCtrl|Shift|K",
+  "shortcuts.nav.direct_messages_menu.mac": "Direct messages menu:\t⌘|Shift|K",
+  "shortcuts.nav.header": "Navigation",
+  "shortcuts.nav.next": "Next channel:\tAlt|Down",
+  "shortcuts.nav.next.mac": "Next channel:\t⌥|Down",
+  "shortcuts.nav.prev": "Previous channel:\tAlt|Up",
+  "shortcuts.nav.prev.mac": "Previous channel:\t⌥|Up",
+  "shortcuts.nav.recent_mentions": "Recent mentions:\tCtrl|Shift|M",
+  "shortcuts.nav.recent_mentions.mac": "Recent mentions:\t⌘|Shift|M",
+  "shortcuts.nav.settings": "Account settings:\tCtrl|Shift|A",
+  "shortcuts.nav.settings.mac": "Account settings:\t⌘|Shift|A",
+  "shortcuts.nav.switcher": "Quick channel switcher:\tCtrl|K",
+  "shortcuts.nav.switcher.mac": "Quick channel switcher:\t⌘|K",
+  "shortcuts.nav.unread_next": "Next unread channel:\tAlt|Shift|Down",
+  "shortcuts.nav.unread_next.mac": "Next unread channel:\t⌥|Shift|Down",
+  "shortcuts.nav.unread_prev": "Previous unread channel:\tAlt|Shift|Up",
+  "shortcuts.nav.unread_prev.mac": "Previous unread channel:\t⌥|Shift|Up",
   "sidebar.channels": "ПУБЛИЧНЫЕ КАНАЛЫ",
   "sidebar.createChannel": "Создать публичный канал",
   "sidebar.createGroup": "Создать приватный канал",
   "sidebar.direct": "ЛИЧНЫЕ СООБЩЕНИЯ",
   "sidebar.favorite": "ИЗБРАННЫЕ КАНАЛЫ",
+  "sidebar.leave": "Покинуть Канал",
+  "sidebar.mainMenu": "Main Menu",
   "sidebar.more": "Еще",
   "sidebar.moreElips": "Еще...",
   "sidebar.otherMembers": "За пределами команды",
diff --git a/webapp/i18n/tr.json b/webapp/i18n/tr.json
index 49b011c8d..a8cdbddb9 100644
--- a/webapp/i18n/tr.json
+++ b/webapp/i18n/tr.json
@@ -9,6 +9,7 @@
   "about.hash": "Yapım Karması:",
   "about.hashee": "Kurumsal Yapım Karması:",
   "about.licensed": "Lisans sahibi:",
+  "about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
   "about.number": "Yapım Numarası:",
   "about.teamEditionLearn": "Mattermost topluluğuna katılın: ",
   "about.teamEditionSt": "Tüm takım iletişimi tek bir yerde, anında aranabilir ve her yerden erişilebilir.",
@@ -28,8 +29,10 @@
   "activity_log.sessionsDescription": "Oturumlar, bir aygıttan yeni bir tarayıcıda oturum açtığınızda oluşturulur. Oturum, Sistem Yöneticisi tarafından belirtilen süre boyunca yeniden oturum açmanız gerekmeden Mattermost kullanmanızı sağlar. Süre dolmadan önce oturumunuzu kapatmak isterseniz, aşağıdaki 'Oturum Kapatma' düğmesini kullanın.",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "Doğal Android Uygulaması",
+  "activity_log_modal.androidNativeClassicApp": "Android Doğal Klasik Uygulama",
   "activity_log_modal.desktop": "Doğal Masaüstü Uygulaması",
   "activity_log_modal.iphoneNativeApp": "Doğal iPhone Uygulaması",
+  "activity_log_modal.iphoneNativeClassicApp": "iPhone Doğal Klasik Uygulama",
   "add_command.autocomplete": "Otomatik doldur",
   "add_command.autocomplete.help": "(İsteğe bağlı) Bölü komutu otomatik tamamlama listesinde görüntülensin.",
   "add_command.autocompleteDescription": "Otomatik Tamamlama Açıklaması",
@@ -146,8 +149,20 @@
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
-  "admin.authentication.saml": "SAML",
+  "admin.authentication.saml": "SAML 2.0",
   "admin.banner.heading": "Not:",
+  "admin.client_versions.androidLatestVersion": "Son Android Sürümü",
+  "admin.client_versions.androidLatestVersionHelp": "Son yayınlanan Android sürümü",
+  "admin.client_versions.androidMinVersion": "En Düşük Android Sürümü",
+  "admin.client_versions.androidMinVersionHelp": "Uyumlu en düşük Android sürümü",
+  "admin.client_versions.desktopLatestVersion": "Son Masaüstü Sürümü",
+  "admin.client_versions.desktopLatestVersionHelp": "Son yayınlanan Masaüstü sürümü",
+  "admin.client_versions.desktopMinVersion": "En Düşük Masaüstü Sürümü",
+  "admin.client_versions.desktopMinVersionHelp": "Uyumlu en düşük Masaüstü sürümü",
+  "admin.client_versions.iosLatestVersion": "Son iOS sürümü",
+  "admin.client_versions.iosLatestVersionHelp": "Son yayınlanan iOS sürümü",
+  "admin.client_versions.iosMinVersion": "En düşük iOS sürümü",
+  "admin.client_versions.iosMinVersionHelp": "Uyumlu en düşük iOS sürümü",
   "admin.cluster.enableDescription": "Bu seçenek etkinleştirildiğinde, Mattermost Yüksek Erişilebilirlik kipinde çalışır. Mattermost Yüksek Erişilebilirlik ayarları hakkında ayrıntılı bilgi almak için <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target='_blank'>belgelere bakın</a>.",
   "admin.cluster.enableTitle": "Yüksek Erişilebilirlik Kipi Kullanılsın:",
   "admin.cluster.interNodeListenAddressDesc": "Sunucunun diğer sunucular ile iletişim kurmak için dinleyeceği adres.",
@@ -587,7 +602,7 @@
   "admin.log.locationPlaceholder": "Dosyanızın konumunu yazın",
   "admin.log.locationTitle": "Dosya Günlüğü Klasörü:",
   "admin.log.logSettings": "Günlük Ayarları",
-  "admin.logs.bannerDesc": "Kullanıcıları kullanıcı koduna göre aramak için Raporlar > Kullanıcılar bölümüne giderek arama süzgecine kodu yapıştırın.",
+  "admin.logs.bannerDesc": "Kullanıcıları Kullanıcı Kodu ya da Erişim Koduna göre aramak için Raporlar > Kullanıcılar bölümüne giderek arama süzgecine kodu yapıştırın.",
   "admin.logs.reload": "Yeniden Yükle",
   "admin.logs.title": "Sunucu Günlükleri",
   "admin.manage_roles.additionalRoles": "Hesaba verilecek ek izinleri seçin.<a href=\"https://about.mattermost.com/default-permissions\" target=\"_blank\">Rol ve izinler hakkında ayrıntılı bilgi alın</a>.",
@@ -651,15 +666,15 @@
   "admin.password.symbol": "En az bir simge (Örnek: \"~!@#$%^&*()\")",
   "admin.password.uppercase": "En az bir büyük harf",
   "admin.plugins.jira": "JIRA (Beta)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "kanaladi",
+  "admin.plugins.jira.channelParamNamePlaceholder": "kanaladresi",
   "admin.plugins.jira.enabledDescription": "Bu seçenek etkinleştirildiğinde, Mattermost iletileri gönderirken JIRA web bağlantıları belirtebilirsiniz. Sahtecilik girişimlerini engellemeye yardımcı olmak için tüm iletiler BOT kod imi ile etiketlenir.",
-  "admin.plugins.jira.enabledLabel": "Etkin:",
+  "admin.plugins.jira.enabledLabel": "JIRA kullanılsın:",
   "admin.plugins.jira.secretDescription": "Mattermost kimlik doğrulaması için kullanılacak parola.",
   "admin.plugins.jira.secretLabel": "Parola:",
   "admin.plugins.jira.secretParamPlaceholder": "parola",
   "admin.plugins.jira.secretRegenerateDescription": "Web bağlantısı uç noktasının parolasını yeniden üretir. Parolanın yeniden üretilmesi varolan JIRA bütünleştirmelerinizi geçersiz kılar.",
   "admin.plugins.jira.setupDescription": "JIRA bütünleştirmesini kurmak için bu bağlantı adresini kullanın. Ayrıntılı bilgi almak için {webhookDocsLink} bölümüne bakın.",
-  "admin.plugins.jira.teamParamPlaceholder": "takimadi",
+  "admin.plugins.jira.teamParamPlaceholder": "takimadresi",
   "admin.plugins.jira.userDescription": "Bu bütünleştirmenin ekleneceği kullanıcı adını seçin.",
   "admin.plugins.jira.userLabel": "Kullanıcı:",
   "admin.plugins.jira.webhookDocsLink": "belgeler",
@@ -719,8 +734,8 @@
   "admin.saml.emailAttrDesc": "Mattermost kullanıcılarının e-posta adreslerinin alınacağı SAML onayı özniteliği.",
   "admin.saml.emailAttrEx": "Örnek: \"Email\" ya da \"PrimaryEmail\"",
   "admin.saml.emailAttrTitle": "E-posta Özniteliği:",
-  "admin.saml.enableDescription": "Bu seçenek etkinleştirildiğinde, Mattermost üzerinde her zaman SAML kullanılarak oturum açılabilir. Mattermost üzerinde SAML yapılandırması ile ilgili ayrıntılı bilgi almak için <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>belgelere bakın</a>.",
-  "admin.saml.enableTitle": "SAML ile oturum açılabilsin:",
+  "admin.saml.enableDescription": "Bu seçenek etkinleştirildiğinde, Mattermost üzerinde her zaman SAML 2.0 kullanılarak oturum açılabilir. Mattermost üzerinde SAML yapılandırması ile ilgili ayrıntılı bilgi almak için <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>belgelere bakın</a>.",
+  "admin.saml.enableTitle": "SAML 2.0 ile oturum açılabilsin:",
   "admin.saml.encryptDescription": "Bu seçenek devre dışı bırakıldığında, Mattermost, Hizmet Sağlayıcınızın Herkese Açık sertifikası ile şifrelenmiş SAML onaylarının şifresini çözmez. Yalnız deneme ortamı için önerilir, üretim ortamlarında kullanılması önerilmez.",
   "admin.saml.encryptTitle": "Şifreme Kullanılsın:",
   "admin.saml.firstnameAttrDesc": "(İsteğe bağlı) Mattermost kullanıcılarının adlarının alınacağı SAML özniteliği.",
@@ -807,6 +822,9 @@
   "admin.service.insecureTlsTitle": "Güvenli Olmayan Dışa Giden Bağlantılar Kullanılsın: ",
   "admin.service.integrationAdmin": "Etkileşim yönetimi yöneticiler ile sınırlansın:",
   "admin.service.integrationAdminDesc": "Bu seçenek etkinleştirildiğinde, web bağlantıları ve bölü komutları yalnız Takım ve Sistem Yöneticileri ile Sistem Yöneticileri tarafından izin verilen OAuth 2.0 uygulamaları tarafından eklenip düzenlenebilir. Yönetici tarafından eklenen bütünleştirmeler tüm kullanıcılar için geçerlidir.",
+  "admin.service.internalConnectionsDesc": "Deneme ortamlarında, örneğin bir geliştirme makinasında bütünleştirme yazılımı geliştirirken, iç bağlantılara izin vermek için etki alanlarını, IP adreslerini ya da CIDR gösterimlerini belirtmek için bu seçeneği kullanın. Bir kullanıcının sunucu ya da iç ağdan gizli bilgileri alabilmesine olanak sağladığı için bu özelliğin <b>üretim ortamlarında kullanılması önerilmez</b>.<br /><br />Varsayılan olarak, Open Graph üst verisi, web bağlantıları ya da bölü komutları gibi kullanıcı tarafından belirtilen adreslerden, iç ağlar için kullanılan çevrim ya da yerel bağlantı  adresleri gibi ayrılmış IP adreslerine bağlantı kurulmasına izin verilmez. Anında bildirim, OAuth 2.0 ve WebRTC sunucu adreslerine güvenilmiştir ve bu ayardan etkilenmezler.",
+  "admin.service.internalConnectionsEx": "webbaglantilari.ic.ornek.com 127.0.0.1 10.0.16.0/28",
+  "admin.service.internalConnectionsTitle": "Şuraya yapılan güvenilmemiş iç bağlantılara izin verilsin: ",
   "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Sertifika Ön Bellek Dosyası:",
   "admin.service.letsEncryptCertificateCacheFileDescription": "Let's Encrypt hizmeti ile ilgili alınan sertifikalar ve diğer bilgiler bu dosyada saklanır.",
   "admin.service.listenAddress": "Dinleme Adresi:",
@@ -841,7 +859,7 @@
   "admin.service.useLetsEncrypt": "Let's Encrypt Kullanılsın:",
   "admin.service.useLetsEncryptDescription": "Bu seçenek etkinleştirildiğinde, Let's Encrypt sertifikaları otomatik olarak alınır. Bir istemci yeni bir etki alanına bağlanmak istediğinde sertifika alınır. Bu özellik birden çok etki alanı ile çalışır.",
   "admin.service.userAccessTokensDescLabel": "Ad: ",
-  "admin.service.userAccessTokensDescription": "Bu seçenek etkinleştirildiğinde, kullanıcılar <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">kişisel erişim kodları</a> oluşturarak <strong>Hesap Ayarları > Güvenlik</strong> bölümündeki bütünleştirmeler için kullanabilir. Bu kodlar API üzerinden kimlik doğrulaması için kullanılabilir ve hesaba tam erişim izni verir.<br/><br/>Kişisel erişim kodlarını oluşturabilecek kullanıcıları belirlemek için <strong>Sistem Konsolu > Kullanıcılar</strong> bölümüne gidin.",
+  "admin.service.userAccessTokensDescription": "Bu seçenek etkinleştirildiğinde, kullanıcılar <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">kişisel erişim kodları</a> oluşturarak <strong>Hesap Ayarları > Güvenlik</strong> bölümündeki bütünleştirmeler için kullanabilir. Bu kodlar API üzerinden kimlik doğrulaması için kullanılabilir ve hesaba tam erişim izni verir.<br/><br/>Kişisel erişim kodlarını oluşturabilecek kullanıcıları belirlemek ya da kullanıcılara erişim koduna göre aramak için <strong>Sistem Konsolu > Kullanıcılar</strong> bölümüne gidin.",
   "admin.service.userAccessTokensIdLabel": "Erişim Kodu: ",
   "admin.service.userAccessTokensTitle": "Kişisel Erişim Kodları Kullanılsın: ",
   "admin.service.webSessionDays": "AD/LDAP ve e-posta oturum süresi (gün):",
@@ -853,6 +871,7 @@
   "admin.sidebar.advanced": "Gelişmiş",
   "admin.sidebar.audits": "Uygunluk ve Denetim",
   "admin.sidebar.authentication": "Kimlik Doğrulama",
+  "admin.sidebar.client_versions": "İstemci Sürümleri",
   "admin.sidebar.cluster": "Yüksek Erişilebilirlik",
   "admin.sidebar.compliance": "Uygunluk",
   "admin.sidebar.configuration": "Ayarlar",
@@ -892,7 +911,7 @@
   "admin.sidebar.push": "Mobil Bildirim",
   "admin.sidebar.rateLimiting": "Hız Sınırlama",
   "admin.sidebar.reports": "RAPORLAMA",
-  "admin.sidebar.saml": "SAML",
+  "admin.sidebar.saml": "SAML 2.0",
   "admin.sidebar.security": "Güvenlik",
   "admin.sidebar.sessions": "Oturumlar",
   "admin.sidebar.settings": "AYARLAR",
@@ -1294,15 +1313,14 @@
   "claim.email_to_oauth.switchTo": "Hesabı {uiType} olarak değiştir",
   "claim.email_to_oauth.title": "E-posta/Parola Hesabını {uiType} olarak değiştir",
   "claim.ldap_to_email.confirm": "Parola Onayı",
-  "claim.ldap_to_email.email": "Oturum açmak için {email} adresini kullanacaksınız",
-  "claim.ldap_to_email.enterLdapPwd": "{site} e-posta hesabınız için {ldapPassword} yazın",
-  "claim.ldap_to_email.enterPwd": "E-posta hesabınız için yeni bir parola yazın",
+  "claim.ldap_to_email.email": "Kimlik doğrulama yöntemini değiştirdiğinizde oturum açmak için {email} kullanacaksınız. AD/LDAP kimlik doğrulama bilgilerinizi kullanarak Mattermost oturumu açamayacaksınız.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "Yeni e-posta ile oturum açma parolası:",
   "claim.ldap_to_email.ldapPasswordError": "Lütfen AD/LDAP parolanızı yazın.",
   "claim.ldap_to_email.ldapPwd": "AD/LDAP Parolası",
   "claim.ldap_to_email.pwd": "Parola",
   "claim.ldap_to_email.pwdError": "Lütfen parolanızı yazın.",
   "claim.ldap_to_email.pwdNotMatch": "Parola ve onayı aynı değil.",
-  "claim.ldap_to_email.ssoType": "Hesabınıza göre yalnız e-posta adresi ve parola ile oturum açabilirsiniz",
   "claim.ldap_to_email.switchTo": "Hesabı E-posta/Parola olarak değiştir",
   "claim.ldap_to_email.title": "AD/LDAP hesabını E-posta/Parola olarak değiştir",
   "claim.oauth_to_email.confirm": "Parola Onayı",
@@ -1761,7 +1779,7 @@
   "member_list.noUsersAdd": "Eklenecek bir kullanıcı yok.",
   "members_popover.manageMembers": "Üye Yönetimi",
   "members_popover.msg": "İleti",
-  "members_popover.title": "Üyeler",
+  "members_popover.title": "Kanal Üyeleri",
   "members_popover.viewMembers": "Üyeleri Görüntüle",
   "mfa.confirm.complete": "<strong>Kurulum tamamlandı!</strong>",
   "mfa.confirm.okay": "Tamam",
@@ -1829,6 +1847,15 @@
   "mobile.custom_list.no_results": "Herhangi bir sonuç bulunamadı",
   "mobile.drawer.teamsTitle": "Takımlar",
   "mobile.edit_post.title": "İleti Düzenleniyor",
+  "mobile.emoji_picker.activity": "ETKİNLİK",
+  "mobile.emoji_picker.custom": "ÖZEL",
+  "mobile.emoji_picker.flags": "İŞARETLER",
+  "mobile.emoji_picker.foods": "YİYECEKLER",
+  "mobile.emoji_picker.nature": "DOĞA",
+  "mobile.emoji_picker.objects": "NESNELER",
+  "mobile.emoji_picker.people": "KİŞİLER",
+  "mobile.emoji_picker.places": "YERLER",
+  "mobile.emoji_picker.symbols": "SİMGELER",
   "mobile.error_handler.button": "Yeniden başlat",
   "mobile.error_handler.description": "\nUygulamayı açmak için yeniden başlat üzerine tıklayın. Yeniden başlatıldıktan sonra ayarlar menüsünden sorunu bildirebilirsiniz.\n",
   "mobile.error_handler.title": "Beklenmeyen bir sorun çıktı",
@@ -1837,6 +1864,7 @@
   "mobile.file_upload.more": "Diğer",
   "mobile.file_upload.video": "Görüntü Kitaplığı",
   "mobile.help.title": "Yardım",
+  "mobile.image_preview.save": "Görseli Kaydet",
   "mobile.intro_messages.DM": "{teammate} takım arkadaşınız ile doğrudan ileti geçmişinizin başlangıcı. Bu bölüm dışındaki kişiler burada paylaşılan doğrudan ileti ve dosyaları göremez.",
   "mobile.intro_messages.default_message": "Takım arkadaşlarınız kayıt olduğunda görecekleri ilk kanal budur. Bu kanalı herkesin bilmesi gereken iletiler için kullanın.",
   "mobile.intro_messages.default_welcome": "{name} üzerine hoş geldiniz!",
@@ -1845,6 +1873,11 @@
   "mobile.loading_members": "Üyeler Yükleniyor...",
   "mobile.loading_posts": "İletiler Yükleniyor...",
   "mobile.login_options.choose_title": "Oturum açma yönteminizi seçin",
+  "mobile.managed.blocked_by": "{vendor} tarafından engellenmiş",
+  "mobile.managed.exit": "Çık",
+  "mobile.managed.jailbreak": "Jailbreak uygulanmış aygıtlara {vendor} tarafından güvenilmiyor, lütfen uygulamadan çıkın.",
+  "mobile.managed.secured_by": "{vendor} tarafından korunuyor",
+  "mobile.markdown.code.plusMoreLines": "+{count, number} satır daha",
   "mobile.more_dms.start": "Başlat",
   "mobile.more_dms.title": "Yeni Konuşma",
   "mobile.notice_mobile_link": "mobil uygulamalar",
@@ -1863,6 +1896,7 @@
   "mobile.post.failed_retry": "Yeniden Dene",
   "mobile.post.failed_title": "İletinizi gönderilemedi",
   "mobile.post.retry": "Yenile",
+  "mobile.post_info.add_reaction": "Tepki Ekle",
   "mobile.request.invalid_response": "Sunucudan geçersiz bir yanıt alındı.",
   "mobile.routes.channelInfo": "Bilgiler",
   "mobile.routes.channelInfo.createdBy": "{creator} tarafından şu zamanda oluşturuldu ",
@@ -1872,6 +1906,8 @@
   "mobile.routes.channel_members.action_message": "Kanaldan çıkarılacak en az bir üye seçmelisiniz.",
   "mobile.routes.channel_members.action_message_confirm": "Seçilmiş üyeleri kanaldan çıkarmak istediğinize emin misiniz?",
   "mobile.routes.channels": "Kanallar",
+  "mobile.routes.code": "{language} Kodu",
+  "mobile.routes.code.noLanguage": "Kod",
   "mobile.routes.enterServerUrl": "Sunucu Adresini Yazın",
   "mobile.routes.login": "Oturum Aç",
   "mobile.routes.loginOptions": "Oturum Açma Seçici",
@@ -1924,6 +1960,7 @@
   "msg_typing.someone": "Biri",
   "multiselect.add": "Ekle",
   "multiselect.go": "Git",
+  "multiselect.list.notFound": "Herhangi bir öge bulunamadı",
   "multiselect.numPeopleRemaining": "Gezinmek için ↑↓, seçmek için ↵ tuşlarını kullanın. {num, number} more {num, plural, one {person} other {people}} daha ekleyebilirsiniz. ",
   "multiselect.numRemaining": "{num, number} kişi daha ekleyebilirsiniz",
   "multiselect.placeholder": "Üye arama ve ekleme",
@@ -2044,6 +2081,7 @@
   "rename_channel.handleHolder": "küçük alfasayısal karakterler",
   "rename_channel.lowercase": "Küçük alfasayısal karakterler olmalı",
   "rename_channel.maxLength": "Bu alana en fazla {maxLength, number} karakter yazılabilir",
+  "rename_channel.minLength": "Kanal adında en az {minLength, number} karakter bulunmalıdır",
   "rename_channel.required": "Bu alan zorunludur",
   "rename_channel.save": "Kaydet",
   "rename_channel.title": "Kanalı Yeniden Adlandır",
@@ -2102,11 +2140,61 @@
   "setting_upload.import": "İçe Aktar",
   "setting_upload.noFile": "Herhangi bir dosya seçilmemiş.",
   "setting_upload.select": "Dosya seçin",
+  "shortcuts.browser.channel_next": "Geçmişte ileri git:\tAlt|Right",
+  "shortcuts.browser.channel_next.mac": "Geçmişte ileri git:\t⌘|]",
+  "shortcuts.browser.channel_prev": "Geçmişte geri git:\tAlt|Left",
+  "shortcuts.browser.channel_prev.mac": "Geçmişte geri git:\t⌘|[",
+  "shortcuts.browser.font_decrease": "Uzaklaştır:\tCtrl|-",
+  "shortcuts.browser.font_decrease.mac": "Uzaklaştır:\t⌘|-",
+  "shortcuts.browser.font_increase": "Yakınlaştır:\tCtrl|+",
+  "shortcuts.browser.font_increase.mac": "Yakınlaştır:\t⌘|+",
+  "shortcuts.browser.header": "İç Tarayıcı Komutları",
+  "shortcuts.browser.highlight_next": "Sonraki satırdaki metini vurgula:\tShift|Down",
+  "shortcuts.browser.highlight_prev": "Önceki satırdaki metni vurgula:\tShift|Up",
+  "shortcuts.browser.input.header": "Bir giriş alanının içinde kullanılır",
+  "shortcuts.browser.newline": "Yeni satır ekle:\tShift|Enter",
+  "shortcuts.files.header": "Dosyalar",
+  "shortcuts.files.upload": "Dosya yükle:\tCtrl|U",
+  "shortcuts.files.upload.mac": "Dosya yükle:\t⌘|U",
+  "shortcuts.header": "Tuştakımı Kısayolları",
+  "shortcuts.info": "Kullanabileceğiniz komutların listesini görmek için iletiye / yazarak başlayın.",
+  "shortcuts.msgs.comp.channel": "Kanal:\t~|[a-z]|Sekme",
+  "shortcuts.msgs.comp.emoji": "İfade:\t:|[a-z]|Sekme",
+  "shortcuts.msgs.comp.header": "Otomatik tamamla",
+  "shortcuts.msgs.comp.username": "Kullanıcı adı:\t@|[a-z]|Sekme",
+  "shortcuts.msgs.edit": "Kanaldaki son iletiyi düzenle:\tYukarı",
+  "shortcuts.msgs.header": "İletiler",
+  "shortcuts.msgs.input.header": "Boş bir giriş alanı içinde kullanılır",
+  "shortcuts.msgs.mark_as_read": "Geçerli kanalı okunmuş olarak işaretle:\tEsc",
+  "shortcuts.msgs.reply": "Kanaldaki son iletiyi yanıtla:\tShift|Yukarı",
+  "shortcuts.msgs.reprint_next": "Sonraki iletiyi yeniden yaz:\tCtrl|Aşağı",
+  "shortcuts.msgs.reprint_next.mac": "Sonraki iletiyi yeniden yaz:\t⌘|Aşağı",
+  "shortcuts.msgs.reprint_prev": "Önceki iletiyi yeniden yaz:\tCtrl|Yukarı",
+  "shortcuts.msgs.reprint_prev.mac": "Önceki iletiyi yeniden yaz:\t⌘|Yukarı",
+  "shortcuts.nav.direct_messages_menu": "Doğrudan iletiler menüsü:\tCtrl|Shift|K",
+  "shortcuts.nav.direct_messages_menu.mac": "Doğrudan iletiler menüsü:\t⌘|Shift|K",
+  "shortcuts.nav.header": "Gezinme",
+  "shortcuts.nav.next": "Sonraki kanal:\tAlt|Aşağı",
+  "shortcuts.nav.next.mac": "Sonraki kanal:\t⌥|Aşağı",
+  "shortcuts.nav.prev": "Önceki kanal:\tAlt|Yukarı",
+  "shortcuts.nav.prev.mac": "Önceki kanal:\t⌥|Yukarı",
+  "shortcuts.nav.recent_mentions": "Son anmalar:\tCtrl|Shift|M",
+  "shortcuts.nav.recent_mentions.mac": "Son anmalar:\t⌘|Shift|M",
+  "shortcuts.nav.settings": "Hesap ayarları:\tCtrl|Shift|A",
+  "shortcuts.nav.settings.mac": "Hesap ayarları:\t⌘|Shift|A",
+  "shortcuts.nav.switcher": "Hızlı kanal değiştirme:\tCtrl|K",
+  "shortcuts.nav.switcher.mac": "Hızlı kanal değiştirme:\t⌘|K",
+  "shortcuts.nav.unread_next": "Sonraki okunmamış kanal:\tAlt|Shift|Aşağı",
+  "shortcuts.nav.unread_next.mac": "Sonraki okunmamış kanal:\t⌥|Shift|Aşağı",
+  "shortcuts.nav.unread_prev": "Önceki okunmamış kanal:\tAlt|Shift|Yukarı",
+  "shortcuts.nav.unread_prev.mac": "Önceki okunmamış kanal:\t⌥|Shift|Yukarı",
   "sidebar.channels": "HERKESE AÇIK KANALLAR",
   "sidebar.createChannel": "Yeni herkese açık kanal ekle",
   "sidebar.createGroup": "Yeni özel kanal ekle",
   "sidebar.direct": "DOĞRUDAN İLETİLER",
   "sidebar.favorite": "BEĞENDİĞİM KANALLAR",
+  "sidebar.leave": "Kanaldan Ayrıl",
+  "sidebar.mainMenu": "Ana Menü",
   "sidebar.more": "Diğer",
   "sidebar.moreElips": "Diğer...",
   "sidebar.otherMembers": "Bu takımın dışında",
diff --git a/webapp/i18n/zh-CN.json b/webapp/i18n/zh-CN.json
index fbd764399..d60af374b 100644
--- a/webapp/i18n/zh-CN.json
+++ b/webapp/i18n/zh-CN.json
@@ -9,6 +9,7 @@
   "about.hash": "构建哈希：",
   "about.hashee": "构建EE哈希：",
   "about.licensed": "授权于：",
+  "about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
   "about.number": "编译号：",
   "about.teamEditionLearn": "加入Mattermost社区",
   "about.teamEditionSt": "所有团队的通讯一站式解决，随时随地可搜索和访问。",
@@ -28,8 +29,10 @@
   "activity_log.sessionsDescription": "当您在设备的新浏览器中登录时，将创建会话。会话让您使用Mattermost时无需在系统管理员限定的时间段内重新登录。如果您希望早些退出，点击下方的‘注销’按钮结束会话。",
   "activity_log_modal.android": "安卓",
   "activity_log_modal.androidNativeApp": "Android本地App",
+  "activity_log_modal.androidNativeClassicApp": "安卓经典应用",
   "activity_log_modal.desktop": "电脑应用",
   "activity_log_modal.iphoneNativeApp": "iPhone本地App",
+  "activity_log_modal.iphoneNativeClassicApp": "iPhone 经典应用",
   "add_command.autocomplete": "自动完成",
   "add_command.autocomplete.help": "(可选) 在自动完成列表显示斜杠命令。",
   "add_command.autocompleteDescription": "自动完成描述",
@@ -146,8 +149,20 @@
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
-  "admin.authentication.saml": "SAML",
+  "admin.authentication.saml": "SAML 2.0",
   "admin.banner.heading": "注释：",
+  "admin.client_versions.androidLatestVersion": "最新的安卓版本",
+  "admin.client_versions.androidLatestVersionHelp": "最新的安卓版本",
+  "admin.client_versions.androidMinVersion": "最低安卓版本",
+  "admin.client_versions.androidMinVersionHelp": "最低兼容的安卓版本",
+  "admin.client_versions.desktopLatestVersion": "最新的桌面版本",
+  "admin.client_versions.desktopLatestVersionHelp": "最新的桌面版本",
+  "admin.client_versions.desktopMinVersion": "最低的桌面版本",
+  "admin.client_versions.desktopMinVersionHelp": "最低兼容的桌面版本",
+  "admin.client_versions.iosLatestVersion": "最新的 IOS 版本",
+  "admin.client_versions.iosLatestVersionHelp": "最新的 IOS 版本",
+  "admin.client_versions.iosMinVersion": "最低的 IOS 版本",
+  "admin.client_versions.iosMinVersionHelp": "最低兼容的 IOS 版本",
   "admin.cluster.enableDescription": "当设为是时，Mattermost 将以高可用性模式运行。请参考<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target='_blank'>文档</a>了解 Mattermost 的高可用性。",
   "admin.cluster.enableTitle": "开启高可用性模式：",
   "admin.cluster.interNodeListenAddressDesc": "服务器与其他服务器通讯的监听地址。",
@@ -587,7 +602,7 @@
   "admin.log.locationPlaceholder": "输入你的文件位置",
   "admin.log.locationTitle": "日志文件目录：",
   "admin.log.logSettings": "日志设置",
-  "admin.logs.bannerDesc": "到 报告 > 用户 并在搜索过滤器输入 ID 以用户 ID 查找用户。",
+  "admin.logs.bannerDesc": "到 报告 > 用户 并在搜索过滤器输入 ID 以用户 ID  或令牌 ID 查找用户。",
   "admin.logs.reload": "重载",
   "admin.logs.title": "服务器日志",
   "admin.manage_roles.additionalRoles": "选择帐号额外的权限。<a href=\"https://about.mattermost.com/default-permissions\" target=\"_blank\">阅读更多关于角色于权限</a>。",
@@ -651,15 +666,15 @@
   "admin.password.symbol": "至少有一个符号 (例如：\"~!@#$%^&*()\")",
   "admin.password.uppercase": "至少有一个大写字母",
   "admin.plugins.jira": "JIRA (Beta)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "channelname",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelurl",
   "admin.plugins.jira.enabledDescription": "当设为是时，您可以设置 JIRA webhooks 发送消息到 Mattermost。为了避免钓鱼攻击，所有消息会被标上 BOT 标签。",
-  "admin.plugins.jira.enabledLabel": "已启用：",
+  "admin.plugins.jira.enabledLabel": "开启 JIRA：",
   "admin.plugins.jira.secretDescription": "此秘钥用于和 Mattermost 验证。",
   "admin.plugins.jira.secretLabel": "秘钥：",
   "admin.plugins.jira.secretParamPlaceholder": "secret",
   "admin.plugins.jira.secretRegenerateDescription": "重新生成 webhook 网址端点秘钥。重新生成秘钥将使现有 JIRA 整合无效。",
   "admin.plugins.jira.setupDescription": "使用 webhook 网址设置 JIRA 整合。参见 {webhookDocsLink} 了解详情。",
-  "admin.plugins.jira.teamParamPlaceholder": "teamname",
+  "admin.plugins.jira.teamParamPlaceholder": "teamurl",
   "admin.plugins.jira.userDescription": "选择此整合关联的用户名。",
   "admin.plugins.jira.userLabel": "用户：",
   "admin.plugins.jira.webhookDocsLink": "文档",
@@ -719,8 +734,8 @@
   "admin.saml.emailAttrDesc": "使用SAML断言中的属性做为Mattermost中用户的电子邮箱地址。",
   "admin.saml.emailAttrEx": "例如 \"Email\" 或 \"PrimaryEmail\"",
   "admin.saml.emailAttrTitle": "邮箱属性：",
-  "admin.saml.enableDescription": "当设为是时，Mattermost允许通过SAML登陆。请参考<a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>文档</a>了解Mattermost配置SAML。",
-  "admin.saml.enableTitle": "开启SAML登入：",
+  "admin.saml.enableDescription": "当设为是时，Mattermost 允许通过 SAML 2.0 登陆。请参考<a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>文档</a>了解 Mattermost 配置 SAML。",
+  "admin.saml.enableTitle": "开启 SAML 2.0 登入：",
   "admin.saml.encryptDescription": "当设为否时，Mattermost 将不会用使用您的服务提供者公开证书解密 SAML 断言。不推荐在正式环境中使用。仅供测试。",
   "admin.saml.encryptTitle": "开启加密：",
   "admin.saml.firstnameAttrDesc": "(可选) 使用SAML断言中的属性做为 Mattermost 中用户的昵称。",
@@ -807,6 +822,9 @@
   "admin.service.insecureTlsTitle": "启用不安全的对外连接：",
   "admin.service.integrationAdmin": "限制只有管理员能管理整合：",
   "admin.service.integrationAdminDesc": "当设为是时，webhhoks 和斜杠命令只由团队和系统管理员可以创建、修改和查看，同时只有系统管理员可以操作 OAuth 2.0 应用。整合在管理员创建后所有人可以使用。",
+  "admin.service.internalConnectionsDesc": "在测试环境中，比如在开发设备上本地开发整合时，使用此设定指定域名，IP 地址，或 CIDR 来允许内部连接。<b>不推荐在正式环境中使用</b>，因为这将允许用户从您的服务器或内部网络提取敏感数据。<br /><br />默认情况下，用户提供的 Open Graph，webhooks，或斜杠命令网址不允许连接到预留 IP 地址包括回环或用于内部网络的本地地址。推送通知，OAuth 2.0 以及 WebRTC 服务器地址为受信任网址并不受此设定影响。",
+  "admin.service.internalConnectionsEx": "webhooks.internal.example.com 127.0.0.1 10.0.16.0/28",
+  "admin.service.internalConnectionsTitle": "允许不受信任的内部连接到：",
   "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt 证书缓存文件：",
   "admin.service.letsEncryptCertificateCacheFileDescription": "从 Let's Encrypt 服务获取的证书和其他数据将储存于此文件。",
   "admin.service.listenAddress": "监听地址：",
@@ -853,6 +871,7 @@
   "admin.sidebar.advanced": "高级",
   "admin.sidebar.audits": "合规性与审计",
   "admin.sidebar.authentication": "验证",
+  "admin.sidebar.client_versions": "客户端版本",
   "admin.sidebar.cluster": "高可用性",
   "admin.sidebar.compliance": "合规",
   "admin.sidebar.configuration": "配置",
@@ -892,7 +911,7 @@
   "admin.sidebar.push": "移动推送",
   "admin.sidebar.rateLimiting": "速率限制",
   "admin.sidebar.reports": "报告",
-  "admin.sidebar.saml": "SAML",
+  "admin.sidebar.saml": "SAML 2.0",
   "admin.sidebar.security": "安全",
   "admin.sidebar.sessions": "会话",
   "admin.sidebar.settings": "设置",
@@ -1294,15 +1313,14 @@
   "claim.email_to_oauth.switchTo": "切换账户到 {uiType}",
   "claim.email_to_oauth.title": "切换邮箱/密码账号到 {uiType}",
   "claim.ldap_to_email.confirm": "确认密码",
-  "claim.ldap_to_email.email": "您将使用电子邮件{email}登录",
-  "claim.ldap_to_email.enterLdapPwd": "输入 {site} 电子邮件帐号的 {ldapPassword}",
-  "claim.ldap_to_email.enterPwd": "输入您的新电子邮件帐号密码",
+  "claim.ldap_to_email.email": "After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "New email login password:",
   "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": "切换到电子邮件/密码的 AD/LDAP 账户",
   "claim.oauth_to_email.confirm": "确认密码",
@@ -1761,7 +1779,7 @@
   "member_list.noUsersAdd": "没有用户可添加。",
   "members_popover.manageMembers": "成员管理",
   "members_popover.msg": "消息",
-  "members_popover.title": "成员",
+  "members_popover.title": "频道成员",
   "members_popover.viewMembers": "查看成员",
   "mfa.confirm.complete": "<strong>设置完成！</strong>",
   "mfa.confirm.okay": "确定",
@@ -1829,6 +1847,15 @@
   "mobile.custom_list.no_results": "无结果",
   "mobile.drawer.teamsTitle": "团队",
   "mobile.edit_post.title": "编辑消息",
+  "mobile.emoji_picker.activity": "活动",
+  "mobile.emoji_picker.custom": "自定义",
+  "mobile.emoji_picker.flags": "标志",
+  "mobile.emoji_picker.foods": "食物",
+  "mobile.emoji_picker.nature": "自然",
+  "mobile.emoji_picker.objects": "物体",
+  "mobile.emoji_picker.people": "人物",
+  "mobile.emoji_picker.places": "地点",
+  "mobile.emoji_picker.symbols": "符号",
   "mobile.error_handler.button": "重加载",
   "mobile.error_handler.description": "\n点击重启动应用。重启后，您可以在设定菜单汇报问题。\n",
   "mobile.error_handler.title": "发生未知错误",
@@ -1837,6 +1864,7 @@
   "mobile.file_upload.more": "更多",
   "mobile.file_upload.video": "视频库",
   "mobile.help.title": "帮助",
+  "mobile.image_preview.save": "Save Image",
   "mobile.intro_messages.DM": "这是您和{teammate}私信记录的开端。此区域外的人不能看到这里共享的私信和文件。",
   "mobile.intro_messages.default_message": "这是团队成员注册后第一个看到的频道 - 使用它发布所有人需要知道的消息。",
   "mobile.intro_messages.default_welcome": "欢迎来到 {name}！",
@@ -1845,6 +1873,11 @@
   "mobile.loading_members": "正在加载成员...",
   "mobile.loading_posts": "正在加载消息...",
   "mobile.login_options.choose_title": "选择您的登入方式",
+  "mobile.managed.blocked_by": "被 {vendor} 封锁",
+  "mobile.managed.exit": "退出",
+  "mobile.managed.jailbreak": "越狱的设备不被 {vendor} 信任，请退出应用。",
+  "mobile.managed.secured_by": "被 {vendor} 安全保护",
+  "mobile.markdown.code.plusMoreLines": "+{count, number} more lines",
   "mobile.more_dms.start": "开始",
   "mobile.more_dms.title": "新建对话",
   "mobile.notice_mobile_link": "移动应用",
@@ -1863,6 +1896,7 @@
   "mobile.post.failed_retry": "重试",
   "mobile.post.failed_title": "无法发送您的消息",
   "mobile.post.retry": "刷新",
+  "mobile.post_info.add_reaction": "Add Reaction",
   "mobile.request.invalid_response": "从服务器收到了无效回应。",
   "mobile.routes.channelInfo": "信息",
   "mobile.routes.channelInfo.createdBy": "{creator} 创建于 ",
@@ -1872,6 +1906,8 @@
   "mobile.routes.channel_members.action_message": "您必须至少选择一个要移出频道的成员。",
   "mobile.routes.channel_members.action_message_confirm": "您确定要将选择的成员移出频道？",
   "mobile.routes.channels": "频道",
+  "mobile.routes.code": "{language} 代码",
+  "mobile.routes.code.noLanguage": "代码",
   "mobile.routes.enterServerUrl": "输入服务器网址",
   "mobile.routes.login": "登录",
   "mobile.routes.loginOptions": "登入选择器",
@@ -1924,6 +1960,7 @@
   "msg_typing.someone": "有人",
   "multiselect.add": "添加",
   "multiselect.go": "转到",
+  "multiselect.list.notFound": "没有找到项目",
   "multiselect.numPeopleRemaining": "使用↑↓浏览，↵选择。您可以添加 {num, number} 位用户。",
   "multiselect.numRemaining": "您还可以添加 {num, number} 位",
   "multiselect.placeholder": "搜索并添加成员",
@@ -2044,6 +2081,7 @@
   "rename_channel.handleHolder": "小写字母符",
   "rename_channel.lowercase": "必须小写字母数字字符",
   "rename_channel.maxLength": "此字段必须小于 {maxLength, number} 个字符",
+  "rename_channel.minLength": "Channel name must be {minLength, number} or more characters",
   "rename_channel.required": "该字段不能为空",
   "rename_channel.save": "保存",
   "rename_channel.title": "重命名频道",
@@ -2102,11 +2140,61 @@
   "setting_upload.import": "导入",
   "setting_upload.noFile": "未选择文件。",
   "setting_upload.select": "选择文件",
+  "shortcuts.browser.channel_next": "历史里前进：\tAlt|Right",
+  "shortcuts.browser.channel_next.mac": "历史里前进：\t⌘|]",
+  "shortcuts.browser.channel_prev": "历史里后退：\tAlt|Left",
+  "shortcuts.browser.channel_prev.mac": "历史里后退：\t⌘|[",
+  "shortcuts.browser.font_decrease": "缩小：\tCtrl|-",
+  "shortcuts.browser.font_decrease.mac": "缩小：\t⌘|-",
+  "shortcuts.browser.font_increase": "放大：\tCtrl|+",
+  "shortcuts.browser.font_increase.mac": "放大：\t⌘|+",
+  "shortcuts.browser.header": "浏览器自带命令",
+  "shortcuts.browser.highlight_next": "高亮到下一行：\tShift|Down",
+  "shortcuts.browser.highlight_prev": "高亮到上一行：\tShift|Up",
+  "shortcuts.browser.input.header": "在输入栏工作",
+  "shortcuts.browser.newline": "创建新一行：\tShift|Enter",
+  "shortcuts.files.header": "文件",
+  "shortcuts.files.upload": "上传文件：\tCtrl|U",
+  "shortcuts.files.upload.mac": "上传文件：\t⌘|U",
+  "shortcuts.header": "键盘快捷键",
+  "shortcuts.info": "Begin a message with / for a list of all the commands at your disposal.",
+  "shortcuts.msgs.comp.channel": "频道：\t~|[a-z]|Tab",
+  "shortcuts.msgs.comp.emoji": "表情符：\t:|[a-z]|Tab",
+  "shortcuts.msgs.comp.header": "自动完成",
+  "shortcuts.msgs.comp.username": "用户名：\t@|[a-z]|Tab",
+  "shortcuts.msgs.edit": "编辑频道里上一条消息：\tUp",
+  "shortcuts.msgs.header": "信息",
+  "shortcuts.msgs.input.header": "在空输入栏工作",
+  "shortcuts.msgs.mark_as_read": "标当前频道为已读：\tEsc",
+  "shortcuts.msgs.reply": "Reply to last message in channel:\tShift|Up",
+  "shortcuts.msgs.reprint_next": "Reprint next message:\tCtrl|Down",
+  "shortcuts.msgs.reprint_next.mac": "Reprint next message:\t⌘|Down",
+  "shortcuts.msgs.reprint_prev": "Reprint previous message:\tCtrl|Up",
+  "shortcuts.msgs.reprint_prev.mac": "Reprint previous message:\t⌘|Up",
+  "shortcuts.nav.direct_messages_menu": "Direct messages menu:\tCtrl|Shift|K",
+  "shortcuts.nav.direct_messages_menu.mac": "Direct messages menu:\t⌘|Shift|K",
+  "shortcuts.nav.header": "导航",
+  "shortcuts.nav.next": "下个频道：\tAlt|Down",
+  "shortcuts.nav.next.mac": "下个频道：\t⌥|Down",
+  "shortcuts.nav.prev": "上个频道：\tAlt|Up",
+  "shortcuts.nav.prev.mac": "上个频道：\t⌥|Up",
+  "shortcuts.nav.recent_mentions": "Recent mentions:\tCtrl|Shift|M",
+  "shortcuts.nav.recent_mentions.mac": "Recent mentions:\t⌘|Shift|M",
+  "shortcuts.nav.settings": "帐号设定：\tCtrl|Shift|A",
+  "shortcuts.nav.settings.mac": "帐号设定：\t⌘|Shift|A",
+  "shortcuts.nav.switcher": "快速频道切换：\tCtrl|K",
+  "shortcuts.nav.switcher.mac": "快速频道切换：\t⌘|K",
+  "shortcuts.nav.unread_next": "下一个未读频道：\tAlt|Shift|Down",
+  "shortcuts.nav.unread_next.mac": "下一个未读频道：\t⌥|Shift|Down",
+  "shortcuts.nav.unread_prev": "上一个未读频道：\tAlt|Shift|Up",
+  "shortcuts.nav.unread_prev.mac": "上一个未读频道：\t⌥|Shift|Up",
   "sidebar.channels": "公开频道",
   "sidebar.createChannel": "创建公共频道",
   "sidebar.createGroup": "创建私有频道",
   "sidebar.direct": "私信",
   "sidebar.favorite": "我的最爱频道",
+  "sidebar.leave": "离开频道",
+  "sidebar.mainMenu": "主菜单",
   "sidebar.more": "更多",
   "sidebar.moreElips": "更多...",
   "sidebar.otherMembers": "此团队之外",
diff --git a/webapp/i18n/zh-TW.json b/webapp/i18n/zh-TW.json
index 678660897..853337dd1 100644
--- a/webapp/i18n/zh-TW.json
+++ b/webapp/i18n/zh-TW.json
@@ -9,6 +9,7 @@
   "about.hash": "編譯 Hash：",
   "about.hashee": "企業版編譯 Hash：",
   "about.licensed": "授權給：",
+  "about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
   "about.number": "編譯序號：",
   "about.teamEditionLearn": "加入 Mattermost 社群：",
   "about.teamEditionSt": "您的團隊溝通皆在同處，隨時隨地皆可搜尋與存取。",
@@ -28,8 +29,10 @@
   "activity_log.sessionsDescription": "當使用新的瀏覽器登入時工作階段會被建立。工作階段讓您可以在系統管理員設定的時間內不用重複登入。如果想先行登出，請使用下方的 '登出' 按鈕以結束工作階段。",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "Android 原生應用程式",
+  "activity_log_modal.androidNativeClassicApp": "Android Native Classic App",
   "activity_log_modal.desktop": "原生桌面應用程式",
   "activity_log_modal.iphoneNativeApp": "iPhone 原生應用程式",
+  "activity_log_modal.iphoneNativeClassicApp": "iPhone Native Classic App",
   "add_command.autocomplete": "自動完成",
   "add_command.autocomplete.help": "在自動完成列表上顯示斜線命令(非必須)。",
   "add_command.autocompleteDescription": "自動完成的描述",
@@ -146,8 +149,20 @@
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
-  "admin.authentication.saml": "SAML",
+  "admin.authentication.saml": "SAML 2.0",
   "admin.banner.heading": "註：",
+  "admin.client_versions.androidLatestVersion": "Latest Android Version",
+  "admin.client_versions.androidLatestVersionHelp": "The latest released Android version",
+  "admin.client_versions.androidMinVersion": "Minimum Android Version",
+  "admin.client_versions.androidMinVersionHelp": "The minimum compliant Android version",
+  "admin.client_versions.desktopLatestVersion": "Latest Desktop Version",
+  "admin.client_versions.desktopLatestVersionHelp": "The latest released Desktop version",
+  "admin.client_versions.desktopMinVersion": "Minimum Destop Version",
+  "admin.client_versions.desktopMinVersionHelp": "The minimum compliant Desktop version",
+  "admin.client_versions.iosLatestVersion": "Latest IOS Version",
+  "admin.client_versions.iosLatestVersionHelp": "The latest released IOS version",
+  "admin.client_versions.iosMinVersion": "Minimum IOS Version",
+  "admin.client_versions.iosMinVersionHelp": "The minimum compliant IOS version",
   "admin.cluster.enableDescription": "啟用時，Mattermost 將會運行於高可用性模式。請參閱<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target='_blank'>說明文件</a>以了解如何設定 Mattermost 的高可用性。",
   "admin.cluster.enableTitle": "啟用高可用性模式：",
   "admin.cluster.interNodeListenAddressDesc": "伺服器將會監聽此位址來跟其他伺服器通訊。",
@@ -651,15 +666,15 @@
   "admin.password.symbol": "至少一個符號(\"~!@#$%^&*()\")",
   "admin.password.uppercase": "至少一個大寫英文字母",
   "admin.plugins.jira": "JIRA (Beta)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "頻道名稱",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelurl",
   "admin.plugins.jira.enabledDescription": "啟用時可以設定 JIRA Webhook 在 Mattermost 上發布訊息。為了避免釣魚攻擊，所有貼文都會被標上 BOT 標籤。",
-  "admin.plugins.jira.enabledLabel": "已啟用：",
+  "admin.plugins.jira.enabledLabel": "Enable JIRA:",
   "admin.plugins.jira.secretDescription": "此密碼用以跟 Mattermost 認證。",
   "admin.plugins.jira.secretLabel": "密碼：",
   "admin.plugins.jira.secretParamPlaceholder": "密碼",
   "admin.plugins.jira.secretRegenerateDescription": "重新產生此 Webhook 網址端點的密碼。重新產生此密碼會讓現有的 JIRA 整合失效。",
   "admin.plugins.jira.setupDescription": "用此 Webhook URL 設定 JIRA 整合。詳情請看{webhookDocsLink}。",
-  "admin.plugins.jira.teamParamPlaceholder": "團隊名稱",
+  "admin.plugins.jira.teamParamPlaceholder": "teamurl",
   "admin.plugins.jira.userDescription": "選擇此外部整合依附的使用者名稱。",
   "admin.plugins.jira.userLabel": "使用者：",
   "admin.plugins.jira.webhookDocsLink": "說明文件",
@@ -807,6 +822,9 @@
   "admin.service.insecureTlsTitle": "啟用不安全的對外連線：",
   "admin.service.integrationAdmin": "限制只有管理員能管理外部整合：",
   "admin.service.integrationAdminDesc": "啟用時，Webhook 跟斜線命令將只有團隊與系統管理員能夠建立、編輯跟觀看，OAuth 2.0 應用程式將只有系統管理員能夠操作。外部整合在被管理員建立之後將會對所有使用者開放。",
+  "admin.service.internalConnectionsDesc": "在像是開發機器上開發外部整合一類的測試環境時，用此設定網域、IP 或 CIDR 來允許內部連線。由於這允許使用者從伺服器或內部網路中獲取機敏資料，<b>不建議用於正式環境</b>。<br/><br/>預設環境下，用於 Open Graph、Webhook 或 斜線命令等使用者提供的 URL 被禁止連往迴路或連結-本機位址。推播通知、OAuth 2.0 以及 WebRTC 伺服器網址為受信任網址，不受此設定影響。",
+  "admin.service.internalConnectionsEx": "webhooks.internal.example.com 127.0.0.1 10.0.16.0/28",
+  "admin.service.internalConnectionsTitle": "允許不受信任的內部連線連往：",
   "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt 憑證快取檔案：",
   "admin.service.letsEncryptCertificateCacheFileDescription": "取得的憑證以及其他關於 Let's Encrypt 服務的資料將會儲存於這個檔案。",
   "admin.service.listenAddress": "監聽位址：",
@@ -853,6 +871,7 @@
   "admin.sidebar.advanced": "進階",
   "admin.sidebar.audits": "規範與審計",
   "admin.sidebar.authentication": "認證",
+  "admin.sidebar.client_versions": "Client Versions",
   "admin.sidebar.cluster": "高可用性",
   "admin.sidebar.compliance": "規範",
   "admin.sidebar.configuration": "設定",
@@ -892,7 +911,7 @@
   "admin.sidebar.push": "行動推播",
   "admin.sidebar.rateLimiting": "張貼速率限制",
   "admin.sidebar.reports": "報告",
-  "admin.sidebar.saml": "SAML",
+  "admin.sidebar.saml": "SAML 2.0",
   "admin.sidebar.security": "安全",
   "admin.sidebar.sessions": "工作階段",
   "admin.sidebar.settings": "設定",
@@ -1294,15 +1313,14 @@
   "claim.email_to_oauth.switchTo": "切換帳號至 {uiType}",
   "claim.email_to_oauth.title": "由電子郵件地址/密碼帳號切換成 {uiType} 帳號",
   "claim.ldap_to_email.confirm": "密碼確認",
-  "claim.ldap_to_email.email": "用電子郵件地址 {email} 登入",
-  "claim.ldap_to_email.enterLdapPwd": "輸入 {site} 電子郵件帳戶的 {ldapPassword}",
-  "claim.ldap_to_email.enterPwd": "輸入電子郵件帳戶新密碼",
+  "claim.ldap_to_email.email": "After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "New email login password:",
   "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": "切換 AD/LDAP 帳戶到電子郵件地址/密碼",
   "claim.oauth_to_email.confirm": "密碼確認",
@@ -1761,7 +1779,7 @@
   "member_list.noUsersAdd": "沒有可增加的使用者。",
   "members_popover.manageMembers": "成員管理",
   "members_popover.msg": "訊息",
-  "members_popover.title": "成員",
+  "members_popover.title": "頻道成員",
   "members_popover.viewMembers": "檢視成員",
   "mfa.confirm.complete": "<strong>完成設定！</strong>",
   "mfa.confirm.okay": "確定",
@@ -1829,6 +1847,15 @@
   "mobile.custom_list.no_results": "找不到相符的結果",
   "mobile.drawer.teamsTitle": "團隊",
   "mobile.edit_post.title": "編輯訊息",
+  "mobile.emoji_picker.activity": "ACTIVITY",
+  "mobile.emoji_picker.custom": "CUSTOM",
+  "mobile.emoji_picker.flags": "FLAGS",
+  "mobile.emoji_picker.foods": "FOODS",
+  "mobile.emoji_picker.nature": "NATURE",
+  "mobile.emoji_picker.objects": "OBJECTS",
+  "mobile.emoji_picker.people": "PEOPLE",
+  "mobile.emoji_picker.places": "PLACES",
+  "mobile.emoji_picker.symbols": "SYMBOLS",
   "mobile.error_handler.button": "重新啟動",
   "mobile.error_handler.description": "\n點擊重新啟動以再次開啟 app。重新啟動後可以經由設定選單來回報問題。\n",
   "mobile.error_handler.title": "發生未預期的錯誤。",
@@ -1837,6 +1864,7 @@
   "mobile.file_upload.more": "更多",
   "mobile.file_upload.video": "媒體櫃",
   "mobile.help.title": "說明",
+  "mobile.image_preview.save": "Save Image",
   "mobile.intro_messages.DM": "這是跟{teammate}之間直接訊息的起頭。直接訊息跟在這邊分享的檔案除了在此處以外的人都看不到。",
   "mobile.intro_messages.default_message": "這將是團隊成員註冊後第一個看到的頻道，請利用它張貼所有人都應該知道的事項。",
   "mobile.intro_messages.default_welcome": "歡迎來到{name}！",
@@ -1845,6 +1873,11 @@
   "mobile.loading_members": "正在載入成員...",
   "mobile.loading_posts": "正在載入訊息...",
   "mobile.login_options.choose_title": "選擇登入方式",
+  "mobile.managed.blocked_by": "Blocked by {vendor}",
+  "mobile.managed.exit": "編輯",
+  "mobile.managed.jailbreak": "Jailbroken devices are not trusted by {vendor}, please exit the app.",
+  "mobile.managed.secured_by": "Secured by {vendor}",
+  "mobile.markdown.code.plusMoreLines": "+{count, number} more lines",
   "mobile.more_dms.start": "開始",
   "mobile.more_dms.title": "新對話",
   "mobile.notice_mobile_link": "行動裝置 App",
@@ -1863,6 +1896,7 @@
   "mobile.post.failed_retry": "重試",
   "mobile.post.failed_title": "無法傳送訊息",
   "mobile.post.retry": "重新整理",
+  "mobile.post_info.add_reaction": "Add Reaction",
   "mobile.request.invalid_response": "從伺服器傳來無效的回應。",
   "mobile.routes.channelInfo": "相關資訊",
   "mobile.routes.channelInfo.createdBy": "由 {creator} 建立於",
@@ -1872,6 +1906,8 @@
   "mobile.routes.channel_members.action_message": "必須選取至少一位成員以從頻道移除",
   "mobile.routes.channel_members.action_message_confirm": "您確定要從頻道移除選取的成員？",
   "mobile.routes.channels": "頻道",
+  "mobile.routes.code": "{language} Code",
+  "mobile.routes.code.noLanguage": "Code",
   "mobile.routes.enterServerUrl": "輸入伺服器網址",
   "mobile.routes.login": "登入",
   "mobile.routes.loginOptions": "登入選擇器",
@@ -1924,6 +1960,7 @@
   "msg_typing.someone": "某人",
   "multiselect.add": "新增",
   "multiselect.go": "前往",
+  "multiselect.list.notFound": "找不到任何使用者",
   "multiselect.numPeopleRemaining": "用↑↓ 瀏覽、 ↵ 選擇。可以增加 {num, number}人。",
   "multiselect.numRemaining": "還可以加 {num, number} 個",
   "multiselect.placeholder": "搜尋與新增成員",
@@ -2044,6 +2081,7 @@
   "rename_channel.handleHolder": "請用小寫英數字",
   "rename_channel.lowercase": "請用小寫英數字",
   "rename_channel.maxLength": "此欄位必須少於 {maxLength, number} 字",
+  "rename_channel.minLength": "Channel name must be {minLength, number} or more characters",
   "rename_channel.required": "此欄位是必需的",
   "rename_channel.save": "儲存",
   "rename_channel.title": "變更頻道名稱",
@@ -2102,11 +2140,61 @@
   "setting_upload.import": "匯入",
   "setting_upload.noFile": "未選取任何檔案。",
   "setting_upload.select": "選取檔案",
+  "shortcuts.browser.channel_next": "Forward in history:\tAlt|Right",
+  "shortcuts.browser.channel_next.mac": "Forward in history:\t⌘|]",
+  "shortcuts.browser.channel_prev": "Back in history:\tAlt|Left",
+  "shortcuts.browser.channel_prev.mac": "Back in history:\t⌘|[",
+  "shortcuts.browser.font_decrease": "Zoom out:\tCtrl|-",
+  "shortcuts.browser.font_decrease.mac": "Zoom out:\t⌘|-",
+  "shortcuts.browser.font_increase": "Zoom in:\tCtrl|+",
+  "shortcuts.browser.font_increase.mac": "Zoom in:\t⌘|+",
+  "shortcuts.browser.header": "Built-in Browser Commands",
+  "shortcuts.browser.highlight_next": "Highlight text to the next line:\tShift|Down",
+  "shortcuts.browser.highlight_prev": "Highlight text to the previous line:\tShift|Up",
+  "shortcuts.browser.input.header": "Works inside an input field",
+  "shortcuts.browser.newline": "Create a new line:\tShift|Enter",
+  "shortcuts.files.header": "檔案",
+  "shortcuts.files.upload": "Upload files:\tCtrl|U",
+  "shortcuts.files.upload.mac": "Upload files:\t⌘|U",
+  "shortcuts.header": "快速鍵",
+  "shortcuts.info": "Begin a message with / for a list of all the commands at your disposal.",
+  "shortcuts.msgs.comp.channel": "Channel:\t~|[a-z]|Tab",
+  "shortcuts.msgs.comp.emoji": "Emoji:\t:|[a-z]|Tab",
+  "shortcuts.msgs.comp.header": "自動完成",
+  "shortcuts.msgs.comp.username": "Username:\t@|[a-z]|Tab",
+  "shortcuts.msgs.edit": "Edit last message in channel:\tUp",
+  "shortcuts.msgs.header": "訊息",
+  "shortcuts.msgs.input.header": "Works inside an empty input field",
+  "shortcuts.msgs.mark_as_read": "Mark current channel as read:\tEsc",
+  "shortcuts.msgs.reply": "Reply to last message in channel:\tShift|Up",
+  "shortcuts.msgs.reprint_next": "Reprint next message:\tCtrl|Down",
+  "shortcuts.msgs.reprint_next.mac": "Reprint next message:\t⌘|Down",
+  "shortcuts.msgs.reprint_prev": "Reprint previous message:\tCtrl|Up",
+  "shortcuts.msgs.reprint_prev.mac": "Reprint previous message:\t⌘|Up",
+  "shortcuts.nav.direct_messages_menu": "Direct messages menu:\tCtrl|Shift|K",
+  "shortcuts.nav.direct_messages_menu.mac": "Direct messages menu:\t⌘|Shift|K",
+  "shortcuts.nav.header": "Navigation",
+  "shortcuts.nav.next": "Next channel:\tAlt|Down",
+  "shortcuts.nav.next.mac": "Next channel:\t⌥|Down",
+  "shortcuts.nav.prev": "Previous channel:\tAlt|Up",
+  "shortcuts.nav.prev.mac": "Previous channel:\t⌥|Up",
+  "shortcuts.nav.recent_mentions": "Recent mentions:\tCtrl|Shift|M",
+  "shortcuts.nav.recent_mentions.mac": "Recent mentions:\t⌘|Shift|M",
+  "shortcuts.nav.settings": "Account settings:\tCtrl|Shift|A",
+  "shortcuts.nav.settings.mac": "Account settings:\t⌘|Shift|A",
+  "shortcuts.nav.switcher": "Quick channel switcher:\tCtrl|K",
+  "shortcuts.nav.switcher.mac": "Quick channel switcher:\t⌘|K",
+  "shortcuts.nav.unread_next": "Next unread channel:\tAlt|Shift|Down",
+  "shortcuts.nav.unread_next.mac": "Next unread channel:\t⌥|Shift|Down",
+  "shortcuts.nav.unread_prev": "Previous unread channel:\tAlt|Shift|Up",
+  "shortcuts.nav.unread_prev.mac": "Previous unread channel:\t⌥|Shift|Up",
   "sidebar.channels": "公開頻道",
   "sidebar.createChannel": "建立公開頻道",
   "sidebar.createGroup": "建立私人頻道",
   "sidebar.direct": "直接傳訊",
   "sidebar.favorite": "我的最愛",
+  "sidebar.leave": "離開頻道",
+  "sidebar.mainMenu": "Main Menu",
   "sidebar.more": "更多",
   "sidebar.moreElips": "更多...",
   "sidebar.otherMembers": "此團隊以外",