translations PR 20170807 (#7144)

* translations PR 20170807

* Fix pt-BR variable

14 files changed, 2256 insertions, 553 deletions

diff --git a/webapp/i18n/de.json b/webapp/i18n/de.json
index 311ee0b65..4a0823f2b 100644
--- a/webapp/i18n/de.json
+++ b/webapp/i18n/de.json
@@ -25,7 +25,7 @@
   "activity_log.moreInfo": "Weitere Informationen",
   "activity_log.os": "Betriebssystem: {os}",
   "activity_log.sessionId": "Sitzungs-ID: {id}",
-  "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.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.desktop": "Native Desktop-App",
@@ -142,7 +142,7 @@
   "admin.advance.metrics": "Performance-Überwachung",
   "admin.audits.reload": "Benutzeraktivitäten-Logs neuladen",
   "admin.audits.title": "Benutzeraktivitäten-Logs",
-  "admin.authentication.email": "E-Mail-Authentifikation",
+  "admin.authentication.email": "E-Mail-Authentifizierung",
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
@@ -203,8 +203,6 @@
   "admin.compliance_table.userId": "Benötigt von",
   "admin.connectionSecurityNone": "Keine",
   "admin.connectionSecurityNoneDescription": "Mattermost wird sich über eine unsichere Verbindung verbinden.",
-  "admin.connectionSecurityPlain": "PLAIN",
-  "admin.connectionSecurityPlainDescription": "Mattermost wird sich über eine unsichere Verbindung verbinden und authentifizieren.",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "Versucht eine existierende unsichere Verbindung in eine TLS Verbindung zu ändern.",
   "admin.connectionSecurityTest": "Verbindung testen",
@@ -235,12 +233,60 @@
   "admin.customization.support": "Rechtsabteilung und Support",
   "admin.database.title": "Datenbank Einstellungen",
   "admin.developer.title": "Entwickler Einstellungen",
+  "admin.elasticsearch.bulkIndexButton.error": "Fehler bei der Planung des Bulk-Index-Jobs: {error}",
+  "admin.elasticsearch.connectionUrlDescription": "Die Adresse des Elasticsearch-Servers. {documentationLink}",
+  "admin.elasticsearch.connectionUrlExample": "Z.B.: \"https://elasticsearch.example.org:9200\"",
+  "admin.elasticsearch.connectionUrlExample.documentationLinkText": "Bitte die Dokumentation mit Servereinrichtungsanleitung ansehen.",
+  "admin.elasticsearch.connectionUrlTitle": "Server-Verbindungsadresse:",
+  "admin.elasticsearch.elasticsearch_test_button": "Verbindung testen",
+  "admin.elasticsearch.enableIndexingDescription": "Wenn wahr, geschieht die Indizierung neuer Nachrichten automatisch. Suchanfragen werden die Datenbanksuche verwenden, bis \"Elasticsearch für Suchanfragen aktivieren\" aktiviert ist. {documentationLink}",
+  "admin.elasticsearch.enableIndexingDescription.documentationLinkText": "Lernen Sie mehr über Elasticsearch in unserer Dokumentation.",
+  "admin.elasticsearch.enableIndexingTitle": "Elasticsearch-Indizierung aktivieren:",
+  "admin.elasticsearch.enableSearchingDescription": "Benötigt eine erfolgreiche Verbindung zum Elasticsearch-Server. Wenn wahr, wird Elasticsearch für alle Suchanfragen mit dem neuesten Index verwendet. Suchergebnisse können unvollständig sein bis eine Massenindizierung abgeschlossen ist. Wenn falsch, wird die Datenbanksuche verwendet.",
+  "admin.elasticsearch.enableSearchingTitle": "Elasticsearch für Suchanfragen aktivieren:",
+  "admin.elasticsearch.indexButton.inProgress": "Indizierung läuft",
+  "admin.elasticsearch.indexButton.ready": "Index erstellen",
+  "admin.elasticsearch.indexHelpText.buildIndex": "Alle Beiträge in der Datenbank werden vom Ältesten zum Neusten indiziert. Elasticsearch ist während der Indizierung verfügbar, aber die Suchergebnisse könnten unvollständig sein, bis der Indizierungs-Job vollständig ist.",
+  "admin.elasticsearch.indexHelpText.cancelIndexing": "Abbrechen stoppt den Indizierungs-Job und entfernt ihn aus der Warteschlange. Beiträge, die noch nich indiziert wurden, werden nicht gelöscht.",
+  "admin.elasticsearch.noteDescription": "Änderungen an Einstellungen in diesem Bereich erfordern einen Server-Neustart, bevor sie in Kraft treten.",
+  "admin.elasticsearch.password": "Z.B.: \"ihrpasswort\"",
+  "admin.elasticsearch.passwordDescription": "(Optional) Das Passwort zur Authentifizierung am Elasticsearch-Server.",
+  "admin.elasticsearch.passwordTitle": "Server-Passwort:",
+  "admin.elasticsearch.purgeIndexesButton": "Indexe leeren",
+  "admin.elasticsearch.purgeIndexesButton.error": "Fehler beim Leeren des Indexes: {error}",
+  "admin.elasticsearch.purgeIndexesButton.label": "Indexe leeren:",
+  "admin.elasticsearch.purgeIndexesButton.success": "Indexe erfolgreich geleert.",
+  "admin.elasticsearch.purgeIndexesHelpText": "Leeren wird den gesamten Index auf dem Elasticsearch-Server entfernen. Suchergebnisse könnten unvollständig sein bis ein Bulk-Index der existierenden Beitrags-Datenbank wiederaufgebaut ist.",
+  "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 Verbindung nicht. 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\"",
+  "admin.elasticsearch.usernameTitle": "Server-Benutzername:",
+  "admin.elasticsearchStatus.bulkIndexLabel": "Bulk-Indizierung:",
+  "admin.elasticsearchStatus.cancelButton": "Abbrechen",
+  "admin.elasticsearchStatus.status": "Status",
+  "admin.elasticsearchStatus.statusCancelled": "Indizierungs-Job abgebrochen.",
+  "admin.elasticsearchStatus.statusError": "Indizierungsfehler.",
+  "admin.elasticsearchStatus.statusError.help": "Mattermost hat einen Fehler beim Erstellen des Elasticsearch-Indexes festgestellt: {error}",
+  "admin.elasticsearchStatus.statusInProgress": "Job läuft. {percent}% abgeschlossen.",
+  "admin.elasticsearchStatus.statusInProgress.help": "Indizierung läuft auf dem Job-Server. Falls Elasticsearch aktiviert ist, könnten Suchergebnisse unvollständig sein, bis der Job abgeschlossen ist.",
+  "admin.elasticsearchStatus.statusIndexingDisabled": "Indizierung deaktiviert.",
+  "admin.elasticsearchStatus.statusLoading": "Lade...",
+  "admin.elasticsearchStatus.statusNoJobs": "Keine Indizierungs-Jobs in Warteschlange.",
+  "admin.elasticsearchStatus.statusPending": "Job bevorstehend.",
+  "admin.elasticsearchStatus.statusPending.help": "Elasticsearch-Indizierungs-Job ist in der Warteschlange auf dem Job-Server. Falls Elasticsearch aktiviert ist, könnten Suchergebnisse unvollständig sein, bis der Job abgeschlossen ist.",
+  "admin.elasticsearchStatus.statusRequestCancel": "Job wird abgebrochen...",
+  "admin.elasticsearchStatus.statusSuccess": "Indizierung abgeschlossen.",
+  "admin.elasticsearchStatus.statusSuccess.help": "Indizierung ist abgeschlossen und neue Beiträge werden automatisch indiziert.",
   "admin.email.agreeHPNS": " Ich verstehe und akzeptiere <a href=\"https://about.mattermost.com/hpns-terms/\" target='_blank'>die Bedingungen</a> des Mattermost Hosted Push Notification Service Terms of Service und die <a href=\"https://about.mattermost.com/hpns-privacy/\" target='_blank'>Datenschutzerklärung</a>.",
   "admin.email.allowEmailSignInDescription": "Wenn wahr, erlaubt Mattermost Nutzern sich mit E-Mail und Passwort anzumelden.",
   "admin.email.allowEmailSignInTitle": "Erlaube Login mit E-Mail: ",
   "admin.email.allowSignupDescription": "Wenn wahr, erlaubt Mattermost Teamerstellung und Registrierung via E-Mail und Passwort.  Dieser Wert sollte nur falsch sein, wenn Sie Anmeldungen auf SSO-Dienste wie OAuth oder AD/LDAP beschränken möchten.",
   "admin.email.allowSignupTitle": "Erlaube Kontoerstellung mit E-Mail: ",
-  "admin.email.allowUsernameSignInDescription": "Wenn wahr, erlaubt Mattermost Nutzern sich mit Benutzername und Passwort anzumelden.  Diese Einstellungen wird typischerweise nur genutzt, wenn E-Mail-Bestätigung deaktiviert ist.",
+  "admin.email.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=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target='_blank'>Enterprise App Store</a>.",
@@ -248,18 +294,26 @@
   "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.",
   "admin.email.enableEmailBatching.siteURL": "E-Mail-Stapelverarbeitung kann nicht aktiviert werden, solange SiteURL nicht in <b>Konfiguration > SiteURL</b> konfiguriert ist.",
-  "admin.email.enableEmailBatchingDesc": "Wenn wahr, können Benutzer Benachrichtigungen für mehrere Direktnachrichten und Erwähnungen in eine einzelne E-Mail kombinieren, konfigurierbar unter <b>Kontoeinstellungen > Benachrichtigungen</b>.",
+  "admin.email.enableEmailBatchingDesc": "Wenn wahr, werden Benutzer E-Mail-Benachrichtigungen für mehrere Direktnachrichten und Erwähnungen kombiniert in einer einzigen Mail erhalten. Die Abarbeitung wird in einem Standardintervall von 15 Minuten stattfinden, konfigurierbar in Kontoeinstellungen > Benachrichtigungen.",
   "admin.email.enableEmailBatchingTitle": "E-Mail-Stapelverarbeitung aktivieren:",
+  "admin.email.enableSMTPAuthDesc": "Wenn aktiviert, werden Benutzername und Passwort für die Authentifizierung am SMTP-Server verwendet.",
+  "admin.email.enableSMTPAuthTitle": "SMTP-Authentifizierung aktivieren:",
   "admin.email.fullPushNotification": "Senden eines Ausschnitts der vollständigen Nachricht",
+  "admin.email.genericNoChannelPushNotification": "Send generic description with only sender name",
   "admin.email.genericPushNotification": "Sende allgemeine Beschreibung mit Benutzer- und Kanalnamen",
   "admin.email.inviteSaltDescription": "32 Zeichen langer Salt der zum Signieren von E-Mail Einladungen hinzugefügt wird. Zufallsgeneriert bei Installation. \"Neu generieren\" klicken um einen neuen Salt zu erstellen.",
   "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=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target='_blank'>HPNS</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=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target='_blank'>TPNS</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=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-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=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target='_blank'>TPNS</a>.",
   "admin.email.nofificationOrganizationExample": "Z.B. \"© Musterfirma GmbH, Musterstraße 23, 59424 Musterhausen, Deutschland\"",
+  "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.generic": "Send generic description with only sender name",
+  "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": "Push-Mitteilungs-Inhalt:",
   "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\"",
   "admin.email.notificationDisplayTitle": "Absendername:",
@@ -274,7 +328,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": "Die Auswahl von \"Sende allgemeine Beschreibung mit Benutzer- und Kanalnamen\" sendet Push-Benachrichtigungen mit allgemeinen Mitteilungen, die die Namen des Nutzers und des Kanals enthalten, jedoch keine Details aus der tatsächlichen Mitteilung enthalten.<br /><br />Die Auswahl von \"Sende der Ausschnitt der Mitteilung\" sendet Teile der auslösenden Mitteilung mit konkreten Angaben und möglicherweise geheimen Informationen aus der Mitteilung. Sofern der Push-Mitteilungs-Service außerhalb Ihrer Firewall ist, empfehlen wir dieses Option ausschließlich in Verbindung mit dem \"https\" Protokoll zu nutzen um die Verbindung zu verschlüsseln.",
+  "admin.email.pushContentDesc": "\"Send generic description with only sender name\" includes only the name of the person who sent the message in push notifications, with no information about channel name or message contents.<br /><br />\"Send generic description with sender and channel names\" includes the name of the person who sent the message and the channel it was sent in, but not the message text.<br /><br />\"Send full message snippet\" includes a message excerpt in push notifications, which may contain confidential information sent in messages. If your Push Notification Service is outside your firewall, it is *highly recommended* this option only be used with an \"https\" protocol to encrypt the connection.",
   "admin.email.pushContentTitle": "Push-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",
@@ -288,7 +342,7 @@
   "admin.email.selfPush": "Manuelle Eingabe des Orts zum Push-Mitteilungs-Service",
   "admin.email.skipServerCertificateVerification.description": "Wenn wahr, wird Mattermost das Zertifikat des E-Mail-Servers nicht verifizieren.",
   "admin.email.skipServerCertificateVerification.title": "Serverzertifikatsüberprüfung überspringen: ",
-  "admin.email.smtpPasswordDescription": " Die Zugangsdaten erhalten Sie vom Administrator des E-Mail-Servers.",
+  "admin.email.smtpPasswordDescription": "Das mit dem SMTP-Benutzernamen verbundene Passwort.",
   "admin.email.smtpPasswordExample": "Z.B.: \"IhrPasswort\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "SMTP-Server-Passwort:",
   "admin.email.smtpPortDescription": "Port des SMTP E-Mail-Servers.",
@@ -297,13 +351,17 @@
   "admin.email.smtpServerDescription": "Adresse des SMTP E-Mail-Servers.",
   "admin.email.smtpServerExample": "Z.B.: \"smtp.ihrefirma.de\", \"email-smtp.eu-west-1.amazonaws.com\"",
   "admin.email.smtpServerTitle": "SMTP-Server:",
-  "admin.email.smtpUsernameDescription": " Die Zugangsdaten erhalten Sie vom Administrator des E-Mail-Servers.",
+  "admin.email.smtpUsernameDescription": "Der Benutzername zur Authentifizierung am SMTP-Server.",
   "admin.email.smtpUsernameExample": "Z.B.: \"admin@ihrefirma.de\", \"AKIADTOVBGERKLCBV\"",
   "admin.email.smtpUsernameTitle": "SMTP-Server-Benutzername:",
   "admin.email.testing": "Überprüfen...",
   "admin.false": "falsch",
-  "admin.file.enableFileAttachments": "Dateianhänge aktivieren:",
-  "admin.file.enableFileAttachmentsDesc": "Wenn falsch, werden Datei- und Bildanhäge an Nachrichten deaktiviert.",
+  "admin.file.enableFileAttachments": "Dateiaustausch erlauben:",
+  "admin.file.enableFileAttachmentsDesc": "Wenn falsch, wird der Dateiaustausch auf dem Server deaktiviert. Alle Datei- und Bild-Uploads sind über alle Clients hinweg, inklusive Mobilgeräten, verboten.",
+  "admin.file.enableMobileDownloadDesc": "Wenn falsch, werden Datei-Downloads in mobilen Apps deaktiviert. Benutzer können immer noch Dateien über einen mobilen Browser herunterladen.",
+  "admin.file.enableMobileDownloadTitle": "Datei-Download auf Mobilgeräten erlauben:",
+  "admin.file.enableMobileUploadDesc": "Wenn falsch, werden Datei-Uploads in mobilen Apps deaktiviert. Benutzer können immer noch Dateien über einen mobilen Browser hochladen.",
+  "admin.file.enableMobileUploadTitle": "Datei-Upload auf Mobilgeräten erlauben:",
   "admin.file_upload.chooseFile": "Datei auswählen",
   "admin.file_upload.noFile": "Keine Datei hochgeladen",
   "admin.file_upload.uploadFile": "Hochladen",
@@ -476,7 +534,7 @@
   "admin.ldap.skipCertificateVerification": "Zertifikatsprüfung überspringen:",
   "admin.ldap.skipCertificateVerificationDesc": "Zertifikatsprüfung für TLS oder STARTTLS Verbindungen überspringen. Nicht empfohlen bei Produktionsumgebungen bei denen TLS benötigt wird. Nur zum Test gedacht.",
   "admin.ldap.syncFailure": "Sync Fehler: {error}",
-  "admin.ldap.syncIntervalHelpText": "Die AD/LDAP-Synchronisation aktualisiert die Mattermost-Benutzerinformationen um die Änderungen auf dem AD/LDAP-Server zu spiegeln. Wenn zum Beispiel der Name eines Benutzers auf dem AD/LDAP-Server geändert wird, wird die Änderung in Mattermost bei der nächsten Synchronisierung durchgeführt. Gelöschte oder deaktivierte Konten auf dem AD/LDAP-Server setzen die Benutzer als \"Inaktiv\" und die Benutzersessions werden entfernt. Mattermost führt die Synchronisation im hier spezifizierten Intervall durch. Wenn zum Beispiel 60 eingegeben wird, synchronisiert Mattermost alle 60 Minuten.",
+  "admin.ldap.syncIntervalHelpText": "Die AD/LDAP-Synchronisation aktualisiert die Mattermost-Benutzerinformationen um die Änderungen auf dem AD/LDAP-Server zu spiegeln. Wenn zum Beispiel der Name eines Benutzers auf dem AD/LDAP-Server geändert wird, wird die Änderung in Mattermost bei der nächsten Synchronisierung durchgeführt. Gelöschte oder deaktivierte Konten auf dem AD/LDAP-Server setzen die Benutzer als \"Inaktiv\" und die Benutzer-Sessions werden entfernt. Mattermost führt die Synchronisation im hier spezifizierten Intervall durch. Wenn zum Beispiel 60 eingegeben wird, synchronisiert Mattermost alle 60 Minuten.",
   "admin.ldap.syncIntervalTitle": "Synchronisationsintervall (in Minuten):",
   "admin.ldap.syncNowHelpText": "Initiiert eine sofortige AD/LDAP Synchronisation.",
   "admin.ldap.sync_button": "AD/LDAP jetzt abgleichen",
@@ -529,6 +587,21 @@
   "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.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.cancel": "Abbrechen",
+  "admin.manage_roles.manageRolesTitle": "Rollen verwalten",
+  "admin.manage_roles.postAllPublicRole": "Zugriff zum Senden in alle öffentlichen Mattermost-Kanäle.",
+  "admin.manage_roles.postAllPublicRoleTitle": "post:channels",
+  "admin.manage_roles.postAllRole": "Zugriff zum Senden in alle Mattermost-Kanäle inklusive Direktnachrichten.",
+  "admin.manage_roles.postAllRoleTitle": "post:all",
+  "admin.manage_roles.save": "Speichern",
+  "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\">Authentifizierung gegenüber der REST-API</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.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.",
@@ -574,6 +647,19 @@
   "admin.password.requirementsDescription": "Erforderliche Zeichentypen für ein gültiges Passwort.",
   "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.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.secretDescription": "Dieses Geheimnis wird zur Authentifizierung gegenüber Mattermost verwendet.",
+  "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.userDescription": "Benutzernamen auswählen, mit dem die Integration verbunden ist.",
+  "admin.plugins.jira.userLabel": "Benutzer",
+  "admin.plugins.jira.webhookDocsLink": "Dokumentation",
   "admin.privacy.showEmailDescription": "Wenn falsch wird die E-Mail Adresse der Mitglieder vor jedem außer den Systemadministratoren versteckt.",
   "admin.privacy.showEmailTitle": "Zeige E-Mail-Adresse: ",
   "admin.privacy.showFullNameDescription": "Wenn falsch wird der Name der Mitglieder vor jedem außer den Systemadministratoren versteckt. Anstelle des vollen Namens wird der Benutzername angezeigt.",
@@ -603,19 +689,19 @@
   "admin.rate.title": "Begrenzer-Einstellungen",
   "admin.recycle.button": "Datenbankverbindungen recyclen",
   "admin.recycle.loading": " Wiederaufbereitung...",
-  "admin.recycle.recycleDescription": "Installationen, die mehrere Datenbanken verwenden, können von einer Master Datenbank zu einer anderen umschalten, ohne den Mattermost Server neu starten zu müssen, indem die \"config.json\" mit der neuen Konfiguration angepasst wird und die Funktion {reloadConfiguration} verwendet wird. Hierdurch werden die neuen Einstellungen geladen während der Server läuft. Der Administrator sollte dann die Funktion {featureName} nutzen, um die Datenbankverbindung aus Basis der aktualisierten Konfiguration neu herzustellen.",
+  "admin.recycle.recycleDescription": "Installationen, die mehrere Datenbanken verwenden, können von einer Hauptdatenbank zu einer anderen umschalten, ohne den Mattermost-Server neu starten zu müssen, indem die \"config.json\" mit der neuen Konfiguration aktualisiert wird und die Funktion {reloadConfiguration} verwendet wird. Hierdurch werden die neuen Einstellungen geladen während der Server läuft. Der Administrator sollte dann die Funktion {featureName} nutzen, um die Datenbankverbindung auf Basis der aktualisierten Konfiguration zu recyclen.",
   "admin.recycle.recycleDescription.featureName": "Datenbankverbindungen recyclen",
   "admin.recycle.recycleDescription.reloadConfiguration": "Konfiguration > Konfiguration von Festplatte neu laden",
   "admin.recycle.reloadFail": "Recycling nicht erfolgreich: {error}",
   "admin.regenerate": "Neu generieren",
   "admin.reload.button": "Konfigurationen neu von Festplatte laden",
   "admin.reload.loading": " Lädt...",
-  "admin.reload.reloadDescription": "Installationen, die mehrere Datenbanken verwenden, können von einer Master Datenbank zu einer anderen umschalten, ohne den Mattermost Server neu starten zu müssen, indem die \"config.json\" mit der neuen Konfiguration angepasst wird und die Funktion {featureName} verwendet wird. Hierdurch werden die neuen Einstellungen geladen während der Server läuft. Der Administrator sollte dann die Funktion {recycleDatabaseConnections} nutzen, um die Datenbankverbindung aus Basis der aktualisierten Konfiguration neu herzustellen.",
+  "admin.reload.reloadDescription": "Installationen, die mehrere Datenbanken verwenden, können von einer Hauptdatenbank zu einer anderen umschalten, ohne den Mattermost-Server neu starten zu müssen, indem die \"config.json\" mit der neuen Konfiguration aktualisiert wird und die Funktion {featureName} verwendet wird. Hierdurch werden die neuen Einstellungen geladen während der Server läuft. Der Administrator sollte dann die Funktion {recycleDatabaseConnections} nutzen, um die Datenbankverbindung auf Basis der aktualisierten Konfiguration zu recyclen.",
   "admin.reload.reloadDescription.featureName": "Konfiguration neu von Festplatte laden",
   "admin.reload.reloadDescription.recycleDatabaseConnections": "Datenbank > Datenbankverbindungen recyclen",
   "admin.reload.reloadFail": "Neuladen nicht erfolgreich: {error}",
   "admin.requestButton.loading": " Lädt...",
-  "admin.requestButton.requestFailure": "Test Fehler: {error}",
+  "admin.requestButton.requestFailure": "Test-Fehler: {error}",
   "admin.requestButton.requestSuccess": "Test erfolgreich",
   "admin.reset_password.close": "Schließen",
   "admin.reset_password.newPassword": "Neues Passwort",
@@ -703,7 +789,7 @@
   "admin.service.corsTitle": "Erlaube Cross Origin Requests von:",
   "admin.service.developerDesc": "Wenn wahr, werden Javascript Fehler in einer roten Zeile im oberen Bereich des Interfaces angezeigt. Nicht empfohlen für Produktionsumgebungen. ",
   "admin.service.developerTitle": "Aktiviere Entwickler Modus: ",
-  "admin.service.enableAPIv3": "Die Verwendung des API v3 Endpunktes erlauben:",
+  "admin.service.enableAPIv3": "Die Verwendung des API-v3-Endpunktes erlauben:",
   "admin.service.enableAPIv3Description": "Auf falsch setzen um alle Endpunkte der Version 3 der REST API zu deaktivieren. Integrationen, die API v3 verwenden, werden nicht mehr funktionieren und können für die Migration zu API v4 identifiziert werden. API v3 ist überholt und wird in der nahen Zukunft entfernt werden. <a href='https://api.mattermost.com' target='_blank'>https://api.mattermost.com</a> für mehr Details besuchen.",
   "admin.service.enforceMfaDesc": "Wenn wahr, wird <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>Multi-Faktor-Authentifizierung</a> für einen Login vorausgesetzt. Neue Benutzer werden aufgefordert MFA bei der Registrierung zu konfigurieren. Angemeldete Benutzer ohne eingerichtete MFA werden zur MFA-Einrichtungsseite weitergeleitet bis die Einrichtung abgeschlossen wurde.<br/><br/>Wenn es im System Benutzer mit einer anderen Anmeldemethode als AD/LDAP oder E-Mail gibt, muss MFA beim Authentifikationsprovider außerhalb von Mattermost erzwungen werden.",
   "admin.service.enforceMfaTitle": "Multi-Faktor-Authentifizierung erzwingen:",
@@ -723,7 +809,7 @@
   "admin.service.listenAddress": "Empfangs-Adresse:",
   "admin.service.listenDescription": "Die Adresse und Port an die gebunden und gehört wird. Bei Angabe von \":8065\" wird an alle Netzwerkkarten gebunden. Bei Angabe von \"127.0.0.1:8065\" wird nur an die Netzwerkkarte mit der IP Adresse gebunden. Wenn Sie einen Port eines niedrigen Levels wählen (auch \"System Ports\" oder \"Well Known Ports\" im Bereich 0-1023), müssen Sie Berechtigungen für das Binden an den Port haben. Auf Linux können Sie \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" verwenden um Mattermost das Binden an Well Known Ports zu erlauben.",
   "admin.service.listenExample": "Z.B.: \":8065\"",
-  "admin.service.mfaDesc": "Wenn wahr, können Benutzer mit AD/LDAP- oder E-Mail-Anmeldung Multi-Faktor-Authentifikation ihrem Konto mit Google Authenticator hinzufügen.",
+  "admin.service.mfaDesc": "Wenn wahr, können Benutzer mit AD/LDAP- oder E-Mail-Anmeldung Multi-Faktor-Authentifizierung ihrem Konto mit Google-Authenticator hinzufügen.",
   "admin.service.mfaTitle": "Multi-Faktor-Authentifizierung einschalten:",
   "admin.service.mobileSessionDays": "Sessiondauer für mobile Anwendungen (Tage):",
   "admin.service.mobileSessionDaysDesc": "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.",
@@ -751,6 +837,10 @@
   "admin.service.tlsKeyFileDescription": "Der zu verwendende private Schlüssel.",
   "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.userAccessTokensIdLabel": "Token-ID: ",
+  "admin.service.userAccessTokensTitle": "Benutzer-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.",
@@ -769,6 +859,7 @@
   "admin.sidebar.customization": "Anpassung",
   "admin.sidebar.database": "Datenbank",
   "admin.sidebar.developer": "Entwickler",
+  "admin.sidebar.elasticsearch": "Elasticsearch (Beta)",
   "admin.sidebar.email": "E-Mail",
   "admin.sidebar.emoji": "Emoji",
   "admin.sidebar.external": "Externe Dienste",
@@ -776,6 +867,7 @@
   "admin.sidebar.general": "Allgemein",
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.integrations": "Integrationen",
+  "admin.sidebar.jira": "JIRA (Beta)",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Rechtsabteilung und Support",
   "admin.sidebar.license": "Edition und Lizenz",
@@ -883,9 +975,9 @@
   "admin.team.restrictTitle": "Begrenze Kontoerstellung auf spezifizierte E-Mail-Domains:",
   "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 (Standard)",
+  "admin.team.showFullname": "Zeige Vor- und Nachname",
   "admin.team.showNickname": "Zeige Spitzname wenn verfügbar, sonst zeige Vor- und Nachname",
-  "admin.team.showUsername": "Zeige Benutzername",
+  "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\"",
   "admin.team.siteNameTitle": "Seitenname:",
@@ -915,7 +1007,9 @@
   "admin.user_item.makeMember": "Zum Mitglied machen",
   "admin.user_item.makeSysAdmin": "Zum Systemadministrator machen",
   "admin.user_item.makeTeamAdmin": "Zum Teamadministrator machen",
+  "admin.user_item.manageRoles": "Rollen verwalten",
   "admin.user_item.manageTeams": "Teams verwalten",
+  "admin.user_item.manageTokens": "Token verwalten",
   "admin.user_item.member": "Mitglied",
   "admin.user_item.mfaNo": "<strong>MFA</strong>: Nein",
   "admin.user_item.mfaYes": "<strong>MFA</strong>: Ja",
@@ -924,6 +1018,9 @@
   "admin.user_item.switchToEmail": "Umschalten zu E-Mail-Adresse/Passwort",
   "admin.user_item.sysAdmin": "Systemadministrator",
   "admin.user_item.teamAdmin": "Teamadministrator",
+  "admin.user_item.userAccessTokenPostAll": "(with post:all personal access tokens)",
+  "admin.user_item.userAccessTokenPostAllPublic": "(with post:channels personal access tokens)",
+  "admin.user_item.userAccessTokenYes": "Keine Benutzer-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.",
@@ -1314,14 +1411,14 @@
   "emoji_picker.custom": "Benutzerdefiniert",
   "emoji_picker.emojiPicker": "Emoji-Auswahl",
   "emoji_picker.flags": "Flaggen",
-  "emoji_picker.food": "Essen",
+  "emoji_picker.foods": "Essen",
   "emoji_picker.nature": "Natur",
   "emoji_picker.objects": "Objekte",
   "emoji_picker.people": "Leute",
+  "emoji_picker.places": "Orte",
   "emoji_picker.recent": "Zuletzt verwendet",
   "emoji_picker.search": "Suche",
   "emoji_picker.symbols": "Symbole",
-  "emoji_picker.travel": "Reisen",
   "error.local_storage.help1": "Cookies aktivieren",
   "error.local_storage.help2": "Privates Browsen abschalten",
   "error.local_storage.help3": "Verwenden Sie einen unterstützen Browser (IE 11, Chrome 43+, Firefox 38+, Safari 9, Edge)",
@@ -1479,7 +1576,7 @@
   "help.mentioning.mentions": "## @Erwähnungen\nVerwenden Sie @Erwähnungen um die Aufmerksamkeit eines spezifischen Teammitgliedes zu erhalten.",
   "help.mentioning.recent": "## Letzte Erwähnungen\nKlicken Sie auf das `@`neben dem Suchfeld um die letzten @Erwähnungen und Wörter, die eine Erwähnungen auslösen, aufzurufen. Klicken Sie auf **Anzeigen** neben dem Suchergebnis in der rechten Seitenleiste um im mittleren Feld an die Stelle der Mittteilung mit der Erwähnungen zu springen.",
   "help.mentioning.title": "# Teammitglieder erwähnen\n_____",
-  "help.mentioning.triggers": "## Wörter welche Erwähnungen auslösen\nZusätzlich zur Benachrichtigung durch @Benutzername und @channel können Sie eigene Wörter unter **Kontoeinstellungen** > **Benachrichtigungen** > **Wörter, welche Erwähnungen auslösen** definieren welche eine Erwähnungsbenachrichtigung auslösen. Standardmäßig erhalten Sie Erwähnungsmeldungen für Ihren Vornamen und Sie können weitere Wörter durch Eingabe in das Feld separiert durch Kommas hinzufügen. Dies ist hilfreich wenn Sie wegen bestimmter Themen benachrichtigt werden wollen, wie zum Beispiel \"Vorstellungsgespräche\" oder \"Marketing\".",
+  "help.mentioning.triggers": "## Wörter welche Erwähnungen auslösen\nZusätzlich zur Benachrichtigung durch @Benutzername und @channel können Sie eigene Wörter unter **Kontoeinstellungen** > **Benachrichtigungen** > **Wörter, welche Erwähnungen auslösen** definieren welche eine Erwähnungsbenachrichtigung auslösen. Standardmäßig erhalten Sie Erwähnungsbenachrichtigungen für Ihren Vornamen und Sie können weitere Wörter durch Eingabe in das Feld, separiert durch Kommas, hinzufügen. Dies ist hilfreich, wenn Sie wegen bestimmter Themen benachrichtigt werden wollen, wie zum Beispiel \"Vorstellungsgespräche\" oder \"Marketing\".",
   "help.mentioning.username": "#### @Benutzername\nSie können ein Teammitglied erwähnen, indem Sie das `@`-Symbol und seinen Benutzernamen verwenden, um ihm eine Benachrichtigung zu senden.\n\nTippen Sie `@` um eine Liste der Mitglieder aufzurufen, die erwähnt werden können. Um die Liste zu filtern, tippen Sie die ersten Buchstaben des Benutzernamens, Vornamens, Nachnamens oder Spitznamens. Die **Hoch** und **Runter** Pfeiltasten können zum Scrollen durch die Liste verwendet werden und durch drücken von **Enter** wird die gewählte Erwähnung übernommen. Sobald dieser ausgewählt wurde wird der volle Name oder Spitzname durch den Benutzernamen ersetzt.\nDas folgende Beispiel sendet eine Erwähnungsnachricht an **alice*, welche Sie über den Kanal und die Mitteilung informiert, in der sie erwähnt wurde. Wenn **alice** von Mattermost abwesend ist und [E-Mail-Benachrichtigung](http://docs.mattermost.com/help/getting-started/configuring-notifications.html#email-notifications) aktiviert hat, erhält sie eine E-Mail mit der Mitteilung.",
   "help.mentioning.usernameCont": "Sollte der erwähnte Benutzer kein Kanalmitglied sein wird eine Systemnachricht angezeigt um Sie darüber zu informieren. Dies ist eine temporäre Mitteilung die nur auslösende Person sieht. Um den erwähnten Benutzer dem Kanal hinzuzufügen, gehen Sie zum Dropdown Menü neben dem Kanalnamen und wählen **Mitglieder hinzufügen**.",
   "help.mentioning.usernameExample": "@alice wie lief das Vorstellungsgespräch mit dem neuen Kandidaten?",
@@ -1495,7 +1592,7 @@
   "installed_commands.delete.confirm": "Diese Aktion wird den Slash-Befehl permanent löschen und wird jede Integration, die ihn verwendet, stoppen. Sind Sie sich sicher dass sie ihn löschen möchten?",
   "installed_commands.empty": "Keine Befehle gefunden",
   "installed_commands.header": "Slash-Befehle",
-  "installed_commands.help": "Verwenden Sie Slash-Befehle um externe Tools mit Mattermost zu verbinden. {buildYourOwn} oder besuchen Sie das {appDirectory} um selbst gehostete, Drittanwendungen und Integrationen zu finden.",
+  "installed_commands.help": "Verwenden Sie Slash-Befehle um externe Tools mit Mattermost zu verbinden. {buildYourOwn} oder besuchen Sie das {appDirectory} um selbst gehostete Anwendungen, Drittanbieteranwendungen und Integrationen zu finden.",
   "installed_commands.help.appDirectory": "App-Verzeichnis",
   "installed_commands.help.buildYourOwn": "Selbst entwickeln",
   "installed_commands.search": "Suche nach Slash-Befehlen",
@@ -1504,7 +1601,7 @@
   "installed_incoming_webhooks.delete.confirm": "Die Aktion wird den eingehenden Webhook permanent löschen und jede Integration, die ihn verwendet, stoppen. Sind Sie sich sicher dass sie ihn löschen möchten?",
   "installed_incoming_webhooks.empty": "Keine eingehende Webhooks gefunden",
   "installed_incoming_webhooks.header": "Eingehende Webhooks",
-  "installed_incoming_webhooks.help": "Verwenden Sie eingehende Webhooks um externe Tools mit Mattermost zu verbinden. {buildYourOwn} oder besuchen Sie das {appDirectory} um selbst gehostete, Drittanwendungen und Integrationen zu finden.",
+  "installed_incoming_webhooks.help": "Verwenden Sie eingehende Webhooks um externe Tools mit Mattermost zu verbinden. {buildYourOwn} oder besuchen Sie das {appDirectory} um selbst gehostete Anwendungen, Drittanbieteranwendungen und Integrationen zu finden.",
   "installed_incoming_webhooks.help.appDirectory": "App-Verzeichnis",
   "installed_incoming_webhooks.help.buildYourOwn": "Selbst entwickeln",
   "installed_incoming_webhooks.search": "Suche nach eingehenden Webhooks",
@@ -1532,7 +1629,7 @@
   "installed_oauth_apps.description": "Beschreibung",
   "installed_oauth_apps.empty": "Keine OAuth-2.0-Applikationen gefunden",
   "installed_oauth_apps.header": "OAuth-2.0-Applikationen",
-  "installed_oauth_apps.help": "Erstellen Sie {oauthApplications} um Bots und Drittanwendungen mit Mattermost sicher zu verbinden. Besuchen Sie das {appDirectory} um selbst gehostete Anwendungen zu finden.",
+  "installed_oauth_apps.help": "Erstellen Sie {oauthApplications} um Bots und Drittanbieteranwendungen mit Mattermost sicher zu verbinden. Besuchen Sie das {appDirectory} um verfügbare selbst gehostete Anwendungen zu finden.",
   "installed_oauth_apps.help.appDirectory": "App-Verzeichnis",
   "installed_oauth_apps.help.oauthApplications": "OAuth-2.0-Applikationen",
   "installed_oauth_apps.homepage": "Homepage",
@@ -1548,7 +1645,7 @@
   "installed_outgoing_webhooks.delete.confirm": "Diese Aktion wird den ausgehenden Webhook permanent löschen und und jede Integration, die ihn verwendet, stoppen. Sind Sie sich sicher, dass Sie ihn löschen möchten?",
   "installed_outgoing_webhooks.empty": "Keine ausgehenden Webhooks gefunden",
   "installed_outgoing_webhooks.header": "Ausgehende Webhooks",
-  "installed_outgoing_webhooks.help": "Verwenden Sie ausgehende Webhooks um externe Tools mit Mattermost zu verbinden. {buildYourOwn} oder besuchen Sie das {appDirectory} um selbst gehostete, Drittanwendungen und Integrationen zu finden.",
+  "installed_outgoing_webhooks.help": "Verwenden Sie ausgehende Webhooks um externe Tools mit Mattermost zu verbinden. {buildYourOwn} oder besuchen Sie das {appDirectory} um selbst gehostete Anwendungen, Drittanbieteranwendungen und Integrationen zu finden.",
   "installed_outgoing_webhooks.help.appDirectory": "App-Verzeichnis",
   "installed_outgoing_webhooks.help.buildYourOwn": "Selbst entwickeln",
   "installed_outgoing_webhooks.search": "Suche ausgehende Webhooks",
@@ -1561,7 +1658,7 @@
   "integrations.done": "Erledigt",
   "integrations.edit": "Bearbeiten",
   "integrations.header": "Integrationen",
-  "integrations.help": "Besuchen Sie das {appDirectory} um selbst gehostete Drittanwendungen und Integrationen für Mattermost zu finden.",
+  "integrations.help": "Besuchen Sie das {appDirectory} um selbst gehostete Drittanbieteranwendungen und Integrationen für Mattermost zu finden.",
   "integrations.help.appDirectory": "App-Verzeichnis",
   "integrations.incomingWebhook.description": "Eingehende Webhooks erlauben externen Integrationen Nachrichten zu senden",
   "integrations.incomingWebhook.title": "Eingehende Webhooks",
@@ -1688,6 +1785,10 @@
   "mobile.account_notifications.threads_mentions": "Erwähnungen in Antworten",
   "mobile.account_notifications.threads_start": "Diskussionen die ich starte",
   "mobile.account_notifications.threads_start_participate": "Diskussionen die ich starte oder an denen ich teilnehme",
+  "mobile.advanced_settings.reset_button": "Zurücksetzen",
+  "mobile.advanced_settings.reset_message": "\nDies wird alle gespeicherten Offlinedaten löschen und die Anwendung neustarten. Sie werden automatisch wieder angemeldet, sobald die App neugestartet wurde.\n",
+  "mobile.advanced_settings.reset_title": "Cache zurücksetzen",
+  "mobile.advanced_settings.title": "Erweiterte Einstellungen",
   "mobile.channel_drawer.search": "Springe zu einer Konversation",
   "mobile.channel_info.alertMessageDeleteChannel": "Sind Sie sicher, dass Sie den {term} {name} löschen möchten?",
   "mobile.channel_info.alertMessageLeaveChannel": "Sind Sie sicher, dass Sie den {term} {name} verlassen möchten?",
@@ -1726,7 +1827,7 @@
   "mobile.drawer.teamsTitle": "Teams",
   "mobile.edit_post.title": "Nachricht bearbeiten",
   "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 die Einstellungen melden.\n",
+  "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",
   "mobile.file_upload.camera": "Ein Foto oder ein Video aufnehmen",
   "mobile.file_upload.library": "Foto-Bibliothek",
@@ -1741,11 +1842,17 @@
   "mobile.loading_members": "Lade Mitglieder...",
   "mobile.loading_posts": "Lade Mitteilungen...",
   "mobile.login_options.choose_title": "Wählen Sie Ihre Anmeldemethode",
+  "mobile.more_dms.start": "Start",
+  "mobile.more_dms.title": "Neue Konversation",
+  "mobile.notice_mobile_link": "mobile Apps",
+  "mobile.notice_platform_link": "Plattform",
+  "mobile.notice_text": "Mattermost wird durch die in {platform} und {mobile} verwendete Open-Source-Software ermöglicht.",
   "mobile.notification.in": " in ",
   "mobile.offlineIndicator.connected": "Verbunden",
   "mobile.offlineIndicator.connecting": "Verbinde...",
   "mobile.offlineIndicator.offline": "Keine Internetverbindung",
   "mobile.open_dm.error": "Der Direktnachrichtenkanal mit {displayName} konnte nicht geöffnet werden. Bitte überprüfen Sie Ihre Verbindung und versuchen es erneut.",
+  "mobile.open_gm.error": "Der Gruppennachrichtenkanal mit diesen Benutzern konnte nicht geöffnet werden. Bitte überprüfen Sie Ihre Verbindung und versuchen es erneut.",
   "mobile.post.cancel": "Abbrechen",
   "mobile.post.delete_question": "Möchten Sie diese Nachricht wirklich löschen?",
   "mobile.post.delete_title": "Nachricht löschen",
@@ -1775,6 +1882,8 @@
   "mobile.routes.thread_dm": "Direktnachrichten-Diskussion",
   "mobile.routes.user_profile": "Profil",
   "mobile.routes.user_profile.send_message": "Nachricht senden",
+  "mobile.search.jump": "JUMP",
+  "mobile.search.no_results": "Keine Ergebnisse gefunden",
   "mobile.select_team.choose": "Ihre Teams:",
   "mobile.select_team.join_open": "Offene Teams, denen Sie beitreten können",
   "mobile.select_team.no_teams": "Es sind keine Teams zum Betreten für Sie verfügbar.",
@@ -1786,8 +1895,9 @@
   "mobile.session_expired": "Sitzung abgelaufen: Bitte anmelden um weiterhin Benachrichtigungen zu erhalten.",
   "mobile.settings.clear": "Offline-Speicher leeren",
   "mobile.settings.clear_button": "Leeren",
-  "mobile.settings.clear_message": "\nDies wird alle gespeicherten Offlinedaten löschen und die Anwendung neustarten. Sie werden automatisch wieder angemeldet sobald die App neugestartet wurde.\n",
+  "mobile.settings.clear_message": "\nDies wird alle gespeicherten Offlinedaten löschen und die Anwendung neustarten. Sie werden automatisch wieder angemeldet, sobald die App neugestartet wurde.\n",
   "mobile.settings.team_selection": "Teamauswahl",
+  "mobile.suggestion.members": "Mitglieder",
   "modal.manaul_status.ask": "Nicht wieder nachfragen",
   "modal.manaul_status.button": "Ja, meinen Status auf \"Online\" setzen",
   "modal.manaul_status.cancel": "Nein, \"{status}\" beibehalten",
@@ -1884,6 +1994,8 @@
   "post_focus_view.beginning": "Anfang des Kanal-Archivs",
   "post_info.del": "Löschen",
   "post_info.edit": "Bearbeiten",
+  "post_info.message.visible": "(Nur für Sie sichtbar)",
+  "post_info.message.visible.compact": " (Nur für Sie sichtbar)",
   "post_info.mobile.flag": "Markieren",
   "post_info.mobile.unflag": "Demarkieren",
   "post_info.permalink": "Dauerhafter Link",
@@ -1896,12 +2008,12 @@
   "posts_view.loadMore": "Weitere Nachrichten laden",
   "posts_view.loadingMore": "Lade weitere Nachrichten...",
   "posts_view.newMsg": "Neue Nachrichten",
-  "posts_view.newMsgBelow": "{count} neue {count, plural, one {Mitteilung} other {Mitteilungen}} weiter unten",
+  "posts_view.newMsgBelow": "Neue {count, plural, one {Mitteilung} other {Mitteilungen}}",
   "quick_switch_modal.channels": "Kanäle",
   "quick_switch_modal.channelsShortcut.mac": "- ⌘K",
   "quick_switch_modal.channelsShortcut.windows": "- STRG+K",
   "quick_switch_modal.help": "Beginnen Sie zu schreiben und nutzen dann TAB um zwischen Kanälen/Teams umzuschalten, ↑↓ zum Navigieren, ↵ zum Auswählen und ESC zum Abbrechen.",
-  "quick_switch_modal.help_mobile": "Tippen um einen Kanal zu finden.",
+  "quick_switch_modal.help_mobile": "Tippen, um einen Kanal zu finden.",
   "quick_switch_modal.help_no_team": "Beginnen Sie mit der Eingabe, um Kanäle zu finden. Verwenden Sie ↑↓ zum Navigieren, ↵ zum Auswählen und ESC zum Abbrechen.",
   "quick_switch_modal.teams": "Teams",
   "quick_switch_modal.teamsShortcut.mac": "- ⌘⌥K",
@@ -1928,7 +2040,7 @@
   "rename_channel.displayNameHolder": "Anzeigenamen eingeben",
   "rename_channel.handleHolder": "Kleinbuchstaben oder Ziffern",
   "rename_channel.lowercase": "Dürfen nur Kleinbuchstaben oder Ziffern sein",
-  "rename_channel.maxLength": "Dieses Feld darf nur bis zu 22 Zeichen enthalten",
+  "rename_channel.maxLength": "Dieses Feld muss kleiner als {maxLength, number} Zeichen sein",
   "rename_channel.required": "Dieses Feld wird erforderlich",
   "rename_channel.save": "Speichern",
   "rename_channel.title": "Kanal umbenennen",
@@ -1967,6 +2079,7 @@
   "search_item.jump": "Anzeigen",
   "search_results.because": "<ul><li>Wenn Sie nach einem Textteil suchen(z.b. suche nach \"rea\", wenn Sie \"Realität\" oder \"Reaktion\" finden möchten), hängen Sie ein * an Ihren Suchbegriff</li><li>Wegen zu vieler Treffer werden Suchen mit nur zwei Buchstaben oder häufigen Wörtern wie \"this\", \"a\" und \"is\" im Suchergebnis nicht angezeigt.</li></ul>",
   "search_results.noResults": "Keine Ergebnisse gefunden. Nochmal versuchen?",
+  "search_results.searching": "Suchen...",
   "search_results.usage": "<ul><li>Verwenden Sie <b>\"Anführungszeichen\"</b> zur Suche nach Phrasen</li><li>Verwenden Sie <b>from:</b> um nach Nachrichten eines bestimmten Absenders zu suchen und <b>in:</b> für Nachrichten in einem bestimmten Kanal</li></ul>",
   "search_results.usageFlag1": "Sie haben bisher keine Nachrichten markiert.",
   "search_results.usageFlag2": "Sie können eine Markierung zu einer Nachricht oder einem Kommentar hinzufügen indem Sie das ",
@@ -1990,7 +2103,7 @@
   "sidebar.createChannel": "Einen neuen öffentlichen Kanal erstellen",
   "sidebar.createGroup": "Einen neuen privaten Kanal erstellen",
   "sidebar.direct": "DIREKTNACHRICHTEN",
-  "sidebar.favorite": "LIEBLINGSKANÄLE",
+  "sidebar.favorite": "KANALFAVORITEN",
   "sidebar.more": "Mehr",
   "sidebar.moreElips": "Mehr...",
   "sidebar.otherMembers": "Außerhalb dieses Teams",
@@ -1999,8 +2112,7 @@
   "sidebar.tutorialScreen1": "<h4>Kanäle</h4><p><strong>Kanäle</strong> organisieren die Unterhaltungen über verschiedene Themen. Jeder aus dem Team kann beitreten. Zur privaten, direkten Kommunikation nutzen Sie <strong>Direktnachrichten</strong> mit einer anderen Person oder <strong>Private Kanäle</strong> bei mehreren Personen.</p>",
   "sidebar.tutorialScreen2": "<h4>\"{townsquare}\" und \"{offtopic}\" Kanäle</h4><p>Hier sind zwei öffentliche Kanäle zum Start:</p><p><strong>{townsquare}</strong> ist ein Platz für Teamweite Kommunikation. Jeder in Ihrem Team ist ein Mitglied dieses Kanals.</p><p><strong>{offtopic}</strong> ist ein Platz fpr Spaß und Unterhaltungen außerhalb von arbeitsrelevanten Kanälen. Sie und Ihr Team können entscheiden welche weiteren Kanäle erstellt werden müssen.</p>",
   "sidebar.tutorialScreen3": "<h4>Erstellen und Beitreten von Kanälen</h4><p>Klicken Sie auf <strong>\"Mehr...\"</strong> um einen neuen Kanal zu erstellen oder einem bestehenden beizutreten.</p><p>Sie können auch einen neuen Kanal über einen Klick auf das <strong>\"+\" Symbol</strong> neben der öffentlichen oder privaten Kanalüberschrift erstellen.</p>",
-  "sidebar.unreadAbove": "Ungelesene Nachricht(en) oben",
-  "sidebar.unreadBelow": "Ungelesene Nachricht(en) unten",
+  "sidebar.unreads": "Weitere Ungelesene",
   "sidebar_header.tutorial": "<h4>Hauptmenü</h4><p>Über das <strong>Hauptmenü</strong>können Sie <strong>neue Teammitglieder einladen</strong>, auf Ihre <strong>Benutzereinstellungen</strong> zugreifen und Ihre <strong>Motiv Farbe</strong> ändern.</p><p>Teamadministratoren können außerdem auf die <strong>Team Einstellungen</strong> zugreifen.</p><p>Systemadministratoren werden eine <strong>System Konsole</strong> Option für die Administration des kompletten Systems finden.</p>",
   "sidebar_right_menu.accountSettings": "Kontoeinstellungen",
   "sidebar_right_menu.addMemberToTeam": "Mitglieder zum Team hinzufügen",
@@ -2134,12 +2246,12 @@
   "textbox.quote": ">Zitat",
   "textbox.strike": "Durchgestrichen",
   "tutorial_intro.allSet": "Sie sind bereit",
-  "tutorial_intro.end": "Klicken Sie auf \"Weiter\" um {channel} zu betreten. Dies ist der erste Kanal den Ihre Teammitglieder sehen wenn Sie sich registrieren. Verwenden Sie ihn um Updates zu versenden die jeder Wissen soll.",
+  "tutorial_intro.end": "Klicken Sie auf \"Weiter\" um {channel} zu betreten. Dies ist der erste Kanal den Ihre Teammitglieder sehen, wenn Sie sich registrieren. Verwenden Sie ihn, um Aktualisierungen zu versenden, die jeder kennen sollte.",
   "tutorial_intro.invite": "Teammitglieder einladen",
   "tutorial_intro.mobileApps": "Installieren Sie die Apps für {link} für einfachen Zugriff und mobile Benachrichtigungen.",
   "tutorial_intro.mobileAppsLinkText": "PC, macOS, iOS und Android",
   "tutorial_intro.next": "Weiter",
-  "tutorial_intro.screenOne": "<h3>Willkommen bei:</h3><h1>Mattermost</h1><p>Ihre Teamkommunikation an einer Stelle, sofort durchsuchbar und überall verfügbar.</p><p>Bleiben Sie mit Ihrem Team verbunden um zu erreichen, was am meisten zählt.</p>",
+  "tutorial_intro.screenOne": "<h3>Willkommen bei:</h3><h1>Mattermost</h1><p>Ihre Teamkommunikation an einer Stelle, sofort durchsuchbar und überall verfügbar.</p><p>Bleiben Sie mit Ihrem Team verbunden, um zu erreichen, was am meisten zählt.</p>",
   "tutorial_intro.screenTwo": "<h3>Wie Mattermost funktioniert:</h3><p>Die Kommunikation findet in öffentlichen Diskussionskanälen, privaten Kanälen und Direktnachrichten statt.</p><p>Alles ist archiviert und von jedem webfähigem Desktop, Notebook oder Smartphone durchsuchbar.</p>",
   "tutorial_intro.skip": "Anleitung überspringen",
   "tutorial_intro.support": "Wenn Sie irgendwas benötigen, schreiben Sie uns einfach eine E-Mail an ",
@@ -2220,10 +2332,6 @@
   "user.settings.display.nameOptsDesc": "Wählen Sie, wie die Namen anderer Benutzer in Direktnachrichten angezeigt werden sollen.",
   "user.settings.display.normalClock": "12-Stunden-Format (z.B.: 4:00 PM)",
   "user.settings.display.preferTime": "Wählen Sie das bevorzugte Zeitformat aus.",
-  "user.settings.display.showFullname": "Zeige Vor- und Nachname",
-  "user.settings.display.showNickname": "Zeige Spitzname wenn verfügbar, sonst zeige Vor- und Nachname",
-  "user.settings.display.showUsername": "Zeige Benutzername (Standard)",
-  "user.settings.display.teammateNameDisplay": "Namensdarstellung der Teammitglider",
   "user.settings.display.theme.applyToAllTeams": "Motiv für alle meine Teams festlegen",
   "user.settings.display.theme.customTheme": "Benutzerdefiniertes Motiv",
   "user.settings.display.theme.describe": "Öffnen um das Motiv zu ändern",
@@ -2320,19 +2428,19 @@
   "user.settings.notifications.commentsNever": "Keine Benachrichtigung bei Antworten auslösen, sofern ich nicht erwähnt wurde",
   "user.settings.notifications.commentsRoot": "Löse Benachrichtigungen für Mitteilungen aus die ich starte",
   "user.settings.notifications.desktop": "Desktop-Benachrichtigungen senden",
-  "user.settings.notifications.desktop.allFirefoxForever": "Für alle Aktivitäten, zeige unbegrenzt",
-  "user.settings.notifications.desktop.allFirefoxTimed": "Für alle Aktivitäten, zeige für {seconds} Sekunden",
   "user.settings.notifications.desktop.allNoSoundForever": "Für alle Aktivitäten, ohne Ton, zeige unbegrenzt",
   "user.settings.notifications.desktop.allNoSoundTimed": "Für alle Aktivitäten, ohne Ton, zeige für {seconds} Sekunden",
   "user.settings.notifications.desktop.allSoundForever": "Für alle Aktivitäten, mit Ton, zeige unbegrenzt",
+  "user.settings.notifications.desktop.allSoundHiddenForever": "Für alle Aktivitäten, zeige unbegrenzt",
+  "user.settings.notifications.desktop.allSoundHiddenTimed": "Für alle Aktivitäten, zeige für {seconds} Sekunden",
   "user.settings.notifications.desktop.allSoundTimed": "Für alle Aktivitäten, mit Ton, zeige für {seconds} Sekunden",
   "user.settings.notifications.desktop.duration": "Mitteilungsdauer",
   "user.settings.notifications.desktop.durationInfo": "Stellt ein wie lange Desktop-Benachrichtigungen auf dem Bildschirm verbleiben wenn Firefox oder Chrome verwendet wird. Desktop-Benachrichtigungen in Edge und Safari können maximal für 5 Sekunden auf dem Bildschirm bleiben.",
-  "user.settings.notifications.desktop.mentionsFirefoxForever": "Für Erwähnungen und Direktnachrichten, zeige unbegrenzt",
-  "user.settings.notifications.desktop.mentionsFirefoxTimed": "Für Erwähnungen und Direktnachrichten, zeige für {seconds} Sekunden",
   "user.settings.notifications.desktop.mentionsNoSoundForever": "Für Erwähnungen und Direktnachrichten, ohne Ton, zeige unbegrenzt",
   "user.settings.notifications.desktop.mentionsNoSoundTimed": "Für Erwähnungen und Direktnachrichten, ohne Ton, zeige für {seconds} Sekunden",
   "user.settings.notifications.desktop.mentionsSoundForever": "Für Erwähnungen und Direktnachrichten, mit Ton, zeige unbegrenzt",
+  "user.settings.notifications.desktop.mentionsSoundHiddenForever": "Für Erwähnungen und Direktnachrichten, zeige unbegrenzt",
+  "user.settings.notifications.desktop.mentionsSoundHiddenTimed": "Für Erwähnungen und Direktnachrichten, zeige für {seconds} Sekunden",
   "user.settings.notifications.desktop.mentionsSoundTimed": "Für Erwähnungen und Direktnachrichten, mit Ton, zeige für {seconds} Sekunden",
   "user.settings.notifications.desktop.seconds": "{seconds} Sekunden",
   "user.settings.notifications.desktop.sound": "Benachrichtigungston",
@@ -2444,6 +2552,28 @@
   "user.settings.security.switchSaml": "Wechsel auf SAML SSO",
   "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.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.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. Sind Sie sicher, dass sie diesen Token löschen möchten?",
+  "user.settings.tokens.confirmDeleteTitle": "Token {name} löschen?",
+  "user.settings.tokens.copy": "Bitte kopieren Sie den unten stehenden Token. Sie werden 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.id": "ID: ",
+  "user.settings.tokens.name": "Name: ",
+  "user.settings.tokens.nameHelp": "Enter a description for your token to remember what it does.",
+  "user.settings.tokens.nameRequired": "Please enter a description.",
+  "user.settings.tokens.save": "Speichern",
+  "user.settings.tokens.title": "Benutzer-Zugriffs-Token",
+  "user.settings.tokens.token": "Token: ",
+  "user.settings.tokens.tokenId": "Token-ID: ",
+  "user.settings.tokens.userAccessTokensNone": "Keine Benutzer-Zugriffs-Token.",
   "user_list.notFound": "Keine Benutzer gefunden",
   "user_profile.send.dm": "Nachricht versenden",
   "user_profile.webrtc.call": "Videoanruf starten",
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 6f87e540b..b74c049b4 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -233,54 +233,54 @@
   "admin.customization.support": "Legal and Support",
   "admin.database.title": "Database Settings",
   "admin.developer.title": "Developer Settings",
-  "admin.elasticsearchStatus.bulkIndexLabel": "Bulk Indexing:",
-  "admin.elasticsearch.title": "Elasticsearch (Beta)",
-  "admin.elasticsearch.noteDescription": "Changing properties in this section will require a server restart before taking effect.",
-  "admin.elasticsearch.enableIndexingTitle": "Enable Elasticsearch Indexing:",
-  "admin.elasticsearch.enableIndexingDescription": "When true, indexing of new posts occurs automatically. Search queries will use database search until \"Enable Elasticsearch for search queries\" is enabled. {documentationLink}",
-  "admin.elasticsearch.enableIndexingDescription.documentationLinkText": "Learn more about Elasticsearch in our documentation.",
-  "admin.elasticsearch.connectionUrlTitle": "Server Connection Address:",
+  "admin.elasticsearch.bulkIndexButton.error": "Failed to schedule Bulk Index Job: {error}",
   "admin.elasticsearch.connectionUrlDescription": "The address of the Elasticsearch server. {documentationLink}",
-  "admin.elasticsearch.connectionUrlExample.documentationLinkText": "Please see documentation with server setup instructions.",
-  "admin.elasticsearch.usernameTitle": "Server Username:",
-  "admin.elasticsearch.usernameDescription": "(Optional) The username to authenticate to the Elasticsearch server.",
-  "admin.elasticsearch.passwordTitle": "Server Password:",
-  "admin.elasticsearch.passwordDescription": "(Optional) The password to authenticate to the Elasticsearch server.",
-  "admin.elasticsearch.sniffTitle": "Enable Cluster Sniffing:",
-  "admin.elasticsearch.sniffDescription": "When true, sniffing finds and connects to all data nodes in your cluster automatically.",
-  "admin.elasticsearch.enableSearchingTitle": "Enable Elasticsearch for search queries:",
-  "admin.elasticsearch.enableSearchingDescription": "Requires a successful connection to the Elasticsearch server. When true, Elasticsearch will be used for all search queries using the latest index. Search results may be incomplete until a bulk index of the existing post database is finished. When false, database search is used.",
   "admin.elasticsearch.connectionUrlExample": "E.g.: \"https://elasticsearch.example.org:9200\"",
-  "admin.elasticsearch.usernameExample": "E.g.: \"elastic\"",
-  "admin.elasticsearch.password": "E.g.: \"yourpassword\"",
-  "admin.elasticsearch.testHelpText": "Tests if the Mattermost server can connect to the Elasticsearch server specified. Testing the connection only saves the configuration if the test is successful. See log file for more detailed error messages.",
-  "admin.elasticsearch.testConfigSuccess": "Test successful. Configuration saved.",
+  "admin.elasticsearch.connectionUrlExample.documentationLinkText": "Please see documentation with server setup instructions.",
+  "admin.elasticsearch.connectionUrlTitle": "Server Connection Address:",
   "admin.elasticsearch.elasticsearch_test_button": "Test Connection",
+  "admin.elasticsearch.enableIndexingDescription": "When true, indexing of new posts occurs automatically. Search queries will use database search until \"Enable Elasticsearch for search queries\" is enabled. {documentationLink}",
+  "admin.elasticsearch.enableIndexingDescription.documentationLinkText": "Learn more about Elasticsearch in our documentation.",
+  "admin.elasticsearch.enableIndexingTitle": "Enable Elasticsearch Indexing:",
+  "admin.elasticsearch.enableSearchingDescription": "Requires a successful connection to the Elasticsearch server. When true, Elasticsearch will be used for all search queries using the latest index. Search results may be incomplete until a bulk index of the existing post database is finished. When false, database search is used.",
+  "admin.elasticsearch.enableSearchingTitle": "Enable Elasticsearch for search queries:",
+  "admin.elasticsearch.indexButton.inProgress": "Indexing in progress",
   "admin.elasticsearch.indexButton.ready": "Build Index",
   "admin.elasticsearch.indexHelpText.buildIndex": "All posts in the database will be indexed from oldest to newest. Elasticsearch is available during indexing but search results may be incomplete until the indexing job is complete.",
-  "admin.elasticsearch.indexButton.inProgress": "Indexing in progress",
   "admin.elasticsearch.indexHelpText.cancelIndexing": "Cancelling stops the indexing job and removes it from the queue. Posts that have already been indexed will not be deleted.",
-  "admin.elasticsearch.bulkIndexButton.error": "Failed to schedule Bulk Index Job: {error}",
+  "admin.elasticsearch.noteDescription": "Changing properties in this section will require a server restart before taking effect.",
+  "admin.elasticsearch.password": "E.g.: \"yourpassword\"",
+  "admin.elasticsearch.passwordDescription": "(Optional) The password to authenticate to the Elasticsearch server.",
+  "admin.elasticsearch.passwordTitle": "Server Password:",
+  "admin.elasticsearch.purgeIndexesButton": "Purge Indexes",
+  "admin.elasticsearch.purgeIndexesButton.error": "Failed to purge indexes: {error}",
+  "admin.elasticsearch.purgeIndexesButton.label": "Purge Indexes:",
+  "admin.elasticsearch.purgeIndexesButton.success": "Indexes purged successfully.",
+  "admin.elasticsearch.purgeIndexesHelpText": "Purging will entirely remove the index on the Elasticsearch server. Search results may be incomplete until a bulk index of the existing post database is rebuilt.",
+  "admin.elasticsearch.sniffDescription": "When true, sniffing finds and connects to all data nodes in your cluster automatically.",
+  "admin.elasticsearch.sniffTitle": "Enable Cluster Sniffing:",
+  "admin.elasticsearch.testConfigSuccess": "Test successful. Configuration saved.",
+  "admin.elasticsearch.testHelpText": "Tests if the Mattermost server can connect to the Elasticsearch server specified. Testing the connection only saves the configuration if the test is successful. See log file for more detailed error messages.",
+  "admin.elasticsearch.title": "Elasticsearch (Beta)",
+  "admin.elasticsearch.usernameDescription": "(Optional) The username to authenticate to the Elasticsearch server.",
+  "admin.elasticsearch.usernameExample": "E.g.: \"elastic\"",
+  "admin.elasticsearch.usernameTitle": "Server Username:",
+  "admin.elasticsearchStatus.bulkIndexLabel": "Bulk Indexing:",
+  "admin.elasticsearchStatus.cancelButton": "Cancel",
+  "admin.elasticsearchStatus.status": "Status: ",
+  "admin.elasticsearchStatus.statusCancelled": "Indexing job cancelled.",
+  "admin.elasticsearchStatus.statusError": "Indexing error.",
+  "admin.elasticsearchStatus.statusError.help": "Mattermost encountered an error building the Elasticsearch index: {error}",
+  "admin.elasticsearchStatus.statusInProgress": "Job in progress. {percent}% complete.",
+  "admin.elasticsearchStatus.statusInProgress.help": "Indexing is in progress on the job server. If Elasticsearch is enabled, search results may be incomplete until the job is finished.",
+  "admin.elasticsearchStatus.statusIndexingDisabled": "Indexing disabled.",
   "admin.elasticsearchStatus.statusLoading": "Loading...",
+  "admin.elasticsearchStatus.statusNoJobs": "No indexing jobs queued.",
   "admin.elasticsearchStatus.statusPending": "Job pending.",
   "admin.elasticsearchStatus.statusPending.help": "Elasticsearch index job is queued on the job server. If Elasticsearch is enabled, search results may be incomplete until the job is finished.",
-  "admin.elasticsearchStatus.statusInProgress": "Job in progress. {percent}% complete.",
-  "admin.elasticsearchStatus.statusInProgress.help": "Indexing is in progress on the job server. If Elasticsearch is enabled, search results may be incomplete until the job is finished.",
+  "admin.elasticsearchStatus.statusRequestCancel": "Canceling Job...",
   "admin.elasticsearchStatus.statusSuccess": "Indexing complete.",
   "admin.elasticsearchStatus.statusSuccess.help": "Indexing is complete and new posts are being automatically indexed.",
-  "admin.elasticsearchStatus.statusError": "Indexing error.",
-  "admin.elasticsearchStatus.statusError.help": "Mattermost encountered an error building the Elasticsearch index: {error}",
-  "admin.elasticsearchStatus.statusRequestCancel": "Canceling Job...",
-  "admin.elasticsearchStatus.statusCancelled": "Indexing job cancelled.",
-  "admin.elasticsearchStatus.statusNoJobs": "No indexing jobs queued.",
-  "admin.elasticsearchStatus.status": "Status: ",
-  "admin.elasticsearchStatus.cancelButton": "Cancel",
-  "admin.elasticsearchStatus.statusIndexingDisabled": "Indexing disabled.",
-  "admin.elasticsearch.purgeIndexesHelpText": "Purging will entirely remove the index on the Elasticsearch server. Search results may be incomplete until a bulk index of the existing post database is rebuilt.",
-  "admin.elasticsearch.purgeIndexesButton": "Purge Indexes",
-  "admin.elasticsearch.purgeIndexesButton.success": "Indexes purged successfully.",
-  "admin.elasticsearch.purgeIndexesButton.error": "Failed to purge indexes: {error}",
-  "admin.elasticsearch.purgeIndexesButton.label": "Purge Indexes:",
   "admin.email.agreeHPNS": " I understand and accept the Mattermost Hosted Push Notification Service <a href=\"https://about.mattermost.com/hpns-terms/\" target='_blank'>Terms of Service</a> and <a href=\"https://about.mattermost.com/hpns-privacy/\" target='_blank'>Privacy Policy</a>.",
   "admin.email.allowEmailSignInDescription": "When true, Mattermost allows users to sign in using their email and password.",
   "admin.email.allowEmailSignInTitle": "Enable sign-in with email: ",
@@ -296,6 +296,8 @@
   "admin.email.enableEmailBatching.siteURL": "Email batching cannot be enabled unless the SiteURL is configured in <b>Configuration > SiteURL</b>.",
   "admin.email.enableEmailBatchingDesc": "When true, users will have email notifications for multiple direct messages and mentions combined into a single email. Batching will occur at a default interval of 15 minutes, configurable in Account Settings > Notifications.",
   "admin.email.enableEmailBatchingTitle": "Enable Email Batching:",
+  "admin.email.enableSMTPAuthDesc": "When enabled, username and password are used for authenticating to the SMTP server.",
+  "admin.email.enableSMTPAuthTitle": "Enable SMTP Authentication:",
   "admin.email.fullPushNotification": "Send full message snippet",
   "admin.email.genericNoChannelPushNotification": "Send generic description with only sender name",
   "admin.email.genericPushNotification": "Send generic description with sender and channel names",
@@ -307,6 +309,11 @@
   "admin.email.mtpns": "Use iOS and Android apps on iTunes and Google Play with TPNS",
   "admin.email.mtpnsHelp": "Download <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS app</a> from iTunes. Download <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android app</a> from Google Play. Learn more about <a href=\"https://about.mattermost.com/default-tpns/\" target='_blank'>TPNS</a>.",
   "admin.email.nofificationOrganizationExample": "E.g.: \"© 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.generic": "Send generic description with only sender name",
+  "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": "Email Notification Contents: ",
   "admin.email.notificationDisplayDescription": "Display name on email account used when sending notification emails from Mattermost.",
   "admin.email.notificationDisplayExample": "E.g.: \"Mattermost Notification\", \"System\", \"No-Reply\"",
   "admin.email.notificationDisplayTitle": "Notification Display Name:",
@@ -347,14 +354,7 @@
   "admin.email.smtpUsernameDescription": "The username for authenticating to the SMTP server.",
   "admin.email.smtpUsernameExample": "E.g.: \"admin@yourcompany.com\", \"AKIADTOVBGERKLCBV\"",
   "admin.email.smtpUsernameTitle": "SMTP Server Username:",
-  "admin.email.enableSMTPAuthTitle": "Enable SMTP Authentication:",
-  "admin.email.enableSMTPAuthDesc": "When enabled, username and password are used for authenticating to the SMTP server.",
   "admin.email.testing": "Testing...",
-  "admin.email.notification.contents.full": "Send full message contents",
-  "admin.email.notification.contents.generic": "Send generic description with only sender name",
-  "admin.email.notification.contents.title": "Email Notification 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.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.false": "false",
   "admin.file.enableFileAttachments": "Allow File Sharing:",
   "admin.file.enableFileAttachmentsDesc": "When false, disables file sharing on the server. All file and image uploads on messages are forbidden across clients and devices, including mobile.",
@@ -490,7 +490,6 @@
   "admin.integrations.custom": "Custom Integrations",
   "admin.integrations.external": "External Services",
   "admin.integrations.webrtc": "Mattermost WebRTC",
-  "admin.plugins.jira": "JIRA (Beta)",
   "admin.ldap.baseDesc": "The Base DN is the Distinguished Name of the location where Mattermost should start its search for users in the AD/LDAP tree.",
   "admin.ldap.baseEx": "E.g.: \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "BaseDN:",
@@ -591,6 +590,21 @@
   "admin.logs.bannerDesc": "To look up users by User ID, go to Reporting > Users and paste the ID into the search filter.",
   "admin.logs.reload": "Reload",
   "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>.",
+  "admin.manage_roles.allowUserAccessTokens": "Allow this account to generate <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a>.",
+  "admin.manage_roles.cancel": "Cancel",
+  "admin.manage_roles.manageRolesTitle": "Manage Roles",
+  "admin.manage_roles.postAllPublicRole": "Access to post to all Mattermost public channels.",
+  "admin.manage_roles.postAllPublicRoleTitle": "post:channels",
+  "admin.manage_roles.postAllRole": "Access to post to all Mattermost channels including direct messages.",
+  "admin.manage_roles.postAllRoleTitle": "post:all",
+  "admin.manage_roles.save": "Save",
+  "admin.manage_roles.saveError": "Unable to save roles.",
+  "admin.manage_roles.systemAdmin": "System Admin",
+  "admin.manage_roles.systemMember": "Member",
+  "admin.manage_tokens.manageTokensTitle": "Manage Personal Access Tokens",
+  "admin.manage_tokens.userAccessTokensDescription": "Personal access tokens function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">interact with this Mattermost server</a>. Learn more about <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a>.",
+  "admin.manage_tokens.userAccessTokensNone": "No personal access tokens.",
   "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>documentation</a> to learn more about configuring performance monitoring for Mattermost.",
   "admin.metrics.enableTitle": "Enable Performance Monitoring:",
   "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
@@ -636,18 +650,19 @@
   "admin.password.requirementsDescription": "Character types required in a valid password.",
   "admin.password.symbol": "At least one symbol (e.g. \"~!@#$%^&*()\")",
   "admin.password.uppercase": "At least one uppercase letter",
-  "admin.plugins.jira.enabledLabel": "Enabled:",
+  "admin.plugins.jira": "JIRA (Beta)",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelname",
   "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.secretLabel": "Secret:",
+  "admin.plugins.jira.enabledLabel": "Enabled:",
   "admin.plugins.jira.secretDescription": "This secret is used to authenticate to Mattermost.",
+  "admin.plugins.jira.secretLabel": "Secret:",
+  "admin.plugins.jira.secretParamPlaceholder": "secret",
   "admin.plugins.jira.secretRegenerateDescription": "Regenerates the secret for the webhook URL endpoint. Regenerating the secret invalidates your existing JIRA integrations.",
-  "admin.plugins.jira.userLabel": "User:",
-  "admin.plugins.jira.userDescription": "Select the username that this integration is attached to.",
   "admin.plugins.jira.setupDescription": "Use this webhook URL to set up the JIRA integration. See {webhookDocsLink} to learn more.",
-  "admin.plugins.jira.webhookDocsLink": "documentation",
-  "admin.plugins.jira.secretParamPlaceholder": "secret",
   "admin.plugins.jira.teamParamPlaceholder": "teamname",
-  "admin.plugins.jira.channelParamNamePlaceholder": "channelname",
+  "admin.plugins.jira.userDescription": "Select the username that this integration is attached to.",
+  "admin.plugins.jira.userLabel": "User:",
+  "admin.plugins.jira.webhookDocsLink": "documentation",
   "admin.privacy.showEmailDescription": "When false, hides the email address of members from everyone except System Administrators.",
   "admin.privacy.showEmailTitle": "Show Email Address: ",
   "admin.privacy.showFullNameDescription": "When false, hides the full name of members from everyone except System Administrators. Username is shown in place of full name.",
@@ -767,10 +782,6 @@
   "admin.select_team.close": "Close",
   "admin.select_team.select": "Select",
   "admin.select_team.selectTeam": "Select Team",
-  "admin.service.userAccessTokensTitle": "Enable Personal Access Tokens: ",
-  "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.userAccessTokensDescLabel": "Name: ",
-  "admin.service.userAccessTokensIdLabel": "Token ID: ",
   "admin.service.attemptDescription": "Number of login attempts allowed before a user is locked out and required to reset their password via email.",
   "admin.service.attemptExample": "E.g.: \"10\"",
   "admin.service.attemptTitle": "Maximum Login Attempts:",
@@ -829,6 +840,10 @@
   "admin.service.tlsKeyFileDescription": "The private key file to use.",
   "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": "Name: ",
+  "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.userAccessTokensIdLabel": "Token ID: ",
+  "admin.service.userAccessTokensTitle": "Enable Personal Access Tokens: ",
   "admin.service.webSessionDays": "Session length AD/LDAP and email (days):",
   "admin.service.webSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
   "admin.service.webhooksDescription": "When true, incoming webhooks will be allowed. To help combat phishing attacks, all posts from webhooks will be labelled by a BOT tag. See <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>documentation</a> to learn more.",
@@ -982,24 +997,6 @@
   "admin.team_analytics.activeUsers": "Active Users With Posts",
   "admin.team_analytics.totalPosts": "Total Posts",
   "admin.true": "true",
-  "admin.manage_tokens.userAccessTokensNone": "No personal access tokens.",
-  "admin.manage_tokens.manageTokensTitle": "Manage Personal Access Tokens",
-  "admin.manage_tokens.userAccessTokensDescription": "Personal access tokens function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">interact with this Mattermost server</a>. Learn more about <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a>.",
-  "admin.manage_roles.saveError": "Unable to save roles.",
-  "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>.",
-  "admin.manage_roles.postAllRoleTitle": "post:all",
-  "admin.manage_roles.postAllRole": "Access to post to all Mattermost channels including direct messages.",
-  "admin.manage_roles.postAllPublicRoleTitle": "post:channels",
-  "admin.manage_roles.postAllPublicRole": "Access to post to all Mattermost public channels.",
-  "admin.manage_roles.allowUserAccessTokens": "Allow this account to generate <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a>.",
-  "admin.manage_roles.systemAdmin": "System Admin",
-  "admin.manage_roles.systemMember": "Member",
-  "admin.manage_roles.manageRolesTitle": "Manage Roles",
-  "admin.manage_roles.cancel": "Cancel",
-  "admin.manage_roles.save": "Save",
-  "admin.user_item.userAccessTokenPostAll": "(with post:all personal access tokens)",
-  "admin.user_item.userAccessTokenPostAllPublic": "(with post:channels personal access tokens)",
-  "admin.user_item.userAccessTokenYes": "(with personal access tokens)",
   "admin.user_item.authServiceEmail": "<strong>Sign-in Method:</strong> Email",
   "admin.user_item.authServiceNotEmail": "<strong>Sign-in Method:</strong> {service}",
   "admin.user_item.confirmDemoteDescription": "If you demote yourself from the System Admin role and there is not another user with System Admin privileges, you'll need to re-assign a System Admin by accessing the Mattermost server through a terminal and running the following command.",
@@ -1013,8 +1010,8 @@
   "admin.user_item.makeMember": "Make Member",
   "admin.user_item.makeSysAdmin": "Make System Admin",
   "admin.user_item.makeTeamAdmin": "Make Team Admin",
-  "admin.user_item.manageTeams": "Manage Teams",
   "admin.user_item.manageRoles": "Manage Roles",
+  "admin.user_item.manageTeams": "Manage Teams",
   "admin.user_item.manageTokens": "Manage Tokens",
   "admin.user_item.member": "Member",
   "admin.user_item.mfaNo": "<strong>MFA</strong>: No",
@@ -1024,6 +1021,9 @@
   "admin.user_item.switchToEmail": "Switch to Email/Password",
   "admin.user_item.sysAdmin": "System Admin",
   "admin.user_item.teamAdmin": "Team Admin",
+  "admin.user_item.userAccessTokenPostAll": "(with post:all personal access tokens)",
+  "admin.user_item.userAccessTokenPostAllPublic": "(with post:channels personal access tokens)",
+  "admin.user_item.userAccessTokenYes": "(with personal access tokens)",
   "admin.webrtc.enableDescription": "When true, Mattermost allows making <strong>one-on-one</strong> video calls. WebRTC calls are available on Chrome, Firefox and Mattermost Desktop Apps.",
   "admin.webrtc.enableTitle": "Enable Mattermost WebRTC: ",
   "admin.webrtc.gatewayAdminSecretDescription": "Enter your admin secret password to access the Gateway Admin URL.",
@@ -1418,10 +1418,10 @@
   "emoji_picker.nature": "Nature",
   "emoji_picker.objects": "Objects",
   "emoji_picker.people": "People",
+  "emoji_picker.places": "Places",
   "emoji_picker.recent": "Recently Used",
   "emoji_picker.search": "Search",
   "emoji_picker.symbols": "Symbols",
-  "emoji_picker.places": "Places",
   "error.local_storage.help1": "Enable cookies",
   "error.local_storage.help2": "Turn off private browsing",
   "error.local_storage.help3": "Use a supported browser (IE 11, Chrome 43+, Firefox 38+, Safari 9, Edge)",
@@ -1788,6 +1788,10 @@
   "mobile.account_notifications.threads_mentions": "Mentions in threads",
   "mobile.account_notifications.threads_start": "Threads that I start",
   "mobile.account_notifications.threads_start_participate": "Threads that I start or participate in",
+  "mobile.advanced_settings.reset_button": "Reset",
+  "mobile.advanced_settings.reset_message": "\nThis will reset all offline data and restart the app. You will be automatically logged back in once the app restarts.\n",
+  "mobile.advanced_settings.reset_title": "Reset Cache",
+  "mobile.advanced_settings.title": "Advanced Settings",
   "mobile.channel_drawer.search": "Jump to a conversation",
   "mobile.channel_info.alertMessageDeleteChannel": "Are you sure you want to delete the {term} {name}?",
   "mobile.channel_info.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
@@ -1841,11 +1845,17 @@
   "mobile.loading_members": "Loading Members...",
   "mobile.loading_posts": "Loading Messages...",
   "mobile.login_options.choose_title": "Choose your login method",
+  "mobile.more_dms.start": "Start",
+  "mobile.more_dms.title": "New Conversation",
+  "mobile.notice_mobile_link": "mobile apps",
+  "mobile.notice_platform_link": "platform",
+  "mobile.notice_text": "Mattermost is made possible by the open source software used in our {platform} and {mobile}.",
   "mobile.notification.in": " in ",
   "mobile.offlineIndicator.connected": "Connected",
   "mobile.offlineIndicator.connecting": "Connecting...",
   "mobile.offlineIndicator.offline": "No internet connection",
   "mobile.open_dm.error": "We couldn't open a direct message with {displayName}. Please check your connection and try again.",
+  "mobile.open_gm.error": "We couldn't open a group message with those users. Please check your connection and try again.",
   "mobile.post.cancel": "Cancel",
   "mobile.post.delete_question": "Are you sure you want to delete this post?",
   "mobile.post.delete_title": "Delete Post",
@@ -1875,6 +1885,8 @@
   "mobile.routes.thread_dm": "Direct Message Thread",
   "mobile.routes.user_profile": "Profile",
   "mobile.routes.user_profile.send_message": "Send Message",
+  "mobile.search.jump": "JUMP",
+  "mobile.search.no_results": "No Results Found",
   "mobile.select_team.choose": "Your teams:",
   "mobile.select_team.join_open": "Open teams you can join",
   "mobile.select_team.no_teams": "There are no available teams for you to join.",
@@ -1888,6 +1900,7 @@
   "mobile.settings.clear_button": "Clear",
   "mobile.settings.clear_message": "\nThis will clear all offline data and restart the app. You will be automatically logged back in once the app restarts.\n",
   "mobile.settings.team_selection": "Team Selection",
+  "mobile.suggestion.members": "Members",
   "modal.manaul_status.ask": "Do not ask me again",
   "modal.manaul_status.button": "Yes, set my status to \"Online\"",
   "modal.manaul_status.cancel": "No, keep it as \"{status}\"",
@@ -1982,10 +1995,10 @@
   "post_delete.okay": "Okay",
   "post_delete.someone": "Someone deleted the message on which you tried to post a comment.",
   "post_focus_view.beginning": "Beginning of Channel Archives",
-  "post_info.message.visible": "(Only visible to you)",
-  "post_info.message.visible.compact": " (Only visible to you)",
   "post_info.del": "Delete",
   "post_info.edit": "Edit",
+  "post_info.message.visible": "(Only visible to you)",
+  "post_info.message.visible.compact": " (Only visible to you)",
   "post_info.mobile.flag": "Flag",
   "post_info.mobile.unflag": "Unflag",
   "post_info.permalink": "Permalink",
@@ -2418,19 +2431,19 @@
   "user.settings.notifications.commentsNever": "Do not trigger notifications on messages in reply threads unless I'm mentioned",
   "user.settings.notifications.commentsRoot": "Trigger notifications on messages in threads that I start",
   "user.settings.notifications.desktop": "Send desktop notifications",
-  "user.settings.notifications.desktop.allSoundHiddenForever": "For all activity, shown indefinitely",
-  "user.settings.notifications.desktop.allSoundHiddenTimed": "For all activity, shown for {seconds} seconds",
   "user.settings.notifications.desktop.allNoSoundForever": "For all activity, without sound, shown indefinitely",
   "user.settings.notifications.desktop.allNoSoundTimed": "For all activity, without sound, shown for {seconds} seconds",
   "user.settings.notifications.desktop.allSoundForever": "For all activity, with sound, shown indefinitely",
+  "user.settings.notifications.desktop.allSoundHiddenForever": "For all activity, shown indefinitely",
+  "user.settings.notifications.desktop.allSoundHiddenTimed": "For all activity, shown for {seconds} seconds",
   "user.settings.notifications.desktop.allSoundTimed": "For all activity, with sound, shown for {seconds} seconds",
   "user.settings.notifications.desktop.duration": "Notification duration",
   "user.settings.notifications.desktop.durationInfo": "Sets how long desktop notifications will remain on screen when using Firefox or Chrome. Desktop notifications in Edge and Safari can only stay on screen for a maximum of 5 seconds.",
-  "user.settings.notifications.desktop.mentionsSoundHiddenForever": "For mentions and direct messages, shown indefinitely",
-  "user.settings.notifications.desktop.mentionsSoundHiddenTimed": "For mentions and direct messages, shown for {seconds} seconds",
   "user.settings.notifications.desktop.mentionsNoSoundForever": "For mentions and direct messages, without sound, shown indefinitely",
   "user.settings.notifications.desktop.mentionsNoSoundTimed": "For mentions and direct messages, without sound, shown for {seconds} seconds",
   "user.settings.notifications.desktop.mentionsSoundForever": "For mentions and direct messages, with sound, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsSoundHiddenForever": "For mentions and direct messages, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsSoundHiddenTimed": "For mentions and direct messages, shown for {seconds} seconds",
   "user.settings.notifications.desktop.mentionsSoundTimed": "For mentions and direct messages, with sound, shown for {seconds} seconds",
   "user.settings.notifications.desktop.seconds": "{seconds} seconds",
   "user.settings.notifications.desktop.sound": "Notification sound",
@@ -2483,28 +2496,6 @@
   "user.settings.push_notification.send": "Send mobile push notifications",
   "user.settings.push_notification.status": "Trigger push notifications when",
   "user.settings.push_notification.status_info": "Notification alerts are only pushed to your mobile device when your online status matches the selection above.",
-  "user.settings.tokens.confirmCreateTitle": "Create System Admin Personal Access Token",
-  "user.settings.tokens.confirmCreateMessage": "You are generating a personal access token with System Admin permissions. Are you sure want to create this token?",
-  "user.settings.tokens.confirmCreateButton": "Yes, Create",
-  "user.settings.tokens.confirmDeleteTitle": "Delete Token?",
-  "user.settings.tokens.confirmDeleteMessage": "Any integrations using this token will no longer be able to access the Mattermost API. You cannot undo this action. <br /><br />Are you sure want to delete the <strong>{description}</strong> token?",
-  "user.settings.tokens.confirmDeleteButton": "Yes, Delete",
-  "user.settings.tokens.tokenId": "Token ID: ",
-  "user.settings.tokens.delete": "Delete",
-  "user.settings.tokens.userAccessTokensNone": "No personal access tokens.",
-  "user.settings.tokens.description": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Personal access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>.",
-  "user.settings.tokens.description_mobile": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Personal access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>. Create new tokens on your desktop.",
-  "user.settings.tokens.name": "Token Description: ",
-  "user.settings.tokens.nameHelp": "Enter a description for your token to remember what it does.",
-  "user.settings.tokens.nameRequired": "Please enter a description.",
-  "user.settings.tokens.save": "Save",
-  "user.settings.tokens.cancel": "Cancel",
-  "user.settings.tokens.id": "Token ID: ",
-  "user.settings.tokens.token": "Access Token: ",
-  "user.settings.tokens.copy": "Please copy the access token below. You won't be able to see it again!",
-  "user.settings.tokens.create": "Create New Token",
-  "user.settings.tokens.title": "Personal Access Tokens",
-  "user.settings.tokens.clickToEdit": "Click 'Edit' to manage your personal access tokens",
   "user.settings.security.active": "Active",
   "user.settings.security.close": "Close",
   "user.settings.security.currentPassword": "Current Password",
@@ -2564,6 +2555,28 @@
   "user.settings.security.switchSaml": "Switch to using SAML SSO",
   "user.settings.security.title": "Security Settings",
   "user.settings.security.viewHistory": "View Access History",
+  "user.settings.tokens.cancel": "Cancel",
+  "user.settings.tokens.clickToEdit": "Click 'Edit' to manage your personal access tokens",
+  "user.settings.tokens.confirmCreateButton": "Yes, Create",
+  "user.settings.tokens.confirmCreateMessage": "You are generating a personal access token with System Admin permissions. Are you sure want to create this token?",
+  "user.settings.tokens.confirmCreateTitle": "Create System Admin Personal Access Token",
+  "user.settings.tokens.confirmDeleteButton": "Yes, Delete",
+  "user.settings.tokens.confirmDeleteMessage": "Any integrations using this token will no longer be able to access the Mattermost API. You cannot undo this action. <br /><br />Are you sure want to delete the <strong>{description}</strong> token?",
+  "user.settings.tokens.confirmDeleteTitle": "Delete Token?",
+  "user.settings.tokens.copy": "Please copy the access token below. You won't be able to see it again!",
+  "user.settings.tokens.create": "Create New Token",
+  "user.settings.tokens.delete": "Delete",
+  "user.settings.tokens.description": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Personal access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>.",
+  "user.settings.tokens.description_mobile": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Personal access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>. Create new tokens on your desktop.",
+  "user.settings.tokens.id": "Token ID: ",
+  "user.settings.tokens.name": "Token Description: ",
+  "user.settings.tokens.nameHelp": "Enter a description for your token to remember what it does.",
+  "user.settings.tokens.nameRequired": "Please enter a description.",
+  "user.settings.tokens.save": "Save",
+  "user.settings.tokens.title": "Personal Access Tokens",
+  "user.settings.tokens.token": "Access Token: ",
+  "user.settings.tokens.tokenId": "Token ID: ",
+  "user.settings.tokens.userAccessTokensNone": "No personal access tokens.",
   "user_list.notFound": "No users found",
   "user_profile.send.dm": "Send Message",
   "user_profile.webrtc.call": "Start Video Call",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index e75fffcec..3ba6a1a53 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -142,7 +142,7 @@
   "admin.advance.metrics": "Monitoreo de Desempeño",
   "admin.audits.reload": "Recargar",
   "admin.audits.title": "Auditorías del Servidor",
-  "admin.authentication.email": "Correo Electrónico",
+  "admin.authentication.email": "Autenticación con Correo electrónico",
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
@@ -203,8 +203,6 @@
   "admin.compliance_table.userId": "Solicitado por",
   "admin.connectionSecurityNone": "Ninguna",
   "admin.connectionSecurityNoneDescription": "Mattermost se conectará a través de una conexión insegura.",
-  "admin.connectionSecurityPlain": "PLANO",
-  "admin.connectionSecurityPlainDescription": "Mattermost se conectará y realizará la autenticación sobre una conexión insegura.",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "Intenta convertir una conexión insegura a una conexión segura utilizando TLS.",
   "admin.connectionSecurityTest": "Probar Conexión",
@@ -235,31 +233,87 @@
   "admin.customization.support": "Legal y Soporte",
   "admin.database.title": "Configuración de la base de datos",
   "admin.developer.title": "Configuración de Desarrollo",
+  "admin.elasticsearch.bulkIndexButton.error": "Error al programar el Trabajo de Indexación: {error}",
+  "admin.elasticsearch.connectionUrlDescription": "La dirección del servidor Elasticsearch. {documentationLink}",
+  "admin.elasticsearch.connectionUrlExample": "Ej.: \"https://elasticsearch.example.org:9200\"",
+  "admin.elasticsearch.connectionUrlExample.documentationLinkText": "Por favor, consulta las instrucciones de instalación en la documentación del servidor.",
+  "admin.elasticsearch.connectionUrlTitle": "Dirección de Conexión del Servidor:",
+  "admin.elasticsearch.elasticsearch_test_button": "Probar Conexión",
+  "admin.elasticsearch.enableIndexingDescription": "Cuando es verdadero, la indexación de nuevos mensajes ocurre de manera automática. Las búsquedas se realizarán en la base de datos hasta que la opción de \"Habilitar búsquedas con Elasticsearch\" sea seleccionada. {documentationLink}",
+  "admin.elasticsearch.enableIndexingDescription.documentationLinkText": "Aprende más acerca de Elasticsearch en nuestra documentación.",
+  "admin.elasticsearch.enableIndexingTitle": "Habilitar indexación con Elasticsearch:",
+  "admin.elasticsearch.enableSearchingDescription": "Requiere una conexión satisfactoria con el servidor de Elasticsearch. Cuando es verdadero, Elasticsearch será utiilzado para realizar las búsquedas utilizando el último indice. Los resultados de las búsquedas podrán estar incompletos mientras que el índice global de la base de datos de los mensajes existentes se haya completado. Cuando es falso, se utiliza las búsqueda directa en la base de datos.",
+  "admin.elasticsearch.enableSearchingTitle": "Habilitar búsquedas con Elasticsearch:",
+  "admin.elasticsearch.indexButton.inProgress": "Indexación en progreso",
+  "admin.elasticsearch.indexButton.ready": "Generar índice",
+  "admin.elasticsearch.indexHelpText.buildIndex": "Todos los mensajes en la base de datos será indexados desde el más antiguo al más reciente. Elasticsearch está disponible durante el proceso de indexación, pero los resultados de la búsqueda pueden estar incompletos hasta que el trabajo de indexación se haya completado.",
+  "admin.elasticsearch.indexHelpText.cancelIndexing": "Al cancelar se detiene el trabajo de indexación y se remueve de la cola. Los mensajes que hayan sido indexados no serán removidos.",
+  "admin.elasticsearch.noteDescription": "Cambiando las propiedades de esta sección se requerirá reiniciar el servidor para que los cambios tomen efecto",
+  "admin.elasticsearch.password": "Ej.: \"yourpassword\"",
+  "admin.elasticsearch.passwordDescription": "(Opcional) La contraseña para autenticar el servidor Elasticsearch.",
+  "admin.elasticsearch.passwordTitle": "Contraseña del Servidor:",
+  "admin.elasticsearch.purgeIndexesButton": "Purgar Índices",
+  "admin.elasticsearch.purgeIndexesButton.error": "No se pudo purgar índices: {error}",
+  "admin.elasticsearch.purgeIndexesButton.label": "Purgar Índices:",
+  "admin.elasticsearch.purgeIndexesButton.success": "Purgado de índices completado satisfactoriamente.",
+  "admin.elasticsearch.purgeIndexesHelpText": "La purga quitará completamente el índice en el servidor de Elasticsearch. Resultados de la búsqueda pueden estar incompletos hasta que un un nuevo índice de los mensajes existentes en la base de datos sea reconstruido.",
+  "admin.elasticsearch.sniffDescription": "Cuando es verdadero, el mecanismo de olfateo encuentra y conecta todos los nodos al agrupamiento de servidores automáticamente.",
+  "admin.elasticsearch.sniffTitle": "Habilitar mecanismo de olfateo:",
+  "admin.elasticsearch.testConfigSuccess": "Prueba con éxito. Configuración guardada.",
+  "admin.elasticsearch.testHelpText": "Comprueba si el servidor Mattermost puede conectarse al servidor Elasticsearch especificado. La comprobación de la conexión sólo guarda la configuración si la prueba tuvo éxito. Consulte el archivo de registro para ver los mensajes de error más detallados.",
+  "admin.elasticsearch.title": "Elasticsearch (Beta)",
+  "admin.elasticsearch.usernameDescription": "(Opcional) El nombre de usuario para autenticarse en el servidor de Elasticsearch.",
+  "admin.elasticsearch.usernameExample": "Ej.: \"elastic\"",
+  "admin.elasticsearch.usernameTitle": "Nombre de usuario del Servidor:",
+  "admin.elasticsearchStatus.bulkIndexLabel": "Indexación:",
+  "admin.elasticsearchStatus.cancelButton": "Cancelar",
+  "admin.elasticsearchStatus.status": "Estado: ",
+  "admin.elasticsearchStatus.statusCancelled": "Trabajo de indexación cancelado.",
+  "admin.elasticsearchStatus.statusError": "Error de Indexación.",
+  "admin.elasticsearchStatus.statusError.help": "Mattermost ha encontrado un error al construir el índice de Elasticsearch: {error}",
+  "admin.elasticsearchStatus.statusInProgress": "Trabajo en progreso. {percent}% completado.",
+  "admin.elasticsearchStatus.statusInProgress.help": "La indexación está en progreso en el servidor de trabajos. Si Elasticsearch está habilitado, los resultados de las búsquedas pueden estar incompletos hasta que el trabajo haya terminado.",
+  "admin.elasticsearchStatus.statusIndexingDisabled": "Indexación deshabilitada.",
+  "admin.elasticsearchStatus.statusLoading": "Cargando...",
+  "admin.elasticsearchStatus.statusNoJobs": "No hay trabajos de indexación pendientes.",
+  "admin.elasticsearchStatus.statusPending": "Trabajo pendiente.",
+  "admin.elasticsearchStatus.statusPending.help": "El trabajo de indexación de Elasticsearch está pendiente en el servidor de trabajos. Si Elasticsearch está habilitado, los resultados de la búsqueda podrán estar incompletos hasta que el trabajo haya terminado.",
+  "admin.elasticsearchStatus.statusRequestCancel": "Cancelando trabajo...",
+  "admin.elasticsearchStatus.statusSuccess": "Indexación completa.",
+  "admin.elasticsearchStatus.statusSuccess.help": "La indexación se ha completado y los mensajes más nuevos serán indexados automáticamente.",
   "admin.email.agreeHPNS": " Comprendo y acepto los <a href=\"https://about.mattermost.com/hpns-terms/\" target='_blank'>Términos de Servicio</a> y <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Políticas de Privacidad</a> del Servicio Alojado de Notificaciones Push de Mattermost.",
   "admin.email.allowEmailSignInDescription": "Cuando es verdadero, Mattermost permite a los usuarios iniciar sesión utilizando el correo electrónico y contraseña.",
   "admin.email.allowEmailSignInTitle": "Habilitar el inicio de sesión con el correo electrónico: ",
-  "admin.email.allowSignupDescription": "Cuando es en verdadero, Mattermost permite la creación de equipos y cuentas utilizando el correo electrónico y contraseña.  Este valor debe estar en falso sólo cuando quieres limitar el inicio de sesión a través de servicios tipo OAuth o AD/LDAP.",
+  "admin.email.allowSignupDescription": "Cuando es en verdadero, Mattermost permite la creación de equipos y cuentas utilizando el correo electrónico y contraseña.  Este valor debe estar en falso sólo cuando quieres limitar el inicio de sesión a través de servicios tipo AD/LDAP, SAML o GitLab.",
   "admin.email.allowSignupTitle": "Habilitar la creación de la cuenta con el correo electrónico: ",
-  "admin.email.allowUsernameSignInDescription": "Cuando es verdadero, Mattermost permite a los usuarios iniciar sesión con el nombre de usuario y contraseña.  Esta opción normalmente se utiliza cuando la verificación de correo electrónico está inhabilitada.",
+  "admin.email.allowUsernameSignInDescription": "Cuando es verdadero, los usuarios que tengan su inicio de sesión por correo electrónico también podrán iniciar sesión con su nombre de usuario y contraseña. Este ajuste no afecta el de inicio de sesión con AD/LDAP.",
   "admin.email.allowUsernameSignInTitle": "Habilitar el inicio de sesión con nombre de usuario: ",
   "admin.email.connectionSecurityTest": "Probar Conexión",
-  "admin.email.easHelp": "Conoce más acerca de como compilar y desplegar tus propias aplicaciones moviles desde un <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target='_blank'>App Store de Empresa</a>.",
+  "admin.email.easHelp": "Conoce más acerca de como compilar y desplegar tus propias aplicaciones móviles desde un <a href=\"https://about.mattermost.com/default-enterprise-app-store\" target='_blank'>App Store de Empresa</a>.",
   "admin.email.emailFail": "Conexión fallida: {error}",
   "admin.email.emailSuccess": "No fueron reportados errores mientras se enviada el correo. Favor validar en tu bandeja de entrada.",
   "admin.email.enableEmailBatching.clusterEnabled": "El procesamiento por lotes de correos electrónicos no puede ser activado cuando el modo de Alta Disponibilidad está habilitado.",
   "admin.email.enableEmailBatching.siteURL": "El procesamiento por lotes de correos electrónicos no puede ser activado a menos que la URL del Sitio sea configurada en <b>Configuración > URL del Sitio</b>.",
-  "admin.email.enableEmailBatchingDesc": "Cuando es verdadero, los usuarios podrán recibir notificaciones por correo electrónico de múltiples mensajes directos y menciones combinados en un sólo correo electrónico, configurable en <b>Configurar Cuenta > Notificaciones</b>.",
+  "admin.email.enableEmailBatchingDesc": "Cuando es verdadero, los usuarios tendrán notificaciones de correo electrónico para múltiples mensajes directos y menciones combinados en un único correo electrónico. El procesamiento por lotes se producen en un intervalo predeterminado de 15 minutos, que se puede configurar en Configuración de la Cuenta > Notificaciones.",
   "admin.email.enableEmailBatchingTitle": "Habilitar procesamiento por lotes de correos electrónicos:",
+  "admin.email.enableSMTPAuthDesc": "Cuando está habilitado, el nombre de usuario y la contraseña que utilizará para la autenticación con el servidor SMTP.",
+  "admin.email.enableSMTPAuthTitle": "Habilitar Autenticación SMTP:",
   "admin.email.fullPushNotification": "Enviar el mensaje completo",
-  "admin.email.genericPushNotification": "Enviar descripción generica con nombres de usuario y canal",
+  "admin.email.genericNoChannelPushNotification": "Enviar descripción genérica con sólo el nombre del remitente",
+  "admin.email.genericPushNotification": "Enviar descripción genérica con el nombre de usuario y canal",
   "admin.email.inviteSaltDescription": "32-caracter salt añadido a la firma de invitación de correos. Aleatoriamente generado en la instalación. Click \"Regenerar\" para crear nuevo salt.",
   "admin.email.inviteSaltExample": "Ej.: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.inviteSaltTitle": "Salt para correos electrónicos de invitación:",
   "admin.email.mhpns": "Utiliza conexiones cifradas, con calidad de producción de HPNS para tus aplicaciones en iOS y Android",
-  "admin.email.mhpnsHelp": "Descarga <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>la app de Mattermost para iOS</a> desde iTunes. Descarga <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>la app de Mattermost para Android</a> desde Google Play. Conoce más acerca de <a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target='_blank'>HPNS</a>.",
+  "admin.email.mhpnsHelp": "Descarga <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>la app de Mattermost para iOS</a> desde iTunes. Descarga <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>la app de Mattermost para Android</a> desde Google Play. Conoce más acerca de <a href=\"https://about.mattermost.com/default-hpns\" target='_blank'>HPNS</a>.",
   "admin.email.mtpns": "Utiliza las apps de iOS y Android en iTunes y Google Play con TPNS",
-  "admin.email.mtpnsHelp": "Descarga <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>la app de Mattermost para iOS</a> desde iTunes. Descarga <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>la app de Mattermost para Android</a> desde Google Play. Conoce más acerca de <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target='_blank'>TPNS</a>.",
+  "admin.email.mtpnsHelp": "Descarga <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>la app de Mattermost para iOS</a> desde iTunes. Descarga <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>la app de Mattermost para Android</a> desde Google Play. Conoce más acerca de <a href=\"https://about.mattermost.com/default-tpns/\" target='_blank'>TPNS</a>.",
   "admin.email.nofificationOrganizationExample": "Ej: \"© 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.generic": "Enviar descripción genérica con sólo el nombre del remitente",
+  "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": "Contenido de las Notificaciones:",
   "admin.email.notificationDisplayDescription": "Muestra el nombre en la cuenta del email utilizada para enviar notificaciones por correo electrónico desde Mattermost.",
   "admin.email.notificationDisplayExample": "Ej: \"Notificación de Mattermost\", \"Sistema\", \"No-Responder\"",
   "admin.email.notificationDisplayTitle": "Notificación de nombre mostrado:",
@@ -274,11 +328,11 @@
   "admin.email.passwordSaltDescription": "Un salt de 32-caracteres es añadido a la firma de correos para restablecer la contraseña. Aleatoriamente generado en la instalación. Haz clic en \"Regenerar\" para crear un nuevo salt.",
   "admin.email.passwordSaltExample": "Ej.: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "Resetear el Salt para las contraseñas:",
-  "admin.email.pushContentDesc": "Al seleccionar \"Enviar descripción generica con nombres de usuario y canal\" las notificaciones se enviarán con mensajes genericos, incluyendo el nombre del usuario y el canal pero obviando el texto del mensaje.<br /><br /> Al seleccionar \"Enviar el mensaje completo\" envía los mensajes desencadenados por las notificaciones con características específicas y puede incluir información confidencial enviada en los mensajes. En el caso de que tu servidor de Envío de Notificaciones se encuentre fuera del alcance de tu cortafuego,, es ALTAMENTE RECOMENDABLE utilizar está opción junto con el protocolo \"https\" para cifrar las notificaciones enviadas por el servidor.",
+  "admin.email.pushContentDesc": "\"Enviar descripción genérica con sólo el nombre del remitente\" incluye únicamente el nombre de la persona que envió el mensaje en la notificación push, sin información del nombre del canal o contenido del mensaje. <br /><br />\"Enviar descripción genérica con el nombre de usuario y canal\" incluye en nombre de la persona que envió el mensaje y en que canal fue enviado, pero no incluye el texto del mensaje.<br /><br />\"Enviar el mensaje completo\" incluye un extracto del mensaje en la notificación push, el cual puede contener información confidencial enviada en el mensaje. Si tu Servicio de Notificaciones Push está fuera de tu cortafuegos, es *Altamente recomendado* que está opción sea utilizada bajo el protocolo \"https\" para cifrar la conexión.",
   "admin.email.pushContentTitle": "Contenido de las Notificaciones:",
   "admin.email.pushDesc": "Normalmente se asigna como verdadero en producción. Cuando está en verdadero, Mattermost intenta enviar notificaciones a dispositivos iOS y Android a través del servidor de notificaciones.",
   "admin.email.pushOff": "No enviar notificaciones push",
-  "admin.email.pushOffHelp": "Por favor revisa la <a href=\"http://docs.mattermost.com/deployment/push.html#push-notifications-and-mobile-devices\" target='_blank'>documentación sobre notificaciones push</a> para conocer sobre las opciones de configuración.",
+  "admin.email.pushOffHelp": "Por favor revisa la <a href=\"https://about.mattermost.com/default-mobile-push-notifications\" target='_blank'>documentación sobre notificaciones push</a> para conocer sobre las opciones de configuración.",
   "admin.email.pushServerDesc": "Ubicación del servicio de notificaciones push de Mattermost, puedes ubicarlo detras de un cortafuego utilizando https://github.com/mattermost/push-proxy. Para realizar pruebas puedes utilizar https://push-test.mattermost.com, el cual conecta con la ap de ejemplo de Mattermost en iOS publicada en el Apple AppStore. Por favor no utilices este servicio en producción.",
   "admin.email.pushServerEx": "Ej.: \"https://push-test.mattermost.com\"",
   "admin.email.pushServerTitle": "Servidor de Notificaciones:",
@@ -288,7 +342,7 @@
   "admin.email.selfPush": "Ingresar manualmente la ubicación del Servicio de Notificaciones Push",
   "admin.email.skipServerCertificateVerification.description": "Cuando es verdadero, Mattermost no verificará el certificado del servidor de correos.",
   "admin.email.skipServerCertificateVerification.title": "Omitir la Verificación del Certificado del Servidor:",
-  "admin.email.smtpPasswordDescription": " Obten esta credencial del administrador del servidor de correos.",
+  "admin.email.smtpPasswordDescription": "La contraseña asociada con el nombre de usuario SMTP.",
   "admin.email.smtpPasswordExample": "Ej: \"tucontraseña\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "Contraseña del Servidor SMTP:",
   "admin.email.smtpPortDescription": "Puerto de servidor SMTP",
@@ -297,13 +351,17 @@
   "admin.email.smtpServerDescription": "Ubicación de SMTP.",
   "admin.email.smtpServerExample": "Ej: \"smtp.tuempresa.com\", \"email-smtp.us-east-1.amazonaws.com\"",
   "admin.email.smtpServerTitle": "Servidor SMTP:",
-  "admin.email.smtpUsernameDescription": " Obten esta credencial del administrado del servidor de correos.",
+  "admin.email.smtpUsernameDescription": "El nombre de usuario para la autenticación con el servidor SMTP.",
   "admin.email.smtpUsernameExample": "Ej: \"admin@tuempresa.com\", \"AKIADTOVBGERKLCBV\"",
   "admin.email.smtpUsernameTitle": "Nombre de usuario del Servidor SMTP:",
   "admin.email.testing": "Probando...",
   "admin.false": "falso",
-  "admin.file.enableFileAttachments": "Habilitar Archivos Adjuntos:",
-  "admin.file.enableFileAttachmentsDesc": "Si es falso, deshabilita la capacidad de subir archivos e imágenes en los mensajes.",
+  "admin.file.enableFileAttachments": "Permitir el Intercambio de Archivos:",
+  "admin.file.enableFileAttachmentsDesc": "Cuando es falso, desactiva el intercambio de archivos en el servidor. Subir archivos o imágenes en los mensajes están prohibidas a través de los clientes y dispositivos, incluyendo móviles.",
+  "admin.file.enableMobileDownloadDesc": "Cuando es falso, se deshabilita la descarga de archivos en las aplicaciones móviles. Los usuarios pueden descargar archivos desde un navegador web para móviles.",
+  "admin.file.enableMobileDownloadTitle": "Permitir la descarga de Archivos en el Móvil:",
+  "admin.file.enableMobileUploadDesc": "Cuando es falso, se deshabilita la carga de archivos en las aplicaciones móviles. Si Permitir el Intercambio de Archivos se establece en verdadero, los usuarios pueden cargar archivos desde un navegador web para móviles.",
+  "admin.file.enableMobileUploadTitle": "Permitir la carga de Archivos en el Móvil:",
   "admin.file_upload.chooseFile": "Seleccionar Archivo",
   "admin.file_upload.noFile": "No se subió ningún archivo",
   "admin.file_upload.uploadFile": "Subir",
@@ -529,6 +587,21 @@
   "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.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>.",
+  "admin.manage_roles.allowUserAccessTokens": "Permitir que esta cuenta genere <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">tokens de acceso de usuario</a>.",
+  "admin.manage_roles.cancel": "Cancelar",
+  "admin.manage_roles.manageRolesTitle": "Gestionar Roles",
+  "admin.manage_roles.postAllPublicRole": "Acceso para publicar mensajes a todos los canales públicos de Mattermost.",
+  "admin.manage_roles.postAllPublicRoleTitle": "mensajes:canales",
+  "admin.manage_roles.postAllRole": "Acceso para publicar mensajes en todos los canales de Mattermost incluyendo mensajes directos.",
+  "admin.manage_roles.postAllRoleTitle": "mensajes:todos",
+  "admin.manage_roles.save": "Guardar",
+  "admin.manage_roles.saveError": "No se puede guardar los roles.",
+  "admin.manage_roles.systemAdmin": "Admin del Sistema",
+  "admin.manage_roles.systemMember": "Miembro",
+  "admin.manage_tokens.manageTokensTitle": "Gestionar Tokens de Acceso de Usuario",
+  "admin.manage_tokens.userAccessTokensDescription": "Tokens de acceso de usuario funcionan similar a un token de sesión y pueden ser utilizado por integraciones para <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">autenticarse con la REST API</a>. Conoce más acerca de <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">tokens de acceso de usuario</a>.",
+  "admin.manage_tokens.userAccessTokensNone": "No hay tokens de acceso de usuario.",
   "admin.metrics.enableDescription": "Cuando es verdadero, Mattermost habilitará el monitoreo de desempeño, la recolección y la elaboración de perfiles. Por favor, consulta la <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>documentación</a> para obtener más información acerca de la configuración del monitoreo del rendimiento para Mattermost.",
   "admin.metrics.enableTitle": "Habilitar el Monitoreo de Desempeño:",
   "admin.metrics.listenAddressDesc": "La dirección del servidor que escuchará para mostrar las métricas de rendimiento.",
@@ -574,13 +647,26 @@
   "admin.password.requirementsDescription": "Los tipos de caracteres que se requiere para una contraseña válida.",
   "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.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.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.userDescription": "Seleccione el nombre de usuario que será utilizado por esta integración.",
+  "admin.plugins.jira.userLabel": "Usuario:",
+  "admin.plugins.jira.webhookDocsLink": "documentación",
   "admin.privacy.showEmailDescription": "Si es falso, se esconde la dirección de correo electrónico de los miembros para todos los usuarios, excepto a los Administradores del Sistema.",
   "admin.privacy.showEmailTitle": "Mostrar dirección de correo electrónico: ",
   "admin.privacy.showFullNameDescription": "Si es falso, se esconde el nombre completo de los miembros para todos los usuarios, excepto a los Administradores del Sistema. El nombre de usuario se muestra en lugar del nombre completo.",
   "admin.privacy.showFullNameTitle": "Mostrar nombre completo: ",
   "admin.purge.button": "Purgar Todos los Cachés",
   "admin.purge.loading": " Cargando...",
-  "admin.purge.purgeDescription": "Esto eliminará toda la memoria caché para cosas como las sesiones, cuentas, canales, etc. Las Implementaciones que utilicen Alta Disponibilidad intentarán purgar todos los servidores del clúster. La purga de cachés pueden tener un impacto adverso en el rendimiento.",
+  "admin.purge.purgeDescription": "Esto eliminará toda la memoria caché para cosas como las sesiones, cuentas, canales, etc. Las Implementaciones que utilicen Alta Disponibilidad intentarán purgar todos los servidores en el agrupamiento de servidores. La purga de cachés pueden tener un impacto adverso en el rendimiento.",
   "admin.purge.purgeFail": "Purga sin éxito: {error}",
   "admin.rate.enableLimiterDescription": "Cuando es verdadero, La APIs son reguladas a tasas especificadas a continuación.",
   "admin.rate.enableLimiterTitle": "Habilitar el limitador de velocidad: ",
@@ -751,6 +837,10 @@
   "admin.service.tlsKeyFileDescription": "El archivo de la llave privada a utilizar.",
   "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": "Name: ",
+  "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 de usuario</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 de usuario, vaya a la página <strong>Consola del Sistema > Usuarios</strong>.",
+  "admin.service.userAccessTokensIdLabel": "Token ID: ",
+  "admin.service.userAccessTokensTitle": "Habilitar Tokens de Acceso de Usuario: ",
   "admin.service.webSessionDays": "Duración de la sesión para AD/LDAP y correo electrónico (días):",
   "admin.service.webSessionDaysDesc": "El número de días desde la última vez que un usuario ingreso sus credenciales para que la sesión del usuario expire. Luego de cambiar esta configuración, la nueva duración de la sesión tendrá efecto luego de la próxima vez que el usuario ingrese sus credenciales.",
   "admin.service.webhooksDescription": "Cuando es verdadero, los webhooks de entrada serán permitidos. Para ayudar el combate contra los ataques de phishing, todos los mensajes provenientes de webhooks serán marcados con una etiqueta BOT. Revisa la <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>documentación</a> para obtener más información.",
@@ -769,6 +859,7 @@
   "admin.sidebar.customization": "Personalización",
   "admin.sidebar.database": "Base de Datos",
   "admin.sidebar.developer": "Desarrollo",
+  "admin.sidebar.elasticsearch": "Elasticsearch (Beta)",
   "admin.sidebar.email": "Correo electrónico",
   "admin.sidebar.emoji": "Emoticon",
   "admin.sidebar.external": "Servicios Externos",
@@ -776,6 +867,7 @@
   "admin.sidebar.general": "General",
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.integrations": "Integraciones",
+  "admin.sidebar.jira": "JIRA (Beta)",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Legal y Soporte",
   "admin.sidebar.license": "Edición y Licencia",
@@ -883,9 +975,9 @@
   "admin.team.restrictTitle": "Restringir la creación de cuentas a los dominios de correo electrónico especificados:",
   "admin.team.restrict_direct_message_any": "Cualquier usuario en el servidor de Mattermost",
   "admin.team.restrict_direct_message_team": "Cualquier miembro del equipo",
-  "admin.team.showFullname": "Mostrar el nombre y apellido (predeterminado)",
+  "admin.team.showFullname": "Mostrar nombre y apellido",
   "admin.team.showNickname": "Mostrar el sobrenombre si existe, de lo contrario mostrar el nombre y apellido",
-  "admin.team.showUsername": "Mostrar nombre de usuario",
+  "admin.team.showUsername": "Mostrar el nombre de usuario (predeterminado)",
   "admin.team.siteNameDescription": "Nombre de servicios mostrados en pantalla login y UI.",
   "admin.team.siteNameExample": "Ej.: \"Mattermost\"",
   "admin.team.siteNameTitle": "Nombre de sitio:",
@@ -915,7 +1007,9 @@
   "admin.user_item.makeMember": "Hacer Miembro",
   "admin.user_item.makeSysAdmin": "Hacer Admin del Sistema",
   "admin.user_item.makeTeamAdmin": "Hacer Admin de Equipo",
+  "admin.user_item.manageRoles": "Gestionar Roles",
   "admin.user_item.manageTeams": "Gestionar Equipos",
+  "admin.user_item.manageTokens": "Gestionar Tokens",
   "admin.user_item.member": "Miembro",
   "admin.user_item.mfaNo": "<strong>MFA</strong>: No",
   "admin.user_item.mfaYes": "<strong>MFA</strong>: Sí",
@@ -924,6 +1018,9 @@
   "admin.user_item.switchToEmail": "Cambiar a Correo Electrónico/Contraseña",
   "admin.user_item.sysAdmin": "Admin del Sistema",
   "admin.user_item.teamAdmin": "Admin de Equipo",
+  "admin.user_item.userAccessTokenPostAll": "(with post:all personal access tokens)",
+  "admin.user_item.userAccessTokenPostAllPublic": "(with post:channels personal access tokens)",
+  "admin.user_item.userAccessTokenYes": "No hay tokens de acceso de usuario.",
   "admin.webrtc.enableDescription": "Cuando es verdadero, Mattermost permite hacer llamadas de vídeo <strong>uno-a-uno</strong>. Las llamadas con WebRTC están disponibles en Chrome, Firefox y la Aplicación de Escritorio de Mattermost.",
   "admin.webrtc.enableTitle": "Habilitar Mattermost WebRTC: ",
   "admin.webrtc.gatewayAdminSecretDescription": "Ingresa la clave secreta para accesar a la Administración de la puerta de enlace.",
@@ -1314,14 +1411,14 @@
   "emoji_picker.custom": "Personalizado",
   "emoji_picker.emojiPicker": "Selector de Emoticones",
   "emoji_picker.flags": "Banderas",
-  "emoji_picker.food": "Comida",
+  "emoji_picker.foods": "Alimentos",
   "emoji_picker.nature": "Naturaleza",
   "emoji_picker.objects": "Objetos",
   "emoji_picker.people": "Personas",
+  "emoji_picker.places": "Lugares",
   "emoji_picker.recent": "Usados recientemente",
   "emoji_picker.search": "Buscar",
   "emoji_picker.symbols": "Símbolos",
-  "emoji_picker.travel": "Viajes",
   "error.local_storage.help1": "Habilitar las cookies",
   "error.local_storage.help2": "Desactivar la navegación privada",
   "error.local_storage.help3": "Utilizar un navegador compatible (IE 11, Chrome 43+, Firefox 38+, Safari 9, Edge)",
@@ -1688,6 +1785,10 @@
   "mobile.account_notifications.threads_mentions": "Menciones en hilos",
   "mobile.account_notifications.threads_start": "Hilos que yo comience",
   "mobile.account_notifications.threads_start_participate": "Hilos que yo comience o participe",
+  "mobile.advanced_settings.reset_button": "Reiniciar",
+  "mobile.advanced_settings.reset_message": "\nEsto borrará todos los datos sin conexión y reiniciará la aplicación. Tu sesión será iniciada automáticamente una vez que la aplicación se reinicie.\n",
+  "mobile.advanced_settings.reset_title": "Borrar caché",
+  "mobile.advanced_settings.title": "Configuración Avanzada",
   "mobile.channel_drawer.search": "Saltar a una conversación",
   "mobile.channel_info.alertMessageDeleteChannel": "¿Seguro quieres abandonar el {term} {name}?",
   "mobile.channel_info.alertMessageLeaveChannel": "¿Seguro quieres abandonar el {term} {name}?",
@@ -1741,11 +1842,17 @@
   "mobile.loading_members": "Cargando Miembros...",
   "mobile.loading_posts": "Cargando Mensajes...",
   "mobile.login_options.choose_title": "Selecciona un método para iniciar sesión",
+  "mobile.more_dms.start": "Comenzar",
+  "mobile.more_dms.title": "Nueva Conversación",
+  "mobile.notice_mobile_link": "aplicaciones móviles",
+  "mobile.notice_platform_link": "plataforma",
+  "mobile.notice_text": "Mattermost es hecho posible con software de código abierto utilizado en nuestra {platform} y {mobile}.",
   "mobile.notification.in": " en ",
   "mobile.offlineIndicator.connected": "Conectado",
   "mobile.offlineIndicator.connecting": "Conectando...",
   "mobile.offlineIndicator.offline": "Sin conexión a Internet",
   "mobile.open_dm.error": "No pudimos abrir el canal de mensajes directos con {displayName}. Por favor revisa tu conexión e intenta de nuevo.",
+  "mobile.open_gm.error": "No pudimos abrir el canal del grupo con esos usuarios. Por favor revisa tu conexión e intenta de nuevo.",
   "mobile.post.cancel": "Cancelar",
   "mobile.post.delete_question": "¿Estás seguro(a) de querer borrar este mensaje?",
   "mobile.post.delete_title": "Eliminar Mensaje",
@@ -1775,6 +1882,8 @@
   "mobile.routes.thread_dm": "Hilo de Mensaje Directo",
   "mobile.routes.user_profile": "Perfil",
   "mobile.routes.user_profile.send_message": "Enviar Mensaje",
+  "mobile.search.jump": "SALTAR",
+  "mobile.search.no_results": "No se han encontrado resultados",
   "mobile.select_team.choose": "Tus equipos: ",
   "mobile.select_team.join_open": "Equipos a los que te puedes unir",
   "mobile.select_team.no_teams": "No hay equipos disponibles a los que te puedas unir.",
@@ -1788,6 +1897,7 @@
   "mobile.settings.clear_button": "Limpiar",
   "mobile.settings.clear_message": "\nEsto borrará todos los datos sin conexión y reiniciará la aplicación. Tu sesión será iniciada automáticamente una vez que la aplicación se reinicie.\n",
   "mobile.settings.team_selection": "Seleccionar Equipo",
+  "mobile.suggestion.members": "Miembros",
   "modal.manaul_status.ask": "No preguntarme de nuevo",
   "modal.manaul_status.button": "Sí, asigna mi estatus como \"En línea\"",
   "modal.manaul_status.cancel": "No, mantenerme como \"{status}\"",
@@ -1884,6 +1994,8 @@
   "post_focus_view.beginning": "Inicio de los Archivos del Canal",
   "post_info.del": "Borrar",
   "post_info.edit": "Editar",
+  "post_info.message.visible": "(Visible sólo por ti)",
+  "post_info.message.visible.compact": " (Visible sólo por ti)",
   "post_info.mobile.flag": "Marcar",
   "post_info.mobile.unflag": "Desmarcar",
   "post_info.permalink": "Enlace permanente",
@@ -1896,7 +2008,7 @@
   "posts_view.loadMore": "Cargar más mensajes",
   "posts_view.loadingMore": "Cargar más mensajes...",
   "posts_view.newMsg": "Nuevos Mensajes",
-  "posts_view.newMsgBelow": "{count, plural, one {Nuevo mensaje} other {Nuevos mensajes}} ▼",
+  "posts_view.newMsgBelow": "{count, plural, one {Nuevo mensaje} other {Nuevos mensajes}}",
   "quick_switch_modal.channels": "Canales",
   "quick_switch_modal.channelsShortcut.mac": "- ⌘K",
   "quick_switch_modal.channelsShortcut.windows": "- CTRL+K",
@@ -1928,7 +2040,7 @@
   "rename_channel.displayNameHolder": "Ingresa el nombre a mostrar",
   "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 22 caracteres",
+  "rename_channel.maxLength": "Este campo debe tener menos de {maxLength, number} caracteres",
   "rename_channel.required": "Este campo es obligatorio",
   "rename_channel.save": "Guardar",
   "rename_channel.title": "Renombrar Canal",
@@ -1967,6 +2079,7 @@
   "search_item.jump": "Ir  ",
   "search_results.because": "<ul><li>Si estás buscando un frase parcial (ej. buscando \"aud\", tratando de encontrar \"audible\" o \"audifonos\"), agrega un * a la palabra que estás buscando</li><li>Debido a la cantidad de resultados, la búsqueda con dos letras y palabras comunes como \"this\", \"a\" and \"es\" no aparecerán en los resultados debido a la cantidad excesiva de resultados retornados.</li></ul>",
   "search_results.noResults": "No se encontraron resultados. ¿Inténtalo de nuevo?",
+  "search_results.searching": "Buscando…",
   "search_results.usage": "<ul><li>Utiliza <b>\"comillas\"</b> para buscar frases</li><li>Utiliza <b>from:</b> para encontrar mensajes de usuarios en específico e <b>in:</b> para encontrar mensajes de canales específicos</li></ul>",
   "search_results.usageFlag1": "Todavía no haz marcado ningún mensaje.",
   "search_results.usageFlag2": "Puedes marcar los mensajes y comentarios haciendo clic en el icono ",
@@ -1999,8 +2112,7 @@
   "sidebar.tutorialScreen1": "<h4>Canales</h4><p><strong>Canales</strong> organizan las conversaciones en diferentes tópicos. Son abiertos para cualquier persona de tu equipo. Para enviar comunicaciones privadas con una sola persona utiliza <strong>Mensajes Directos</strong> o con multiples personas utilizando <strong>Canales Privados</strong>.</p>",
   "sidebar.tutorialScreen2": "<h4>Los canal \"{townsquare}\" y \"{offtopic}\"</h4><p>Estos son dos canales para comenzar:</p><p><strong>{townsquare}</strong> es el lugar para tener comunicación con todo el equipo. Todos los integrantes de tu equipo son miembros de este canal.</p><p><strong>{offtopic}</strong> es un lugar para diversión y humor fuera de los canales relacionados con el trabajo. Tu y tu equipo pueden decidir que otros canales crear.</p>",
   "sidebar.tutorialScreen3": "<h4>Creando y Uniéndose a Canales</h4><p>Haz clic en <strong>\"Más...\"</strong> para crear un nuevo canal o unirte a uno existente.</p><p>También puedes crear un nuevo canal al hacer clic en el símbolo de <strong>\"+\"</strong> que se encuentra al lado del encabezado de canales públicos o privados.</p>",
-  "sidebar.unreadAbove": "Mensaje(s) sin leer ▲",
-  "sidebar.unreadBelow": "Mensaje(s) sin leer ▼",
+  "sidebar.unreads": "Más sin leer",
   "sidebar_header.tutorial": "<h4>Menú Principal</h4><p>El <strong>Menú Principal</strong> es donde puedes <strong>Invitar a nuevos miembros</strong>, podrás <strong>Configurar tu Cuenta</strong> y seleccionar un <strong>Tema</strong> para personalizar la apariencia.</p><p>Los administradores del Equipo podrán <strong>Configurar el Equipo</strong> desde este menú.</p><p>Los administradores del Sistema encontrarán una opción para ir a la <strong>Consola de Sistema</strong> para administrar el sistema completo.</p>",
   "sidebar_right_menu.accountSettings": "Configurar tu Cuenta",
   "sidebar_right_menu.addMemberToTeam": "Agregar Miembros al Equipo",
@@ -2220,10 +2332,6 @@
   "user.settings.display.nameOptsDesc": "Asigna como mostrar los nombres de los otros usuarios en los mensajes y en la lista de Mensajes Directos.",
   "user.settings.display.normalClock": "Reloj de 12 horas (ejemplo: 4:00 pm)",
   "user.settings.display.preferTime": "Selecciona como prefieres mostrar la hora.",
-  "user.settings.display.showFullname": "Mostrar nombre y apellido",
-  "user.settings.display.showNickname": "Mostrar el sobrenombre si existe, de lo contrario mostrar el nombre y apellido",
-  "user.settings.display.showUsername": "Mostrar el nombre de usuario (predeterminado)",
-  "user.settings.display.teammateNameDisplay": "Visualización del nombre de los compañeros",
   "user.settings.display.theme.applyToAllTeams": "Aplicar el nuevo tema para todos mis equipos",
   "user.settings.display.theme.customTheme": "Tema Personalizado",
   "user.settings.display.theme.describe": "Abrir para administrar tu tema",
@@ -2320,19 +2428,19 @@
   "user.settings.notifications.commentsNever": "No activar notificaciones de mensajes en respuesta hilos a menos que yo esté mencionado",
   "user.settings.notifications.commentsRoot": "Activar notificaciones para mensajes en los hilos de conversación iniciados por mi",
   "user.settings.notifications.desktop": "Enviar notifiaciones de escritorio",
-  "user.settings.notifications.desktop.allFirefoxForever": "Para toda actividad, que se muestran de forma permanente",
-  "user.settings.notifications.desktop.allFirefoxTimed": "Para toda actividad, que se muestran por {seconds} segundos",
   "user.settings.notifications.desktop.allNoSoundForever": "Para toda actividad, sin sonido, que se muestran de forma permanente",
   "user.settings.notifications.desktop.allNoSoundTimed": "Para toda actividad, sin sonido, que se muestran por {seconds} segundos",
   "user.settings.notifications.desktop.allSoundForever": "Para toda actividad, con sonido, que se muestran de forma permanente",
+  "user.settings.notifications.desktop.allSoundHiddenForever": "Para toda actividad, que se muestran de forma permanente",
+  "user.settings.notifications.desktop.allSoundHiddenTimed": "Para toda actividad, que se muestran por {seconds} segundos",
   "user.settings.notifications.desktop.allSoundTimed": "Para toda actividad, con sonido, que se muestran por {seconds} segundos",
   "user.settings.notifications.desktop.duration": "Duración de la notificación:",
   "user.settings.notifications.desktop.durationInfo": "Determina el tiempo que las notificaciones de escritorio permanecerá en la pantalla cuando se utiliza Firefox o Chrome. Las notificaciones de escritorio en Edge y Safari sólo puede permanecer en la pantalla por un máximo de 5 segundos.",
-  "user.settings.notifications.desktop.mentionsFirefoxForever": "Para las menciones y mensajes directos, que se muestran de forma permanente",
-  "user.settings.notifications.desktop.mentionsFirefoxTimed": "Para las menciones y mensajes directos, que se muestran por {seconds} segundos",
   "user.settings.notifications.desktop.mentionsNoSoundForever": "Para las menciones y mensajes directos, sin sonido, que se muestran de forma permanente",
   "user.settings.notifications.desktop.mentionsNoSoundTimed": "Para las menciones y mensajes directos, sin sonido, que se muestran por {seconds} segundos",
   "user.settings.notifications.desktop.mentionsSoundForever": "Para las menciones y mensajes directos, con sonido, que se muestran de forma permanente",
+  "user.settings.notifications.desktop.mentionsSoundHiddenForever": "Para las menciones y mensajes directos, que se muestran de forma permanente",
+  "user.settings.notifications.desktop.mentionsSoundHiddenTimed": "Para las menciones y mensajes directos, que se muestran por {seconds} segundos",
   "user.settings.notifications.desktop.mentionsSoundTimed": "Para las menciones y mensajes directos, con sonido, que se muestran por {seconds} segundos",
   "user.settings.notifications.desktop.seconds": "{seconds} segundos",
   "user.settings.notifications.desktop.sound": "Sonido de la notificación",
@@ -2444,6 +2552,28 @@
   "user.settings.security.switchSaml": "Cambiar para utilizar SAML SSO",
   "user.settings.security.title": "Configuración de Seguridad",
   "user.settings.security.viewHistory": "Visualizar historial de acceso",
+  "user.settings.tokens.cancel": "Cancelar",
+  "user.settings.tokens.clickToEdit": "Haga clic en 'Editar' para gestionar sus tokens de acceso de usuario",
+  "user.settings.tokens.confirmCreateButton": "Sí, Crear",
+  "user.settings.tokens.confirmCreateMessage": "Estás generando un token de acceso de usuario con permisos de Admin del Sistema. ¿Estás seguro de querer crear este token?",
+  "user.settings.tokens.confirmCreateTitle": "Creación de Token de Acceso de Usuario como Admin del Sistema",
+  "user.settings.tokens.confirmDeleteButton": "Sí, Eliminar",
+  "user.settings.tokens.confirmDeleteMessage": "Cualquier integración que este utilizando este token no podrá seguir accesando la API de Mattermost. No puedes deshacer está acción. ¿Estás seguro de querer eliminar este token?",
+  "user.settings.tokens.confirmDeleteTitle": "¿Eliminar el Token {name}?",
+  "user.settings.tokens.copy": "Por favor, copie el token a continuación. No podrás de volver a verlo!",
+  "user.settings.tokens.create": "Crear Nuevo Token",
+  "user.settings.tokens.delete": "Eliminar",
+  "user.settings.tokens.description": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Tokens de acceso de usuario</a> funciona similar a un token de sesión y puede ser utilizado por integraciones para <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">autenticar contra la REST API</a>.",
+  "user.settings.tokens.description_mobile": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Tokens de acceso de usuario</a> funciona similar a un token de sesión y puede ser utilizado por integraciones para <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">autenticar contra la REST API</a>. Crea un nuevo token desde tu computador.",
+  "user.settings.tokens.id": "ID: ",
+  "user.settings.tokens.name": "Nombre: ",
+  "user.settings.tokens.nameHelp": "Enter a description for your token to remember what it does.",
+  "user.settings.tokens.nameRequired": "Please enter a description.",
+  "user.settings.tokens.save": "Guardar",
+  "user.settings.tokens.title": "Tokens de Acceso de Usuario",
+  "user.settings.tokens.token": "Token: ",
+  "user.settings.tokens.tokenId": "Token ID: ",
+  "user.settings.tokens.userAccessTokensNone": "No hay tokens de acceso de usuario.",
   "user_list.notFound": "No se encontraron usuarios",
   "user_profile.send.dm": "Enviar Mensaje",
   "user_profile.webrtc.call": "Iniciar llamada de vídeo",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index e9ec2a7a2..b2b456cdf 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -142,7 +142,7 @@
   "admin.advance.metrics": "Suivi des performances",
   "admin.audits.reload": "Recharger les logs de l'activité utilisateur",
   "admin.audits.title": "Activité de l'utilisateur",
-  "admin.authentication.email": "Authentification e-mail",
+  "admin.authentication.email": "Email Authentication",
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
@@ -203,8 +203,6 @@
   "admin.compliance_table.userId": "Demandé par",
   "admin.connectionSecurityNone": "Aucun",
   "admin.connectionSecurityNoneDescription": "Mattermost se connectera via une connexion non sécurisée.",
-  "admin.connectionSecurityPlain": "PLAIN",
-  "admin.connectionSecurityPlainDescription": "Mattermost se connectera et s'authentifiera via une connexion non sécurisée.",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "Utilise une connexion non sécurisée existante et tente de la mettre à niveau vers une connexion sécurisée en utilisant TLS .",
   "admin.connectionSecurityTest": "test de connexion",
@@ -235,12 +233,60 @@
   "admin.customization.support": "Mentions légales",
   "admin.database.title": "Paramètres de base de données",
   "admin.developer.title": "Paramètres de développement",
+  "admin.elasticsearch.bulkIndexButton.error": "Failed to schedule Bulk Index Job: {error}",
+  "admin.elasticsearch.connectionUrlDescription": "The address of the Elasticsearch server. {documentationLink}",
+  "admin.elasticsearch.connectionUrlExample": "E.g.: \"https://elasticsearch.example.org:9200\"",
+  "admin.elasticsearch.connectionUrlExample.documentationLinkText": "Please see documentation with server setup instructions.",
+  "admin.elasticsearch.connectionUrlTitle": "Server Connection Address:",
+  "admin.elasticsearch.elasticsearch_test_button": "test de connexion",
+  "admin.elasticsearch.enableIndexingDescription": "When true, indexing of new posts occurs automatically. Search queries will use database search until \"Enable Elasticsearch for search queries\" is enabled. {documentationLink}",
+  "admin.elasticsearch.enableIndexingDescription.documentationLinkText": "Learn more about Elasticsearch in our documentation.",
+  "admin.elasticsearch.enableIndexingTitle": "Enable Elasticsearch Indexing:",
+  "admin.elasticsearch.enableSearchingDescription": "Requires a successful connection to the Elasticsearch server. When true, Elasticsearch will be used for all search queries using the latest index. Search results may be incomplete until a bulk index of the existing post database is finished. When false, database search is used.",
+  "admin.elasticsearch.enableSearchingTitle": "Enable Elasticsearch for search queries:",
+  "admin.elasticsearch.indexButton.inProgress": "Indexing in progress",
+  "admin.elasticsearch.indexButton.ready": "Build Index",
+  "admin.elasticsearch.indexHelpText.buildIndex": "All posts in the database will be indexed from oldest to newest. Elasticsearch is available during indexing but search results may be incomplete until the indexing job is complete.",
+  "admin.elasticsearch.indexHelpText.cancelIndexing": "Cancelling stops the indexing job and removes it from the queue. Posts that have already been indexed will not be deleted.",
+  "admin.elasticsearch.noteDescription": "Modifier ces paramètres nécessite le redémarrage du serveur pour prendre effet.",
+  "admin.elasticsearch.password": "E.g.: \"yourpassword\"",
+  "admin.elasticsearch.passwordDescription": "(Optional) The password to authenticate to the Elasticsearch server.",
+  "admin.elasticsearch.passwordTitle": "Mot de passe du serveur SMTP :",
+  "admin.elasticsearch.purgeIndexesButton": "Purge Indexes",
+  "admin.elasticsearch.purgeIndexesButton.error": "Failed to purge indexes: {error}",
+  "admin.elasticsearch.purgeIndexesButton.label": "Purge Indexes:",
+  "admin.elasticsearch.purgeIndexesButton.success": "Indexes purged successfully.",
+  "admin.elasticsearch.purgeIndexesHelpText": "Purging will entirely remove the index on the Elasticsearch server. Search results may be incomplete until a bulk index of the existing post database is rebuilt.",
+  "admin.elasticsearch.sniffDescription": "When true, sniffing finds and connects to all data nodes in your cluster automatically.",
+  "admin.elasticsearch.sniffTitle": "Enable Cluster Sniffing:",
+  "admin.elasticsearch.testConfigSuccess": "Test successful. Configuration saved.",
+  "admin.elasticsearch.testHelpText": "Tests if the Mattermost server can connect to the Elasticsearch server specified. Testing the connection only saves the configuration if the test is successful. See log file for more detailed error messages.",
+  "admin.elasticsearch.title": "Elasticsearch (Beta)",
+  "admin.elasticsearch.usernameDescription": "(Optional) The username to authenticate to the Elasticsearch server.",
+  "admin.elasticsearch.usernameExample": "E.g.: \"elastic\"",
+  "admin.elasticsearch.usernameTitle": "Nom d'utilisateur du serveur SMTP :",
+  "admin.elasticsearchStatus.bulkIndexLabel": "Bulk Indexing:",
+  "admin.elasticsearchStatus.cancelButton": "Annuler",
+  "admin.elasticsearchStatus.status": "État",
+  "admin.elasticsearchStatus.statusCancelled": "Indexing job cancelled.",
+  "admin.elasticsearchStatus.statusError": "Indexing error.",
+  "admin.elasticsearchStatus.statusError.help": "Mattermost encountered an error building the Elasticsearch index: {error}",
+  "admin.elasticsearchStatus.statusInProgress": "Job in progress. {percent}% complete.",
+  "admin.elasticsearchStatus.statusInProgress.help": "Indexing is in progress on the job server. If Elasticsearch is enabled, search results may be incomplete until the job is finished.",
+  "admin.elasticsearchStatus.statusIndexingDisabled": "Indexing disabled.",
+  "admin.elasticsearchStatus.statusLoading": "Chargement…",
+  "admin.elasticsearchStatus.statusNoJobs": "No indexing jobs queued.",
+  "admin.elasticsearchStatus.statusPending": "Job pending.",
+  "admin.elasticsearchStatus.statusPending.help": "Elasticsearch index job is queued on the job server. If Elasticsearch is enabled, search results may be incomplete until the job is finished.",
+  "admin.elasticsearchStatus.statusRequestCancel": "Canceling Job...",
+  "admin.elasticsearchStatus.statusSuccess": "Indexing complete.",
+  "admin.elasticsearchStatus.statusSuccess.help": "Indexing is complete and new posts are being automatically indexed.",
   "admin.email.agreeHPNS": " J’ai compris et j’accepte les <a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">termes de service</a> et la <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">politique de confidentialité</a> du service de notifications push hébergé par Mattermost.",
   "admin.email.allowEmailSignInDescription": "Lorsqu'activé, les utilisateurs pourront se connecter avec leur adresse e-mail et leur mot de passe.",
   "admin.email.allowEmailSignInTitle": "Activer la connexion avec une adresse e-mail : ",
   "admin.email.allowSignupDescription": "Si activé, Mattermost autorisera la création d'équipes et de comptes en utilisant une adresse e-mail et un mot de passe. Cette valeur devrait être désactivée seulement si vous souhaitez utiliser un service d'authentification unique (SSO) comme OAuth ou AD/LDAP pour les connexions.",
   "admin.email.allowSignupTitle": "Activer la création de comptes avec une adresse e-mail : ",
-  "admin.email.allowUsernameSignInDescription": "Lorsqu'activé, les utilisateurs seront autorisés à se connecter avec leur nom d'utilisateur et leur mot de passe. Cette option n'est généralement utilisée que lorsque la vérification de l'adresse e-mail est désactivée.",
+  "admin.email.allowUsernameSignInDescription": "When true, users with email login can sign in using their username and password. This setting does not affect AD/LDAP login.",
   "admin.email.allowUsernameSignInTitle": "Activer la connexion avec nom d'utilisateur : ",
   "admin.email.connectionSecurityTest": "Tester la connexion",
   "admin.email.easHelp": "En savoir plus sur la compilation et le déploiement de vos propres applications mobiles à partir de l'<a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target=\"_blank\">App Store Entreprise</a>.",
@@ -248,18 +294,26 @@
   "admin.email.emailSuccess": "Aucune erreur signalée lors de l'envoi de l'e-mail. Vérifiez votre boîte de réception pour vous en assurer.",
   "admin.email.enableEmailBatching.clusterEnabled": "L'envoi d'e-mails par lot ne peut pas être activé lorsque le mode haute disponibilité est activé.",
   "admin.email.enableEmailBatching.siteURL": "L'envoi d'e-mails par lot ne peut pas être activé tant que l'URL de site n'est pas configurée dans <b>Configuration > URL de site</b>.",
-  "admin.email.enableEmailBatchingDesc": "Lorsqu'activé, les utilisateurs peuvent recevoir des notifications condensées en un seul e-mail pour les messages privés et mentions qu'ils reçoivent. Ceci est configurable dans <b>Paramètres du compte > Notifications</b>",
+  "admin.email.enableEmailBatchingDesc": "When true, users will have email notifications for multiple direct messages and mentions combined into a single email. Batching will occur at a default interval of 15 minutes, configurable in Account Settings > Notifications.",
   "admin.email.enableEmailBatchingTitle": "Activer l'envoi d'e-mails par lot :",
+  "admin.email.enableSMTPAuthDesc": "When enabled, username and password are used for authenticating to the SMTP server.",
+  "admin.email.enableSMTPAuthTitle": "Enable SMTP Authentication:",
   "admin.email.fullPushNotification": "Envoyer un extrait du message complet",
+  "admin.email.genericNoChannelPushNotification": "Send generic description with only sender name",
   "admin.email.genericPushNotification": "Envoyer une description générale avec les noms d'utilisateurs et canaux",
   "admin.email.inviteSaltDescription": "Clé de salage de 32 caractères utilisée pour signer les e-mails d'invitation. Cette clé est générée aléatoirement lors de l'installation. Veuillez cliquer sur \"Regénérer\" pour créer une nouvelle clé de salage.",
   "admin.email.inviteSaltExample": "Ex. : \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.inviteSaltTitle": "Clé de salage des e-mails d'invitation :",
   "admin.email.mhpns": "La connexion à iOS et aux applications Android est cryptée",
-  "admin.email.mhpnsHelp": "Téléchargez l'<a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>application iOS Mattermost</a> depuis iTunes. Téléchargez l'<a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>application Android Mattermost</a> depuis le Google Play. Apprenez-en davantage sur <a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target=\"_blank\">HPNS</a>.",
+  "admin.email.mhpnsHelp": "Téléchargez l'<a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>application iOS Mattermost</a> depuis iTunes. Téléchargez l'<a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>application Android Mattermost</a> depuis le Google Play. Apprenez-en davantage sur <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target='_blank'>TPNS</a>.",
   "admin.email.mtpns": "Utilisez iOS et Android sur iTunes et Google Play avec TPNS",
   "admin.email.mtpnsHelp": "Téléchargez l'<a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>application iOS Mattermost</a> depuis iTunes. Téléchargez l'<a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>application Android Mattermost</a> depuis le Google Play. Apprenez-en davantage sur <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target='_blank'>TPNS</a>.",
   "admin.email.nofificationOrganizationExample": "Ex. : \"© MonEntreprise, 12 avenue Niel, 75017 Paris, France\"",
+  "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.generic": "Send generic description with only sender name",
+  "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": "Contenu des notifications push :",
   "admin.email.notificationDisplayDescription": "Afficher le nom du compte de messagerie utilisé lors de l'envoi d'e-mails de notification par Mattermost.",
   "admin.email.notificationDisplayExample": "Ex. : \"Notification Mattermost\", \"Système\", \"No-reply\"",
   "admin.email.notificationDisplayTitle": "Nom affiché dans les notifications :",
@@ -274,7 +328,7 @@
   "admin.email.passwordSaltDescription": "Clé de salage de 32 caractères utilisé pour générer la clé de réinitialisation du mot de passe. Générée aléatoirement à l'installation. Veuillez cliquer sur \"regénérer\" pour créer une nouvelle clé de salage.",
   "admin.email.passwordSaltExample": "Ex. : \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "Clé de salage de réinitialisation du mot de passe :",
-  "admin.email.pushContentDesc": "Choisir \"Envoyer une description générale avec les noms d'utilisateurs et canaux\" permet aux notifications push d'envoyer des messages sans détail, en incluant juste les noms d'utilisateurs et de canaux.<br /><br />Choisir \"Envoyer un extrait du message complet\" envoie des extraits des messages qui déclenchent les notifications, et peuvent inclure des informations confidentielles visibles sur le terminal des utilisateurs notifiés. Si votre serveur de notifications push n'est pas protégé par votre pare-feu, il est HAUTEMENT RECOMMANDÉ d'utiliser uniquement cette option avec le protocole \"https\" pour chiffrer la connexion.",
+  "admin.email.pushContentDesc": "\"Send generic description with only sender name\" includes only the name of the person who sent the message in push notifications, with no information about channel name or message contents.<br /><br />\"Send generic description with sender and channel names\" includes the name of the person who sent the message and the channel it was sent in, but not the message text.<br /><br />\"Send full message snippet\" includes a message excerpt in push notifications, which may contain confidential information sent in messages. If your Push Notification Service is outside your firewall, it is *highly recommended* this option only be used with an \"https\" protocol to encrypt the connection.",
   "admin.email.pushContentTitle": "Contenu des notifications push :",
   "admin.email.pushDesc": "En général activé en production. Lorsqu'activé, Mattermost essaye d'envoyer à iOS et Android des notifications push.",
   "admin.email.pushOff": "Ne pas envoyer de notifications push",
@@ -288,7 +342,7 @@
   "admin.email.selfPush": "Spécifiez manuellement la configuration du service de notifications push",
   "admin.email.skipServerCertificateVerification.description": "Lorsqu'activé, Mattermost ne vérifiera pas le certificat du serveur e-mail.",
   "admin.email.skipServerCertificateVerification.title": "Passer la vérification du certificat du serveur: ",
-  "admin.email.smtpPasswordDescription": " Récupérez ces informations de l'administrateur de votre serveur e-mail.",
+  "admin.email.smtpPasswordDescription": "The password associated with the SMTP username.",
   "admin.email.smtpPasswordExample": "Ex. : \"votremotdepasse\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "Mot de passe du serveur SMTP :",
   "admin.email.smtpPortDescription": "Port du serveur SMTP.",
@@ -297,13 +351,17 @@
   "admin.email.smtpServerDescription": "Adresse de votre serveur SMTP.",
   "admin.email.smtpServerExample": "Ex. : \"smtp.votreentreprise.com\", \"email-smtp.us-east-1.amazonaws.com\"",
   "admin.email.smtpServerTitle": "Serveur SMTP :",
-  "admin.email.smtpUsernameDescription": " Récupérez ces informations de l'administrateur de votre serveur e-mail.",
+  "admin.email.smtpUsernameDescription": "The username for authenticating to the SMTP server.",
   "admin.email.smtpUsernameExample": "Ex. : \"admin@votreentreprise.com\", \"AKIADTOVBGERKLCBV\"",
   "admin.email.smtpUsernameTitle": "Nom d'utilisateur du serveur SMTP :",
   "admin.email.testing": "Essai en cours...",
   "admin.false": "non",
-  "admin.file.enableFileAttachments": "Activer les fichiers en pièces jointes :",
-  "admin.file.enableFileAttachmentsDesc": "Lorsque désactivé, désactive les envois de fichiers et d'images accompagnant les messages.",
+  "admin.file.enableFileAttachments": "Allow File Sharing:",
+  "admin.file.enableFileAttachmentsDesc": "When false, disables file sharing on the server. All file and image uploads on messages are forbidden across clients and devices, including mobile.",
+  "admin.file.enableMobileDownloadDesc": "When false, disables file downloads on mobile apps. Users can still download files from a mobile web browser.",
+  "admin.file.enableMobileDownloadTitle": "Allow File Downloads on Mobile:",
+  "admin.file.enableMobileUploadDesc": "When false, disables file uploads on mobile apps. If Allow File Sharing is set to true, users can still upload files from a mobile web browser.",
+  "admin.file.enableMobileUploadTitle": "Allow File Uploads on Mobile:",
   "admin.file_upload.chooseFile": "Parcourir",
   "admin.file_upload.noFile": "Aucun fichier téléchargé",
   "admin.file_upload.uploadFile": "Télécharger",
@@ -529,6 +587,21 @@
   "admin.logs.bannerDesc": "Pour rechercher des utilisateurs sur base de leur User ID, allez dans Rapports > Utilisateurs et collez l'ID dans la barre de recherche.",
   "admin.logs.reload": "Recharger",
   "admin.logs.title": "Journaux du serveur",
+  "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>.",
+  "admin.manage_roles.allowUserAccessTokens": "Allow this account to generate <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a>.",
+  "admin.manage_roles.cancel": "Annuler",
+  "admin.manage_roles.manageRolesTitle": "Manage Roles",
+  "admin.manage_roles.postAllPublicRole": "Access to post to all Mattermost public channels.",
+  "admin.manage_roles.postAllPublicRoleTitle": "post:channels",
+  "admin.manage_roles.postAllRole": "Access to post to all Mattermost channels including direct messages.",
+  "admin.manage_roles.postAllRoleTitle": "post:all",
+  "admin.manage_roles.save": "Enregistrer",
+  "admin.manage_roles.saveError": "Unable to save roles.",
+  "admin.manage_roles.systemAdmin": "Administrateur système",
+  "admin.manage_roles.systemMember": "Membre",
+  "admin.manage_tokens.manageTokensTitle": "Manage Personal Access Tokens",
+  "admin.manage_tokens.userAccessTokensDescription": "Personal access tokens function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">interact with this Mattermost server</a>. Learn more about <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a>.",
+  "admin.manage_tokens.userAccessTokensNone": "No personal access tokens.",
   "admin.metrics.enableDescription": "Lorsqu'activé, Mattermost activera la collecte des rapports de performance et de profilage. Veuillez vous référer à la <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>documentation</a> pour en savoir davantage sur la configuration du suivi des performances de Mattermost.",
   "admin.metrics.enableTitle": "Activer le suivi des performances :",
   "admin.metrics.listenAddressDesc": "L'adresse d'écoute du serveur pour publier les mesures de performances.",
@@ -574,6 +647,19 @@
   "admin.password.requirementsDescription": "Lettres obligatoires pour un mot de passe valide.",
   "admin.password.symbol": "Au moins un symbole (ex :  \"~!@#$%^&*()\")",
   "admin.password.uppercase": "Au moins une majuscule",
+  "admin.plugins.jira": "JIRA (Beta)",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelname",
+  "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": "activé",
+  "admin.plugins.jira.secretDescription": "This secret is used to authenticate to Mattermost.",
+  "admin.plugins.jira.secretLabel": "Clé secrète :",
+  "admin.plugins.jira.secretParamPlaceholder": "Clé secrète :",
+  "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.userDescription": "Select the username that this integration is attached to.",
+  "admin.plugins.jira.userLabel": "Utilisateurs",
+  "admin.plugins.jira.webhookDocsLink": "documentation",
   "admin.privacy.showEmailDescription": "Lorsque désactivé, cache l'adresse e-mail des membres de tout le monde sauf des administrateurs système.",
   "admin.privacy.showEmailTitle": "Afficher l'adresse e-mail : ",
   "admin.privacy.showFullNameDescription": "Lorsque désactivé, cache le nom complet des membres de tout le monde sauf des administrateurs système. Le nom d'utilisateur s'affiche alors à la place du nom complet.",
@@ -751,6 +837,10 @@
   "admin.service.tlsKeyFileDescription": "Le fichier contenant la clé privée à utiliser.",
   "admin.service.useLetsEncrypt": "Utiliser Let's Encrypt :",
   "admin.service.useLetsEncryptDescription": "Active la récupération automatique des certificats de Let's Encrypt. Le certificat sera récupéré lorsqu'un client tentera de se connecter à partir d'un nouveau domaine. Ceci fonctionne également avec des domaines multiples.",
+  "admin.service.userAccessTokensDescLabel": "Name: ",
+  "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.userAccessTokensIdLabel": "Token ID: ",
+  "admin.service.userAccessTokensTitle": "Enable Personal Access Tokens: ",
   "admin.service.webSessionDays": "Durée de la session AD/LDAP et e-mail (en jours) :",
   "admin.service.webSessionDaysDesc": "Le nombre de jours entre la dernière fois qu'un utilisateur a entré ses identifiants et l'expiration de la session de l'utilisateur. Après le changement de ce paramètre, la nouvelle durée de session prendra effet la prochaine fois que les utilisateurs entreront leurs identifiants.",
   "admin.service.webhooksDescription": "Lorsqu'activé, les webhooks entrants seront autorisés. Pour aider à combattre les attaques d'hameçonnage, tous les messages de webhooks seront étiquetés par un label BOT. Consultez la <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>documentation</a> pour en savoir davantage.",
@@ -769,6 +859,7 @@
   "admin.sidebar.customization": "Personnalisation",
   "admin.sidebar.database": "Base de données",
   "admin.sidebar.developer": "Développeur",
+  "admin.sidebar.elasticsearch": "Elasticsearch (Beta)",
   "admin.sidebar.email": "E-mail",
   "admin.sidebar.emoji": "Emoticônes",
   "admin.sidebar.external": "Services externes",
@@ -776,6 +867,7 @@
   "admin.sidebar.general": "Général",
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.integrations": "Intégrations",
+  "admin.sidebar.jira": "JIRA (Beta)",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Mentions légales",
   "admin.sidebar.license": "Édition et licence",
@@ -883,9 +975,9 @@
   "admin.team.restrictTitle": "Restreindre la création de compte à ces domaines :",
   "admin.team.restrict_direct_message_any": "Tout utilisateur sur le serveur Mattermost",
   "admin.team.restrict_direct_message_team": "Tous les membres de l’équipe",
-  "admin.team.showFullname": "Afficher le prénom et nom (par défaut)",
+  "admin.team.showFullname": "Afficher prénom et nom",
   "admin.team.showNickname": "Afficher le pseudo s'il existe, sinon afficher le prénom d'abord puis le nom",
-  "admin.team.showUsername": "Afficher le nom d'utilisateur",
+  "admin.team.showUsername": "Afficher le nom d'utilisateur (défaut)",
   "admin.team.siteNameDescription": "Nom du service affiché dans les écrans de connexion et l'interface.",
   "admin.team.siteNameExample": "Ex. : \"Mattermost\"",
   "admin.team.siteNameTitle": "Nom du site :",
@@ -915,7 +1007,9 @@
   "admin.user_item.makeMember": "Assigner le rôle Membre",
   "admin.user_item.makeSysAdmin": "Assigner le rôle administrateur système",
   "admin.user_item.makeTeamAdmin": "Assigner le rôle \"Administrateur d'équipe\"",
+  "admin.user_item.manageRoles": "Manage Roles",
   "admin.user_item.manageTeams": "Gérer les équipes",
+  "admin.user_item.manageTokens": "Manage Tokens",
   "admin.user_item.member": "Membre",
   "admin.user_item.mfaNo": "<strong>MFA</strong> : Non",
   "admin.user_item.mfaYes": "<strong>MFA</strong> : Oui",
@@ -924,6 +1018,9 @@
   "admin.user_item.switchToEmail": "Basculer le type de connexion sur le couple adresse e-mail / mot de passe",
   "admin.user_item.sysAdmin": "Administrateur système",
   "admin.user_item.teamAdmin": "Administrateur d'équipe",
+  "admin.user_item.userAccessTokenPostAll": "(with post:all personal access tokens)",
+  "admin.user_item.userAccessTokenPostAllPublic": "(with post:channels personal access tokens)",
+  "admin.user_item.userAccessTokenYes": "(with personal access tokens)",
   "admin.webrtc.enableDescription": "Lorsqu'activé, Mattermost autorise les appels vidéo en <strong>tête-à-tête</strong>. Les appels par WebRTC sont disponibles sur Chrome, Firefox et les applications Mattermost de bureau.",
   "admin.webrtc.enableTitle": "Activer Mattermost WebRTC :",
   "admin.webrtc.gatewayAdminSecretDescription": "Saisissez votre mot de passe pour accéder à l'URL de la passerelle administrateur.",
@@ -1314,14 +1411,14 @@
   "emoji_picker.custom": "Personnalisée",
   "emoji_picker.emojiPicker": "Sélection d'émoticônes",
   "emoji_picker.flags": "Indicateurs",
-  "emoji_picker.food": "Nourriture",
+  "emoji_picker.foods": "Nourriture",
   "emoji_picker.nature": "Nature",
   "emoji_picker.objects": "Objets",
   "emoji_picker.people": "Personnes",
+  "emoji_picker.places": "Places",
   "emoji_picker.recent": "Récemment utilisées",
   "emoji_picker.search": "Rechercher",
   "emoji_picker.symbols": "Symboles",
-  "emoji_picker.travel": "Voyage",
   "error.local_storage.help1": "Activer les cookies",
   "error.local_storage.help2": "Veuillez désactiver la navigation privée",
   "error.local_storage.help3": "Veuillez utiliser un navigateur web supporté (IE11, Chrome 43+, Firefox 38+, Safari 9, Edge)",
@@ -1688,6 +1785,10 @@
   "mobile.account_notifications.threads_mentions": "Mentions dans les fils de discussion",
   "mobile.account_notifications.threads_start": "Fils de discussion que je démarre",
   "mobile.account_notifications.threads_start_participate": "Fils de discussion que je démarre ou auxquels je participe",
+  "mobile.advanced_settings.reset_button": "Reset",
+  "mobile.advanced_settings.reset_message": "\nCela effacera toutes les données en mode hors connexion et redémarrera l'application. Vous serez automatiquement reconnecté une fois l'application redémarrée.\n",
+  "mobile.advanced_settings.reset_title": "Reset Cache",
+  "mobile.advanced_settings.title": "Paramètres avancés",
   "mobile.channel_drawer.search": "Aller à la conversation",
   "mobile.channel_info.alertMessageDeleteChannel": "Voulez-vous vraiment supprimer le {term} {name} ?",
   "mobile.channel_info.alertMessageLeaveChannel": "Voulez-vous vraiment quitter le {term} {name} ?",
@@ -1741,11 +1842,17 @@
   "mobile.loading_members": "Chargement des membres...",
   "mobile.loading_posts": "Chargement des messages...",
   "mobile.login_options.choose_title": "Choisissez votre méthode de connexion",
+  "mobile.more_dms.start": "Start",
+  "mobile.more_dms.title": "New Conversation",
+  "mobile.notice_mobile_link": "mobile apps",
+  "mobile.notice_platform_link": "platform",
+  "mobile.notice_text": "Mattermost is made possible by the open source software used in our {platform} and {mobile}.",
   "mobile.notification.in": "  dans  ",
   "mobile.offlineIndicator.connected": "Connecté",
   "mobile.offlineIndicator.connecting": "Connexion en cours...",
   "mobile.offlineIndicator.offline": "Aucune connexion internet",
   "mobile.open_dm.error": "Impossible d'ouvrir un message privé avec {displayName}. Veuillez vérifier votre connexion et essayer à nouveau.",
+  "mobile.open_gm.error": "Impossible d'ouvrir un message privé avec {displayName}. Veuillez vérifier votre connexion et essayer à nouveau.",
   "mobile.post.cancel": "Annuler",
   "mobile.post.delete_question": "Voulez-vous vraiment supprimer ce message ?",
   "mobile.post.delete_title": "Supprimer le message",
@@ -1775,6 +1882,8 @@
   "mobile.routes.thread_dm": "Fil de discussion de message privé",
   "mobile.routes.user_profile": "Profil",
   "mobile.routes.user_profile.send_message": "Envoyer un message",
+  "mobile.search.jump": "JUMP",
+  "mobile.search.no_results": "Aucun résultat trouvé",
   "mobile.select_team.choose": "Vos équipes : ",
   "mobile.select_team.join_open": "Les autres équipes que vous pouvez rejoindre.",
   "mobile.select_team.no_teams": "Il n'y a aucune équipe disponible que vous pouvez rejoindre.",
@@ -1788,6 +1897,7 @@
   "mobile.settings.clear_button": "Effacer",
   "mobile.settings.clear_message": "\nCela effacera toutes les données en mode hors connexion et redémarrera l'application. Vous serez automatiquement reconnecté une fois l'application redémarrée.\n",
   "mobile.settings.team_selection": "Sélection d'équipe",
+  "mobile.suggestion.members": "Membres",
   "modal.manaul_status.ask": "Ne plus me demander",
   "modal.manaul_status.button": "Oui, définir mon état en \"En ligne\"",
   "modal.manaul_status.cancel": "Non, conserver mon état \"{status}\"",
@@ -1884,6 +1994,8 @@
   "post_focus_view.beginning": "Début des archives du canal",
   "post_info.del": "Supprimer",
   "post_info.edit": "Éditer",
+  "post_info.message.visible": "(Only visible to you)",
+  "post_info.message.visible.compact": " (Only visible to you)",
   "post_info.mobile.flag": "Marquer avec un indicateur",
   "post_info.mobile.unflag": "Supprimer l'indicateur",
   "post_info.permalink": "Lien permanent",
@@ -1928,7 +2040,7 @@
   "rename_channel.displayNameHolder": "Saisissez le nom d'affichage",
   "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 faire moins de 22 caractères",
+  "rename_channel.maxLength": "This field must be less than {maxLength, number} characters",
   "rename_channel.required": "Ce champ est obligatoire",
   "rename_channel.save": "Enregistrer",
   "rename_channel.title": "Renommer le canal",
@@ -1967,6 +2079,7 @@
   "search_item.jump": "Aller à",
   "search_results.because": "<ul><li>Pour rechercher une partie d'un mot (ex. rechercher \"réa\" en souhaitant \"réagir\" ou \"réaction\"), ajoutez un * au terme recherché</li><li>En raison du nombre de résultats, les recherches sur deux lettres ou sur les mots communs tels que \"ce\", \"un\" et \"est\" n'apparaîtront pas dans les résultats de la recherche</li></ul>",
   "search_results.noResults": "Aucun résultat. Recommencer ?",
+  "search_results.searching": "Searching...",
   "search_results.usage": "<ul><li>Utilisez <b>\"des guillemets\"</b> pour rechercher des phrases</li><li>Utilisez <b>from:</b> pour rechercher des messages d'utilisateurs spécifiques et <b>in:</b> pour rechercher des messages sur des canaux spécifiques</li></ul>",
   "search_results.usageFlag1": "Vous n'avez pas encore de messages marqués d'un indicateur.",
   "search_results.usageFlag2": "Vous pouvez marquer un message ou un commentaire en cliquant sur ",
@@ -1999,8 +2112,7 @@
   "sidebar.tutorialScreen1": "<h4>Canaux</h4><p><strong>Les canaux</strong> organisent les conversations en sujets distincts. Ils sont ouverts à tous les utilisateurs de votre équipe. Pour envoyer des messages privés, utilisez <strong>Messages privés</strong> pour une personne ou des <strong>Canaux privés</strong> pour plusieurs personnes.</p>",
   "sidebar.tutorialScreen2": "<h4>Canaux \"{townsquare}\" et \"{offtopic}\"</h4><p>Voici deux canaux publics pour commencer :</p><p><strong>{townsquare}</strong> est l'endroit idéal pour communiquer avec toute l'équipe. Tous les membres de votre équipe sont membres de ce canal.</p><p><strong>{offtopic}</strong> (est l'endroit pour se détendre et parler d'autre chose que du travail. Vous et votre équipe décidez des autres canaux à créer.</p>",
   "sidebar.tutorialScreen3": "<h4>Créer et rejoindre des canaux</h4><p>Cliquez sur <strong>\"Plus...\"</strong> pour créer un nouveau canal ou rejoindre un canal existant.</p><p>Vous pouvez aussi créer un nouveau canal ou un groupe privé en cliquant sur le symbole <strong>\"+\"</strong> à côté du nom du canal public ou privé.</p>",
-  "sidebar.unreadAbove": "Messages non-lus ▲",
-  "sidebar.unreadBelow": "Messages non-lus ▼",
+  "sidebar.unreads": "More unreads",
   "sidebar_header.tutorial": "<h4>Menu principal</h4><p>Le <strong>Menu Principal</strong> est l'endroit où vous pouvez <strong>inviter des nouveaux membres</strong>, accéder aux <strong>paramètres de votre compte</strong> et configurer les <strong>couleurs de votre thème</strong>.</p><p>Les administrateurs d'équipe peuvent aussi accéder aux <strong>paramètres de l'équipe</strong>.</p><p>Les administrateurs système trouveront la <strong>console système</strong> pour administrer tout le site.</p>",
   "sidebar_right_menu.accountSettings": "Paramètres du compte",
   "sidebar_right_menu.addMemberToTeam": "Ajouter des membres",
@@ -2220,10 +2332,6 @@
   "user.settings.display.nameOptsDesc": "Choisissez comment afficher les autres utilisateurs dans les messages et les listes de messages privés.",
   "user.settings.display.normalClock": "Horloge 12 heures (exemple : 4:00 PM)",
   "user.settings.display.preferTime": "Choisissez l'affichage des heures dans l'application.",
-  "user.settings.display.showFullname": "Afficher prénom et nom",
-  "user.settings.display.showNickname": "Afficher le pseudo s'il existe, sinon afficher le prénom d'abord puis le nom",
-  "user.settings.display.showUsername": "Afficher le nom d'utilisateur (défaut)",
-  "user.settings.display.teammateNameDisplay": "Affichage des noms des membres d'équipe",
   "user.settings.display.theme.applyToAllTeams": "Appliquer le nouveau thème à toutes mes équipes",
   "user.settings.display.theme.customTheme": "Thème personnalisé",
   "user.settings.display.theme.describe": "Ouvrez pour gérer votre thème",
@@ -2320,19 +2428,19 @@
   "user.settings.notifications.commentsNever": "Ne pas recevoir de notifications pour toutes réponses apportées à un fil de réponses à moins que je ne sois mentionné",
   "user.settings.notifications.commentsRoot": "Recevoir des notifications pour pour toutes réponses apportées à un fil de messages que j'ai débuté",
   "user.settings.notifications.desktop": "Envoyer des notifications de bureau",
-  "user.settings.notifications.desktop.allFirefoxForever": "Pour toute activité, visible indéfiniment",
-  "user.settings.notifications.desktop.allFirefoxTimed": "Pour toute activité, visible {seconds} secondes",
   "user.settings.notifications.desktop.allNoSoundForever": "Pour toute activité, sans son, visible indéfiniment",
   "user.settings.notifications.desktop.allNoSoundTimed": "Pour toute activité, sans son, visible {seconds} secondes",
   "user.settings.notifications.desktop.allSoundForever": "Pour toute activité, avec son, visible indéfiniment",
+  "user.settings.notifications.desktop.allSoundHiddenForever": "Pour toute activité, visible indéfiniment",
+  "user.settings.notifications.desktop.allSoundHiddenTimed": "Pour toute activité, visible {seconds} secondes",
   "user.settings.notifications.desktop.allSoundTimed": "Pour toute activité, avec son, visible {seconds} secondes",
   "user.settings.notifications.desktop.duration": "Durée de notification",
   "user.settings.notifications.desktop.durationInfo": "Définit combien de temps les notifications de bureau resteront à l'écran lors de l'utilisation de Firefox ou Chrome. Les notifications de bureau dans Edge et Safari ne peuvent rester affichées à l'écran que pour un maximum de 5 secondes.",
-  "user.settings.notifications.desktop.mentionsFirefoxForever": "Pour les mentions et messages privés, visible indéfiniment",
-  "user.settings.notifications.desktop.mentionsFirefoxTimed": "Pour les mentions et messages privés, visible {seconds} secondes",
   "user.settings.notifications.desktop.mentionsNoSoundForever": "Pour les mentions et messages privés, sans son, visible indéfiniment",
   "user.settings.notifications.desktop.mentionsNoSoundTimed": "Pour les mentions et messages privés, sans son, visible {seconds} secondes",
   "user.settings.notifications.desktop.mentionsSoundForever": "Pour les mentions et messages privés, avec son, visible indéfiniment",
+  "user.settings.notifications.desktop.mentionsSoundHiddenForever": "Pour les mentions et messages privés, visible indéfiniment",
+  "user.settings.notifications.desktop.mentionsSoundHiddenTimed": "Pour les mentions et messages privés, visible {seconds} secondes",
   "user.settings.notifications.desktop.mentionsSoundTimed": "Pour les mentions et messages privés, avec son, visible {seconds} secondes",
   "user.settings.notifications.desktop.seconds": "{seconds} secondes",
   "user.settings.notifications.desktop.sound": "Son de notification",
@@ -2444,6 +2552,28 @@
   "user.settings.security.switchSaml": "Utiliser l'authentification unique (SSO) via SAML",
   "user.settings.security.title": "Paramètres de sécurité",
   "user.settings.security.viewHistory": "Voir l'historique des accès",
+  "user.settings.tokens.cancel": "Annuler",
+  "user.settings.tokens.clickToEdit": "Click 'Edit' to manage your personal access tokens",
+  "user.settings.tokens.confirmCreateButton": "Yes, Create",
+  "user.settings.tokens.confirmCreateMessage": "You are generating a personal access token with System Admin permissions. Are you sure want to create this token?",
+  "user.settings.tokens.confirmCreateTitle": "Create System Admin Personal Access Token",
+  "user.settings.tokens.confirmDeleteButton": "Yes, Delete",
+  "user.settings.tokens.confirmDeleteMessage": "Any integrations using this token will no longer be able to access the Mattermost API. You cannot undo this action. <br /><br />Are you sure want to delete the <strong>{description}</strong> token?",
+  "user.settings.tokens.confirmDeleteTitle": "Delete Token?",
+  "user.settings.tokens.copy": "Please copy the access token below. You won't be able to see it again!",
+  "user.settings.tokens.create": "Create New Token",
+  "user.settings.tokens.delete": "Supprimer",
+  "user.settings.tokens.description": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Personal access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>.",
+  "user.settings.tokens.description_mobile": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Personal access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>. Create new tokens on your desktop.",
+  "user.settings.tokens.id": "ID : ",
+  "user.settings.tokens.name": "Nom",
+  "user.settings.tokens.nameHelp": "Enter a description for your token to remember what it does.",
+  "user.settings.tokens.nameRequired": "Please enter a description.",
+  "user.settings.tokens.save": "Enregistrer",
+  "user.settings.tokens.title": "Personal Access Tokens",
+  "user.settings.tokens.token": "Access Token: ",
+  "user.settings.tokens.tokenId": "Token ID: ",
+  "user.settings.tokens.userAccessTokensNone": "No personal access tokens.",
   "user_list.notFound": "Aucun utilisateur trouvé.",
   "user_profile.send.dm": "Envoyer un message",
   "user_profile.webrtc.call": "Démarrer un appel vidéo",
diff --git a/webapp/i18n/it.json b/webapp/i18n/it.json
index acda13894..1d67ce366 100644
--- a/webapp/i18n/it.json
+++ b/webapp/i18n/it.json
@@ -142,7 +142,7 @@
   "admin.advance.metrics": "Monitoraggio prestazioni",
   "admin.audits.reload": "Aggiorna il log delle Attività Utente",
   "admin.audits.title": "Log delle Attività Utente",
-  "admin.authentication.email": "Autenticazione Email",
+  "admin.authentication.email": "Autenticazione email",
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
@@ -203,8 +203,6 @@
   "admin.compliance_table.userId": "Richiesto da",
   "admin.connectionSecurityNone": "Nessuno",
   "admin.connectionSecurityNoneDescription": "Mattermost si connetterà senza una connessione sicura.",
-  "admin.connectionSecurityPlain": "IN CHIARO",
-  "admin.connectionSecurityPlainDescription": "Mattermost si connetterà e darà accesso senza una connessione sicura.",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "Prendi una connesione insicura esistente e cerca di renderla una connessione sicura usando TLS.",
   "admin.connectionSecurityTest": "Connessione di prova",
@@ -235,31 +233,87 @@
   "admin.customization.support": "Aspetti legali e supporto",
   "admin.database.title": "Impostazioni database",
   "admin.developer.title": "Impostazioni sviluppatori",
+  "admin.elasticsearch.bulkIndexButton.error": "Impossibile pianificare il lavoro di indicizzazione massiva: {error}",
+  "admin.elasticsearch.connectionUrlDescription": "Indirizzo del server Elasticsearch. {documentationLink}",
+  "admin.elasticsearch.connectionUrlExample": "Es.: \"https://elasticsearch.example.org:9200\"",
+  "admin.elasticsearch.connectionUrlExample.documentationLinkText": "Controlla la documentazione con le istruzioni per configurare il server.",
+  "admin.elasticsearch.connectionUrlTitle": "Indirizzo del server:",
+  "admin.elasticsearch.elasticsearch_test_button": "Prova connessione",
+  "admin.elasticsearch.enableIndexingDescription": "Se vero, l'indicizzazione delle nuove pubblicazioni è automatica. Le ricerche utilizzeranno il database finché \"Abilita Elasticsearch per le ricerche\" verrà attivo. {documentationLink}",
+  "admin.elasticsearch.enableIndexingDescription.documentationLinkText": "Scopri di più su Elasticsearch nella nostra documentazione.",
+  "admin.elasticsearch.enableIndexingTitle": "Attiva indicizzazione Elasticsearch:",
+  "admin.elasticsearch.enableSearchingDescription": "Richiede una connessione valida al server Elasticsearch. Se vero, Elasticsearch verrà utilizzato per tutte le ricerche utilizzando l'ultimo indice. I risultati della ricerca possono essere incompleti finché non vengono indicizzate tutte le pubblicazioni esistenti. Se falso, viene eseguita una ricerca su database.",
+  "admin.elasticsearch.enableSearchingTitle": "Abilita Elasticsearch per le ricerche:",
+  "admin.elasticsearch.indexButton.inProgress": "Indicizzazione in corso",
+  "admin.elasticsearch.indexButton.ready": "Indicizza",
+  "admin.elasticsearch.indexHelpText.buildIndex": "Tutte le pubblicazioni nel database saranno indicizzate dalla più vecchia alla più nuova. Elsaticsearch è disponibile durante l'indicizzazione ma i risultati delle ricerche potrebbero essere incompleti fino al termine dell'indicizzazione.",
+  "admin.elasticsearch.indexHelpText.cancelIndexing": "Annulla il lavoro di indicizzazione e lo rimuove dalla coda lavori. Le pubblicazioni già indicizzate non saranno cancellate.",
+  "admin.elasticsearch.noteDescription": "Modificare le impostazioni in questa sezione richiede un riavvio del server affinché abbiano effetto.",
+  "admin.elasticsearch.password": "Es: \"tuapassword\"",
+  "admin.elasticsearch.passwordDescription": "(Opzionale) La password di autenticazione sul server Elasticsearch.",
+  "admin.elasticsearch.passwordTitle": "Password del server:",
+  "admin.elasticsearch.purgeIndexesButton": "Elimina indici",
+  "admin.elasticsearch.purgeIndexesButton.error": "Impossibile eliminare gli indici: {error}",
+  "admin.elasticsearch.purgeIndexesButton.label": "Elimina indici:",
+  "admin.elasticsearch.purgeIndexesButton.success": "Indici eliminati correttamente.",
+  "admin.elasticsearch.purgeIndexesHelpText": "Elimina completamente l'indice sul server Elasticsearch. I risultati delle ricerche potrebbero essere incompleti fino a quando un indice completo delle pubblicazioni non viene ricostruito.",
+  "admin.elasticsearch.sniffDescription": "Se vero, trova e connette automaticamente a tutti i nodi del cluster.",
+  "admin.elasticsearch.sniffTitle": "Abilita ricerca nel cluster:",
+  "admin.elasticsearch.testConfigSuccess": "Test eseguito correttamente. Configurazione salvata.",
+  "admin.elasticsearch.testHelpText": "Verifica se il server di Mattermost riesce a connettersi al server Elasticsearch specificato. Il test salva la configurazione solo se l'esito è positivo. Controlla il file di log per i messaggi di errori dettagliati.",
+  "admin.elasticsearch.title": "Elasticsearch (Beta)",
+  "admin.elasticsearch.usernameDescription": "(Opzionale) Il nome utente per autenticarsi sul server Elasticsearch.",
+  "admin.elasticsearch.usernameExample": "Es.: \"elastic\"",
+  "admin.elasticsearch.usernameTitle": "Nome utente del server:",
+  "admin.elasticsearchStatus.bulkIndexLabel": "Indicizzazione massiva:",
+  "admin.elasticsearchStatus.cancelButton": "Annulla",
+  "admin.elasticsearchStatus.status": "Stato: ",
+  "admin.elasticsearchStatus.statusCancelled": "Lavoro di indicizzazione annullato.",
+  "admin.elasticsearchStatus.statusError": "Errore di indicizzazione.",
+  "admin.elasticsearchStatus.statusError.help": "Mattermost ha rilevato un problema durante la costruzione dell'indice di Elasticsearch: {error}",
+  "admin.elasticsearchStatus.statusInProgress": "Lavoro in corso. {percent}%.",
+  "admin.elasticsearchStatus.statusInProgress.help": "Indicizzazione in corso sul server. Se Elasticsearch è attivo, i risultati delle ricerche potrebbero essere incompleti fino al termine del lavoro.",
+  "admin.elasticsearchStatus.statusIndexingDisabled": "Indicizzazione disabilitata.",
+  "admin.elasticsearchStatus.statusLoading": "Caricamento...",
+  "admin.elasticsearchStatus.statusNoJobs": "Nessun lavoro di indicizzazione in coda.",
+  "admin.elasticsearchStatus.statusPending": "Lavoro in attesa.",
+  "admin.elasticsearchStatus.statusPending.help": "Il lavoro di indicizzazione di Elasticsearch è in coda sul server. Se Elasticsearch è attivo, i risultato potrebbero essere incompleti fino al termine del lavoro.",
+  "admin.elasticsearchStatus.statusRequestCancel": "Annulla lavoro...",
+  "admin.elasticsearchStatus.statusSuccess": "Indicizzazione completata.",
+  "admin.elasticsearchStatus.statusSuccess.help": "Indicizzazione completata, le nuove pubblicazioni saranno automaticamente indicizzate.",
   "admin.email.agreeHPNS": " Riconosco ed accetto i termini del Servizio di Notifiche Push di Mattermost <a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">Termini del servizio</a> e <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Informativa sulla pivacy</a>.",
   "admin.email.allowEmailSignInDescription": "Quando abilitato, Mattermost permette agli utenti di registrarsi utilizzando la loro eMail e password.",
   "admin.email.allowEmailSignInTitle": "Abilita accesso con email: ",
-  "admin.email.allowSignupDescription": "Quando abilitato, Mattermost permette la creazione di gruppi ed iscrizione tramite email e password.  Questa impostazione dovrebbe essere disattivata quando si vuole limitare l'iscrizione ad un servizio di single sign-on come OAuth o LDAP.",
+  "admin.email.allowSignupDescription": "Quando abilitato, Mattermost permette la creazione di account tramite email e password. Questa impostazione dovrebbe essere disattivata quando si vuole limitare l'accesso tramite un servizio di single sign-on come AD/LDAP, SAML o GitLab.",
   "admin.email.allowSignupTitle": "Abilita creazione account con email: ",
-  "admin.email.allowUsernameSignInDescription": "Quando abilitato, Mattermost consente agli utenti di accedere utilizzando il loro username e la password.  Questa impostazione è tipicamente utilizzata solo quando la verifica email è disattivata.",
+  "admin.email.allowUsernameSignInDescription": "Quando attivato, gli utenti con un accesso email possono effettuare l'accesso con il loro nome utente e password. Questa impostazione non influisce sul login AD/LDAP.",
   "admin.email.allowUsernameSignInTitle": "Abilita accesso con nome utente: ",
   "admin.email.connectionSecurityTest": "Connessione di prova",
-  "admin.email.easHelp": "Vedi altre info sulla compilazione e la distribuzione di proprie app mobili da un <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target='_blank'>Enterprise App Store</a>.",
+  "admin.email.easHelp": "Scopri di più sulla compilazione e la distribuzione die app proprietarie sul sito <a href=\"https://about.mattermost.com/default-enterprise-app-store\" target='_blank'>App Store Enterprise</a>.",
   "admin.email.emailFail": "Connessione non riuscita: {error}",
   "admin.email.emailSuccess": "Nessun errore riportato durante l'invio delle eMail.  Controllare la vostra Inbox.",
   "admin.email.enableEmailBatching.clusterEnabled": "L'invio di email in blocco non può essere attivato nella modalità Alta disponibilità.",
   "admin.email.enableEmailBatching.siteURL": "L'invio di email in blocco non può essere attivato senza la configurazione del SiteURL in <b>Configurazione > SiteURL</b>.",
-  "admin.email.enableEmailBatchingDesc": "Quando abilitato, gli utenti possono chiedere l'invio di diversi messaggi diretti e citazioni raggruppati in un solo messaggio email, configurato in <b>Impostazioni account > Notifiche</b>.",
+  "admin.email.enableEmailBatchingDesc": "Se vero, gli utenti riceveranno un'unica email di notifica per tutti gli ultimi messaggi diretti e le citazioni che li coinvolgono. Il controllo avviene a un intervallo predefinito di 15 minuti, modificabile in Impostazioni Account > Notifiche.",
   "admin.email.enableEmailBatchingTitle": "Abilita raggruppamento email:",
+  "admin.email.enableSMTPAuthDesc": "Se attivo, il nome nome utente e la password sono utilizzati per autenticarsi sul server SMTP.",
+  "admin.email.enableSMTPAuthTitle": "Abilita Autenticazione SMTP:",
   "admin.email.fullPushNotification": "Invia estratto dal messaggio completo",
-  "admin.email.genericPushNotification": "Invia una descrizione generica con nomi del utente e del canale",
+  "admin.email.genericNoChannelPushNotification": "Invia una descrizione generica solo con il mittente",
+  "admin.email.genericPushNotification": "Invia una descrizione generica con il mittente e i canali",
   "admin.email.inviteSaltDescription": "Seme di 32 caratteri aggiunto alla firma di inviti email. Viene generato casualmente ad ogni installazione. Clic su \"Rigenera\" per creare un nuovo seme.",
   "admin.email.inviteSaltExample": "Es. \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.inviteSaltTitle": "Seme per inviti email:",
   "admin.email.mhpns": "USa connesioni criptate HPNS per le applicazioni iOS and Android",
-  "admin.email.mhpnsHelp": "Scarica <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS app</a> da iTunes. Scarica <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android app</a> da Google Play. Scopri di più su <a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target='_blank'>HPNS</a>.",
+  "admin.email.mhpnsHelp": "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-hpns\" target='_blank'>HPNS</a>.",
   "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 iOS app</a> da iTunes. Scarica <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android app</a> da Google Play. Scopri di più su <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target='_blank'>TPNS</a>.",
+  "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.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.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:",
@@ -274,11 +328,11 @@
   "admin.email.passwordSaltDescription": "Seme di 32 caratteri aggiunto alla firma di email per il reset password. Viene generato casualmente ad ogni installazione. Clic su \"Rigenera\" per creare un nuovo seme.",
   "admin.email.passwordSaltExample": "Es.: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "Seme per password reset:",
-  "admin.email.pushContentDesc": "Scegliendo \"Invia descrizione generica con nomi di utenti e di canali\" si permette l'invio di notifiche push con messaggi generici, contenenti nomi di utenti e di canali ma senza dettagli specifici tratti dal testo del messaggio. <br /><br />. Scegliendo \"Invia estratto dal messaggio completo\" si permette l'invio di parti dei messaggi che hanno attivato la notifica, contenenti dettagli che potrebbero includere informazioni confidenziali inviate nei messaggi. Se il servizio di Notifiche Push è all'esterno del firewall è altamente consigliabile usare questa seconda opzione soltanto con il protocollo HTTPS per crittografare la connessione.",
+  "admin.email.pushContentDesc": "\"Invia una descrizione generica solo con il mittente\" include solo il nome della persona che ha inviato il messaggio nelle notifiche push, senza informazioni relative al nome del canale o al contenuto del messaggio.<br /><br />\"Invia una descrizione generica con il mittente e i canali\" include il nome della persona che ha inviato il messaggio e il canale su cui è stato inviato, ma non il testo del messaggio.<br /><br />\"Invia estratto del messaggio\" include un estratto del messaggio nella notifica push, che può contenere informazioni confidenziali. Se il Servizio di Notifica Push è esterno al tuo firewall è *altamente raccomandato* di utilizzare questa opzione solo con un protocollo \"https\" per criptare la connessione.",
   "admin.email.pushContentTitle": "Contenuto Notifiche Push:",
   "admin.email.pushDesc": "Normalmente abilitato in produzione. Quando abilitato, Mattermost tenta di inviare ad iOS e Android le notifiche push tramite il server delle notifiche push.",
   "admin.email.pushOff": "Non inviare notifiche push",
-  "admin.email.pushOffHelp": "Vedi la <a href=\"http://docs.mattermost.com/deployment/push.html#push-notifications-and-mobile-devices\" target='_blank'>documentazione sulle notifiche push</a> per altre info sulle opzioni di configurazione.",
+  "admin.email.pushOffHelp": "Vedi la <a href=\"https://about.mattermost.com/default-mobile-push-notifications\" target='_blank'>documentazione sulle notifiche push</a> per scoprire di più sulla configurazione.",
   "admin.email.pushServerDesc": "Collocazione del servizio di notifiche push di Mattermost, che può essere configurato dietro al firewall usando https://github.com/mattermost/push-proxy. Per prova si può usare http://push-test.mattermost.com, che si connette all'app iOS Mattermost di esempio nell'AppStore pubblico di Apple. Non usare questo servizio per impieghi in produzione.",
   "admin.email.pushServerEx": "E.s.: \"http://push-test.mattermost.com\"",
   "admin.email.pushServerTitle": "Server notifiche push:",
@@ -287,8 +341,8 @@
   "admin.email.requireVerificationTitle": "Richiedi Email di verifica : ",
   "admin.email.selfPush": "Inserisci manualmente il percorso del Servizio Notifiche Push",
   "admin.email.skipServerCertificateVerification.description": "Quando abilitato, Mattermost non verificherà il certificato del server email.",
-  "admin.email.skipServerCertificateVerification.title": "Salta Verifica Certifcato Server: ",
-  "admin.email.smtpPasswordDescription": " Ottieni questi dati dal amministratore che ha impostato il server email.",
+  "admin.email.skipServerCertificateVerification.title": "Salta Verifica Certificato Server: ",
+  "admin.email.smtpPasswordDescription": "La password associata al nome utente SMTP.",
   "admin.email.smtpPasswordExample": "Es. \"latuapassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "Password server SMTP:",
   "admin.email.smtpPortDescription": "Porta del server smtp.",
@@ -297,13 +351,17 @@
   "admin.email.smtpServerDescription": "Indirizzo del server email SMTP.",
   "admin.email.smtpServerExample": "Es. \"smtp.tuacompagnia.com\", \"email-smtp.us-east-1.amazonaws.com\"",
   "admin.email.smtpServerTitle": "Server SMTP:",
-  "admin.email.smtpUsernameDescription": " Ottieni questi dati dal amministratore che ha impostato il server email.",
+  "admin.email.smtpUsernameDescription": "Il nome utente per autenticarsi sul server SMTP.",
   "admin.email.smtpUsernameExample": "Es.: \"admin@tuacompagniacom\", \"AKIADTOVBGERKLCBV\"",
   "admin.email.smtpUsernameTitle": "Nome utente server SMTP:",
   "admin.email.testing": "Verifica in corso...",
   "admin.false": "falso",
-  "admin.file.enableFileAttachments": "Abilita Allegati:",
-  "admin.file.enableFileAttachmentsDesc": "Se false, disabilita l'upload di file ed immagini nei messaggi.",
+  "admin.file.enableFileAttachments": "Consenti Condivisione File:",
+  "admin.file.enableFileAttachmentsDesc": "Se falso, disattiva la possibilità di condividere file su questo server. Tutti i file e le immagini caricati nei messaggi saranno bloccati su tutti i client e dispositivi, inclusi i dispositivi mobili.",
+  "admin.file.enableMobileDownloadDesc": "Se falso, disattiva il download dei file sulle app per smartphone. Gli utente potranno ancora scaricare i file dal browser web mobile.",
+  "admin.file.enableMobileDownloadTitle": "Permetti download dei file da mobile:",
+  "admin.file.enableMobileUploadDesc": "Se falso, disattiva il caricamento dei file dalle app per smartphone. Se Consenti Condivisione File è vero, gli utenti potranno ancora caricare file dal browser web mobile.",
+  "admin.file.enableMobileUploadTitle": "Permetti Caricamento File da Mobile:",
   "admin.file_upload.chooseFile": "Scegliere file",
   "admin.file_upload.noFile": "Nessun file caricato",
   "admin.file_upload.uploadFile": "Carica",
@@ -311,7 +369,7 @@
   "admin.files.storage": "Archiviazione",
   "admin.general.configuration": "Configurazione",
   "admin.general.localization": "Localizzazione",
-  "admin.general.localization.availableLocalesDescription": "Impostare quali lingue sono disponibili per gli utenti nelle Impostazioni utente (lasciare in bianco per  tutte le lingue disponibili). Se si stanno aggiungendo manualmente altre lingue, si deve aggiungere la <strong>Lingua predefinta utente</strong> prima di salvare.<br/><br/>. Se si vuole contribuire alla traduzione, iscriversi al <a href='http://translate.mattermost.com/' target='_blank'>Server traduzioni Mattermost</a>.",
+  "admin.general.localization.availableLocalesDescription": "Impostare quali lingue sono disponibili per gli utenti nelle Impostazioni utente (lasciare in bianco per  tutte le lingue disponibili). Se si stanno aggiungendo manualmente altre lingue, si deve aggiungere la <strong>Lingua predefinita utente</strong> prima di salvare.<br/><br/>. Se si vuole contribuire alla traduzione, iscriversi al <a href='http://translate.mattermost.com/' target='_blank'>Server traduzioni Mattermost</a>.",
   "admin.general.localization.availableLocalesNoResults": "Nessun risultato trovato",
   "admin.general.localization.availableLocalesNotPresent": "La lingua predefinita del client deve essere inclusa nella lista di quelle disponibili",
   "admin.general.localization.availableLocalesTitle": "Lingue disponibili:",
@@ -501,12 +559,12 @@
   "admin.license.upload": "Carica",
   "admin.license.uploadDesc": "Carica una chiave di licenza per Mattermost Enterprise Edition per aggiornare questo server. <a href=\"http://mattermost.com\" target='_blank'>Vai sul nostro sito</a> per scoprire quali vantaggi offre la versione Enterprise o per acquistare una chiave di licenza.",
   "admin.license.uploading": "Invio Licenza...",
-  "admin.log.consoleDescription": "Tipicamente impostato a false in produzione. Gli sviluppatori posso impostare questo campo a true per inviare i messaggi di log alla console impostata. Se true il server scrive i messaggi sullo standard output stream (stdout).",
+  "admin.log.consoleDescription": "Tipicamente impostato a false in produzione. Gli sviluppatori posso impostare questo campo a true per inviare i messaggi di log alla console impostata.  Se vero, il server scrive i messaggi sullo standard output stream (stdout).",
   "admin.log.consoleTitle": "Scrive i logs sulla console: ",
   "admin.log.enableDiagnostics": "Abilita Diagnostica e Invio Errori:",
   "admin.log.enableDiagnosticsDescription": "Abilita questa opzione per aumentare la qualità e le funzionalità di Mattermost inviando informazioni diagnostiche ed errori a Mattermost, Inc. Leggi la nosta <a href=\"https://about.mattermost.com/default-privacy-policy/\" target='_blank'>politica sulla privacy</a> per scoprirne di più.",
   "admin.log.enableWebhookDebugging": "Attiva il debug di Webhook:",
-  "admin.log.enableWebhookDebuggingDescription": "Impostare a false per disattivare il debug di tutte le richieste webhook in ingresso.",
+  "admin.log.enableWebhookDebuggingDescription": "Impostare a falso per disattivare il debug di tutte le richieste webhook in ingresso.",
   "admin.log.fileDescription": "Tipicamente abilitato in produzione. Quando attivo, i log registrati vengono scritti nel file mattermost.log all'interno della directory specificata nel campo File Log Directory. I log vengono ruotati ogni 10,000 linee ed archiviati in un file presente nella stessa directory, con un nome ed una data comprendente un numero di serie. Per esempio, mattermost.2017-03-31.001.",
   "admin.log.fileLevelDescription": "Questa impostazione determina il livello di dettaglio con cui i log vengono scritti. ERROR: Scrive solo messaggi di errore. INFO: Scrive i messaggi di errore e le informazioni di avvio e inizializzazione. DEBUG: Scrive informazioni dettagliate per gli sviluppatori in fase di debug.",
   "admin.log.fileLevelTitle": "Livello di log file:",
@@ -529,6 +587,21 @@
   "admin.logs.bannerDesc": "Per cercare gli utenti tramite ID, 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>.",
+  "admin.manage_roles.allowUserAccessTokens": "Permetti a questo account di generare <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">token di accesso</a>.",
+  "admin.manage_roles.cancel": "Annulla",
+  "admin.manage_roles.manageRolesTitle": "Gestisci ruoli",
+  "admin.manage_roles.postAllPublicRole": "Accede alle pubblicazione di tutti i canali pubblici.",
+  "admin.manage_roles.postAllPublicRoleTitle": "post:channels",
+  "admin.manage_roles.postAllRole": "Accede a tutte le pubblicazioni inclusi i messaggi diretti.",
+  "admin.manage_roles.postAllRoleTitle": "post:all",
+  "admin.manage_roles.save": "Salva",
+  "admin.manage_roles.saveError": "Impossibile salvare i ruoli.",
+  "admin.manage_roles.systemAdmin": "Amministratore di Sistema",
+  "admin.manage_roles.systemMember": "Membro",
+  "admin.manage_tokens.manageTokensTitle": "Gestisci Token di Accesso",
+  "admin.manage_tokens.userAccessTokensDescription": "I token di accesso sono simili ai token di session e possono essere utilizzati dalle integrazioni per <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">autenticarsi con le API REST</a>. Scopri di più sui <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">token di accesso</a>.",
+  "admin.manage_tokens.userAccessTokensNone": "Nessun token di accesso.",
   "admin.metrics.enableDescription": "Quando abilitato, Mattermost abiliterà il monitoraggio e l'analisi delle prestazioni. Consultare la <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>documentazione</a> per ottenere maggiori informazioni su come configurare il monitoraggio delle prestazioni per Mattermost.",
   "admin.metrics.enableTitle": "Abilitare il monitor delle performance:",
   "admin.metrics.listenAddressDesc": "L'indirizzo su cui il server starà in ascolto per esporre le informazioni di performace.",
@@ -574,9 +647,22 @@
   "admin.password.requirementsDescription": "Tipi di carattere richiesti in una password valida.",
   "admin.password.symbol": "Almeno un simbolo (es. \"~!@#$%^&*()\")",
   "admin.password.uppercase": "Almeno una lettera maiuscola",
-  "admin.privacy.showEmailDescription": "Se false, nasconde gli indirizzi email dei membri a tutti gli utenti esclusi gli Amministratori di Sistema.",
+  "admin.plugins.jira": "JIRA (Beta)",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelname",
+  "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.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.userDescription": "Seleziona il nome utente utilizzato dall'integrazione.",
+  "admin.plugins.jira.userLabel": "Utente:",
+  "admin.plugins.jira.webhookDocsLink": "documentazione",
+  "admin.privacy.showEmailDescription": "Se falso, nasconde gli indirizzi email dei membri a tutti gli utenti esclusi gli Amministratori di Sistema.",
   "admin.privacy.showEmailTitle": "Mostra Indirizzo Email: ",
-  "admin.privacy.showFullNameDescription": "Se false, nascone i nomi completi dei membri a tutti gli utenti esclusi gli Amministratori di Sistema. Al posto del nome completo verrà visualizzato il nome utente.",
+  "admin.privacy.showFullNameDescription": "Se falso, nascone i nomi completi dei membri a tutti gli utenti esclusi gli Amministratori di Sistema. Al posto del nome completo verrà visualizzato il nome utente.",
   "admin.privacy.showFullNameTitle": "Mostra nome completo: ",
   "admin.purge.button": "Svuota tutte le Cache",
   "admin.purge.loading": "Caricamento...",
@@ -593,7 +679,7 @@
   "admin.rate.memoryDescription": "Numero massimo di sessioni utente connesse al sistema come determinato dalle impostazioni \"Varia il limite di velocità secondo l'indirizzo remoto\" e \"Varia il limite di velocità secondo l'header HTTP\".",
   "admin.rate.memoryExample": "Es.: \"10000\"",
   "admin.rate.memoryTitle": "Dimensione Allocazione Memoria:",
-  "admin.rate.noteDescription": "Per rendere effettive le modifiche apportate in questa sezione ad impostazioni diverse da Site URL richiederà il riavvio del server.",
+  "admin.rate.noteDescription": "Riavviare il server per rendere effettive le modifiche apportate ad impostazioni diverse da URL del sito.",
   "admin.rate.noteTitle": "Nota:",
   "admin.rate.queriesDescription": "Restringere il tasso di richieste API a questo numero per secondo.",
   "admin.rate.queriesExample": "Es.: \"10\"",
@@ -632,7 +718,7 @@
   "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.encryptDescription": "Se false, Mattermost non decodificherà le Asserzioni SAML codificate con il tuo Service Provider Public Certificate. Sconsigliato in ambienti di produzione. Solo per test.",
+  "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.",
   "admin.saml.firstnameAttrEx": "Es.: \"FirstName\"",
@@ -677,7 +763,7 @@
   "admin.saml.usernameAttrDesc": "L'attributo nell'asserzione SAML che verrà usato per popolare il campo nome utente in Mattermost.",
   "admin.saml.usernameAttrEx": "Es.: \"Username\"",
   "admin.saml.usernameAttrTitle": "Attributo del nome utente:",
-  "admin.saml.verifyDescription": "Se false, Mattermost non verificherà che la firma di una Risposta SAML coincida con l'URL di login del fornitore del servizio. Sconsigliato in ambienti di produzione. Solo per test.",
+  "admin.saml.verifyDescription": "Se falso, Mattermost non verificherà che la firma di una Risposta SAML coincida con l'URL di login del fornitore del servizio. Sconsigliato in ambienti di produzione. Solo per test.",
   "admin.saml.verifyTitle": "Verifica Firma:",
   "admin.save": "Salva",
   "admin.saving": "Salvataggio configurazione...",
@@ -704,7 +790,7 @@
   "admin.service.developerDesc": "Quando abilitato, gli errori JavaScript vengono mostrati all'interno di una barra rossa nella parte alta dell'interfaccia utente. Uso non raccomandato in produzione.  ",
   "admin.service.developerTitle": "Abilita Modalità Sviluppatore:  ",
   "admin.service.enableAPIv3": "Consenti l'utilizzo delle API versione 3:",
-  "admin.service.enableAPIv3Description": "Imposta a false per disattivare la versione 3 delle API REST. Le integrazioni che si basano sulle API v3 smetteranno di funzionare e potranno essere identificate per essere migrate alle API v4. Le API v3 sono considerate deprecate e saranno rimosse nelle prossime release. Vedere <a href='https://api.mattermost.com' target='_blank'>https://api.mattermost.com</a> per ulteriori dettagli.",
+  "admin.service.enableAPIv3Description": "Imposta a falso per disattivare la versione 3 delle API REST. Le integrazioni che si basano sulle API v3 smetteranno di funzionare e potranno essere identificate per essere migrate alle API v4. Le API v3 sono considerate deprecate e saranno rimosse nelle prossime release. Vedere <a href='https://api.mattermost.com' target='_blank'>https://api.mattermost.com</a> per ulteriori dettagli.",
   "admin.service.enforceMfaDesc": "Quando vero, per effettuare il login è necessario usare<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>autenticazione multi-fattore</a>. I nuovi utenti saranno obbligati ad impostare MFA durante l'iscrizione. Gli utenti che hanno già eseguito l'accesso senza MFA saranno confinati nella pagina di impostazione MFA fino al completamento della procedura.<br/><br/>Se il tuo sistema comprende utenti con meccanismi di login diversi da AD/LDAP ed email, MFA dovrà essere forzato tramite il provider di autenticazione all'infuori di Mattermost.",
   "admin.service.enforceMfaTitle": "Forza Autenticazione Multifattore:",
   "admin.service.forward80To443": "Inoltra porta 80 su 443:",
@@ -714,7 +800,7 @@
   "admin.service.googleTitle": "Chiave API Google:",
   "admin.service.iconDescription": "Quando vero, webhooks, comandi slash ed altre integrazioni come <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target='_blank'>Zapier</a>, saranno messe in grado di modificare l'immagine di profilo con cui postano. Nota: in concomitanza con l'abilitazione delle integrazioni per l'override dei nomi utenti, gli utenti potrebbero essere in grado di eseguire attacchi di phishing tentando di impersonare altri utenti.",
   "admin.service.iconTitle": "Abilita integrazioni per l'override delle immagini profilo:",
-  "admin.service.insecureTlsDesc": "Se vero, qualsiasi richiesta HTTPS in uscita, accetterà senza verifica certificati self-signed. Per esempio, verranno ammessi webhook in uscita verso server provvisti di certificato self-signed per un qualsiasi dominio. Da notare che questo renderà questo eventuali connessioni suscettibili ad attacchi di tipo main-in-the-middle.",
+  "admin.service.insecureTlsDesc": "Se vero, qualsiasi richiesta HTTPS in uscita, accetterà senza verifica certificati self-signed. Per esempio, verranno ammessi webhook in uscita verso server provvisti di certificato self-signed per un qualsiasi dominio. Da notare che questo renderà queste eventuali connessioni suscettibili ad attacchi di tipo man-in-the-middle.",
   "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.",
@@ -733,7 +819,7 @@
   "admin.service.overrideTitle": "Abilita integrazioni per l'override dei nome utente:",
   "admin.service.readTimeout": "Timeout Lettura:",
   "admin.service.readTimeoutDescription": "Tempo massimo ammesso da quando la connessione è stata accettata a quando la il body della richiesta è stato completamente letto.",
-  "admin.service.securityDesc": "Se true, gli Amministratori di Sistema sono notificati tramite email se delle importanti fix di sicurezza sono stati annunciate nelle ultime 12 ore. Le email devono essere attive.",
+  "admin.service.securityDesc": "Se vero, gli Amministratori di Sistema sono notificati tramite email se delle importanti fix di sicurezza sono stati annunciate nelle ultime 12 ore. Le email devono essere attive.",
   "admin.service.securityTitle": "Abilita notifiche di sicurezza: ",
   "admin.service.sessionCache": "Cache di session (minuti):",
   "admin.service.sessionCacheDesc": "Il numero di minuti in cui tenere una sessione in memoria.",
@@ -743,7 +829,7 @@
   "admin.service.siteURLExample": "Es.: \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "Durata sessione SSO (giorni):",
   "admin.service.ssoSessionDaysDesc": "Il numero di giorni dall'ultimo login alla scadenza della sessione utente. Se il metodo di autenticazione è SAML oppure GitLab, l'utente può automaticamente riaccedere se è già loggato in SAML o GitLab. Eventuali modifiche a questa impostazione avranno effetto dalla prossima volta in cui l'utente inserisce le sue credenziali.",
-  "admin.service.testingDescription": "Se true, il comando /test è attivo per provare account, dati e formattazione del testo. Eventuali modifiche richiedono il riavvio del server per avere effetto.",
+  "admin.service.testingDescription": "Se vero, il comando /test è attivo per provare account, dati e formattazione del testo. Eventuali modifiche richiedono il riavvio del server per avere effetto.",
   "admin.service.testingTitle": "Abilita comandi di test: ",
   "admin.service.tlsCertFile": "File del certificato TLS:",
   "admin.service.tlsCertFileDescription": "Il file del certificato da utilizzare.",
@@ -751,9 +837,13 @@
   "admin.service.tlsKeyFileDescription": "File della chiave privata da utilizzare.",
   "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": "Name: ",
+  "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>. 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.userAccessTokensIdLabel": "ID token: ",
+  "admin.service.userAccessTokensTitle": "Attiva Token di Accesso: ",
   "admin.service.webSessionDays": "Durata session AD/LDAP e email (giorni):",
   "admin.service.webSessionDaysDesc": "Il numero di giorni trascorsi dall'ultima volta in cui un utente ha inserito le proprie credenziali e la scadenza della sessione utente. Dopo aver modificato questa impostazione, la nuova durata sessione sarà attiva a partire dalla prossima volta in cui l'utente avrà inserito le proprio credenziali.",
-  "admin.service.webhooksDescription": "Se true, le richieste webhook in ingresso sono consentite. Per prevenire gli attacchi di phishing, tutte le pubblicazioni da webhooks saranno etichettati da un tah NOT. vedere la <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>documentazione</a> per ulteriori informazioni.",
+  "admin.service.webhooksDescription": "Se vero, le richieste webhook in ingresso sono consentite. Per prevenire gli attacchi di phishing, tutte le pubblicazioni da webhooks saranno etichettati da un tag BOT. vedere la <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>documentazione</a> per ulteriori informazioni.",
   "admin.service.webhooksTitle": "Abilita Webhook in ingresso:  ",
   "admin.service.writeTimeout": "Timeout in scrittura:",
   "admin.service.writeTimeoutDescription": "Se si utilizza HTTP (non sicuro), è il tempo massimo che può trascorre da quando l'intestazione della richiesta viene letta a quando la risposta viene scritta. Se si utilizza HTTPS è il tempo totale da quando la connessione è accettata a quando la risposta viene inviata.",
@@ -769,6 +859,7 @@
   "admin.sidebar.customization": "Personalizzazione",
   "admin.sidebar.database": "Database",
   "admin.sidebar.developer": "Sviluppatore",
+  "admin.sidebar.elasticsearch": "Elasticsearch (Beta)",
   "admin.sidebar.email": "Email",
   "admin.sidebar.emoji": "Emoji",
   "admin.sidebar.external": "Servizi esterni",
@@ -776,6 +867,7 @@
   "admin.sidebar.general": "Generale",
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.integrations": "Integrazioni",
+  "admin.sidebar.jira": "JIRA (Beta)",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Aspetti legali e supporto",
   "admin.sidebar.license": "Versione e Licenza",
@@ -828,7 +920,7 @@
   "admin.sql.queryTimeoutExample": "Es.: \"30\"",
   "admin.sql.queryTimeoutTitle": "Timeout Query:",
   "admin.sql.replicas": "Repliche sorgente dati:",
-  "admin.sql.traceDescription": "(Modalità sviluppo) Se true, l'esecuzione di statement SQL viene scritta nei log.",
+  "admin.sql.traceDescription": "(Modalità sviluppo) Se vero, l'esecuzione di statement SQL viene scritta nei log.",
   "admin.sql.traceTitle": "Traccia: ",
   "admin.sql.warning": "Attenzione: rigenerare questo salt può rendere impossibile recuperare i valori di alcune colonne del database.",
   "admin.support.aboutDesc": "L'URL del collegamento \"Informazioni\" nelle pagine di accesso a Mattermost. Se vuoto il collegamento viene nascosto agli utenti.",
@@ -860,7 +952,7 @@
   "admin.team.brandTextTitle": "Testo marchio personalizzato:",
   "admin.team.brandTitle": "Abilita marchio personalizzato: ",
   "admin.team.chooseImage": "Scegli Nuova Immmagine",
-  "admin.team.dirDesc": "Se true, i gruppi che sono configurati per essere visualizzati nella cartella gruppi saranno visualizzati nella pagina principale al posto della voce \"crea nuovo gruppo\".",
+  "admin.team.dirDesc": "Se vero, i gruppi che sono configurati per essere visualizzati nella cartella gruppi saranno visualizzati nella pagina principale al posto della voce \"crea nuovo gruppo\".",
   "admin.team.dirTitle": "Abilita Cartella Gruppi: ",
   "admin.team.maxChannelsDescription": "Numero totate di canali (attivi e cancellati) per gruppo.",
   "admin.team.maxChannelsExample": "Es.: \"100\"",
@@ -872,24 +964,24 @@
   "admin.team.maxUsersExample": "Es.: \"25\"",
   "admin.team.maxUsersTitle": "Numero massimo di utenti per gruppo:",
   "admin.team.noBrandImage": "Nessun immagine logo caricata",
-  "admin.team.openServerDescription": "Se true, chiunque per registrare un account utente su questo server senza essere stato invitato.",
+  "admin.team.openServerDescription": "Se vero, chiunque per registrare un account utente su questo server senza essere stato invitato.",
   "admin.team.openServerTitle": "Abilita Server Aperto: ",
   "admin.team.restrictDescription": "Gruppi e utenti possono essere creati solo da un dominio specifico (es. \"mattermost.org\") o da una lista di domini separati da virgola (es. \"corp.mattermost.com, mattermost.org\").",
   "admin.team.restrictDirectMessage": "Abilita gli utenti ad aprire canali di Messaggi Diretti con:",
   "admin.team.restrictDirectMessageDesc": "'Tutti gli utenti su questo server Mattermost' abilita gli utenti a inviare Messaggi Diretti con qualsiasi utente sul server, anche se non appartengono a nessun gruppo comune. 'Tutti i membri del gruppo' limita l'abilità di inviare Messaggi Diretti solo agli utenti che appartengono allo stesso gruppo.",
   "admin.team.restrictExample": "Es.: \"corp.mattermost.com, mattermost.org\"",
-  "admin.team.restrictNameDesc": "Se true, non è possibile creare gruppo con nomi che contengono parole riservate ad esempio www, admin, support, test, channel, ecc",
+  "admin.team.restrictNameDesc": "Se vero, non è possibile creare gruppo con nomi che contengono parole riservate ad esempio www, admin, support, test, channel, ecc",
   "admin.team.restrictNameTitle": "Restringi Nomi Gruppo: ",
   "admin.team.restrictTitle": "Restringi la creazione di account ai domini specificati:",
   "admin.team.restrict_direct_message_any": "Qualunque utente sul server Mattermost",
   "admin.team.restrict_direct_message_team": "Qualsiasi membro del gruppo",
-  "admin.team.showFullname": "Visualizza nome e cognome (default)",
+  "admin.team.showFullname": "Visualizza nome e cognome",
   "admin.team.showNickname": "Visualizza soprannome se esiste, altrimenti visualizza nome e cognome",
-  "admin.team.showUsername": "Visualizza nome utente",
+  "admin.team.showUsername": "Visualizza nome utente (default)",
   "admin.team.siteNameDescription": "Nome del servizio visualizzato nella pagina di accesso e nell'interfaccia utente.",
   "admin.team.siteNameExample": "Es.: \"Mattermost\"",
   "admin.team.siteNameTitle": "Nome del sito:",
-  "admin.team.teamCreationDescription": "Se false, solo gli Amministratori di Sistema possono creare Gruppi.",
+  "admin.team.teamCreationDescription": "Se falso, solo gli Amministratori di Sistema possono creare Gruppi.",
   "admin.team.teamCreationTitle": "Abilita creazione gruppi: ",
   "admin.team.teammateNameDisplay": "Visualizza nome collega:",
   "admin.team.teammateNameDisplayDesc": "Seleziona come visualizzare i nomi degli altri utenti nelle pubblicazioni e nelle liste dei messaggi diretti.",
@@ -897,7 +989,7 @@
   "admin.team.uploadDesc": "Personalizza la tua esperienza utente aggiungendo un'immagine personalizzata alla pagina di accesso. La dimensione massima raccomandata per l'immagine è inferiore ai 2 MB.",
   "admin.team.uploaded": "Caricato!",
   "admin.team.uploading": "Invio..",
-  "admin.team.userCreationDescription": "Se false, la creazione di nuovi account è disattivata. Il pulsate di creazione account visualizza un errore se cliccato.",
+  "admin.team.userCreationDescription": "Se falso, la creazione di nuovi account è disattivata. Il pulsate di creazione account visualizza un errore se cliccato.",
   "admin.team.userCreationTitle": "Abilita creazione account: ",
   "admin.team_analytics.activeUsers": "Utenti attivi con post",
   "admin.team_analytics.totalPosts": "Pubblicazioni totali",
@@ -915,7 +1007,9 @@
   "admin.user_item.makeMember": "Rendi membro",
   "admin.user_item.makeSysAdmin": "Rendi Amministratore di Sistema",
   "admin.user_item.makeTeamAdmin": "Rendi Amministratore di Gruppo",
+  "admin.user_item.manageRoles": "Gestisci ruoli",
   "admin.user_item.manageTeams": "Gestisci Gruppi",
+  "admin.user_item.manageTokens": "Gestisci Tokens",
   "admin.user_item.member": "Membro",
   "admin.user_item.mfaNo": "<strong>AMF</strong>: No",
   "admin.user_item.mfaYes": "<strong>AMF</strong>: Sì",
@@ -924,7 +1018,10 @@
   "admin.user_item.switchToEmail": "Cambia a Email/Password",
   "admin.user_item.sysAdmin": "Amministratore di sistema",
   "admin.user_item.teamAdmin": "Amministratore di Gruppo",
-  "admin.webrtc.enableDescription": "Se true, Mattermost permetti di fare videochiamate <strong>uno-a-uno</strong>. Le chiamate WebRTC sono disponibili su Chrome, Firefox e l'App Mattermost Desktop.",
+  "admin.user_item.userAccessTokenPostAll": "(with post:all personal access tokens)",
+  "admin.user_item.userAccessTokenPostAllPublic": "(with post:channels personal access tokens)",
+  "admin.user_item.userAccessTokenYes": "Nessun token di accesso.",
+  "admin.webrtc.enableDescription": "Se vero, Mattermost permetti di fare videochiamate <strong>uno-a-uno</strong>. Le chiamate WebRTC sono disponibili su Chrome, Firefox e l'App Mattermost Desktop.",
   "admin.webrtc.enableTitle": "Abilita Mattermost WebRTC: ",
   "admin.webrtc.gatewayAdminSecretDescription": "Inserisci la password segreta di amministrazione per accedere all'URL del Gateway di Amministrazione.",
   "admin.webrtc.gatewayAdminSecretExample": "Es.:  \"PVRzWNN1Tg6szn7IQWvhpAvLByScWxdy\"",
@@ -1314,14 +1411,14 @@
   "emoji_picker.custom": "Personalizzata",
   "emoji_picker.emojiPicker": "Selettore Emoji",
   "emoji_picker.flags": "Contrassegni",
-  "emoji_picker.food": "Cibo",
+  "emoji_picker.foods": "Cibi",
   "emoji_picker.nature": "Natura",
   "emoji_picker.objects": "Oggetti",
   "emoji_picker.people": "Persone",
+  "emoji_picker.places": "Luoghi",
   "emoji_picker.recent": "Usati di recente",
   "emoji_picker.search": "Ricerca",
   "emoji_picker.symbols": "Simboli",
-  "emoji_picker.travel": "Viaggio",
   "error.local_storage.help1": "Attiva cookies",
   "error.local_storage.help2": "Disattiva navigazione privata",
   "error.local_storage.help3": "Utilizza un browser supportato (IE 11, Chrome 43+, Firefox 38+, Safari 9, Edge)",
@@ -1367,15 +1464,15 @@
   "flag_post.flag": "Contrassegna",
   "flag_post.unflag": "Togli contrassegno",
   "general_tab.chooseDescription": "Scegli una nuova descrizione per il tuo gruppo",
-  "general_tab.codeDesc": "Clicka su 'Modifica' per rigenerare il codice di invito.",
+  "general_tab.codeDesc": "Clicca su 'Modifica' per rigenerare il codice di invito.",
   "general_tab.codeLongDesc": "Il codice di invito è usato come parte dell'URL nel collemento di invito ad unirsi a un gruppo {getTeamInviteLink} nel menu principale. Rigenerarlo crea un nuovo collegamento di unione al gruppo e invalida il collegamento precedente.",
   "general_tab.codeTitle": "Codice di invito",
   "general_tab.emptyDescription": "Clicca 'Modifica' per aggiungere una descrizione al gruppo.",
   "general_tab.getTeamInviteLink": "Ottieni collegamento di invito al gruppo",
   "general_tab.includeDirDesc": "Includere questo gruppo visualizzerà il nome del gruppo nella sezione Directory Gruppo della Pagina Principale e offrirà un colleamento alla pagina di unione.",
   "general_tab.no": "No",
-  "general_tab.openInviteDesc": "Se permetto, un collegamento a questo gruppo verrà inserito nella pagina principale consentendo a chiunque di unirsi a questo gruppo.",
-  "general_tab.openInviteTitle": "Permette a tutti gli utenti con un account su questo server di unirsi al gruppo",
+  "general_tab.openInviteDesc": "Se sì, un collegamento a questo gruppo verrà inserito nella pagina principale consentendo a chiunque di unirsi a questo gruppo.",
+  "general_tab.openInviteTitle": "Permetti a tutti gli utenti con un account su questo server di unirsi al gruppo",
   "general_tab.regenerate": "Rigenera",
   "general_tab.required": "Il campo è richiesto",
   "general_tab.teamDescription": "Descrizione del gruppo",
@@ -1576,7 +1673,7 @@
   "intro_messages.beginning": "Inizio di {name}",
   "intro_messages.channel": "canale",
   "intro_messages.creator": "Questo è l'inizio di {name} {type}, creato il {date} da {creator}.",
-  "intro_messages.default": "<h4 class='channel-intro__title'>Inizio di {display_name}</h4><p class='channel-intro__content'><strong>Benvenuto in {display_name}!</strong><br/><br/>Pubblicare i messaggi qui se si vuole renderli visibili a tutti. Tutto diventano membri permanenti di questo gruppo quando ci entrano.</p>",
+  "intro_messages.default": "<h4 class='channel-intro__title'>Inizio di {display_name}</h4><p class='channel-intro__content'><strong>Benvenuto in {display_name}!</strong><br/><br/>Pubblicare i messaggi qui se si vuole renderli visibili a tutti. Tutti diventano membri permanenti di questo gruppo quando ci entrano.</p>",
   "intro_messages.group": "canale privato",
   "intro_messages.group_message": "Questo è l'inizio della tua conversazione privata con questi colleghi. Messaggi privati e file condivisi qui non sono accessibili ad altre persone.",
   "intro_messages.invite": "Invita altri a questo {type}",
@@ -1688,6 +1785,10 @@
   "mobile.account_notifications.threads_mentions": "Citazioni nelle discussioni",
   "mobile.account_notifications.threads_start": "Discussioni avviate da me",
   "mobile.account_notifications.threads_start_participate": "Discussioni alle quali ho partecipato",
+  "mobile.advanced_settings.reset_button": "Azzera",
+  "mobile.advanced_settings.reset_message": "\nQuesta operazione cancella tutti i dati salvati in locale e riavvia l'app. L'accesso verrà eseguito automaticamente al termine del riavvio.\n",
+  "mobile.advanced_settings.reset_title": "Azzera Cache",
+  "mobile.advanced_settings.title": "Impostazioni Avanzate",
   "mobile.channel_drawer.search": "Salta alla conversazione",
   "mobile.channel_info.alertMessageDeleteChannel": "Sei sicuro di voler eliminare questo {term} {name}?",
   "mobile.channel_info.alertMessageLeaveChannel": "Sei sicuro di voler tralasciare questo {term} {name}?",
@@ -1741,11 +1842,17 @@
   "mobile.loading_members": "Caricamento Membri...",
   "mobile.loading_posts": "Caricamento Messaggi...",
   "mobile.login_options.choose_title": "Seleziona il tuo metodo di login",
+  "mobile.more_dms.start": "Inizio",
+  "mobile.more_dms.title": "Nuova Conversazione",
+  "mobile.notice_mobile_link": "apps per smartphone",
+  "mobile.notice_platform_link": "piattaforma",
+  "mobile.notice_text": "Mattermost è stato realizzato con il software open source usato sulla nostra {platform} e {mobile}.",
   "mobile.notification.in": " in ",
   "mobile.offlineIndicator.connected": "Connesso",
   "mobile.offlineIndicator.connecting": "Connessione...",
   "mobile.offlineIndicator.offline": "Nessuna connessione internet",
   "mobile.open_dm.error": "Impossibile aprire un messaggio diretto con {displayName}. Controlla la connessione e riprova.",
+  "mobile.open_gm.error": "Impossibile aprire un messaggio di gruppo con questi utenti. Controlla la tua connessione e riprova.",
   "mobile.post.cancel": "Annulla",
   "mobile.post.delete_question": "Sei sicuro di voler eliminare questo post?",
   "mobile.post.delete_title": "Elimina Pubblicazione",
@@ -1775,6 +1882,8 @@
   "mobile.routes.thread_dm": "Discussione Messaggi Diretti",
   "mobile.routes.user_profile": "Profilo",
   "mobile.routes.user_profile.send_message": "Invia messaggio",
+  "mobile.search.jump": "SALTA",
+  "mobile.search.no_results": "Nessun risultato trovato",
   "mobile.select_team.choose": "I tuoi gruppi:",
   "mobile.select_team.join_open": "Gruppi librei a cui puoi accedere",
   "mobile.select_team.no_teams": "Non ci sono gruppi disponibili.",
@@ -1788,6 +1897,7 @@
   "mobile.settings.clear_button": "Pulisci",
   "mobile.settings.clear_message": "\nQuesta operazione cancella tutti i dati salvati in locale e riavvia l'app. Sarai automaticamente loggato al termine del riavvio.\n",
   "mobile.settings.team_selection": "Seleziona gruppo",
+  "mobile.suggestion.members": "Membri",
   "modal.manaul_status.ask": "Non chiedere più in futuro",
   "modal.manaul_status.button": "Si, imposta lo stato \"Online\"",
   "modal.manaul_status.cancel": "No, rimani \"{status}\"",
@@ -1815,7 +1925,7 @@
   "multiselect.numRemaining": "Si possono ancora aggiungere {num, number}",
   "multiselect.placeholder": "Cercare ed aggiungere membri",
   "navbar.addMembers": "Aggiungi Membro",
-  "navbar.click": "Clicka qui",
+  "navbar.click": "Clicca qui",
   "navbar.delete": "Elimina Canale...",
   "navbar.leave": "Elimina Canale",
   "navbar.manageMembers": "Amministra Membri",
@@ -1884,6 +1994,8 @@
   "post_focus_view.beginning": "Inizio del Archivio del Canale",
   "post_info.del": "Cancella",
   "post_info.edit": "Modifica",
+  "post_info.message.visible": "(Visibile soltanto a te)",
+  "post_info.message.visible.compact": " (Visibile soltanto a te)",
   "post_info.mobile.flag": "Contrassegna",
   "post_info.mobile.unflag": "Togli contrassegno",
   "post_info.permalink": "Permalink",
@@ -1896,7 +2008,7 @@
   "posts_view.loadMore": "Carica più messaggi",
   "posts_view.loadingMore": "Carico più messaggi...",
   "posts_view.newMsg": "Nuovo Messaggio",
-  "posts_view.newMsgBelow": "Nuovo  {count, plural, one {message} other {messages}} sotto",
+  "posts_view.newMsgBelow": "Nuovo {count, plural, one {message} other {messages}} sotto",
   "quick_switch_modal.channels": "Canali",
   "quick_switch_modal.channelsShortcut.mac": "- ⌘K",
   "quick_switch_modal.channelsShortcut.windows": "- CTRL+K",
@@ -1928,7 +2040,7 @@
   "rename_channel.displayNameHolder": "Inserisci il nome visualizato",
   "rename_channel.handleHolder": "caratteri alfanumerici minuscoli",
   "rename_channel.lowercase": "Devono essere caratteri alfanumerici minuscoli",
-  "rename_channel.maxLength": "Il campo deve essere meno di 22 caratteri",
+  "rename_channel.maxLength": "Questo campo può essere al massimo di {maxLength, number} caratteri",
   "rename_channel.required": "Il campo è richiesto",
   "rename_channel.save": "Salva",
   "rename_channel.title": "Rinomina Canale",
@@ -1967,6 +2079,7 @@
   "search_item.jump": "Salta",
   "search_results.because": "<ul><li>Se stai cercando una frase parziale (es. cerca \"one\" per trovare \"riunione\" o \" reazione\"), aggiungi un * al tuo termine di ricerca.</li><li>Le ricerche a due lettere o con parole comuni come \"questo\", \"e\" ed \"è\" non compaiono nei risultati causa dell'elevato numero di occorrenze trovate.</li></ul>",
   "search_results.noResults": "Nessun risultato trovato. Ritentare?",
+  "search_results.searching": "Ricerca...",
   "search_results.usage": "<ul><li>Usa <b>\"gli apici\"</b> per cercare delle frasi</li><li>Usa <b>from:</b> per cercare pubblicazioni di un utente e <b>in:</b> per trovare pubblicazioni in canali specifici.</li></ul>",
   "search_results.usageFlag1": "Non hai contrassegnato nessun messaggio.",
   "search_results.usageFlag2": "Puoi contrassegnare i messaggi e i commenti cliccando ",
@@ -1999,8 +2112,7 @@
   "sidebar.tutorialScreen1": "<h4>Canali</h4><p>I <strong>canali</strong> organizzano le conversazioni per argomenti. Sono aperti a tutto il gruppo. Per inviare messaggi privati usa <strong>Messaggi Privati</strong> verso una persona o <strong>Canale privato</strong> verso un gruppo di persone.</p>",
   "sidebar.tutorialScreen2": "<h4>I canali \"{townsquare}\" e \"{offtopic}\"</h4><p>Questi sono due canali pubblici di partenza:</p><p><strong>{townsquare}</strong> è un canale per le comunicazioni intragruppo. Tutti i membri del gruppo accedono a questo canale.</p><p><strong>{offtopic}</strong> è un canale per divertirsi e trattare argomenti diversi dal lavoro. Tu e il tuo gruppo potete scegliere quali altri canali creare.</p>",
   "sidebar.tutorialScreen3": "<h4>Creare e Entrare nei canali</h4><p>Clicca <strong>\"Di più...\"</strong> per creare un nuovo canale o entrare su un canale esistente.</p><p>Puoi anche creare un nuovo canale cliccando sul <strong>simbolo \"+\"</strong> vicino al titolo del canale.</p>",
-  "sidebar.unreadAbove": "Pubblicazioni non lette sopra",
-  "sidebar.unreadBelow": "Pubblicazioni non lette sotto",
+  "sidebar.unreads": "Più non letti",
   "sidebar_header.tutorial": "<h4>Menu principale</h4><p>Il <strong>Menu principale</strong> è dove puoi <strong>Invitare nuovi membri</strong>, accedere alle tue <strong>Impostazioni account</strong> e impostare il tuo <strong>colore tema</strong>.</p><p>Gli amministratori di gruppo possono anche accedere alle <strong>Impostazioni di gruppo</strong>.</p><p>Gli Amministratori di Sistema troveranno la <strong>Console di Sistema</strong> per gestire l'intera installazione.</p>",
   "sidebar_right_menu.accountSettings": "Impostazioni Account",
   "sidebar_right_menu.addMemberToTeam": "Aggiungi membri al gruppo",
@@ -2160,7 +2272,7 @@
   "upload_overlay.info": "Trascina un file per caricarlo.",
   "user.settings.advance.embed_preview": "Per il primo collegamento web in un messaggio, visualizza un'anteprima del contenuto del sito web sotto il messaggio, se disponibile",
   "user.settings.advance.embed_toggle": "Visualizza toggle per tutte le anteprime incorporate",
-  "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} attivo",
+  "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} attiva/e",
   "user.settings.advance.formattingDesc": "Se attivo le pubblicazioni saranno formattate per creare collegamenti, visualizzare emoji, formattare il testo e aggiungere le interruzioni di riga. Per default questa opzione è attiva. Ricaricare la pagina per applicare eventuali modifiche.",
   "user.settings.advance.formattingTitle": "Abilita formattazione pubblicazioni",
   "user.settings.advance.joinLeaveDesc": "Se \"On\" i Messaggi di Sistema che indicano se un utente si è unito o ha lasciato un canale saranno visibili, altrimenti questi messaggi saranno nascosti. Un messaggio continuerà a comparire quando vieni aggiunto ad un canale in modo da ricevere una notifica.",
@@ -2220,10 +2332,6 @@
   "user.settings.display.nameOptsDesc": "Seleziona come visualizzare i nomi degli altri utenti nelle pubblicazioni e nelle liste dei messaggi diretti.",
   "user.settings.display.normalClock": "Orologio 12 ore (esempio 4:00 PM)",
   "user.settings.display.preferTime": "Seleziona come visualizzare l'ora.",
-  "user.settings.display.showFullname": "Visualizza nome e cognome",
-  "user.settings.display.showNickname": "Visualizza soprannome se esiste, altrimenti visualizza nome e cognome",
-  "user.settings.display.showUsername": "Visualizza nome utente (default)",
-  "user.settings.display.teammateNameDisplay": "Visualizza nome collega",
   "user.settings.display.theme.applyToAllTeams": "Applica il nuovo tema a tutti i miei gruppi",
   "user.settings.display.theme.customTheme": "Tema personalizzato",
   "user.settings.display.theme.describe": "Apri per gestire il tema",
@@ -2320,19 +2428,19 @@
   "user.settings.notifications.commentsNever": "Non inviare notifiche per le risposte a meno che io non sia citato",
   "user.settings.notifications.commentsRoot": "Invia notifiche per le conversazioni che ho iniziato",
   "user.settings.notifications.desktop": "Invia notifiche desktop",
-  "user.settings.notifications.desktop.allFirefoxForever": "Per tutte le attività, mostra per sempre",
-  "user.settings.notifications.desktop.allFirefoxTimed": "Per tutte le attività, mostra per {seconds} secondi",
   "user.settings.notifications.desktop.allNoSoundForever": "Per tutte le attività, senza suono, mostra per sempre",
   "user.settings.notifications.desktop.allNoSoundTimed": "Per tutte le attività, senza suono, mostra per {seconds} secondi",
   "user.settings.notifications.desktop.allSoundForever": "Per tutte le attività, con suono, mostra per sempre",
+  "user.settings.notifications.desktop.allSoundHiddenForever": "Per tutte le attività, mostra per sempre",
+  "user.settings.notifications.desktop.allSoundHiddenTimed": "Per tutte le attività, mostra per {seconds} secondi",
   "user.settings.notifications.desktop.allSoundTimed": "Per tutte le attività, con suono, mostra per {seconds} secondi",
   "user.settings.notifications.desktop.duration": "Durata della notifica",
   "user.settings.notifications.desktop.durationInfo": "Imposta per quanto le notifiche desktop devono rimanere sullo schermo quando si usa Firefox o Chrome. Le notifiche desktop in Edge e Safari possono rimanere sullo schermo per massimo 5 secondi.",
-  "user.settings.notifications.desktop.mentionsFirefoxForever": "Per le citazioni e i messaggi diretti, mostra per sempre",
-  "user.settings.notifications.desktop.mentionsFirefoxTimed": "Per le citazioni e i messaggi diretti, mostra per {seconds} seconds",
   "user.settings.notifications.desktop.mentionsNoSoundForever": "Per le citazioni e i messaggi diretti, senza suono, mostra per sempre",
   "user.settings.notifications.desktop.mentionsNoSoundTimed": "Per le citazioni e i messaggi diretti, senza suono, mostra per {seconds} secondi",
   "user.settings.notifications.desktop.mentionsSoundForever": "Per le citazioni e i messaggi diretti, con suono, mostra per sempre",
+  "user.settings.notifications.desktop.mentionsSoundHiddenForever": "Per le citazioni e i messaggi diretti, mostra per sempre",
+  "user.settings.notifications.desktop.mentionsSoundHiddenTimed": "Per le citazioni e i messaggi diretti, mostra per {seconds} seconds",
   "user.settings.notifications.desktop.mentionsSoundTimed": "Per le citazioni e i messaggi diretti, con suono, mostra per {seconds} secondi",
   "user.settings.notifications.desktop.seconds": "{seconds} secondi",
   "user.settings.notifications.desktop.sound": "Suono di notifica",
@@ -2444,6 +2552,28 @@
   "user.settings.security.switchSaml": "Cambia a SAML SSO",
   "user.settings.security.title": "Impostazioni di sicurezza",
   "user.settings.security.viewHistory": "Guarda Storico degli Accessi",
+  "user.settings.tokens.cancel": "Annulla",
+  "user.settings.tokens.clickToEdit": "Clicca 'Modifica' per gestire i token di accesso",
+  "user.settings.tokens.confirmCreateButton": "Sì, Crealo",
+  "user.settings.tokens.confirmCreateMessage": "Stai generando un token di accesso con i permessi di Amministratore di Sistema. Sicuro di voler continuare?",
+  "user.settings.tokens.confirmCreateTitle": "Crea un Token di Accesso come Amministratore di Sistema",
+  "user.settings.tokens.confirmDeleteButton": "Sì, Cancellalo",
+  "user.settings.tokens.confirmDeleteMessage": "Tutte le integrazioni che utilizzano questo token non riusciranno più ad accedere alle API di Mattermost. Questa operazione non è reversibile. Continuare con la cancellazione?",
+  "user.settings.tokens.confirmDeleteTitle": "Cancellare il token {name}?",
+  "user.settings.tokens.copy": "Per favore copia il token sottostante. Non riuscirai a vederlo di nuovo!",
+  "user.settings.tokens.create": "Crea un Nuovo Token",
+  "user.settings.tokens.delete": "Cancella",
+  "user.settings.tokens.description": "<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>.",
+  "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: ",
+  "user.settings.tokens.name": "Nome: ",
+  "user.settings.tokens.nameHelp": "Enter a description for your token to remember what it does.",
+  "user.settings.tokens.nameRequired": "Please enter a description.",
+  "user.settings.tokens.save": "Salva",
+  "user.settings.tokens.title": "Token di Accesso",
+  "user.settings.tokens.token": "Token: ",
+  "user.settings.tokens.tokenId": "Token ID: ",
+  "user.settings.tokens.userAccessTokensNone": "Nessun token di accesso.",
   "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 2c94b0a46..a5359a068 100644
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -142,7 +142,7 @@
   "admin.advance.metrics": "パフォーマンスモニタリング",
   "admin.audits.reload": "再読み込み",
   "admin.audits.title": "ユーザーのアクティビティー",
-  "admin.authentication.email": "電子メールアドレス認証",
+  "admin.authentication.email": "電子メール認証",
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
@@ -203,11 +203,9 @@
   "admin.compliance_table.userId": "これを必要としている項目",
   "admin.connectionSecurityNone": "なし",
   "admin.connectionSecurityNoneDescription": "Mattermostは安全でない接続で接続します。",
-  "admin.connectionSecurityPlain": "PLAIN",
-  "admin.connectionSecurityPlainDescription": "Mattermostは安全でない接続で接続し認証します。",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "既に安全でない接続が存在します。TLSを使った安全な接続にアップグレードしてください。",
-  "admin.connectionSecurityTest": "接続のテスト",
+  "admin.connectionSecurityTest": "接続をテストする",
   "admin.connectionSecurityTitle": "接続のセキュリティー:",
   "admin.connectionSecurityTls": "TLS",
   "admin.connectionSecurityTlsDescription": "Mattermostとあなたのサーバー間のコミュニケーションを暗号化します。",
@@ -235,31 +233,87 @@
   "admin.customization.support": "法的事項とサポート",
   "admin.database.title": "データベースの設定",
   "admin.developer.title": "開発者の設定",
+  "admin.elasticsearch.bulkIndexButton.error": "一括インデックス付与処理をスケジューリングできませんでした: {error}",
+  "admin.elasticsearch.connectionUrlDescription": "Elasticsearchサーバーのアドレス。 {documentationLink}",
+  "admin.elasticsearch.connectionUrlExample": "例: \"https://elasticsearch.example.org:9200\"",
+  "admin.elasticsearch.connectionUrlExample.documentationLinkText": "サーバーのセットアップ手順はドキュメントを参照してください。",
+  "admin.elasticsearch.connectionUrlTitle": "サーバー接続アドレス:",
+  "admin.elasticsearch.elasticsearch_test_button": "接続をテストする",
+  "admin.elasticsearch.enableIndexingDescription": "有効な場合、新しい投稿へのインデックス付与は自動で行われます。\"Elasticsearchの検索クエリを有効にする\"が有効になるまで、検索クエリはデータベース検索を使用します。 {documentationLink}",
+  "admin.elasticsearch.enableIndexingDescription.documentationLinkText": "Elasticsearchについてもっと詳しく知るには、ドキュメントを参照してください。",
+  "admin.elasticsearch.enableIndexingTitle": "Elasticsearchのインデックス付与を有効にする:",
+  "admin.elasticsearch.enableSearchingDescription": "Elasticsearchサーバーへの正常な接続が必要です。有効な場合、全ての検索に対して最新のインデックスを使用したElasticsearchが利用されます。既存の投稿データベースへのインデックス付与処理が完了するまで、検索結果が不完全となる可能性があります。",
+  "admin.elasticsearch.enableSearchingTitle": "Elasticsearchの検索クエリを有効にする:",
+  "admin.elasticsearch.indexButton.inProgress": "インデックス付与処理実行中",
+  "admin.elasticsearch.indexButton.ready": "インデックスを構築する",
+  "admin.elasticsearch.indexHelpText.buildIndex": "データベース内のすべての投稿は古いものからインデックスが付与されます。Elasticsearchはインデックス付与注も利用可能ですが、インデックス付与処理が完了するまでは検索結果が不完全になる恐れがあります。",
+  "admin.elasticsearch.indexHelpText.cancelIndexing": "キャンセルすると、インデックス付与処理を停止し、キューから削除されます。すでにインデックスが付与された投稿が削除されることはありません。",
+  "admin.elasticsearch.noteDescription": "このセクションでの設定値の変更を有効にするにはサーバーを再起動させる必要があります。",
+  "admin.elasticsearch.password": "例: \"yourpassword\"",
+  "admin.elasticsearch.passwordDescription": "(オプション) Elasticsearchサーバーを認証するためのパスワード。",
+  "admin.elasticsearch.passwordTitle": "サーバーパスワード:",
+  "admin.elasticsearch.purgeIndexesButton": "インデックスを除去する",
+  "admin.elasticsearch.purgeIndexesButton.error": "インデックスを除去できませんでした: {error}",
+  "admin.elasticsearch.purgeIndexesButton.label": "インデックスを除去する:",
+  "admin.elasticsearch.purgeIndexesButton.success": "インデックスの除去に成功しました。",
+  "admin.elasticsearch.purgeIndexesHelpText": "除去処理によりElasticsearchサーバー上のすべてのインデックスが削除されます。既存の投稿データベースの一インデックスが再構築されるまで検索結果が不完全になる恐れがあります。",
+  "admin.elasticsearch.sniffDescription": "有効な場合、自動的にクラスタ内の全てのデータノードを見つけ、接続します。",
+  "admin.elasticsearch.sniffTitle": "クラスタースニッフィングを有効にする:",
+  "admin.elasticsearch.testConfigSuccess": "テストが成功し、設定が保存されました。",
+  "admin.elasticsearch.testHelpText": "Mattermostが指定されたElasticsearchサーバーに接続できるかどうかテストします。接続のテストが成功した場合のみ、設定が保存されます。エラーメッセージの詳細はログファイルを参照してください。",
+  "admin.elasticsearch.title": "Elasticsearch (ベータ)",
+  "admin.elasticsearch.usernameDescription": "(オプション) Elasticsearchサーバーを認証するためのユーザー名。",
+  "admin.elasticsearch.usernameExample": "例: \"elastic\"",
+  "admin.elasticsearch.usernameTitle": "サーバーのユーザー名:",
+  "admin.elasticsearchStatus.bulkIndexLabel": "一括インデックス付与:",
+  "admin.elasticsearchStatus.cancelButton": "キャンセル",
+  "admin.elasticsearchStatus.status": "状態: ",
+  "admin.elasticsearchStatus.statusCancelled": "インデックス付与処理はキャンセルされました。",
+  "admin.elasticsearchStatus.statusError": "インデックス付与でエラーが発生しました。",
+  "admin.elasticsearchStatus.statusError.help": "Elasticsearchのインデックス構築時にMattermostがエラーを検知しました: {error}",
+  "admin.elasticsearchStatus.statusInProgress": "処理実行中。 {percent}% 完了。",
+  "admin.elasticsearchStatus.statusInProgress.help": "インデックス付与処理はジョブサーバーで実行中です。Elasticsearchが有効な場合、検索結果は処理が完了するまで不完全になる恐れがあります。",
+  "admin.elasticsearchStatus.statusIndexingDisabled": "インデックス付与は無効になっています。",
+  "admin.elasticsearchStatus.statusLoading": "読み込み中です…",
+  "admin.elasticsearchStatus.statusNoJobs": "キューにインデックス付与処理がありません。",
+  "admin.elasticsearchStatus.statusPending": "処理は保留中です。",
+  "admin.elasticsearchStatus.statusPending.help": "Elasticsearchインデックス付与処理はジョブサーバーでキューに入れられました。Elasticsearchが有効な場合、検索結果は処理が完了するまで不完全になる恐れがあります。",
+  "admin.elasticsearchStatus.statusRequestCancel": "処理をキャンセルしています...",
+  "admin.elasticsearchStatus.statusSuccess": "インデックス付与が完了しました。",
+  "admin.elasticsearchStatus.statusSuccess.help": "インデックス付与が完了し、新しい投稿には自動でインデックスが付与されます。",
   "admin.email.agreeHPNS": " 私はMattermostのホストするプッシュ通知サービスの<a href=\"https://about.mattermost.com/hpns-terms/\" target='_blank'>使用条件</a>と<a href=\"https://about.mattermost.com/hpns-privacy/\" target='_blank'>プライバシーポリシー</a>を理解し、承諾します。",
   "admin.email.allowEmailSignInDescription": "有効な場合、Mattermostはユーザーが電子メールアドレスとパスワードを使ってサインインをできるようにします。",
   "admin.email.allowEmailSignInTitle": "電子メールアドレスでのログインを有効にする: ",
-  "admin.email.allowSignupDescription": "有効な場合、Mattermostはチームの作成と電子メールアドレスとパスワードによる利用登録を許可します。  この値は利用登録をOAuthまたはAD/LDAPによるシングルサインオンに制限したい時のみ無効にしてください。",
+  "admin.email.allowSignupDescription": "有効な場合、Mattermostは電子メールアドレスとパスワードによるアカウント作成を許可します。  この値は利用登録をAD/LDAP、SAML、GitLabなどによるシングルサインオンに制限したい時のみ無効にしてください。",
   "admin.email.allowSignupTitle": "電子メールアドレスでのアカウント作成を有効にする: ",
-  "admin.email.allowUsernameSignInDescription": "有効な場合、Mattermostはユーザーがユーザー名とパスワードでサインインすることを許可します。この設定は電子メール確認が無効にされている場合にのみ使われます。",
+  "admin.email.allowUsernameSignInDescription": "有効な場合、電子メールログインのユーザーはユーザー名とパスワードでのサインインが可能です。この設定はAD/LDAPログインには影響しません。",
   "admin.email.allowUsernameSignInTitle": "ユーザー名でのサインインを有効にする: ",
   "admin.email.connectionSecurityTest": "接続をテストする",
-  "admin.email.easHelp": "あなた自身のためのモバイルアプリをコンパイルし展開する方法を<a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target='_blank'>エンタープライズアプリストア</a>から学びます。",
+  "admin.email.easHelp": "あなた自身のためのモバイルアプリをコンパイルし展開する方法については<a href=\"https://about.mattermost.com/default-enterprise-app-store\" target='_blank'>エンタープライズアプリストア</a>を参照してください。",
   "admin.email.emailFail": "接続できません: {error}",
   "admin.email.emailSuccess": "電子メールを送信するに当たりエラーはありませんでした。受信ボックスを確認してください。",
   "admin.email.enableEmailBatching.clusterEnabled": "高可用モードを有効にした場合、電子メールバッチ処理を有効にすることはできません。",
   "admin.email.enableEmailBatching.siteURL": "<b>設定 > サイトURL</b>のサイトURLを設定しない限り、電子メールバッチ処理を有効にすることはできません。",
-  "admin.email.enableEmailBatchingDesc": "有効な場合、ユーザーはダイレクトメッセージやあなたについての投稿などを一通の電子メールにまとめた、電子メール通知を受けることができます。通知の内容は<b>アカウントの設定 > 通知</b>で設定できます。",
+  "admin.email.enableEmailBatchingDesc": "有効な場合、ユーザーは複数のダイレクトメッセージや自分についての投稿を一つのメールとした電子メール通知を受け取ることになります。この処理はデフォルトでは15分間隔で行われ、アカウント設定 > 通知で設定することができます。",
   "admin.email.enableEmailBatchingTitle": "電子メールバッチ処理:",
-  "admin.email.fullPushNotification": "メッセージ全文を送信する",
+  "admin.email.enableSMTPAuthDesc": "有効な場合、ユーザー名とパスワードがSMTPサーバーへの認証に利用されます。",
+  "admin.email.enableSMTPAuthTitle": "SMTP認証を有効にする:",
+  "admin.email.fullPushNotification": "メッセージの抜粋を送信する",
+  "admin.email.genericNoChannelPushNotification": "ユーザー名を付けて一般的な説明を送信する",
   "admin.email.genericPushNotification": "ユーザーとチャンネル名を付けて一般的な説明を送信する",
   "admin.email.inviteSaltDescription": "招待の電子メールの署名に32文字のソルトを付与します。これはインストールするたびにランダムに生成されます。新しいソルトを生成するには「再生成する」をクリックしてください。",
   "admin.email.inviteSaltExample": "例: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.inviteSaltTitle": "電子メール招待ソルト:",
   "admin.email.mhpns": "iOSとAndroidアプリで、暗号化され高品質なHPNS接続を使用する",
-  "admin.email.mhpnsHelp": "iTunesから<a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOSアプリ</a>をダウンロードし、Google Playから<a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Androidアプリ</a>をダウンロードしてください。詳しくは<a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target='_blank'>HPNS</a>を参照してください。",
+  "admin.email.mhpnsHelp": "iTunesから<a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOSアプリ</a>をダウンロードしてください。Google Playから<a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Androidアプリ</a>をダウンロードしてください。詳しくは<a href=\"https://about.mattermost.com/default-hpns\" target='_blank'>TPNS</a>を参照してください。",
   "admin.email.mtpns": "TPNSが有効化されたiOS/AndroidアプリをiTunes/Google Playから入手する",
-  "admin.email.mtpnsHelp": "iTunesから<a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOSアプリ</a>をダウンロードしてください。Google Playから<a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Androidアプリ</a>をダウンロードしてください。詳しくは<a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target='_blank'>TPNS</a>を参照してください。",
+  "admin.email.mtpnsHelp": "iTunesから<a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOSアプリ</a>をダウンロードしてください。Google Playから<a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Androidアプリ</a>をダウンロードしてください。詳しくは<a href=\"https://about.mattermost.com/default-tpns/\" target='_blank'>TPNS</a>を参照してください。",
   "admin.email.nofificationOrganizationExample": "例: \"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\"",
+  "admin.email.notification.contents.full": "メッセージ全文を送信する",
+  "admin.email.notification.contents.full.description": "送信者名とチャンネルが電子メール通知に含まれます。</br>Mattermostが秘密情報を含んでおり、かつポリシーとして電子メールに保存できない場合にコンプライアンス上の理由により利用されます。",
+  "admin.email.notification.contents.generic": "ユーザー名のみを付けて一般的な説明を送信する",
+  "admin.email.notification.contents.generic.description": "チャンネル名やメッセージ内容などの情報を含まず、送信者の名前のみが電子メール通知に含まれます。</br>Mattermostが秘密情報を含んでおり、かつポリシーとして電子メールに保存できない場合にコンプライアンス上の理由により利用されます。",
+  "admin.email.notification.contents.title": "プッシュ通知の内容: ",
   "admin.email.notificationDisplayDescription": "Mattermostから電子メールによる通知を送信する際に使用される電子メールアカウントの表示名です。",
   "admin.email.notificationDisplayExample": "例: \"Mattermost Notification\", \"System\", \"No-Reply\"",
   "admin.email.notificationDisplayTitle": "通知電子メールでの表示名:",
@@ -274,11 +328,11 @@
   "admin.email.passwordSaltDescription": "パスワード初期化の電子メールの署名に32文字のソルトを付与します。これはインストールするたびにランダムに生成されます。新しいソルトを生成するには「再生成する」をクリックしてください。",
   "admin.email.passwordSaltExample": "例: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "パスワード初期化ソルト:",
-  "admin.email.pushContentDesc": "「ユーザーとチャンネル名を付けて一般的な説明を送信する」を選択することで、一般的なメッセージを付けてプッシュ通知をします。これにはユーザーの名前、チャンネル名は含まれますが、メッセージテキストの詳細は含まれません。<br/><br/>「メッセージ全文を送信する」を選択すると、通知のトリガーとなったメッセージを引用します。これには、秘密にしなくてはいけない内容が含まれる可能性があります。ファイアウォールの外側に対してプッシュ通知を送る場合には、「https」プロトコルを使い暗号化した接続を使用する場合のみこの設定を有効にすることを強くお勧めします。",
+  "admin.email.pushContentDesc": "\"ユーザー名を付けて一般的な説明を送信する\" はメッセージを送信したユーザーの名前のみをプッシュ通知に含め、チャンネル名やメッセージ内容は含めません。<br /><br /> \"ユーザーとチャンネル名を付けて一般的な説明を送信する\"はメッセージを送信したユーザーの名前と送信されたチャンネルを含みますが、メッセージの内容は含みません。<br /><br />\"メッセージの抜粋を送信する\"はプッシュ通知にメッセージの抜粋を含めます。それは送信されたメッセージに含まれる機密情報も含む恐れがあります。プッシュ通知サービスがファイアウォールの外側にある場合、接続を暗号化するために\"https\"プロトコルを使用している場合にのみ、このオプションを使用することを *強く推奨* します。",
   "admin.email.pushContentTitle": "プッシュ通知の内容:",
   "admin.email.pushDesc": "本番環境では有効に設定してください。有効な場合、Mattermostはプッシュ通知サーバーを通じてiOSとAndroidにプッシュ通知を送信します。",
   "admin.email.pushOff": "プッシュ通知を送らない",
-  "admin.email.pushOffHelp": "セットアップオプションを設定する前に、<a href=\"http://docs.mattermost.com/deployment/push.html#push-notifications-and-mobile-devices\" target='_blank'>プッシュ通知についての説明</a>を参照してください。",
+  "admin.email.pushOffHelp": "セットアップオプションを設定する前に、<a href=\"https://about.mattermost.com/default-mobile-push-notifications\" target='_blank'>プッシュ通知についての説明</a>を参照してください。",
   "admin.email.pushServerDesc": "Mattermost プッシュ通知サービスをファイアウォールの内側に設置するには、https://github.com/mattermost/push-proxy を使ってください。テストするためには、http://push-test.mattermost.com を使うことができます。これには、Apple AppStoreにあるサンプルのMattermost iOSアプリで接続できます。本番環境でテストサービスを使わないでください。",
   "admin.email.pushServerEx": "例: \"http://push-test.mattermost.com\"",
   "admin.email.pushServerTitle": "プッシュ通知サーバー:",
@@ -288,7 +342,7 @@
   "admin.email.selfPush": "プッシュ通知サービスの場所を手入力する",
   "admin.email.skipServerCertificateVerification.description": "有効な場合、Mattermostは電子メールサーバーの証明書を検証しなくなります。",
   "admin.email.skipServerCertificateVerification.title": "証明書の検証をしない: ",
-  "admin.email.smtpPasswordDescription": "電子メールサーバーを設定するために管理者から認証情報を入手してください。",
+  "admin.email.smtpPasswordDescription": "SMTPユーザー名に関連するパスワードです。",
   "admin.email.smtpPasswordExample": "例: \"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "SMTPサーバーパスワード:",
   "admin.email.smtpPortDescription": "SMTP電子メールサーバーのポート番号です。",
@@ -297,13 +351,17 @@
   "admin.email.smtpServerDescription": "SMTP電子メールサーバーの場所です。",
   "admin.email.smtpServerExample": "例: \"smtp.yourcompany.com\", \"email-smtp.us-east-1.amazonaws.com\"",
   "admin.email.smtpServerTitle": "SMTPサーバー:",
-  "admin.email.smtpUsernameDescription": "電子メールサーバーを設定するために管理者から認証情報を入手してください。",
+  "admin.email.smtpUsernameDescription": "SMTPサーバーへの認証に使われるユーザー名です。",
   "admin.email.smtpUsernameExample": "例: \"admin@yourcompany.com\", \"AKIADTOVBGERKLCBV\"",
   "admin.email.smtpUsernameTitle": "SMTPサーバーのユーザー名:",
   "admin.email.testing": "テストしています…",
   "admin.false": "無効",
-  "admin.file.enableFileAttachments": "ファイル添付を有効にする:",
-  "admin.file.enableFileAttachmentsDesc": "無効な場合、投稿へのファイルや画像のアップロードが無効になります。",
+  "admin.file.enableFileAttachments": "ファイル共有を許可する:",
+  "admin.file.enableFileAttachmentsDesc": "無効な場合、このサーバーではファイル共有が無効になります。メッセージへのファイルや画像のアップロードは、モバイルを含むクライアント-デバイス間で許可されません。",
+  "admin.file.enableMobileDownloadDesc": "無効な場合、モバイルアプリでのファイルダウンロードが無効になります。ユーザーはモバイルウェブブラウザーからであればファイルダウンロードが可能です。",
+  "admin.file.enableMobileDownloadTitle": "モバイルでのファイルダウンロードを許可する:",
+  "admin.file.enableMobileUploadDesc": "無効な場合、モバイルアプリでのファイルアップロードが無効になります。ファイル共有を許可する を有効にした場合、ユーザーはモバイルウェブブラウザーからであればファイルアップロードが可能です。",
+  "admin.file.enableMobileUploadTitle": "モバイルでのファイルアップロードを許可する:",
   "admin.file_upload.chooseFile": "ファイルを選択する",
   "admin.file_upload.noFile": "ファイルがアップロードされていません",
   "admin.file_upload.uploadFile": "アップロード",
@@ -529,6 +587,21 @@
   "admin.logs.bannerDesc": "ユーザーIDでユーザーを検索するには、リポート > ユーザーへ行き検索フィルターにIDをペーストしてください。",
   "admin.logs.reload": "再読み込み",
   "admin.logs.title": "サーバーログ",
+  "admin.manage_roles.additionalRoles": "アカウントに関する追加の権限を選択してください。 <a href=\"https://about.mattermost.com/default-permissions\" target=\"_blank\">役割と権限の詳細</a>.",
+  "admin.manage_roles.allowUserAccessTokens": "このアカウントで<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">ユーザーアクセストークン</a>を生成できるようにする.",
+  "admin.manage_roles.cancel": "キャンセル",
+  "admin.manage_roles.manageRolesTitle": "役割の管理",
+  "admin.manage_roles.postAllPublicRole": "すべてのMattermost公開チャンネルの投稿へのアクセスする。",
+  "admin.manage_roles.postAllPublicRoleTitle": "投稿:チャンネル",
+  "admin.manage_roles.postAllRole": "ダイレクトメッセージを含むすべてのMattermostチャンネルの投稿へアクセスする。",
+  "admin.manage_roles.postAllRoleTitle": "投稿:全て",
+  "admin.manage_roles.save": "保存",
+  "admin.manage_roles.saveError": "役割を保存できませんでした。",
+  "admin.manage_roles.systemAdmin": "システム管理者",
+  "admin.manage_roles.systemMember": "メンバー",
+  "admin.manage_tokens.manageTokensTitle": "ユーザーアクセストークン管理",
+  "admin.manage_tokens.userAccessTokensDescription": "ユーザーアクセストークンはセッショントークンと同様に機能し、統合機能が<a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">REST APIに対して認証</a>するために利用できます。詳しくは<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">ユーザーアクセストークン</a>を参照してください。",
+  "admin.manage_tokens.userAccessTokensNone": "ユーザーアクセストークンがありません。",
   "admin.metrics.enableDescription": "有効な場合、Mattermostはパフォーマンスのモニタリングやプロファイリングが有効になります。Mattermostのパフォーマンスモニタリングの設定について、詳しくは<a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>documentation</a>を参照してください。",
   "admin.metrics.enableTitle": "パフォーマンスモニタリングを有効にする:",
   "admin.metrics.listenAddressDesc": "パフォーマンスメトリクスの公開先のサーバーが接続待ちをするアドレスです。",
@@ -574,6 +647,19 @@
   "admin.password.requirementsDescription": "有効なパスワードで求められる文字の種類です。",
   "admin.password.symbol": "少なくとも1つの記号が必要です(例: \"~!@#$%^&*()\")",
   "admin.password.uppercase": "少なくとも1つの英大文字が必要です",
+  "admin.plugins.jira": "JIRA (ベータ)",
+  "admin.plugins.jira.channelParamNamePlaceholder": "チャンネル名",
+  "admin.plugins.jira.enabledDescription": "有効な場合、Mattermostへのメッセージ投稿のためのJIRAウェブフックを設定できるようになります。フィッシング攻撃対策のため、全ての投稿にはBOTタグが表示されます。",
+  "admin.plugins.jira.enabledLabel": "有効:",
+  "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.userDescription": "この統合機能が付与されるユーザー名を選択してください。",
+  "admin.plugins.jira.userLabel": "ユーザー:",
+  "admin.plugins.jira.webhookDocsLink": "説明文書",
   "admin.privacy.showEmailDescription": "無効な場合、メンバーの電子メールアドレスをシステム管理者以外からは見えないようにします。",
   "admin.privacy.showEmailTitle": "電子メールアドレスを表示する: ",
   "admin.privacy.showFullNameDescription": "無効な場合、メンバーの氏名をシステム管理者以外からは見えないようにします。氏名の代わりにはユーザー名が表示されます。",
@@ -751,6 +837,10 @@
   "admin.service.tlsKeyFileDescription": "使用される非公開鍵ファイルです。",
   "admin.service.useLetsEncrypt": "Let's Encryptを使用する:",
   "admin.service.useLetsEncryptDescription": "Let's Encryptからの証明書自動検出を有効にします。証明書はクライアントが新しいドメインから接続しようとした場合に検出されます。これは複数のドメインで動作します。",
+  "admin.service.userAccessTokensDescLabel": "Name: ",
+  "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.userAccessTokensIdLabel": "チームID: ",
+  "admin.service.userAccessTokensTitle": "ユーザーアクセストークンを有効にする: ",
   "admin.service.webSessionDays": "AD/LDAPと電子メールのセッション維持期間 (日数):",
   "admin.service.webSessionDaysDesc": "ユーザーが最後に認証情報を入力してから、そのユーザーのセッションが期限切れとなるまでの日数です。この設定を変更した後の新しいセッション維持期間は、次にユーザーが認証情報を入力してから有効になります。",
   "admin.service.webhooksDescription": "有効な場合、内向きのウェブフックが使用できます。フィッシング攻撃対策のため、ウェブフックからの投稿にはBOTタグが表示されます。詳しくは<a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>説明文書</a>を参照してください。",
@@ -769,6 +859,7 @@
   "admin.sidebar.customization": "カスタマイズ",
   "admin.sidebar.database": "データベース",
   "admin.sidebar.developer": "開発者",
+  "admin.sidebar.elasticsearch": "Elasticsearch (ベータ)",
   "admin.sidebar.email": "電子メールアドレス",
   "admin.sidebar.emoji": "絵文字",
   "admin.sidebar.external": "外部のサービス",
@@ -776,6 +867,7 @@
   "admin.sidebar.general": "全般",
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.integrations": "統合機能",
+  "admin.sidebar.jira": "JIRA (ベータ)",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "法的事項とサポート",
   "admin.sidebar.license": "Editionとライセンス",
@@ -883,9 +975,9 @@
   "admin.team.restrictTitle": "特定のドメインに電子メールでのアカウント作成を制限する:",
   "admin.team.restrict_direct_message_any": "Mattermostの全てのユーザー",
   "admin.team.restrict_direct_message_team": "チームのメンバーのみ",
-  "admin.team.showFullname": "氏名を表示する (デフォルト)",
+  "admin.team.showFullname": "氏名を表示する",
   "admin.team.showNickname": "ニックネームが存在すればそれを表示する。存在していなければ氏名を表示する",
-  "admin.team.showUsername": "ユーザー名を表示する",
+  "admin.team.showUsername": "ユーザー名を表示する(デフォルト)",
   "admin.team.siteNameDescription": "ログイン画面とユーザーインターフェースで表示されるサービス名です。",
   "admin.team.siteNameExample": "例: \"Mattermost\"",
   "admin.team.siteNameTitle": "サイト名:",
@@ -915,7 +1007,9 @@
   "admin.user_item.makeMember": "メンバーにする",
   "admin.user_item.makeSysAdmin": "システム管理者にする",
   "admin.user_item.makeTeamAdmin": "チーム管理者にする",
+  "admin.user_item.manageRoles": "役割の管理",
   "admin.user_item.manageTeams": "チーム管理",
+  "admin.user_item.manageTokens": "トークンの管理",
   "admin.user_item.member": "メンバー",
   "admin.user_item.mfaNo": "<strong>多要素認証</strong>: 使用しない",
   "admin.user_item.mfaYes": "<strong>多要素認証</strong>: 使用する",
@@ -924,6 +1018,9 @@
   "admin.user_item.switchToEmail": "電子メールアドレス/パスワードに切り替える",
   "admin.user_item.sysAdmin": "システム管理者",
   "admin.user_item.teamAdmin": "チーム管理者",
+  "admin.user_item.userAccessTokenPostAll": "(投稿:全て ユーザーアクセストークン)",
+  "admin.user_item.userAccessTokenPostAllPublic": "(投稿:チャンネル ユーザーアクセストークン)",
+  "admin.user_item.userAccessTokenYes": "(ユーザーアクセストークン)",
   "admin.webrtc.enableDescription": "有効な場合、Mattermostは<strong>1対1</strong>のビデオ通話を可能にします。WebRTC通話は、ChromeとFirefox、Mattermostデスクトップアプリで利用可能です。",
   "admin.webrtc.enableTitle": "Mattermost WebRTCを有効にする: ",
   "admin.webrtc.gatewayAdminSecretDescription": "ゲートウェイ管理者URLにアクセスするための管理者パスワードを入力してください。",
@@ -1019,7 +1116,7 @@
   "audit_table.channelCreated": "{channelName} チャンネルを作成しました",
   "audit_table.channelDeleted": "URL {url} のチャンネルを削除しました",
   "audit_table.establishedDM": "{username}のダイレクトメッセージチャンネルを作成しました",
-  "audit_table.failedExpiredLicenseAdd": "有効期間外のため新しいライセンスを追加できませんでした",
+  "audit_table.failedExpiredLicenseAdd": "ライセンスが有効期間外もしくは有効になっていないため、新しいライセンスを追加できませんでした",
   "audit_table.failedInvalidLicenseAdd": "不正なライセンスを追加できませんでした",
   "audit_table.failedLogin": "ログインに失敗しました",
   "audit_table.failedOAuthAccess": "新しいOAuthサービスへのアクセスを許可できませんでした - リダイレクトURIが過去に登録されたコールバックと一致しません",
@@ -1035,10 +1132,10 @@
   "audit_table.member": "メンバー",
   "audit_table.nameUpdated": "{channelName} チャンネルの名称を更新しました",
   "audit_table.oauthTokenFailed": "OAuthアクセストークン{token}の取得に失敗しました",
-  "audit_table.revokedAll": "チームの現在の全てのセッションを削除しました",
+  "audit_table.revokedAll": "チームの現在の全てのセッションを破棄しました",
   "audit_table.sentEmail": "パスワードを初期化するために{email}へ電子メールを送信しました",
   "audit_table.session": "セッションID",
-  "audit_table.sessionRevoked": "ID{sessionId}のセッションを削除しました",
+  "audit_table.sessionRevoked": "ID {sessionId}のセッションを破棄しました",
   "audit_table.successfullLicenseAdd": "新しいライセンスを追加しました",
   "audit_table.successfullLogin": "ログインしました",
   "audit_table.successfullOAuthAccess": "新しいOAuthサービスアクセスを使用しました",
@@ -1314,14 +1411,14 @@
   "emoji_picker.custom": "カスタム",
   "emoji_picker.emojiPicker": "絵文字選択",
   "emoji_picker.flags": "国旗",
-  "emoji_picker.food": "食べ物",
+  "emoji_picker.foods": "食べ物",
   "emoji_picker.nature": "自然",
   "emoji_picker.objects": "モノ",
   "emoji_picker.people": "人物",
+  "emoji_picker.places": "場所",
   "emoji_picker.recent": "最近使用したもの",
   "emoji_picker.search": "検索",
   "emoji_picker.symbols": "シンボル",
-  "emoji_picker.travel": "旅行",
   "error.local_storage.help1": "クッキーを有効にする",
   "error.local_storage.help2": "プライベートブラウザを終了する",
   "error.local_storage.help3": "サポートされているブラウザを使用する (IE 11, Chrome 43+, Firefox 38+, Safari 9, Edge)",
@@ -1652,7 +1749,7 @@
   "login.userNotFound": "あなたのログイン情報に合致するアカウントはありません。",
   "login.username": "ユーザー名",
   "login.verified": " 電子メールアドレスが確認されました",
-  "login_mfa.enterToken": "サインインを完了するには、スマートフォンのauthenticatorからのトークンを入力してください。",
+  "login_mfa.enterToken": "サインインを完了するために、あなたのスマートフォンのAuthenticatorのトークンを入力してください。",
   "login_mfa.submit": "送信する",
   "login_mfa.token": "多要素認証トークン",
   "login_mfa.tokenReq": "多要素認証トークンを入力してください",
@@ -1665,7 +1762,7 @@
   "members_popover.viewMembers": "メンバーを見る",
   "mfa.confirm.complete": "<strong>セットアップが完了しました!</strong>",
   "mfa.confirm.okay": "OK",
-  "mfa.confirm.secure": "あなたのアカウントは安全です。次にサインインするとき、あなたはGoogle Authenticatorからのコードの入力を求められるでしょう。",
+  "mfa.confirm.secure": "あなたのアカウントは安全です。次にサインインするとき、あなたはGoogle Authenticatorのコードの入力を求められるでしょう。",
   "mfa.setup.badCode": "不正なコードです。問題が解決できない場合、システム管理者に問い合わせてください。",
   "mfa.setup.code": "多要素認証コード",
   "mfa.setup.codeError": "Google Authenticatorのコードを入力してください。",
@@ -1688,6 +1785,10 @@
   "mobile.account_notifications.threads_mentions": "スレッド内のあなたについての投稿",
   "mobile.account_notifications.threads_start": "自分で開始したスレッド",
   "mobile.account_notifications.threads_start_participate": "開始もしくは参加したスレッド",
+  "mobile.advanced_settings.reset_button": "リセット",
+  "mobile.advanced_settings.reset_message": "\nこれにより全てのオフラインデータがクリアされ、アプリが再起動します。アプリが再起動されると、自動でログインされます。\n",
+  "mobile.advanced_settings.reset_title": "キャッシュをリセットする",
+  "mobile.advanced_settings.title": "詳細設定",
   "mobile.channel_drawer.search": "会話へ移動する",
   "mobile.channel_info.alertMessageDeleteChannel": "{term} {name} を本当に削除しますか?",
   "mobile.channel_info.alertMessageLeaveChannel": "{term} {name} から本当に脱退しますか?",
@@ -1741,11 +1842,17 @@
   "mobile.loading_members": "メンバーをロード中...",
   "mobile.loading_posts": "メッセージをロード中...",
   "mobile.login_options.choose_title": "ログイン方法を選択してください",
+  "mobile.more_dms.start": "先頭",
+  "mobile.more_dms.title": "新しい会話",
+  "mobile.notice_mobile_link": "モバイルアプリ",
+  "mobile.notice_platform_link": "プラットフォーム",
+  "mobile.notice_text": "Mattermostはオープンソースとして {platform} と {mobile} で開発されています。",
   "mobile.notification.in": " in ",
   "mobile.offlineIndicator.connected": "接続しました",
   "mobile.offlineIndicator.connecting": "接続中",
   "mobile.offlineIndicator.offline": "インターネット未接続",
   "mobile.open_dm.error": "{displayName} とのダイレクトメッセージを開くことができませんでした。接続を確認し、もう一度試してみてください。",
+  "mobile.open_gm.error": "そのユーザーとのダイレクトメッセージを開くことができませんでした。接続を確認し、もう一度試してみてください。",
   "mobile.post.cancel": "キャンセル",
   "mobile.post.delete_question": "この投稿を本当に削除しますか?",
   "mobile.post.delete_title": "投稿を削除する",
@@ -1775,6 +1882,8 @@
   "mobile.routes.thread_dm": "ダイレクトメッセージスレッド",
   "mobile.routes.user_profile": "プロフィール",
   "mobile.routes.user_profile.send_message": "メッセージを送信する",
+  "mobile.search.jump": "ジャンプ",
+  "mobile.search.no_results": "結果が見付かりません",
   "mobile.select_team.choose": "あなたの所属チーム:",
   "mobile.select_team.join_open": "参加可能なチームを開く",
   "mobile.select_team.no_teams": "あなたが参加できるチームはありません。",
@@ -1788,6 +1897,7 @@
   "mobile.settings.clear_button": "クリア",
   "mobile.settings.clear_message": "\nこれにより全てのオフラインデータがクリアされ、アプリが再起動します。アプリが再起動されると、自動でログインされます。\n",
   "mobile.settings.team_selection": "チームを切り替える",
+  "mobile.suggestion.members": "メンバー",
   "modal.manaul_status.ask": "次回からこのメッセージを表示しない",
   "modal.manaul_status.button": "はい、ステータスを \"オンライン\" にします",
   "modal.manaul_status.cancel": "いいえ、\"{status}\" のままにします",
@@ -1884,6 +1994,8 @@
   "post_focus_view.beginning": "チャンネルアーカイブの最初",
   "post_info.del": "削除する",
   "post_info.edit": "編集する",
+  "post_info.message.visible": "(あなただけが見ることができます)",
+  "post_info.message.visible.compact": " (あなただけが見ることができます)",
   "post_info.mobile.flag": "フラグ",
   "post_info.mobile.unflag": "フラグを消す",
   "post_info.permalink": "パーマリンク",
@@ -1896,7 +2008,7 @@
   "posts_view.loadMore": "もっとメッセージを読み込む",
   "posts_view.loadingMore": "もっとメッセージを読み込む...",
   "posts_view.newMsg": "新しいメッセージ",
-  "posts_view.newMsgBelow": "以下に新しい {count, plural, one {message} other {messages}}があります",
+  "posts_view.newMsgBelow": "新しい {count, plural, one {message} other {messages}}",
   "quick_switch_modal.channels": "チャンネル",
   "quick_switch_modal.channelsShortcut.mac": "- ⌘K",
   "quick_switch_modal.channelsShortcut.windows": "- CTRL+K",
@@ -1928,7 +2040,7 @@
   "rename_channel.displayNameHolder": "表示名を入力してください",
   "rename_channel.handleHolder": "小文字の英数字にしてください",
   "rename_channel.lowercase": "小文字の英数字にしてください",
-  "rename_channel.maxLength": "この項目は22文字より短くしてください",
+  "rename_channel.maxLength": "このフィールドは {maxLength, number} 文字未満でなくてはなりません",
   "rename_channel.required": "この項目は必須です",
   "rename_channel.save": "保存する",
   "rename_channel.title": "チャンネル名を変更する",
@@ -1967,6 +2079,7 @@
   "search_item.jump": "ジャンプする",
   "search_results.because": "<ul><li>語句の一部を検索するには*を付けてください(\"reach\"や\"reaction\"を検索するのに\"rea\"を使う場合等)</li><li>検索結果の件数によっては、2文字の検索、一般的な\"this\"や\"a\"、\"is\"は表示されません</li></ul>",
   "search_results.noResults": "結果が見付かりません。もう一度試しますか?",
+  "search_results.searching": "検索中...",
   "search_results.usage": "<ul><li>文を検索するには<b>「引用符」</b>を使ってください</li><li>特定のユーザーの投稿に限定して検索するには<b>From:</b>を、特定のチャンネルのみ検索するには<b>in:</b>を使ってください</li></ul>",
   "search_results.usageFlag1": "まだフラグの立てられたメッセージはありません。",
   "search_results.usageFlag2": "アイコンをクリックすることでメッセージとコメントにフラグを立てることができます。",
@@ -1999,8 +2112,7 @@
   "sidebar.tutorialScreen1": "<h4>チャンネル</h4><p><strong>チャンネル</strong>は様々な話題についての会話を扱います。チャンネルはあなたのチームの全員が読み書き可能です。個人的なコミュニケーションを行う場合、特定の一人との場合には<strong>ダイレクトメッセージ</strong>を、複数の人との場合には<strong>非公開チャンネル</strong>を使用してください。</p>",
   "sidebar.tutorialScreen2": "<h4>\"{townsquare}\"と\"{offtopic}\"チャンネル</h4><p>以下は最初にふさわしい2つの公開チャンネルです</p><p><strong>{townsquare}</strong>は、チーム内のコミュニケーションのための場所です、あなたのチームの全員が参加しています。</p><p><strong>{offtopic}</strong>は仕事と関係のない楽しみとユーモアのための場所です。あなたとチームは、他のチャンネルを作るか決めることができます。</p>",
   "sidebar.tutorialScreen3": "<h4>チャンネルの作成と参加</h4><p><strong>「もっと…」</strong>をクリックすることで新しいチャンネルを作成したり既存のチャンネルに参加することができます。</p><p>公開/非公開チャンネルのヘッダーの隣にある<strong>「+」記号</strong>をクリックすることで、新しいチャンネルを作成することができます。</p>",
-  "sidebar.unreadAbove": "上の未読へ",
-  "sidebar.unreadBelow": "下の未読へ",
+  "sidebar.unreads": "未読",
   "sidebar_header.tutorial": "<h4>メインメニュー</h4><p><strong>メインメニュー</strong>は、<strong>メンバーを招待したり</strong><strong>アカウントの設定</strong>にアクセスしたり、<strong>テーマ色</strong>を設定したりする場所です。</p><p>チーム管理者は<strong>チームの設定</strong>にもこのメニューからアクセスすることができます。</p><p>システム管理者には、システム全体を設定する<strong>システムコンソール</strong>へのリンクもここに表示されます。</p>",
   "sidebar_right_menu.accountSettings": "アカウントの設定",
   "sidebar_right_menu.addMemberToTeam": "メンバーをチームに追加",
@@ -2220,10 +2332,6 @@
   "user.settings.display.nameOptsDesc": "投稿やダイレクトメッセージ中の他のユーザーの名前の表示方法を設定します。",
   "user.settings.display.normalClock": "時計の12時間表示(例: 4:00 PM)",
   "user.settings.display.preferTime": "時刻の表示形式を選択します。",
-  "user.settings.display.showFullname": "氏名を表示する",
-  "user.settings.display.showNickname": "ニックネームが存在すればそれを表示する。存在していなければ氏名を表示する",
-  "user.settings.display.showUsername": "ユーザー名を表示する(デフォルト)",
-  "user.settings.display.teammateNameDisplay": "チームメイトの名前の表示",
   "user.settings.display.theme.applyToAllTeams": "全ての自分のチームに新しいテーマを適用する",
   "user.settings.display.theme.customTheme": "カスタムテーマ",
   "user.settings.display.theme.describe": "テーマを管理する",
@@ -2320,19 +2428,19 @@
   "user.settings.notifications.commentsNever": "あなたについての投稿がない限り、返信スレッドのメッセージについて通知をトリガーしません",
   "user.settings.notifications.commentsRoot": "あなたが開始したスレッドへのメッセージについて通知をトリガーします",
   "user.settings.notifications.desktop": "デスクトップ通知を送る",
-  "user.settings.notifications.desktop.allFirefoxForever": "全てのアクティビティーについて無期限に表示します",
-  "user.settings.notifications.desktop.allFirefoxTimed": "全てのアクティビティーについて{seconds}秒間表示します",
   "user.settings.notifications.desktop.allNoSoundForever": "全てのアクティビティーについて、通知音無しで無期限に表示します",
   "user.settings.notifications.desktop.allNoSoundTimed": "全てのアクティビティーについて、通知音無しで{seconds}秒間表示します",
   "user.settings.notifications.desktop.allSoundForever": "全てのアクティビティーについて、通知音有りで無期限に表示します",
+  "user.settings.notifications.desktop.allSoundHiddenForever": "全てのアクティビティーについて無期限に表示します",
+  "user.settings.notifications.desktop.allSoundHiddenTimed": "全てのアクティビティーについて{seconds}秒間表示します",
   "user.settings.notifications.desktop.allSoundTimed": "全てのアクティビティーについて、通知音有りで{seconds}秒間表示します",
   "user.settings.notifications.desktop.duration": "通知持続時間",
   "user.settings.notifications.desktop.durationInfo": "FirefoxかChromeを使用している場合のデスクトップ通知が画面に残る時間を設定してください。EdgeとSafariでのデスクトップ通知は最大5秒間表示されます。",
-  "user.settings.notifications.desktop.mentionsFirefoxForever": "あなたについての投稿とダイレクトメッセージについて無期限に表示します",
-  "user.settings.notifications.desktop.mentionsFirefoxTimed": "あなたについての投稿とダイレクトメッセージについて{seconds}秒間表示します",
   "user.settings.notifications.desktop.mentionsNoSoundForever": "あなたについての投稿とダイレクトメッセージについて、通知音無しで無期限に表示します",
   "user.settings.notifications.desktop.mentionsNoSoundTimed": "あなたについての投稿とダイレクトメッセージについて、通知音無しで{seconds}秒間表示します",
   "user.settings.notifications.desktop.mentionsSoundForever": "あなたについての投稿とダイレクトメッセージについて、通知音有りで無期限に表示します",
+  "user.settings.notifications.desktop.mentionsSoundHiddenForever": "あなたについての投稿とダイレクトメッセージについて無期限に表示します",
+  "user.settings.notifications.desktop.mentionsSoundHiddenTimed": "あなたについての投稿とダイレクトメッセージについて{seconds}秒間表示します",
   "user.settings.notifications.desktop.mentionsSoundTimed": "あなたについての投稿とダイレクトメッセージについて、通知音有りで{seconds}秒間表示します",
   "user.settings.notifications.desktop.seconds": "{seconds}秒",
   "user.settings.notifications.desktop.sound": "通知音",
@@ -2363,7 +2471,7 @@
   "user.settings.notifications.sensitiveUsername": "あなたのユーザー名は、大文字小文字を区別せず\"{username}\"です",
   "user.settings.notifications.sensitiveWords": "他の単語をカンマで区切って入力してください。大文字小文字は区別されません:",
   "user.settings.notifications.soundConfig": "ブラウザーの設定画面で、通知音について設定してください",
-  "user.settings.notifications.sounds_info": "通知音はIE11、Edge、Safari、Chrome、Mattermostデスクトップアプリで利用できます。",
+  "user.settings.notifications.sounds_info": "通知音はIE11、Safari、Chrome、Mattermostデスクトップアプリで利用できます。",
   "user.settings.notifications.teamWide": "チーム全体についての「@all」",
   "user.settings.notifications.title": "通知の設定",
   "user.settings.notifications.wordsTrigger": "あなたについての投稿となる単語",
@@ -2444,6 +2552,28 @@
   "user.settings.security.switchSaml": "SAMLシングルサインオンに切り替える",
   "user.settings.security.title": "セキュリティーの設定",
   "user.settings.security.viewHistory": "アクセス履歴を見る",
+  "user.settings.tokens.cancel": "キャンセル",
+  "user.settings.tokens.clickToEdit": "ユーザーアクセストークンを管理するには'編集'をクリックしてください",
+  "user.settings.tokens.confirmCreateButton": "はい、作成します",
+  "user.settings.tokens.confirmCreateMessage": "システム管理者権限でユーザーアクセストークンを生成しています。本当にこのトークンを生成してもよろしいですか？",
+  "user.settings.tokens.confirmCreateTitle": "システム管理者ユーザーアクセストークンを生成する",
+  "user.settings.tokens.confirmDeleteButton": "はい、削除します",
+  "user.settings.tokens.confirmDeleteMessage": "このトークンを使った全ての統合機能がMattermost APIにアクセスできなくなります。この操作はやり直すことができません。本当にこのトークンを削除しますか？",
+  "user.settings.tokens.confirmDeleteTitle": "トークン {name} を削除しますか？",
+  "user.settings.tokens.copy": "以下のトークンをコピーしてください。二度と確認することはできません!",
+  "user.settings.tokens.create": "新しいトークンを生成する",
+  "user.settings.tokens.delete": "削除",
+  "user.settings.tokens.description": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">ユーザーアクセストークン</a>はセッショントークンと同様に機能し、統合機能が<a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">REST APIに対して認証</a>するために利用できます。",
+  "user.settings.tokens.description_mobile": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">ユーザーアクセストークン</a>はセッショントークンと同様に機能し、統合機能が<a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">REST APIに対して認証</a>するために利用できます。デスクトップ環境で新しトークンを生成してください。",
+  "user.settings.tokens.id": "ID: ",
+  "user.settings.tokens.name": "名前: ",
+  "user.settings.tokens.nameHelp": "Enter a description for your token to remember what it does.",
+  "user.settings.tokens.nameRequired": "Please enter a description.",
+  "user.settings.tokens.save": "保存",
+  "user.settings.tokens.title": "ユーザーアクセストークン",
+  "user.settings.tokens.token": "トークン: ",
+  "user.settings.tokens.tokenId": "トークンID: ",
+  "user.settings.tokens.userAccessTokensNone": "ユーザーアクセストークンがありません。",
   "user_list.notFound": "ユーザーが見付かりません",
   "user_profile.send.dm": "メッセージを送信",
   "user_profile.webrtc.call": "ビデオ通話の開始",
diff --git a/webapp/i18n/ko.json b/webapp/i18n/ko.json
index 82a904e4a..6c758ea7a 100644
--- a/webapp/i18n/ko.json
+++ b/webapp/i18n/ko.json
@@ -142,7 +142,7 @@
   "admin.advance.metrics": "Performance Monitoring",
   "admin.audits.reload": "사용자 활동 기록 새로고침",
   "admin.audits.title": "사용자 활동 기록",
-  "admin.authentication.email": "이메일 인증",
+  "admin.authentication.email": "Email Authentication",
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
@@ -203,8 +203,6 @@
   "admin.compliance_table.userId": "Requested By",
   "admin.connectionSecurityNone": "None",
   "admin.connectionSecurityNoneDescription": "Mattermost will connect over an unsecure connection.",
-  "admin.connectionSecurityPlain": "PLAIN",
-  "admin.connectionSecurityPlainDescription": "Mattermost는 안전하지 않은 연결을 통해 인증 및 접속할 것입니다.",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "Takes an existing insecure connection and attempts to upgrade it to a secure connection using TLS.",
   "admin.connectionSecurityTest": "연결 테스트",
@@ -235,12 +233,60 @@
   "admin.customization.support": "법적 사항 및 지원",
   "admin.database.title": "데이터베이스 설정",
   "admin.developer.title": "개발자 설정",
+  "admin.elasticsearch.bulkIndexButton.error": "Failed to schedule Bulk Index Job: {error}",
+  "admin.elasticsearch.connectionUrlDescription": "The address of the Elasticsearch server. {documentationLink}",
+  "admin.elasticsearch.connectionUrlExample": "E.g.: \"https://elasticsearch.example.org:9200\"",
+  "admin.elasticsearch.connectionUrlExample.documentationLinkText": "Please see documentation with server setup instructions.",
+  "admin.elasticsearch.connectionUrlTitle": "Server Connection Address:",
+  "admin.elasticsearch.elasticsearch_test_button": "연결 테스트",
+  "admin.elasticsearch.enableIndexingDescription": "When true, indexing of new posts occurs automatically. Search queries will use database search until \"Enable Elasticsearch for search queries\" is enabled. {documentationLink}",
+  "admin.elasticsearch.enableIndexingDescription.documentationLinkText": "Learn more about Elasticsearch in our documentation.",
+  "admin.elasticsearch.enableIndexingTitle": "Enable Elasticsearch Indexing:",
+  "admin.elasticsearch.enableSearchingDescription": "Requires a successful connection to the Elasticsearch server. When true, Elasticsearch will be used for all search queries using the latest index. Search results may be incomplete until a bulk index of the existing post database is finished. When false, database search is used.",
+  "admin.elasticsearch.enableSearchingTitle": "Enable Elasticsearch for search queries:",
+  "admin.elasticsearch.indexButton.inProgress": "Indexing in progress",
+  "admin.elasticsearch.indexButton.ready": "Build Index",
+  "admin.elasticsearch.indexHelpText.buildIndex": "All posts in the database will be indexed from oldest to newest. Elasticsearch is available during indexing but search results may be incomplete until the indexing job is complete.",
+  "admin.elasticsearch.indexHelpText.cancelIndexing": "Cancelling stops the indexing job and removes it from the queue. Posts that have already been indexed will not be deleted.",
+  "admin.elasticsearch.noteDescription": "Changing properties in this section will require a server restart before taking effect.",
+  "admin.elasticsearch.password": "E.g.: \"yourpassword\"",
+  "admin.elasticsearch.passwordDescription": "(Optional) The password to authenticate to the Elasticsearch server.",
+  "admin.elasticsearch.passwordTitle": "SMTP 서버 패스워드:",
+  "admin.elasticsearch.purgeIndexesButton": "Purge Indexes",
+  "admin.elasticsearch.purgeIndexesButton.error": "Failed to purge indexes: {error}",
+  "admin.elasticsearch.purgeIndexesButton.label": "Purge Indexes:",
+  "admin.elasticsearch.purgeIndexesButton.success": "Indexes purged successfully.",
+  "admin.elasticsearch.purgeIndexesHelpText": "Purging will entirely remove the index on the Elasticsearch server. Search results may be incomplete until a bulk index of the existing post database is rebuilt.",
+  "admin.elasticsearch.sniffDescription": "When true, sniffing finds and connects to all data nodes in your cluster automatically.",
+  "admin.elasticsearch.sniffTitle": "Enable Cluster Sniffing:",
+  "admin.elasticsearch.testConfigSuccess": "Test successful. Configuration saved.",
+  "admin.elasticsearch.testHelpText": "Tests if the Mattermost server can connect to the Elasticsearch server specified. Testing the connection only saves the configuration if the test is successful. See log file for more detailed error messages.",
+  "admin.elasticsearch.title": "Elasticsearch (Beta)",
+  "admin.elasticsearch.usernameDescription": "(Optional) The username to authenticate to the Elasticsearch server.",
+  "admin.elasticsearch.usernameExample": "E.g.: \"elastic\"",
+  "admin.elasticsearch.usernameTitle": "SMTP 서버 사용자명:",
+  "admin.elasticsearchStatus.bulkIndexLabel": "Bulk Indexing:",
+  "admin.elasticsearchStatus.cancelButton": "취소",
+  "admin.elasticsearchStatus.status": "상태",
+  "admin.elasticsearchStatus.statusCancelled": "Indexing job cancelled.",
+  "admin.elasticsearchStatus.statusError": "Indexing error.",
+  "admin.elasticsearchStatus.statusError.help": "Mattermost encountered an error building the Elasticsearch index: {error}",
+  "admin.elasticsearchStatus.statusInProgress": "Job in progress. {percent}% complete.",
+  "admin.elasticsearchStatus.statusInProgress.help": "Indexing is in progress on the job server. If Elasticsearch is enabled, search results may be incomplete until the job is finished.",
+  "admin.elasticsearchStatus.statusIndexingDisabled": "Indexing disabled.",
+  "admin.elasticsearchStatus.statusLoading": "로딩 중...",
+  "admin.elasticsearchStatus.statusNoJobs": "No indexing jobs queued.",
+  "admin.elasticsearchStatus.statusPending": "Job pending.",
+  "admin.elasticsearchStatus.statusPending.help": "Elasticsearch index job is queued on the job server. If Elasticsearch is enabled, search results may be incomplete until the job is finished.",
+  "admin.elasticsearchStatus.statusRequestCancel": "Canceling Job...",
+  "admin.elasticsearchStatus.statusSuccess": "Indexing complete.",
+  "admin.elasticsearchStatus.statusSuccess.help": "Indexing is complete and new posts are being automatically indexed.",
   "admin.email.agreeHPNS": " I understand and accept the Mattermost Hosted Push Notification Service <a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">Terms of Service</a> and <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Privacy Policy</a>.",
   "admin.email.allowEmailSignInDescription": "설정 시, Mattermost는 사용자들이 그들의 이메일과 패스워드로 로그인할 수 있게 합니다.",
   "admin.email.allowEmailSignInTitle": "Enable sign-in with email: ",
   "admin.email.allowSignupDescription": "When true, Mattermost allows team creation and account signup using email and password.  This value should be false only when you want to limit signup to a single-sign-on service like OAuth or LDAP.",
   "admin.email.allowSignupTitle": "Enable account creation with email: ",
-  "admin.email.allowUsernameSignInDescription": "When true, Mattermost allows users to sign in using their username and password.  This setting is typically only used when email verification is disabled.",
+  "admin.email.allowUsernameSignInDescription": "When true, users with email login can sign in using their username and password. This setting does not affect AD/LDAP login.",
   "admin.email.allowUsernameSignInTitle": "Enable sign-in with username: ",
   "admin.email.connectionSecurityTest": "연결 테스트",
   "admin.email.easHelp": "Learn more about compiling and deploying your own mobile apps from an <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target=\"_blank\">Enterprise App Store</a>.",
@@ -248,18 +294,26 @@
   "admin.email.emailSuccess": "No errors were reported while sending an email.  Please check your inbox to make sure.",
   "admin.email.enableEmailBatching.clusterEnabled": "Email batching cannot be enabled when High Availability mode is enabled.",
   "admin.email.enableEmailBatching.siteURL": "Email batching cannot be enabled unless the SiteURL is configured in <b>Configuration > SiteURL</b>.",
-  "admin.email.enableEmailBatchingDesc": "When true, users can have email notifications for multiple direct messages and mentions combined into a single email, configurable in <b>Account Settings > Notifications</b>.",
+  "admin.email.enableEmailBatchingDesc": "When true, users will have email notifications for multiple direct messages and mentions combined into a single email. Batching will occur at a default interval of 15 minutes, configurable in Account Settings > Notifications.",
   "admin.email.enableEmailBatchingTitle": "Enable Email Batching:",
+  "admin.email.enableSMTPAuthDesc": "When enabled, username and password are used for authenticating to the SMTP server.",
+  "admin.email.enableSMTPAuthTitle": "Enable SMTP Authentication:",
   "admin.email.fullPushNotification": "Send full message snippet",
+  "admin.email.genericNoChannelPushNotification": "Send generic description with only sender name",
   "admin.email.genericPushNotification": "Send generic description with user and channel names",
   "admin.email.inviteSaltDescription": "32-character salt added to signing of email invites. Randomly generated on install. Click \"Regenerate\" to create new salt.",
   "admin.email.inviteSaltExample": "예시 \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.inviteSaltTitle": "Email Invite Salt:",
   "admin.email.mhpns": "Use encrypted, production-quality HPNS connection to iOS and Android apps",
-  "admin.email.mhpnsHelp": "iTunes에서 <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target=\"_blank\">Mattermost iOS 앱</a> 다운로드. Google Play에서 <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target=\"_blank\">Mattermost Android 앱</a> 다운로드.  <a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target=\"_blank\">HPNS</a>에 대해 알아보기.",
+  "admin.email.mhpnsHelp": "iTunes에서 <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target=\"_blank\">Mattermost iOS 앱</a> 다운로드. Google Play에서 <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target=\"_blank\">Mattermost Android 앱</a> 다운로드. <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target=\"_blank\">TPNS</a>에 대해 알아보기.",
   "admin.email.mtpns": "IOS, Android 앱을 TPNS와 사용합니다.",
   "admin.email.mtpnsHelp": "iTunes에서 <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target=\"_blank\">Mattermost iOS 앱</a> 다운로드. Google Play에서 <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target=\"_blank\">Mattermost Android 앱</a> 다운로드. <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target=\"_blank\">TPNS</a>에 대해 알아보기.",
   "admin.email.nofificationOrganizationExample": "예시 \"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\"",
+  "admin.email.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.generic": "Send generic description with only sender name",
+  "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": "푸시 알림 콘텐츠:",
   "admin.email.notificationDisplayDescription": "Display name on email account used when sending notification emails from Mattermost.",
   "admin.email.notificationDisplayExample": "예시 \"Mattermost Notification\", \"System\", \"No-Reply\"",
   "admin.email.notificationDisplayTitle": "알림 표시명:",
@@ -274,7 +328,7 @@
   "admin.email.passwordSaltDescription": "32-character salt added to signing of password reset emails. Randomly generated on install. Click \"Regenerate\" to create new salt.",
   "admin.email.passwordSaltExample": "예시 \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "Password Reset Salt:",
-  "admin.email.pushContentDesc": "Selecting \"Send generic description with user and channel names\" provides push notifications with generic messages, including names of users and channels but no specific details from the message text.<br /><br />Selecting \"Send full message snippet\" sends excerpts from messages triggering notifications with specifics and may include confidential information sent in messages. If your Push Notification Service is outside your firewall, it is HIGHLY RECOMMENDED this option only be used with an \"https\" protocol to encrypt the connection.",
+  "admin.email.pushContentDesc": "\"Send generic description with only sender name\" includes only the name of the person who sent the message in push notifications, with no information about channel name or message contents.<br /><br />\"Send generic description with sender and channel names\" includes the name of the person who sent the message and the channel it was sent in, but not the message text.<br /><br />\"Send full message snippet\" includes a message excerpt in push notifications, which may contain confidential information sent in messages. If your Push Notification Service is outside your firewall, it is *highly recommended* this option only be used with an \"https\" protocol to encrypt the connection.",
   "admin.email.pushContentTitle": "푸시 알림 콘텐츠:",
   "admin.email.pushDesc": "Typically set to true in production. When true, Mattermost attempts to send iOS and Android push notifications through the push notification server.",
   "admin.email.pushOff": "Do not send push notifications",
@@ -288,7 +342,7 @@
   "admin.email.selfPush": "Manually enter Push Notification Service location",
   "admin.email.skipServerCertificateVerification.description": "When true, Mattermost will not verify the email server certificate.",
   "admin.email.skipServerCertificateVerification.title": "인증서 검증 생략",
-  "admin.email.smtpPasswordDescription": " Obtain this credential from administrator setting up your email server.",
+  "admin.email.smtpPasswordDescription": "The password associated with the SMTP username.",
   "admin.email.smtpPasswordExample": "예시 \"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "SMTP 서버 패스워드:",
   "admin.email.smtpPortDescription": "SMTP 이메일 서버의 포트를 입력하세요.",
@@ -297,13 +351,17 @@
   "admin.email.smtpServerDescription": "Location of SMTP email server.",
   "admin.email.smtpServerExample": "예시 \"smtp.yourcompany.com\", \"email-smtp.us-east-1.amazonaws.com\"",
   "admin.email.smtpServerTitle": "SMTP 서버:",
-  "admin.email.smtpUsernameDescription": " Obtain this credential from administrator setting up your email server.",
+  "admin.email.smtpUsernameDescription": "The username for authenticating to the SMTP server.",
   "admin.email.smtpUsernameExample": "예시 \"admin@yourcompany.com\", \"AKIADTOVBGERKLCBV\"",
   "admin.email.smtpUsernameTitle": "SMTP 서버 사용자명:",
   "admin.email.testing": "테스트 중...",
   "admin.false": "비활성화",
-  "admin.file.enableFileAttachments": "Enable File Attachments:",
-  "admin.file.enableFileAttachmentsDesc": "When false, disable file and image uploads on messages.",
+  "admin.file.enableFileAttachments": "Allow File Sharing:",
+  "admin.file.enableFileAttachmentsDesc": "When false, disables file sharing on the server. All file and image uploads on messages are forbidden across clients and devices, including mobile.",
+  "admin.file.enableMobileDownloadDesc": "When false, disables file downloads on mobile apps. Users can still download files from a mobile web browser.",
+  "admin.file.enableMobileDownloadTitle": "Allow File Downloads on Mobile:",
+  "admin.file.enableMobileUploadDesc": "When false, disables file uploads on mobile apps. If Allow File Sharing is set to true, users can still upload files from a mobile web browser.",
+  "admin.file.enableMobileUploadTitle": "Allow File Uploads on Mobile:",
   "admin.file_upload.chooseFile": "파일 선택",
   "admin.file_upload.noFile": "업로드 된 파일이 없습니다.",
   "admin.file_upload.uploadFile": "업로드",
@@ -529,6 +587,21 @@
   "admin.logs.bannerDesc": "To look up users by User 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>.",
+  "admin.manage_roles.allowUserAccessTokens": "Allow this account to generate <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a>.",
+  "admin.manage_roles.cancel": "취소",
+  "admin.manage_roles.manageRolesTitle": "Manage Roles",
+  "admin.manage_roles.postAllPublicRole": "Access to post to all Mattermost public channels.",
+  "admin.manage_roles.postAllPublicRoleTitle": "post:channels",
+  "admin.manage_roles.postAllRole": "Access to post to all Mattermost channels including direct messages.",
+  "admin.manage_roles.postAllRoleTitle": "post:all",
+  "admin.manage_roles.save": "저장",
+  "admin.manage_roles.saveError": "Unable to save roles.",
+  "admin.manage_roles.systemAdmin": "시스템 관리자",
+  "admin.manage_roles.systemMember": "회원",
+  "admin.manage_tokens.manageTokensTitle": "Manage Personal Access Tokens",
+  "admin.manage_tokens.userAccessTokensDescription": "Personal access tokens function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">interact with this Mattermost server</a>. Learn more about <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a>.",
+  "admin.manage_tokens.userAccessTokensNone": "No personal access tokens.",
   "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>documentation</a> to learn more about configuring performance monitoring for Mattermost.",
   "admin.metrics.enableTitle": "Enable Performance Monitoring:",
   "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
@@ -574,6 +647,19 @@
   "admin.password.requirementsDescription": "Character types required in a valid password.",
   "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.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.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.userDescription": "Select the username that this integration is attached to.",
+  "admin.plugins.jira.userLabel": "사용자",
+  "admin.plugins.jira.webhookDocsLink": "문서",
   "admin.privacy.showEmailDescription": "When false, hides the email address of members from everyone except System Administrators.",
   "admin.privacy.showEmailTitle": "이메일 표시: ",
   "admin.privacy.showFullNameDescription": "When false, hides the full name of members from everyone except System Administrators. Username is shown in place of full name.",
@@ -751,6 +837,10 @@
   "admin.service.tlsKeyFileDescription": "The private key file to use.",
   "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": "Name: ",
+  "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.userAccessTokensIdLabel": "Token ID: ",
+  "admin.service.userAccessTokensTitle": "Enable Personal Access Tokens: ",
   "admin.service.webSessionDays": "Session length LDAP and email (days):",
   "admin.service.webSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
   "admin.service.webhooksDescription": "When true, incoming webhooks will be allowed. To help combat phishing attacks, all posts from webhooks will be labelled by a BOT tag. See <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>documentation</a> to learn more.",
@@ -769,6 +859,7 @@
   "admin.sidebar.customization": "커스터마이징",
   "admin.sidebar.database": "데이터베이스",
   "admin.sidebar.developer": "개발자 설정",
+  "admin.sidebar.elasticsearch": "Elasticsearch (Beta)",
   "admin.sidebar.email": "이메일",
   "admin.sidebar.emoji": "Emoji",
   "admin.sidebar.external": "외부 서비스",
@@ -776,6 +867,7 @@
   "admin.sidebar.general": "일반",
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.integrations": "통합",
+  "admin.sidebar.jira": "JIRA (Beta)",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "지원",
   "admin.sidebar.license": "라이센스와 에디션",
@@ -883,9 +975,9 @@
   "admin.team.restrictTitle": "Restrict account creation to specified email domains:",
   "admin.team.restrict_direct_message_any": "Any user on the Mattermost server",
   "admin.team.restrict_direct_message_team": "Any member of the team",
-  "admin.team.showFullname": "Show first and last name (default)",
+  "admin.team.showFullname": "본명으로 보기",
   "admin.team.showNickname": "별명이 있으면 별명으로 보기, 없으면 본명으로 보기",
-  "admin.team.showUsername": "Show username",
+  "admin.team.showUsername": "사용자명으로 보기 (기본)",
   "admin.team.siteNameDescription": "Name of service shown in login screens and UI.",
   "admin.team.siteNameExample": "예시 \"Mattermost\"",
   "admin.team.siteNameTitle": "사이트 이름:",
@@ -915,7 +1007,9 @@
   "admin.user_item.makeMember": "회원으로 변경",
   "admin.user_item.makeSysAdmin": "시스템 관리자로 변경",
   "admin.user_item.makeTeamAdmin": "팀 관리자로 변경",
+  "admin.user_item.manageRoles": "Manage Roles",
   "admin.user_item.manageTeams": "Manage Teams",
+  "admin.user_item.manageTokens": "Manage Tokens",
   "admin.user_item.member": "회원",
   "admin.user_item.mfaNo": ", <strong>MFA</strong>: 아니요",
   "admin.user_item.mfaYes": ", <strong>MFA</strong>: 예",
@@ -924,6 +1018,9 @@
   "admin.user_item.switchToEmail": "이메일/패스워드로 변경",
   "admin.user_item.sysAdmin": "시스템 관리자",
   "admin.user_item.teamAdmin": "팀 관리자",
+  "admin.user_item.userAccessTokenPostAll": "(with post:all personal access tokens)",
+  "admin.user_item.userAccessTokenPostAllPublic": "(with post:channels personal access tokens)",
+  "admin.user_item.userAccessTokenYes": "(with personal access tokens)",
   "admin.webrtc.enableDescription": "When true, Mattermost allows making <strong>one-on-one</strong> video calls. WebRTC calls are available on Chrome, Firefox and Mattermost Desktop Apps.",
   "admin.webrtc.enableTitle": "Mattermost WebRTC: ",
   "admin.webrtc.gatewayAdminSecretDescription": "Enter your admin secret password to access the Gateway Admin URL.",
@@ -1314,14 +1411,14 @@
   "emoji_picker.custom": "Custom",
   "emoji_picker.emojiPicker": "Emoji Picker",
   "emoji_picker.flags": "중요 지정",
-  "emoji_picker.food": "Food",
+  "emoji_picker.foods": "Foods",
   "emoji_picker.nature": "Nature",
   "emoji_picker.objects": "Objects",
   "emoji_picker.people": "People",
+  "emoji_picker.places": "Places",
   "emoji_picker.recent": "Recently Used",
   "emoji_picker.search": "검색",
   "emoji_picker.symbols": "Symbols",
-  "emoji_picker.travel": "Travel",
   "error.local_storage.help1": "Enable cookies",
   "error.local_storage.help2": "Turn off private browsing",
   "error.local_storage.help3": "Use a supported browser (IE 11, Chrome 43+, Firefox 38+, Safari 9, Edge)",
@@ -1688,6 +1785,10 @@
   "mobile.account_notifications.threads_mentions": "Mentions in threads",
   "mobile.account_notifications.threads_start": "Threads that I start",
   "mobile.account_notifications.threads_start_participate": "Threads that I start or participate in",
+  "mobile.advanced_settings.reset_button": "Reset",
+  "mobile.advanced_settings.reset_message": "\nThis will reset all offline data and restart the app. You will be automatically logged back in once the app restarts.\n",
+  "mobile.advanced_settings.reset_title": "Reset Cache",
+  "mobile.advanced_settings.title": "고급 설정",
   "mobile.channel_drawer.search": "Jump to a conversation",
   "mobile.channel_info.alertMessageDeleteChannel": "{term} {name}을 (를) 삭제 하시겠습니까?",
   "mobile.channel_info.alertMessageLeaveChannel": "{term} {name}을 (를) 종료 하시겠습니까?",
@@ -1741,11 +1842,17 @@
   "mobile.loading_members": "Loading Members...",
   "mobile.loading_posts": "메시지 더 보기",
   "mobile.login_options.choose_title": "Choose your login method",
+  "mobile.more_dms.start": "Start",
+  "mobile.more_dms.title": "New Conversation",
+  "mobile.notice_mobile_link": "mobile apps",
+  "mobile.notice_platform_link": "platform",
+  "mobile.notice_text": "Mattermost is made possible by the open source software used in our {platform} and {mobile}.",
   "mobile.notification.in": " in ",
   "mobile.offlineIndicator.connected": "Connected",
   "mobile.offlineIndicator.connecting": "연결",
   "mobile.offlineIndicator.offline": "No internet connection",
   "mobile.open_dm.error": "We couldn't open a direct message with {displayName}. Please check your connection and try again.",
+  "mobile.open_gm.error": "We couldn't open a group message with those users. Please check your connection and try again.",
   "mobile.post.cancel": "취소",
   "mobile.post.delete_question": "정말 게시물을 삭제하시겠습니까?",
   "mobile.post.delete_title": "Delete Post",
@@ -1775,6 +1882,8 @@
   "mobile.routes.thread_dm": "Direct Message Thread",
   "mobile.routes.user_profile": "Profile",
   "mobile.routes.user_profile.send_message": "Send Message",
+  "mobile.search.jump": "JUMP",
+  "mobile.search.no_results": "No Results Found",
   "mobile.select_team.choose": "가입한 팀: ",
   "mobile.select_team.join_open": "Open teams you can join",
   "mobile.select_team.no_teams": "There are no available teams for you to join.",
@@ -1788,6 +1897,7 @@
   "mobile.settings.clear_button": "Clear",
   "mobile.settings.clear_message": "\nThis will clear all offline data and restart the app. You will be automatically logged back in once the app restarts.\n",
   "mobile.settings.team_selection": "팀 선택",
+  "mobile.suggestion.members": "회원",
   "modal.manaul_status.ask": "Do not ask me again",
   "modal.manaul_status.button": "Yes, set my status to \"Online\"",
   "modal.manaul_status.cancel": "No, keep it as \"{status}\"",
@@ -1884,6 +1994,8 @@
   "post_focus_view.beginning": "채널의 시작",
   "post_info.del": "삭제",
   "post_info.edit": "편집",
+  "post_info.message.visible": "(Only visible to you)",
+  "post_info.message.visible.compact": " (Only visible to you)",
   "post_info.mobile.flag": "중요 지정",
   "post_info.mobile.unflag": "중요 해제",
   "post_info.permalink": "링크",
@@ -1896,7 +2008,7 @@
   "posts_view.loadMore": "메시지 더 보기",
   "posts_view.loadingMore": "메시지 더 보기",
   "posts_view.newMsg": "새로운 메시지",
-  "posts_view.newMsgBelow": "New {count, plural, one {message} other {messages}} below",
+  "posts_view.newMsgBelow": "New {count, plural, one {message} other {messages}}",
   "quick_switch_modal.channels": "채널",
   "quick_switch_modal.channelsShortcut.mac": "- ⌘K",
   "quick_switch_modal.channelsShortcut.windows": "- CTRL+K",
@@ -1928,7 +2040,7 @@
   "rename_channel.displayNameHolder": "표시명을 입력하세요.",
   "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 22 characters",
+  "rename_channel.maxLength": "This field must be less than {maxLength, number} characters",
   "rename_channel.required": "필수 항목입니다.",
   "rename_channel.save": "저장",
   "rename_channel.title": "채널 이름 변경",
@@ -1967,6 +2079,7 @@
   "search_item.jump": "바로가기",
   "search_results.because": "<ul><li>문구의 일부분을 검색하려면(예: \"rea\", 를 검색하여 \"reach\" 또는 \"reaction\") 단어 앞 또는 뒤에 와일드카드 문자(*)를 붙여보세요.</li><li>두 글자 검색이나 \"this\", \"a\", \"is\"같이 일반적인 단어는 과도한 결과를 반환하기 때문에 검색결과에 표시되지 않습니다.</li></ul>",
   "search_results.noResults": "검색 결과가 없습니다. 다시 시도하세요.",
+  "search_results.searching": "Searching...",
   "search_results.usage": "<ul><li><b>\"따옴표\"</b>를 사용하여 문구를 검색할 수 있습니다.</li><li><b>from:</b> 을 사용하여 특정 작성자를 검색하거나 <b>in:</b> 을 사용하여 특정 채널에 대해 검색할 수 있습니다.</li></ul>",
   "search_results.usageFlag1": "중요 지정된 메시지가 아직 없습니다.",
   "search_results.usageFlag2": "타임스탬프 옆의 ",
@@ -1999,8 +2112,7 @@
   "sidebar.tutorialScreen1": "<h4>채널</h4><p><strong>채널</strong>을 통해 주제별로 대화를 구성합니다. 팀의 모든 일원에게 공개되어 있습니다. 공개하고 싶지 않은 메시지는 <strong>개인 메시지</strong>나 <strong>비공개 그룹</strong>으로 전달할 수 있습니다. </p>",
   "sidebar.tutorialScreen2": "<h4>\"{townsquare}\" 와 \"{offtopic}\" 채널</h4><p>두 채널과 함께 시작합니다:</p><p><strong>{townsquare}</strong>(은)는 팀 전체의 소통을 위한 공간입니다. 모든 팀의 구성원들이 확인할 수 있습니다.</p><p><strong>{offtopic}</strong> 비업무 대화를 위한 공간입니다. 당신의 팀에 어떤 채널을 만들고 운영할지 결정할 수 있습니다.</p>",
   "sidebar.tutorialScreen3": "<h4>채널 만들고 가입하기</h4><p><strong>\"더 보기...\"</strong>를 눌러 새로운 채널을 만들거나 기존 채널에 입장할 수 있습니다.</p><p>채널이나 비공개 그룹의 헤더 옆에 <strong>\"+\" 표시</strong> 를 눌러 새로운 채널이나 비공개 그룹을 만들 수 있습니다.</p>",
-  "sidebar.unreadAbove": "상단에 읽지않은 메시지",
-  "sidebar.unreadBelow": "하단에 읽지않은 메시지",
+  "sidebar.unreads": "More unreads",
   "sidebar_header.tutorial": "<h4>메인 메뉴</h4><p> <strong>메인 메뉴</strong>에서 <strong>회원 초대</strong>를 하거나, <strong>계정 설정</strong>에 진입하여 <strong>테마 색상</strong>을 변경할 수 있습니다.</p><p>팀 관리자는 메뉴에서 <strong>팀 설정</strong>에 진입할 수 있습니다.</p><p>시스템 관리자는 <strong>관리자 도구</strong> 메뉴를 통해 시스템을 전체 설정을 관리할 수 있습니다.</p>",
   "sidebar_right_menu.accountSettings": "계정 설정",
   "sidebar_right_menu.addMemberToTeam": "팀 멤버 추가",
@@ -2220,10 +2332,6 @@
   "user.settings.display.nameOptsDesc": "글과 대화 목록에서 사용자의 이름이 어떻게 표시될 지 선택하세요.",
   "user.settings.display.normalClock": "12시간으로 보이기 (예: 4:00 PM)",
   "user.settings.display.preferTime": "시간이 어떻게 표시될지 선택하세요.",
-  "user.settings.display.showFullname": "본명으로 보기",
-  "user.settings.display.showNickname": "별명이 있으면 별명으로 보기, 없으면 본명으로 보기",
-  "user.settings.display.showUsername": "사용자명으로 보기 (기본)",
-  "user.settings.display.teammateNameDisplay": "사용자명 표시",
   "user.settings.display.theme.applyToAllTeams": "가입한 모든 팀에서 새로운 테마를 적용합니다.",
   "user.settings.display.theme.customTheme": "커스텀 테마",
   "user.settings.display.theme.describe": "내 테마 관리하기",
@@ -2320,19 +2428,19 @@
   "user.settings.notifications.commentsNever": "사용 안함",
   "user.settings.notifications.commentsRoot": "등록한 모든 스레드의 답변에 대해 알림",
   "user.settings.notifications.desktop": "알림 받기",
-  "user.settings.notifications.desktop.allFirefoxForever": "모든 활동에 대해 무기한 보여줍니다.",
-  "user.settings.notifications.desktop.allFirefoxTimed": "모든 활동에 대해, {seconds}초 동안 보여줍니다.",
   "user.settings.notifications.desktop.allNoSoundForever": "모든 활동에 대해, 소리 없이 무기한 보여줍니다.",
   "user.settings.notifications.desktop.allNoSoundTimed": "모든 활동에 대해, 소리 없이 {seconds}초 동안 보여줍니다.",
   "user.settings.notifications.desktop.allSoundForever": "모든 활동에 대해 무기한 보여줍니다.",
+  "user.settings.notifications.desktop.allSoundHiddenForever": "모든 활동에 대해 무기한 보여줍니다.",
+  "user.settings.notifications.desktop.allSoundHiddenTimed": "모든 활동에 대해, {seconds}초 동안 보여줍니다.",
   "user.settings.notifications.desktop.allSoundTimed": "모든 활동에 대해 {seconds}초 동안 보여줍니다.",
   "user.settings.notifications.desktop.duration": "알림 지속시간",
   "user.settings.notifications.desktop.durationInfo": "Sets how long desktop notifications will remain on screen when using Firefox or Chrome. Desktop notifications in Edge and Safari can only stay on screen for a maximum of 5 seconds.",
-  "user.settings.notifications.desktop.mentionsFirefoxForever": "개인 메시지와 멘션에 대해 무기한 보여줍니다",
-  "user.settings.notifications.desktop.mentionsFirefoxTimed": "개인 메시지와 멘션에 대해, {seconds}초 동안 보여줍니다.",
   "user.settings.notifications.desktop.mentionsNoSoundForever": "개인 메시지와 멘션에 대해, 소리 없이 무기한 보여줍니다.",
   "user.settings.notifications.desktop.mentionsNoSoundTimed": "개인 메시지와 멘션에 대해, 소리 없이 {seconds}초 동안 보여줍니다.",
   "user.settings.notifications.desktop.mentionsSoundForever": "개인 메시지와 멘션에 대해 무기한 보여줍니다.",
+  "user.settings.notifications.desktop.mentionsSoundHiddenForever": "개인 메시지와 멘션에 대해 무기한 보여줍니다",
+  "user.settings.notifications.desktop.mentionsSoundHiddenTimed": "개인 메시지와 멘션에 대해, {seconds}초 동안 보여줍니다.",
   "user.settings.notifications.desktop.mentionsSoundTimed": "개인 메시지와 멘션에 대해, {seconds}초 동안 보여줍니다.",
   "user.settings.notifications.desktop.seconds": "{seconds}초 동안",
   "user.settings.notifications.desktop.sound": "알림음",
@@ -2363,7 +2471,7 @@
   "user.settings.notifications.sensitiveUsername": "내 사용자명 \"{username}\" (대소문자 구별 안함)",
   "user.settings.notifications.sensitiveWords": "다른 알림받을 단어들을 쉼표로 구분하여 입력: (대소문자 구별 안함)",
   "user.settings.notifications.soundConfig": "브라우저 설정에서 알림 소리를 변경하세요",
-  "user.settings.notifications.sounds_info": "Notification sounds are available on IE11, Edge, Safari, Chrome and Mattermost Desktop Apps.",
+  "user.settings.notifications.sounds_info": "Notification sounds are available on IE11, Safari, Chrome and Mattermost Desktop Apps.",
   "user.settings.notifications.teamWide": "팀 전체 멘션 \"@all\"",
   "user.settings.notifications.title": "알림 설정",
   "user.settings.notifications.wordsTrigger": "멘션 알림",
@@ -2444,6 +2552,28 @@
   "user.settings.security.switchSaml": "SAML SSO을 사용하도록 변경",
   "user.settings.security.title": "보안 설정",
   "user.settings.security.viewHistory": "접속 내역 보기",
+  "user.settings.tokens.cancel": "취소",
+  "user.settings.tokens.clickToEdit": "Click 'Edit' to manage your personal access tokens",
+  "user.settings.tokens.confirmCreateButton": "Yes, Create",
+  "user.settings.tokens.confirmCreateMessage": "You are generating a personal access token with System Admin permissions. Are you sure want to create this token?",
+  "user.settings.tokens.confirmCreateTitle": "Create System Admin Personal Access Token",
+  "user.settings.tokens.confirmDeleteButton": "Yes, Delete",
+  "user.settings.tokens.confirmDeleteMessage": "Any integrations using this token will no longer be able to access the Mattermost API. You cannot undo this action. <br /><br />Are you sure want to delete the <strong>{description}</strong> token?",
+  "user.settings.tokens.confirmDeleteTitle": "Delete Token?",
+  "user.settings.tokens.copy": "Please copy the access token below. You won't be able to see it again!",
+  "user.settings.tokens.create": "Create New Token",
+  "user.settings.tokens.delete": "삭제",
+  "user.settings.tokens.description": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Personal access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>.",
+  "user.settings.tokens.description_mobile": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Personal access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>. Create new tokens on your desktop.",
+  "user.settings.tokens.id": "ID: ",
+  "user.settings.tokens.name": "이름:",
+  "user.settings.tokens.nameHelp": "Enter a description for your token to remember what it does.",
+  "user.settings.tokens.nameRequired": "Please enter a description.",
+  "user.settings.tokens.save": "저장",
+  "user.settings.tokens.title": "Personal Access Tokens",
+  "user.settings.tokens.token": "Access Token: ",
+  "user.settings.tokens.tokenId": "Token ID: ",
+  "user.settings.tokens.userAccessTokensNone": "No personal access tokens.",
   "user_list.notFound": "사용자를 찾을 수 없습니다 :(",
   "user_profile.send.dm": "Send Message",
   "user_profile.webrtc.call": "영상통화 시작",
diff --git a/webapp/i18n/nl.json b/webapp/i18n/nl.json
index d25466bc4..fdab2253c 100644
--- a/webapp/i18n/nl.json
+++ b/webapp/i18n/nl.json
@@ -142,7 +142,7 @@
   "admin.advance.metrics": "Performance Monitoring",
   "admin.audits.reload": "Laad de gebruikeractiviteit logs opnieuw",
   "admin.audits.title": "Gebruiker activiteits logs",
-  "admin.authentication.email": "Email authenticatie",
+  "admin.authentication.email": "Email Authentication",
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
@@ -203,8 +203,6 @@
   "admin.compliance_table.userId": "Aangevraagd door",
   "admin.connectionSecurityNone": "Geen",
   "admin.connectionSecurityNoneDescription": "Mattermost gebruikt een onbeveilgde verbinding.",
-  "admin.connectionSecurityPlain": "PLATTE",
-  "admin.connectionSecurityPlainDescription": "Mattermost gebruikt een onbeveiligde verbinding om te verbinden en authenticeren.",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "Gebruik een bestaand onveilige verbinding en probeerd deze te upgraden naar beveiligde verbinding door middel van TLS.",
   "admin.connectionSecurityTest": "Verbinding testen",
@@ -235,12 +233,60 @@
   "admin.customization.support": "Wettelijk en Ondersteuning",
   "admin.database.title": "Database instellingen",
   "admin.developer.title": "Ontwikkelaars instellingen",
+  "admin.elasticsearch.bulkIndexButton.error": "Failed to schedule Bulk Index Job: {error}",
+  "admin.elasticsearch.connectionUrlDescription": "The address of the Elasticsearch server. {documentationLink}",
+  "admin.elasticsearch.connectionUrlExample": "E.g.: \"https://elasticsearch.example.org:9200\"",
+  "admin.elasticsearch.connectionUrlExample.documentationLinkText": "Please see documentation with server setup instructions.",
+  "admin.elasticsearch.connectionUrlTitle": "Server Connection Address:",
+  "admin.elasticsearch.elasticsearch_test_button": "Verbinding testen",
+  "admin.elasticsearch.enableIndexingDescription": "When true, indexing of new posts occurs automatically. Search queries will use database search until \"Enable Elasticsearch for search queries\" is enabled. {documentationLink}",
+  "admin.elasticsearch.enableIndexingDescription.documentationLinkText": "Learn more about Elasticsearch in our documentation.",
+  "admin.elasticsearch.enableIndexingTitle": "Enable Elasticsearch Indexing:",
+  "admin.elasticsearch.enableSearchingDescription": "Requires a successful connection to the Elasticsearch server. When true, Elasticsearch will be used for all search queries using the latest index. Search results may be incomplete until a bulk index of the existing post database is finished. When false, database search is used.",
+  "admin.elasticsearch.enableSearchingTitle": "Enable Elasticsearch for search queries:",
+  "admin.elasticsearch.indexButton.inProgress": "Indexing in progress",
+  "admin.elasticsearch.indexButton.ready": "Build Index",
+  "admin.elasticsearch.indexHelpText.buildIndex": "All posts in the database will be indexed from oldest to newest. Elasticsearch is available during indexing but search results may be incomplete until the indexing job is complete.",
+  "admin.elasticsearch.indexHelpText.cancelIndexing": "Cancelling stops the indexing job and removes it from the queue. Posts that have already been indexed will not be deleted.",
+  "admin.elasticsearch.noteDescription": "Wanneer u wijzigingen aanbrengt in deze sectie moet de server opnieuw worden opgestart.",
+  "admin.elasticsearch.password": "E.g.: \"yourpassword\"",
+  "admin.elasticsearch.passwordDescription": "(Optional) The password to authenticate to the Elasticsearch server.",
+  "admin.elasticsearch.passwordTitle": "SMTP server wachtwoord:",
+  "admin.elasticsearch.purgeIndexesButton": "Purge Indexes",
+  "admin.elasticsearch.purgeIndexesButton.error": "Failed to purge indexes: {error}",
+  "admin.elasticsearch.purgeIndexesButton.label": "Purge Indexes:",
+  "admin.elasticsearch.purgeIndexesButton.success": "Indexes purged successfully.",
+  "admin.elasticsearch.purgeIndexesHelpText": "Purging will entirely remove the index on the Elasticsearch server. Search results may be incomplete until a bulk index of the existing post database is rebuilt.",
+  "admin.elasticsearch.sniffDescription": "When true, sniffing finds and connects to all data nodes in your cluster automatically.",
+  "admin.elasticsearch.sniffTitle": "Enable Cluster Sniffing:",
+  "admin.elasticsearch.testConfigSuccess": "Test successful. Configuration saved.",
+  "admin.elasticsearch.testHelpText": "Tests if the Mattermost server can connect to the Elasticsearch server specified. Testing the connection only saves the configuration if the test is successful. See log file for more detailed error messages.",
+  "admin.elasticsearch.title": "Elasticsearch (Beta)",
+  "admin.elasticsearch.usernameDescription": "(Optional) The username to authenticate to the Elasticsearch server.",
+  "admin.elasticsearch.usernameExample": "E.g.: \"elastic\"",
+  "admin.elasticsearch.usernameTitle": "SMTP server gebruikersnaam:",
+  "admin.elasticsearchStatus.bulkIndexLabel": "Bulk Indexing:",
+  "admin.elasticsearchStatus.cancelButton": "Annuleren",
+  "admin.elasticsearchStatus.status": "Status",
+  "admin.elasticsearchStatus.statusCancelled": "Indexing job cancelled.",
+  "admin.elasticsearchStatus.statusError": "Indexing error.",
+  "admin.elasticsearchStatus.statusError.help": "Mattermost encountered an error building the Elasticsearch index: {error}",
+  "admin.elasticsearchStatus.statusInProgress": "Job in progress. {percent}% complete.",
+  "admin.elasticsearchStatus.statusInProgress.help": "Indexing is in progress on the job server. If Elasticsearch is enabled, search results may be incomplete until the job is finished.",
+  "admin.elasticsearchStatus.statusIndexingDisabled": "Indexing disabled.",
+  "admin.elasticsearchStatus.statusLoading": "Laden...",
+  "admin.elasticsearchStatus.statusNoJobs": "No indexing jobs queued.",
+  "admin.elasticsearchStatus.statusPending": "Job pending.",
+  "admin.elasticsearchStatus.statusPending.help": "Elasticsearch index job is queued on the job server. If Elasticsearch is enabled, search results may be incomplete until the job is finished.",
+  "admin.elasticsearchStatus.statusRequestCancel": "Canceling Job...",
+  "admin.elasticsearchStatus.statusSuccess": "Indexing complete.",
+  "admin.elasticsearchStatus.statusSuccess.help": "Indexing is complete and new posts are being automatically indexed.",
   "admin.email.agreeHPNS": " Ik begrijp en accepteer de Mattermost Gehoste Push Meldingen Service <a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">Servicevoorwaarden</a> en <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Privacy-beleid</a>.",
   "admin.email.allowEmailSignInDescription": "Indien ingeschakeld dan kunnen gebruikers inloggen in Mattermost met hun e-mailadres en wachtwoord.",
   "admin.email.allowEmailSignInTitle": "Inschakelen van inloggen met email:",
   "admin.email.allowSignupDescription": "Indien gezet dan kan binnen Mattermost teams en accounts gemaakt worden op basis van e-mailadres en wachtwoord. Schakel deze optie uit wanneer aanmelden bepert moet worden op basis van single-sign-on opties zoals OAuth of AD/LDAP.",
   "admin.email.allowSignupTitle": "Inschakelen van het maken van een account met email: ",
-  "admin.email.allowUsernameSignInDescription": "Indien gezet dan kunnen gebruikers lid worden van Mattermost op basis van gebruikersnaam en wachtwoord. Deze optie word meestal gebruikt als e-mailadres verificatie uitgeschakeld is.",
+  "admin.email.allowUsernameSignInDescription": "When true, users with email login can sign in using their username and password. This setting does not affect AD/LDAP login.",
   "admin.email.allowUsernameSignInTitle": "Inschakelen van inloggen met gebruikersnaam: ",
   "admin.email.connectionSecurityTest": "Verbinding testen",
   "admin.email.easHelp": "Meer informatie over het maken en implementeren van uw eigen mobiele apps van een <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target=\"_blank\">Enterprise App Store</a>.",
@@ -248,18 +294,26 @@
   "admin.email.emailSuccess": "Het versturen van een e-mail lijkt foutloos verlopen. Controleer de mail ter bevestiging.",
   "admin.email.enableEmailBatching.clusterEnabled": "Bulk email kan niet worden aangezet als de High Availability modus aan staat.",
   "admin.email.enableEmailBatching.siteURL": "Niet mogelijk om bulk email aan te zetten als de SiteURL niet is ingevuld in <b>Configuratie > SiteURL</b>.",
-  "admin.email.enableEmailBatchingDesc": "Wanneer aangezet kunnen gebruikers email notificaties krijgen van meerdere directe berichten en vermeldingen in 1 email, configureerbaar in <b>Account Instellingen > Notificaties</b>",
+  "admin.email.enableEmailBatchingDesc": "When true, users will have email notifications for multiple direct messages and mentions combined into a single email. Batching will occur at a default interval of 15 minutes, configurable in Account Settings > Notifications.",
   "admin.email.enableEmailBatchingTitle": "Aanzetten Bulk Email:",
+  "admin.email.enableSMTPAuthDesc": "When enabled, username and password are used for authenticating to the SMTP server.",
+  "admin.email.enableSMTPAuthTitle": "Enable SMTP Authentication:",
   "admin.email.fullPushNotification": "Stuur een bericht met samenvatting",
+  "admin.email.genericNoChannelPushNotification": "Send generic description with only sender name",
   "admin.email.genericPushNotification": "Stuur een algemeen bericht met de gebruiker en kanaal namen",
   "admin.email.inviteSaltDescription": "32-karakter 'salt' word gebruikt voor het versturen van e-mail uitnodigingen. Deze worden willekeurig gegenereerd tijdens de installatie. Klik op \"Opnieuw Genereren\" om een nieuwe 'salt' te maken.",
   "admin.email.inviteSaltExample": "Bijv.: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.inviteSaltTitle": "Email uitnodiging salt:",
   "admin.email.mhpns": "Gebruik de versleutelde aansluiting op HPNS van productie-kwaliteit voor iOS-en Android-apps",
-  "admin.email.mhpnsHelp": "Download <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target=\"_blank\">Mattermost iOS-app</a> van iTunes. Download <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target=\"_blank\">Mattermost Android app</a> uit Google Play. Meer informatie over <a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target=\"_blank\">HPNS</a>.",
+  "admin.email.mhpnsHelp": "Download <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target=\"_blank\">Mattermost iOS-app</a> van iTunes. Download <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target=\"_blank\">Mattermost Android app</a> uit Google Play. Meer informatie over <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target=\"_blank\">TPNS</a>.",
   "admin.email.mtpns": "Gebruik van iOS-en Android-apps in iTunes en de Google Play met TPNS",
   "admin.email.mtpnsHelp": "Download <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target=\"_blank\">Mattermost iOS-app</a> van iTunes. Download <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target=\"_blank\">Mattermost Android app</a> uit Google Play. Meer informatie over <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target=\"_blank\">TPNS</a>.",
   "admin.email.nofificationOrganizationExample": "Bijvoorbeeld \"© 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.generic": "Send generic description with only sender name",
+  "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": "Push meldings-berichten:",
   "admin.email.notificationDisplayDescription": "Weergavenaam van e-mail account word gebruikt tijdens het versturen van meldings-e-mails vanuit Mattermost.",
   "admin.email.notificationDisplayExample": "Bijv.: \"Mattermost Melding\", \"Systeem\", \"Niet-Antwoorden\"",
   "admin.email.notificationDisplayTitle": "Meldings-weergave naam:",
@@ -274,7 +328,7 @@
   "admin.email.passwordSaltDescription": "32-karakter 'salt' wordt gebruikt om wachtwoord reset mails te beveiligen. Deze wordt tijdens installatie aangemaakt. Klik op \"Opnieuw Genereren\" om een nieuwe 'salt' te maken.",
   "admin.email.passwordSaltExample": "Bijv.: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "Wachtwoord reset 'salt':",
-  "admin.email.pushContentDesc": "Het selecteren van \"Verzend algemene beschrijving met de gebruiker en kanaal namen\" biedt push-notificaties met generieke berichten, met inbegrip van de namen van de gebruikers en kanalen, maar geen specifieke details uit de tekst van het bericht. <br /> <br /> \"Verstuur volledige bericht snippet\" stuurt uittreksels uit berichten die worden getriggered door notificaties met specifieke kenmerken en kunnen vertrouwelijke informatie bevatten. Als uw Push Notification Service zich buiten een firewall bevindt, is het STERK AANBEVOLEN deze optie alleen te gebruiken met een 'https' protocol om de verbinding te versleutelen.",
+  "admin.email.pushContentDesc": "\"Send generic description with only sender name\" includes only the name of the person who sent the message in push notifications, with no information about channel name or message contents.<br /><br />\"Send generic description with sender and channel names\" includes the name of the person who sent the message and the channel it was sent in, but not the message text.<br /><br />\"Send full message snippet\" includes a message excerpt in push notifications, which may contain confidential information sent in messages. If your Push Notification Service is outside your firewall, it is *highly recommended* this option only be used with an \"https\" protocol to encrypt the connection.",
   "admin.email.pushContentTitle": "Push meldings-berichten:",
   "admin.email.pushDesc": "Meestal ingesteld op ingeschakeld in productie. Wanneer dit ingeschakeld is, zal Mattermost iOS-en Android-push-berichten verzenden via de push meldings-server.",
   "admin.email.pushOff": "Verstuur geen meldings-notificaties",
@@ -288,7 +342,7 @@
   "admin.email.selfPush": "Voer de locatie van de push meldingen service handmatig in",
   "admin.email.skipServerCertificateVerification.description": "When true, Mattermost will not verify the email server certificate.",
   "admin.email.skipServerCertificateVerification.title": "Overslaan van certificaat verificatie:",
-  "admin.email.smtpPasswordDescription": " Vraag de credentials op bij de beheerder van de e-mail server.",
+  "admin.email.smtpPasswordDescription": "The password associated with the SMTP username.",
   "admin.email.smtpPasswordExample": "Bijv. \"uwwachtwoord\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "SMTP server wachtwoord:",
   "admin.email.smtpPortDescription": "De poort van de SMTP (mailserver).",
@@ -297,13 +351,17 @@
   "admin.email.smtpServerDescription": "Naam of ip adres van de SMTP (mail)server.",
   "admin.email.smtpServerExample": "Bijv. \"smtp.uwbedrijf.nl\", \"email-smtp.us-east-1.amazonaws.com\"",
   "admin.email.smtpServerTitle": "SMTP (mail)server:",
-  "admin.email.smtpUsernameDescription": " Vraag de credentials op bij de beheerder van de e-mail server.",
+  "admin.email.smtpUsernameDescription": "The username for authenticating to the SMTP server.",
   "admin.email.smtpUsernameExample": "Bv. \"beheerder@uwbedrijf.nl\", \"AKIADTOVBGERKLCBV\"",
   "admin.email.smtpUsernameTitle": "SMTP server gebruikersnaam:",
   "admin.email.testing": "Testen...",
   "admin.false": "uitgeschakeld",
-  "admin.file.enableFileAttachments": "Enable File Attachments:",
-  "admin.file.enableFileAttachmentsDesc": "When false, disable file and image uploads on messages.",
+  "admin.file.enableFileAttachments": "Allow File Sharing:",
+  "admin.file.enableFileAttachmentsDesc": "When false, disables file sharing on the server. All file and image uploads on messages are forbidden across clients and devices, including mobile.",
+  "admin.file.enableMobileDownloadDesc": "When false, disables file downloads on mobile apps. Users can still download files from a mobile web browser.",
+  "admin.file.enableMobileDownloadTitle": "Allow File Downloads on Mobile:",
+  "admin.file.enableMobileUploadDesc": "When false, disables file uploads on mobile apps. If Allow File Sharing is set to true, users can still upload files from a mobile web browser.",
+  "admin.file.enableMobileUploadTitle": "Allow File Uploads on Mobile:",
   "admin.file_upload.chooseFile": "Kies een bestand",
   "admin.file_upload.noFile": "Geen bestand geüpload",
   "admin.file_upload.uploadFile": "Upload",
@@ -529,6 +587,21 @@
   "admin.logs.bannerDesc": "To look up users by User 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>.",
+  "admin.manage_roles.allowUserAccessTokens": "Allow this account to generate <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a>.",
+  "admin.manage_roles.cancel": "Annuleren",
+  "admin.manage_roles.manageRolesTitle": "Manage Roles",
+  "admin.manage_roles.postAllPublicRole": "Access to post to all Mattermost public channels.",
+  "admin.manage_roles.postAllPublicRoleTitle": "post:channels",
+  "admin.manage_roles.postAllRole": "Access to post to all Mattermost channels including direct messages.",
+  "admin.manage_roles.postAllRoleTitle": "post:all",
+  "admin.manage_roles.save": "Opslaan",
+  "admin.manage_roles.saveError": "Unable to save roles.",
+  "admin.manage_roles.systemAdmin": "Systeem beheerder",
+  "admin.manage_roles.systemMember": "Lid",
+  "admin.manage_tokens.manageTokensTitle": "Manage Personal Access Tokens",
+  "admin.manage_tokens.userAccessTokensDescription": "Personal access tokens function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">interact with this Mattermost server</a>. Learn more about <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a>.",
+  "admin.manage_tokens.userAccessTokensNone": "No personal access tokens.",
   "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>documentation</a> to learn more about configuring performance monitoring for Mattermost.",
   "admin.metrics.enableTitle": "Enable Performance Monitoring:",
   "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
@@ -574,6 +647,19 @@
   "admin.password.requirementsDescription": "Karakter types voor een geldig wachtwoord.",
   "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.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.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.userDescription": "Select the username that this integration is attached to.",
+  "admin.plugins.jira.userLabel": "Gebruikers",
+  "admin.plugins.jira.webhookDocsLink": "documentatie",
   "admin.privacy.showEmailDescription": "When false, hides the email address of members from everyone except System Administrators.",
   "admin.privacy.showEmailTitle": "Toon e-mail adres: ",
   "admin.privacy.showFullNameDescription": "When false, hides the full name of members from everyone except System Administrators. Username is shown in place of full name.",
@@ -751,6 +837,10 @@
   "admin.service.tlsKeyFileDescription": "The private key file to use.",
   "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": "Name: ",
+  "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.userAccessTokensIdLabel": "Token ID: ",
+  "admin.service.userAccessTokensTitle": "Enable Personal Access Tokens: ",
   "admin.service.webSessionDays": "Sessie duur voor AD/LDAP en email (dagen):",
   "admin.service.webSessionDaysDesc": "Het aantal dagen dat de gebruiker voor het laatst zijn credentials heeft ingevoerd voordat gebruikers sessie verloopt. Nadat deze instelling is gewijzigd, zal de nieuwe sessie lengte plaatsvinden de volgende keer de gebruiker zijn credentials invult. ",
   "admin.service.webhooksDescription": "Wanneer dit aanstaat, inkomende webhooks worden toegestaan. Om combat phishing aanvallen tegen te gaan zullen alle berichten worden gelabeld met een BOT tag. Bekijk de <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>documentatie</a> om hier meer over te lezen.",
@@ -769,6 +859,7 @@
   "admin.sidebar.customization": "Customisatie",
   "admin.sidebar.database": "Database",
   "admin.sidebar.developer": "Ontwikkelaar",
+  "admin.sidebar.elasticsearch": "Elasticsearch (Beta)",
   "admin.sidebar.email": "E-mail",
   "admin.sidebar.emoji": "Emoji",
   "admin.sidebar.external": "Externe services",
@@ -776,6 +867,7 @@
   "admin.sidebar.general": "Algemeen",
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.integrations": "Integraties",
+  "admin.sidebar.jira": "JIRA (Beta)",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Wettelijk en Ondersteuning",
   "admin.sidebar.license": "Editie en Licentie",
@@ -883,9 +975,9 @@
   "admin.team.restrictTitle": "Beperkt het aanmaken van accounts tot de volgende e-mail domeinen:",
   "admin.team.restrict_direct_message_any": "Elke gebruiker van de Mattermost server",
   "admin.team.restrict_direct_message_team": "Elke gebruiker van het team",
-  "admin.team.showFullname": "Show first and last name (default)",
+  "admin.team.showFullname": "Toon voornaam en achternaam",
   "admin.team.showNickname": "Toon bijnaam, indien aanwezig, anders voor- en achternaam",
-  "admin.team.showUsername": "Show username",
+  "admin.team.showUsername": "Toon gebruikersnaam (standaard)",
   "admin.team.siteNameDescription": "Naam van de site welke getoond wordt op inlog- en andere schermen.",
   "admin.team.siteNameExample": "Bijv.: \"Mattermost\"",
   "admin.team.siteNameTitle": "Site naam:",
@@ -915,7 +1007,9 @@
   "admin.user_item.makeMember": "Maak lid",
   "admin.user_item.makeSysAdmin": "Maak systeembeheerder",
   "admin.user_item.makeTeamAdmin": "Maak team beheerder",
+  "admin.user_item.manageRoles": "Manage Roles",
   "admin.user_item.manageTeams": "Manage Teams",
+  "admin.user_item.manageTokens": "Manage Tokens",
   "admin.user_item.member": "Lid",
   "admin.user_item.mfaNo": ", <strong>MFA</strong>: Nee",
   "admin.user_item.mfaYes": ", <strong>MFA</strong>: Ja",
@@ -924,6 +1018,9 @@
   "admin.user_item.switchToEmail": "Overschakelen naar e-mail/wachtwoord",
   "admin.user_item.sysAdmin": "Systeem beheerder",
   "admin.user_item.teamAdmin": "Team beheerder",
+  "admin.user_item.userAccessTokenPostAll": "(with post:all personal access tokens)",
+  "admin.user_item.userAccessTokenPostAllPublic": "(with post:channels personal access tokens)",
+  "admin.user_item.userAccessTokenYes": "(with personal access tokens)",
   "admin.webrtc.enableDescription": "When true, Mattermost allows making <strong>one-on-one</strong> video calls. WebRTC calls are available on Chrome, Firefox and Mattermost Desktop Apps.",
   "admin.webrtc.enableTitle": "Aanzetten Mattermost WebRTC: ",
   "admin.webrtc.gatewayAdminSecretDescription": "Enter your admin secret password to access the Gateway Admin URL.",
@@ -1255,7 +1352,7 @@
   "delete_channel.cancel": "Annuleren",
   "delete_channel.confirm": "Bevestig het WISSEN van het kanaal",
   "delete_channel.del": "Verwijderen",
-  "delete_channel.question": "This will delete the channel from the team and make its contents inaccessible for all users. Are you sure you wish to delete the {display_name} channel?",
+  "delete_channel.question": "This will delete the channel from the team and make its contents inaccessible for all users. <br /><br />Are you sure you wish to delete the <strong>{display_name}</strong> channel?",
   "delete_post.cancel": "Annuleren",
   "delete_post.comment": "Commentaar",
   "delete_post.confirm": "Bevestig {term} verwijdering",
@@ -1314,14 +1411,14 @@
   "emoji_picker.custom": "Custom",
   "emoji_picker.emojiPicker": "Emoji Picker",
   "emoji_picker.flags": "Markeer",
-  "emoji_picker.food": "Food",
+  "emoji_picker.foods": "Foods",
   "emoji_picker.nature": "Nature",
   "emoji_picker.objects": "Objects",
   "emoji_picker.people": "People",
+  "emoji_picker.places": "Places",
   "emoji_picker.recent": "Recently Used",
   "emoji_picker.search": "Zoeken",
   "emoji_picker.symbols": "Symbols",
-  "emoji_picker.travel": "Travel",
   "error.local_storage.help1": "Enable cookies",
   "error.local_storage.help2": "Turn off private browsing",
   "error.local_storage.help3": "Use a supported browser (IE 11, Chrome 43+, Firefox 38+, Safari 9, Edge)",
@@ -1688,6 +1785,10 @@
   "mobile.account_notifications.threads_mentions": "Mentions in threads",
   "mobile.account_notifications.threads_start": "Threads that I start",
   "mobile.account_notifications.threads_start_participate": "Threads that I start or participate in",
+  "mobile.advanced_settings.reset_button": "Reset",
+  "mobile.advanced_settings.reset_message": "\nThis will reset all offline data and restart the app. You will be automatically logged back in once the app restarts.\n",
+  "mobile.advanced_settings.reset_title": "Reset Cache",
+  "mobile.advanced_settings.title": "Geavanceerde instellingen",
   "mobile.channel_drawer.search": "Jump to a conversation",
   "mobile.channel_info.alertMessageDeleteChannel": "Weet u zeker dat u deze {term} wilt verwijderen?",
   "mobile.channel_info.alertMessageLeaveChannel": "Weet u zeker dat u deze {term} wilt verwijderen?",
@@ -1741,11 +1842,17 @@
   "mobile.loading_members": "Loading Members...",
   "mobile.loading_posts": "Laad meer berichten",
   "mobile.login_options.choose_title": "Choose your login method",
+  "mobile.more_dms.start": "Start",
+  "mobile.more_dms.title": "New Conversation",
+  "mobile.notice_mobile_link": "mobile apps",
+  "mobile.notice_platform_link": "platform",
+  "mobile.notice_text": "Mattermost is made possible by the open source software used in our {platform} and {mobile}.",
   "mobile.notification.in": " in ",
   "mobile.offlineIndicator.connected": "Connected",
   "mobile.offlineIndicator.connecting": "Verbindingen",
   "mobile.offlineIndicator.offline": "No internet connection",
   "mobile.open_dm.error": "We couldn't open a direct message with {displayName}. Please check your connection and try again.",
+  "mobile.open_gm.error": "We couldn't open a group message with those users. Please check your connection and try again.",
   "mobile.post.cancel": "Annuleren",
   "mobile.post.delete_question": "Weet u zeker dat u deze {term} wilt verwijderen?",
   "mobile.post.delete_title": "Delete Post",
@@ -1775,6 +1882,8 @@
   "mobile.routes.thread_dm": "Direct Message Thread",
   "mobile.routes.user_profile": "Profile",
   "mobile.routes.user_profile.send_message": "Send Message",
+  "mobile.search.jump": "JUMP",
+  "mobile.search.no_results": "No Results Found",
   "mobile.select_team.choose": "Je teams:",
   "mobile.select_team.join_open": "Open teams you can join",
   "mobile.select_team.no_teams": "There are no available teams for you to join.",
@@ -1788,6 +1897,7 @@
   "mobile.settings.clear_button": "Clear",
   "mobile.settings.clear_message": "\nThis will clear all offline data and restart the app. You will be automatically logged back in once the app restarts.\n",
   "mobile.settings.team_selection": "Team Selectie",
+  "mobile.suggestion.members": " Leden",
   "modal.manaul_status.ask": "Do not ask me again",
   "modal.manaul_status.button": "Yes, set my status to \"Online\"",
   "modal.manaul_status.cancel": "No, keep it as \"{status}\"",
@@ -1884,6 +1994,8 @@
   "post_focus_view.beginning": "Begin van de kanaal archieven",
   "post_info.del": "Verwijderen",
   "post_info.edit": "Bewerken",
+  "post_info.message.visible": "(Only visible to you)",
+  "post_info.message.visible.compact": " (Only visible to you)",
   "post_info.mobile.flag": "Markeer",
   "post_info.mobile.unflag": "Demarkeer ",
   "post_info.permalink": "Permanente koppeling",
@@ -1896,7 +2008,7 @@
   "posts_view.loadMore": "Laad meer berichten",
   "posts_view.loadingMore": "Laad meer berichten",
   "posts_view.newMsg": "Nieuwe berichten",
-  "posts_view.newMsgBelow": "New {count, plural, one {message} other {messages}} below",
+  "posts_view.newMsgBelow": "New {count, plural, one {message} other {messages}}",
   "quick_switch_modal.channels": "Kanalen",
   "quick_switch_modal.channelsShortcut.mac": "- ⌘K",
   "quick_switch_modal.channelsShortcut.windows": "- CTRL+K",
@@ -1928,7 +2040,7 @@
   "rename_channel.displayNameHolder": "Voer de weergavenaam in",
   "rename_channel.handleHolder": "Kan enkel kleine letters en nummers zijn",
   "rename_channel.lowercase": "Kan enkel kleine letters en nummers zijn",
-  "rename_channel.maxLength": "Dit veld moet minder dan 22 tekens bevatten",
+  "rename_channel.maxLength": "This field must be less than {maxLength, number} characters",
   "rename_channel.required": "Dit veld is verplicht",
   "rename_channel.save": "Opslaan",
   "rename_channel.title": "Hernoem kanaal...",
@@ -1967,6 +2079,7 @@
   "search_item.jump": "Spring",
   "search_results.because": "<ul><li>Wanneer u op zoek bent naar een gedeeltelijk woord (bijv. zoek naar \"tele\", op zoek naar \"telefooon\" of \"televisie\"), moet u een * aan de zoekterm toevoegen</li><li>Zoekopdrachten van 2 letters en algemene woorden zoals \"dit\", \"een\", \"het\" verschijnen niet in de zoekresultaten</li></ul>",
   "search_results.noResults": "Geen resultaten gevonden. Opnieuw proberen?",
+  "search_results.searching": "Searching...",
   "search_results.usage": "<ul><li>Gebruik <b>\"aanhalingstekens\"</b> om hele zinnen te zoeken</li><li>Gebruik <b>van:</b> om berichten van specifieke gebruikers te zoeken en <b>in:</b> om berichten in specifieke kanalen te zoeken</li></ul>",
   "search_results.usageFlag1": "Je hebt nog geen berichten gemarkeerd.",
   "search_results.usageFlag2": "Je kan berichten en reacties markeren door te klikken op het  ",
@@ -1999,8 +2112,7 @@
   "sidebar.tutorialScreen1": "<h4>Kanalen</h4><p><strong>Kanalen</strong> organiseren conversaties in verschillende onderwerpen. Ze zijn open voor iedereen in je team. Om privéberichten te sturen, gebruik <strong>Directe Berichten</strong> voor een enkel persoon of <strong>Privé Groepen</strong> voor meerdere personen.</p>",
   "sidebar.tutorialScreen2": "<h4>\"{townsquare}\" en \"{offtopic}\" kanalen</h4><p>Hier zijn 2 publieke kanalen om te starten:</p><p><strong>{townsquare}</strong> is een plaats voor team wijde communicatie. Iedereen in jouw team is lid van dit kanaal.</p><p><strong>{offtopic}</strong> is een plaats voor ontspanning en humor buiten werk gerelateerde zaken en kanalen. Jij en jouw team kunnen beslissen wel andere kanalen er gemaakt moeten worden.</p>",
   "sidebar.tutorialScreen3": "<h4>Kanalen maken en lid worden</h4><p>Klik op <strong>\"Meer...\"</strong> om een nieuw kanaal te maken of lid te worden van een bestaand kanaal.</p><p>Je kan ook een nieuw kanaal of privégroep maken door op het <strong>\"+\"-teken</strong> naast het kanaal of de privégroep te drukken.</p>",
-  "sidebar.unreadAbove": "Ongelezen bericht(en) hierboven",
-  "sidebar.unreadBelow": "Ongelezen bericht(en) hierbeneden",
+  "sidebar.unreads": "More unreads",
   "sidebar_header.tutorial": "<h4>Hoofdmenu</h4><p>Het <strong>Hoofdmenu</strong> is waar je kan  <strong>Uitnodigen van Nieuwe Leden</strong>, toegang tot jouw <strong>Account Instellingen</strong> en instellen van jouw  <strong>Thema Kleur</strong>.</p><p>Team admins kunnen ook hun <strong>Team Instellngen</strong>  instellen via dit menu.</p><p>Systeem admins vinden hier een <strong>Systeem Console</strong> optie om het hele systeem te beheren.</p>",
   "sidebar_right_menu.accountSettings": "Account instellingen",
   "sidebar_right_menu.addMemberToTeam": "Add Members to Team",
@@ -2220,10 +2332,6 @@
   "user.settings.display.nameOptsDesc": "Geef aan hoe de gebruikersnaam word weergegeven in berichten en de Directe Berichten lijst. ",
   "user.settings.display.normalClock": "12 uren klok (bijvoorbeeld: 4:00 PM)",
   "user.settings.display.preferTime": "Selecteer hoe u de tijd wilt zien.",
-  "user.settings.display.showFullname": "Toon voornaam en achternaam",
-  "user.settings.display.showNickname": "Toon bijnaam, indien aanwezig, anders voor- en achternaam",
-  "user.settings.display.showUsername": "Toon gebruikersnaam (standaard)",
-  "user.settings.display.teammateNameDisplay": "Naamweergave van teamgenoten",
   "user.settings.display.theme.applyToAllTeams": "Apply new theme to all my teams",
   "user.settings.display.theme.customTheme": "Aangepast thema",
   "user.settings.display.theme.describe": "Open om uw thema te beheren",
@@ -2320,19 +2428,19 @@
   "user.settings.notifications.commentsNever": "Trigger geen notificaties in berichten in antwoord lijsten tenzij ik word genoemd",
   "user.settings.notifications.commentsRoot": "Trigger notificaties in berichten die ik ben begonnen",
   "user.settings.notifications.desktop": "Verstuur desktop meldingen",
-  "user.settings.notifications.desktop.allFirefoxForever": "Voor alle activiteit, onbeperkt tonen",
-  "user.settings.notifications.desktop.allFirefoxTimed": "Voor alle activiteit, tonen voor {seconds} secondes",
   "user.settings.notifications.desktop.allNoSoundForever": "Voor alle activiteit, zonder geluid, onbeperkt tonen",
   "user.settings.notifications.desktop.allNoSoundTimed": "Voor alle activiteit, zonder geluid, tonen voor {seconds} secondes",
   "user.settings.notifications.desktop.allSoundForever": "Voor alle activiteit, met geluid, onbeperkt tonen ",
+  "user.settings.notifications.desktop.allSoundHiddenForever": "Voor alle activiteit, onbeperkt tonen",
+  "user.settings.notifications.desktop.allSoundHiddenTimed": "Voor alle activiteit, tonen voor {seconds} secondes",
   "user.settings.notifications.desktop.allSoundTimed": "Voor alle activiteit, met geluid, tonen voor {seconds} secondes",
   "user.settings.notifications.desktop.duration": "Duur van notificatie",
   "user.settings.notifications.desktop.durationInfo": "Sets how long desktop notifications will remain on screen when using Firefox or Chrome. Desktop notifications in Edge and Safari can only stay on screen for a maximum of 5 seconds.",
-  "user.settings.notifications.desktop.mentionsFirefoxForever": "Voor vermeldingen en directe berichten, toon altijd",
-  "user.settings.notifications.desktop.mentionsFirefoxTimed": "Voor vermeldingen en directe berichten, toon voor {seconds} secondes",
   "user.settings.notifications.desktop.mentionsNoSoundForever": "Voor vermeldingen en directe berichten, zonder geluid, toon altijd",
   "user.settings.notifications.desktop.mentionsNoSoundTimed": "Voor vermeldingen en directe berichten, zonder geluid, toon voor {seconds} secondes",
   "user.settings.notifications.desktop.mentionsSoundForever": "Voor vermeldingen en directe berichten, met geluid, toon altijd",
+  "user.settings.notifications.desktop.mentionsSoundHiddenForever": "Voor vermeldingen en directe berichten, toon altijd",
+  "user.settings.notifications.desktop.mentionsSoundHiddenTimed": "Voor vermeldingen en directe berichten, toon voor {seconds} secondes",
   "user.settings.notifications.desktop.mentionsSoundTimed": "Voor vermeldingen en directe berichten, zonder geluid, toon voor {seconds} secondes",
   "user.settings.notifications.desktop.seconds": "{seconds} secondes",
   "user.settings.notifications.desktop.sound": "Notificatie geluid",
@@ -2363,7 +2471,7 @@
   "user.settings.notifications.sensitiveUsername": "Uw niet-hoofdlettergevoelige gebruikersnaam \"{username}\"",
   "user.settings.notifications.sensitiveWords": "Andere niet-hoofdlettergevoelige woorden, gescheiden door komma's:",
   "user.settings.notifications.soundConfig": "Configureer de meldings-geluiden in de instellingen van uw browser",
-  "user.settings.notifications.sounds_info": "Notification sounds are available on IE11, Edge, Safari, Chrome and Mattermost Desktop Apps.",
+  "user.settings.notifications.sounds_info": "Notification sounds are available on IE11, Safari, Chrome and Mattermost Desktop Apps.",
   "user.settings.notifications.teamWide": "Team-vermeldingen \"@all\"",
   "user.settings.notifications.title": "Meldings-instellingen",
   "user.settings.notifications.wordsTrigger": "Woorden die een vermelding triggeren",
@@ -2444,6 +2552,28 @@
   "user.settings.security.switchSaml": "Overschakelen naar SAML SSO",
   "user.settings.security.title": "Beveiligingsinstellingen",
   "user.settings.security.viewHistory": "Bekijk Toegang Geschiedenis ",
+  "user.settings.tokens.cancel": "Annuleren",
+  "user.settings.tokens.clickToEdit": "Click 'Edit' to manage your personal access tokens",
+  "user.settings.tokens.confirmCreateButton": "Yes, Create",
+  "user.settings.tokens.confirmCreateMessage": "You are generating a personal access token with System Admin permissions. Are you sure want to create this token?",
+  "user.settings.tokens.confirmCreateTitle": "Create System Admin Personal Access Token",
+  "user.settings.tokens.confirmDeleteButton": "Yes, Delete",
+  "user.settings.tokens.confirmDeleteMessage": "Any integrations using this token will no longer be able to access the Mattermost API. You cannot undo this action. <br /><br />Are you sure want to delete the <strong>{description}</strong> token?",
+  "user.settings.tokens.confirmDeleteTitle": "Delete Token?",
+  "user.settings.tokens.copy": "Please copy the access token below. You won't be able to see it again!",
+  "user.settings.tokens.create": "Create New Token",
+  "user.settings.tokens.delete": "Verwijderen",
+  "user.settings.tokens.description": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Personal access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>.",
+  "user.settings.tokens.description_mobile": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Personal access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>. Create new tokens on your desktop.",
+  "user.settings.tokens.id": "ID: ",
+  "user.settings.tokens.name": "Naam:",
+  "user.settings.tokens.nameHelp": "Enter a description for your token to remember what it does.",
+  "user.settings.tokens.nameRequired": "Please enter a description.",
+  "user.settings.tokens.save": "Opslaan",
+  "user.settings.tokens.title": "Personal Access Tokens",
+  "user.settings.tokens.token": "Access Token: ",
+  "user.settings.tokens.tokenId": "Token ID: ",
+  "user.settings.tokens.userAccessTokensNone": "No personal access tokens.",
   "user_list.notFound": "Geen gebruikers gevonden",
   "user_profile.send.dm": "Send Message",
   "user_profile.webrtc.call": "Start een video-oproep",
diff --git a/webapp/i18n/pl.json b/webapp/i18n/pl.json
index 8bd4c96cc..834ad32dc 100644
--- a/webapp/i18n/pl.json
+++ b/webapp/i18n/pl.json
@@ -142,7 +142,7 @@
   "admin.advance.metrics": "Monitorowanie Wydajności",
   "admin.audits.reload": "Odśwież statystyki aktywności użytkownika",
   "admin.audits.title": "Statystyki aktywności użytkownika",
-  "admin.authentication.email": "Uwierzytelnienie email",
+  "admin.authentication.email": "Email Authentication",
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
@@ -203,8 +203,6 @@
   "admin.compliance_table.userId": "Żądane przez",
   "admin.connectionSecurityNone": "Brak",
   "admin.connectionSecurityNoneDescription": "Mattermost będzie łączył się przez niezabezpieczone połączenie.",
-  "admin.connectionSecurityPlain": "PLAIN",
-  "admin.connectionSecurityPlainDescription": "Mattermost będzie łączył się i autoryzował przez niezabezpieczone połączenie.",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "Wykorzystuje bieżące niezabezpieczone połączenie i próbuje przekształcić je w bezpieczne połączenie używające TLS.",
   "admin.connectionSecurityTest": "Sprawdź połączenie",
@@ -235,12 +233,60 @@
   "admin.customization.support": "Informacje prawne i wsparcie",
   "admin.database.title": "Ustawienia bazy danych",
   "admin.developer.title": "Ustawienia deweloperów",
+  "admin.elasticsearch.bulkIndexButton.error": "Failed to schedule Bulk Index Job: {error}",
+  "admin.elasticsearch.connectionUrlDescription": "The address of the Elasticsearch server. {documentationLink}",
+  "admin.elasticsearch.connectionUrlExample": "E.g.: \"https://elasticsearch.example.org:9200\"",
+  "admin.elasticsearch.connectionUrlExample.documentationLinkText": "Please see documentation with server setup instructions.",
+  "admin.elasticsearch.connectionUrlTitle": "Server Connection Address:",
+  "admin.elasticsearch.elasticsearch_test_button": "Sprawdź połączenie",
+  "admin.elasticsearch.enableIndexingDescription": "When true, indexing of new posts occurs automatically. Search queries will use database search until \"Enable Elasticsearch for search queries\" is enabled. {documentationLink}",
+  "admin.elasticsearch.enableIndexingDescription.documentationLinkText": "Learn more about Elasticsearch in our documentation.",
+  "admin.elasticsearch.enableIndexingTitle": "Enable Elasticsearch Indexing:",
+  "admin.elasticsearch.enableSearchingDescription": "Requires a successful connection to the Elasticsearch server. When true, Elasticsearch will be used for all search queries using the latest index. Search results may be incomplete until a bulk index of the existing post database is finished. When false, database search is used.",
+  "admin.elasticsearch.enableSearchingTitle": "Enable Elasticsearch for search queries:",
+  "admin.elasticsearch.indexButton.inProgress": "Indexing in progress",
+  "admin.elasticsearch.indexButton.ready": "Build Index",
+  "admin.elasticsearch.indexHelpText.buildIndex": "All posts in the database will be indexed from oldest to newest. Elasticsearch is available during indexing but search results may be incomplete until the indexing job is complete.",
+  "admin.elasticsearch.indexHelpText.cancelIndexing": "Cancelling stops the indexing job and removes it from the queue. Posts that have already been indexed will not be deleted.",
+  "admin.elasticsearch.noteDescription": "Zmiana właściwości w tej sekcji będzie wymagała restartu serwera aby zaczęły one działać.",
+  "admin.elasticsearch.password": "E.g.: \"yourpassword\"",
+  "admin.elasticsearch.passwordDescription": "(Optional) The password to authenticate to the Elasticsearch server.",
+  "admin.elasticsearch.passwordTitle": "Hasło serwera SMTP:",
+  "admin.elasticsearch.purgeIndexesButton": "Purge Indexes",
+  "admin.elasticsearch.purgeIndexesButton.error": "Failed to purge indexes: {error}",
+  "admin.elasticsearch.purgeIndexesButton.label": "Purge Indexes:",
+  "admin.elasticsearch.purgeIndexesButton.success": "Indexes purged successfully.",
+  "admin.elasticsearch.purgeIndexesHelpText": "Purging will entirely remove the index on the Elasticsearch server. Search results may be incomplete until a bulk index of the existing post database is rebuilt.",
+  "admin.elasticsearch.sniffDescription": "When true, sniffing finds and connects to all data nodes in your cluster automatically.",
+  "admin.elasticsearch.sniffTitle": "Enable Cluster Sniffing:",
+  "admin.elasticsearch.testConfigSuccess": "Test successful. Configuration saved.",
+  "admin.elasticsearch.testHelpText": "Tests if the Mattermost server can connect to the Elasticsearch server specified. Testing the connection only saves the configuration if the test is successful. See log file for more detailed error messages.",
+  "admin.elasticsearch.title": "Elasticsearch (Beta)",
+  "admin.elasticsearch.usernameDescription": "(Optional) The username to authenticate to the Elasticsearch server.",
+  "admin.elasticsearch.usernameExample": "E.g.: \"elastic\"",
+  "admin.elasticsearch.usernameTitle": "Nazwa użytkownika SMTP:",
+  "admin.elasticsearchStatus.bulkIndexLabel": "Bulk Indexing:",
+  "admin.elasticsearchStatus.cancelButton": "Anuluj",
+  "admin.elasticsearchStatus.status": "Stan",
+  "admin.elasticsearchStatus.statusCancelled": "Indexing job cancelled.",
+  "admin.elasticsearchStatus.statusError": "Indexing error.",
+  "admin.elasticsearchStatus.statusError.help": "Mattermost encountered an error building the Elasticsearch index: {error}",
+  "admin.elasticsearchStatus.statusInProgress": "Job in progress. {percent}% complete.",
+  "admin.elasticsearchStatus.statusInProgress.help": "Indexing is in progress on the job server. If Elasticsearch is enabled, search results may be incomplete until the job is finished.",
+  "admin.elasticsearchStatus.statusIndexingDisabled": "Indexing disabled.",
+  "admin.elasticsearchStatus.statusLoading": "Ładowanie...",
+  "admin.elasticsearchStatus.statusNoJobs": "No indexing jobs queued.",
+  "admin.elasticsearchStatus.statusPending": "Job pending.",
+  "admin.elasticsearchStatus.statusPending.help": "Elasticsearch index job is queued on the job server. If Elasticsearch is enabled, search results may be incomplete until the job is finished.",
+  "admin.elasticsearchStatus.statusRequestCancel": "Canceling Job...",
+  "admin.elasticsearchStatus.statusSuccess": "Indexing complete.",
+  "admin.elasticsearchStatus.statusSuccess.help": "Indexing is complete and new posts are being automatically indexed.",
   "admin.email.agreeHPNS": "Rozumiem i akceptuję <a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">Warunki Użycia (jęz. angielski)</a> i <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Politykę Prywatności (jęz. angielski)</a> usługi Mattermost Hosted Push Notification Service.",
   "admin.email.allowEmailSignInDescription": "Kiedy włączone, Mattermost pozwoli użytkownikom logować się za pomocą ich adresu e-mail i hasła.",
   "admin.email.allowEmailSignInTitle": "Włącz logowanie za pomocą adresu email:",
   "admin.email.allowSignupDescription": "Kiedy włączone, Mattermost pozwoli na tworzenie zespołów i zakładanie kont przy użyciu adresu e-mail i hasła. Wyłącz tą opcję tylko kiedy chcesz ograniczyć zakładanie kont przez usługi single-sign-on takie jak OAuth lub LDAP. ",
   "admin.email.allowSignupTitle": "Włącz tworzenie kont za pomocą emaila:",
-  "admin.email.allowUsernameSignInDescription": "Kiedy włączone, Mattermost pozwoli użytkownikom logować się przy pomocy ich nazwy użytkownika i hasła. Ta opcja jest przeważnie używana kiedy weryfikacja adresu e-mail jest wyłączona.",
+  "admin.email.allowUsernameSignInDescription": "When true, users with email login can sign in using their username and password. This setting does not affect AD/LDAP login.",
   "admin.email.allowUsernameSignInTitle": "Włącz logowanie za pomocą nazwy użytkownika:",
   "admin.email.connectionSecurityTest": "Sprawdź połączenie",
   "admin.email.easHelp": "Dowiedz się więcej o kompilacji i wdrożeniu swoich własnych aplikacji mobilnych w <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target=\"_blank\">Enterprise App Store</a>.",
@@ -248,18 +294,26 @@
   "admin.email.emailSuccess": "Podczas wysyłania poczty nie zostały zgłoszone żadne błędy. Dla pewności proszę sprawdzić skrzynkę pocztową.",
   "admin.email.enableEmailBatching.clusterEnabled": "Kolejkowanie maili nie może zostać włączone gdy tryb wysokiej dostępności jest uruchomiony.",
   "admin.email.enableEmailBatching.siteURL": "Kolejkowanie e-maili nie może być włączone, jeśli adres URL strony nie jest ustawiany w <b>Konfiguracja > Adres URL strony</b>.",
-  "admin.email.enableEmailBatchingDesc": "Jeśli włączone, użytkownicy mogą mieć powiadomienia email dla wielu bezpośrednich wiadomości i wzmianek połączone razem w jednego emaila, konfigurowalne w <b>Ustawienia Konta > Powiadomienia</b>.",
+  "admin.email.enableEmailBatchingDesc": "When true, users will have email notifications for multiple direct messages and mentions combined into a single email. Batching will occur at a default interval of 15 minutes, configurable in Account Settings > Notifications.",
   "admin.email.enableEmailBatchingTitle": "Włączyć kolejkowanie e-maili:",
+  "admin.email.enableSMTPAuthDesc": "When enabled, username and password are used for authenticating to the SMTP server.",
+  "admin.email.enableSMTPAuthTitle": "Enable SMTP Authentication:",
   "admin.email.fullPushNotification": "Wysyłaj pełną treść wiadomości",
+  "admin.email.genericNoChannelPushNotification": "Send generic description with only sender name",
   "admin.email.genericPushNotification": "Wysyłaj ogólny opis z nazwami użytkowników i kanałów",
   "admin.email.inviteSaltDescription": "32-znakowa wartość losowa dodawana do podpisu zaproszeń email. Losowo generowana przy instalacji. Kliknij \"Regeneruj\" aby utworzyć nową wartość losową.",
   "admin.email.inviteSaltExample": "Np. \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.inviteSaltTitle": "Wartość losowa do zaproszeń Email:",
   "admin.email.mhpns": "Użyj szyfrowanego, produkcyjnej jakości połączenia HPNS do aplikacji iOS i Android",
-  "admin.email.mhpnsHelp": "Pobierz <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>aplikację Mattermost na iOS</a> z iTunes. Pobierz <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>aplikację Mattermost na Androida</a> z Google Play. Dowiedz się więcej o <a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target=\"_blank\">HPNS (jęz. angielski)</a>.",
+  "admin.email.mhpnsHelp": "Pobierz <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>aplikację Mattermost na iOS</a> z iTunes. Pobierz <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>aplikację Mattermost na Androida</a> z Google Play. Dowiedz się więcej o <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target=\"_blank\">TPNS (jęz. angielski)</a>. ",
   "admin.email.mtpns": "Użyj aplikacji na iOS i Android na iTunes i Google Play z TPNS",
   "admin.email.mtpnsHelp": "Pobierz <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>aplikację Mattermost na iOS</a> z iTunes. Pobierz <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>aplikację Mattermost na Androida</a> z Google Play. Dowiedz się więcej o <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target=\"_blank\">TPNS (jęz. angielski)</a>. ",
   "admin.email.nofificationOrganizationExample": "Np. \"© 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.generic": "Send generic description with only sender name",
+  "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": "Treści powiadomienia push:",
   "admin.email.notificationDisplayDescription": "Nazwa wyświetlana w powiadomieniach mailowych wysyłanych z Mattermost.",
   "admin.email.notificationDisplayExample": "np: \"Powiadomienia Mattermost\", \"System\", \"No-Reply\", \"Nie odpowiadać\"",
   "admin.email.notificationDisplayTitle": "Nazwa wyświetlana w powiadomieniach:",
@@ -274,7 +328,7 @@
   "admin.email.passwordSaltDescription": "32-znakowa wartość losowa dodawana do podpisywania maili resetujących hasło. Losowo generowana przy instalacji. Kliknij \"Regeneruj\" aby utworzyć nową wartość losową. ",
   "admin.email.passwordSaltExample": "Np. \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "Wartość losowa do resetu hasła:",
-  "admin.email.pushContentDesc": "Wybranie \"Wysyłaj opis ogólny z nazwami użytkowników i kanałów\" umożliwia aktywne powiadomienia do ogólnych wiadomości, włącznie z nazwami użytkowników i kanałów, jednak bez szczegółów na temat treści wiadomości.<br/><br/>Wybranie \"Wysyłaj pełne fragmenty wiadomości\" wysyła fragmenty z wiadomości wywołując powiadomienia ze szczegółami i może zawierać poufne informacje. Jeśli twoja Usługa Aktywnych Powiadomień jest poza zaporą, jest WYSOCE ZALECANE aby tą opcję używać tylko z protokołem \"https\" do szyfrowania połączenia.",
+  "admin.email.pushContentDesc": "\"Send generic description with only sender name\" includes only the name of the person who sent the message in push notifications, with no information about channel name or message contents.<br /><br />\"Send generic description with sender and channel names\" includes the name of the person who sent the message and the channel it was sent in, but not the message text.<br /><br />\"Send full message snippet\" includes a message excerpt in push notifications, which may contain confidential information sent in messages. If your Push Notification Service is outside your firewall, it is *highly recommended* this option only be used with an \"https\" protocol to encrypt the connection.",
   "admin.email.pushContentTitle": "Treści powiadomienia push:",
   "admin.email.pushDesc": "Zazwyczaj włączone na produkcji. Jeśli włączone, Mattermost będzie próbował wysyłać aktywne powiadomienia do iOS i Android poprzez serwer do aktywnych powiadomień.",
   "admin.email.pushOff": "Nie wysyłać powiadomień push",
@@ -288,7 +342,7 @@
   "admin.email.selfPush": "Ręcznie wprowadź lokalizacje usługi powiadamiania push",
   "admin.email.skipServerCertificateVerification.description": "Jeśli włączone, Mattermost nie będzie weryfikował certyfikaty serwera email.",
   "admin.email.skipServerCertificateVerification.title": "Pomiń sprawdzanie certyfikatu serwera: ",
-  "admin.email.smtpPasswordDescription": " Uzyskaj tę poświadczenia od administratora zarządzającego twoim serwerem email.",
+  "admin.email.smtpPasswordDescription": "The password associated with the SMTP username.",
   "admin.email.smtpPasswordExample": "Na przykład: \"hasło\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "Hasło serwera SMTP:",
   "admin.email.smtpPortDescription": "Port SMTP serwera poczty e-mail.",
@@ -297,13 +351,17 @@
   "admin.email.smtpServerDescription": "Lokalizacja serwera SMTP poczty e-mail.",
   "admin.email.smtpServerExample": "Eks: \"smtp.yourcompany.com\", \"email-smtp.us-east-1.amazonaws.com\"",
   "admin.email.smtpServerTitle": "Serwer SMTP:",
-  "admin.email.smtpUsernameDescription": "Uzyskaj to poświadczenie od administratora zakładającego twój serwer email.",
+  "admin.email.smtpUsernameDescription": "The username for authenticating to the SMTP server.",
   "admin.email.smtpUsernameExample": "Np.: \"admin@yourcompany.com\", \"AKIADTOVBGERKLCBV\"",
   "admin.email.smtpUsernameTitle": "Nazwa użytkownika SMTP:",
   "admin.email.testing": "Testowanie...",
   "admin.false": "fałsz",
-  "admin.file.enableFileAttachments": "Włącz załączniki:",
-  "admin.file.enableFileAttachmentsDesc": "Gdy fałsz, wyłącz przesyłanie plików i zdjęć w wiadomościach.",
+  "admin.file.enableFileAttachments": "Allow File Sharing:",
+  "admin.file.enableFileAttachmentsDesc": "When false, disables file sharing on the server. All file and image uploads on messages are forbidden across clients and devices, including mobile.",
+  "admin.file.enableMobileDownloadDesc": "When false, disables file downloads on mobile apps. Users can still download files from a mobile web browser.",
+  "admin.file.enableMobileDownloadTitle": "Allow File Downloads on Mobile:",
+  "admin.file.enableMobileUploadDesc": "When false, disables file uploads on mobile apps. If Allow File Sharing is set to true, users can still upload files from a mobile web browser.",
+  "admin.file.enableMobileUploadTitle": "Allow File Uploads on Mobile:",
   "admin.file_upload.chooseFile": "Wybierz plik",
   "admin.file_upload.noFile": "Nie wysłano żadnego pliku",
   "admin.file_upload.uploadFile": "Wyślij",
@@ -529,6 +587,21 @@
   "admin.logs.bannerDesc": "Aby wyszukać użytkowników według identyfikatora użytkownika, przejdź do Raportowanie > Użytkownicy i wklej identyfikator do filtra wyszukiwania.",
   "admin.logs.reload": "Wczytaj ponownie",
   "admin.logs.title": "Logi serwera",
+  "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>.",
+  "admin.manage_roles.allowUserAccessTokens": "Allow this account to generate <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a>.",
+  "admin.manage_roles.cancel": "Anuluj",
+  "admin.manage_roles.manageRolesTitle": "Manage Roles",
+  "admin.manage_roles.postAllPublicRole": "Access to post to all Mattermost public channels.",
+  "admin.manage_roles.postAllPublicRoleTitle": "post:channels",
+  "admin.manage_roles.postAllRole": "Access to post to all Mattermost channels including direct messages.",
+  "admin.manage_roles.postAllRoleTitle": "post:all",
+  "admin.manage_roles.save": "Zapisz",
+  "admin.manage_roles.saveError": "Unable to save roles.",
+  "admin.manage_roles.systemAdmin": "Administrator Systemu",
+  "admin.manage_roles.systemMember": "Użytkownik",
+  "admin.manage_tokens.manageTokensTitle": "Manage Personal Access Tokens",
+  "admin.manage_tokens.userAccessTokensDescription": "Personal access tokens function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">interact with this Mattermost server</a>. Learn more about <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a>.",
+  "admin.manage_tokens.userAccessTokensNone": "No personal access tokens.",
   "admin.metrics.enableDescription": "Jeśli włączone, Mattermost umożliwi monitorowanie wydajności oraz profilowanie. Zobacz proszę <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>dokumentację</a> aby dowiedzieć się więcej na temat konfiguracji monitoringu wydajności dla Mattermost.",
   "admin.metrics.enableTitle": "Włącz Monitorowanie Wydajności:",
   "admin.metrics.listenAddressDesc": "Adres na którym serwer będzie nasłuchiwał aby udostępnić metrykę wydajności.",
@@ -574,6 +647,19 @@
   "admin.password.requirementsDescription": "Wymagane są różne rodzaje znaków w poprawnym haśle.",
   "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.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.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.userDescription": "Select the username that this integration is attached to.",
+  "admin.plugins.jira.userLabel": "Użytkownicy",
+  "admin.plugins.jira.webhookDocsLink": "dokumentacja",
   "admin.privacy.showEmailDescription": "Kiedy fałsz, ukrywa adresy e-mail wszystkich użytkowniów, z wyjątkiem administratorów systemu.",
   "admin.privacy.showEmailTitle": "Pokaż adres E-mail:",
   "admin.privacy.showFullNameDescription": "Gdy wyłączone, ukrywa imię i nazwisko uczestników przed każdym poza Administratorami Systemu. Zamiast tego pokazana jest nazwa użytkownika.",
@@ -751,6 +837,10 @@
   "admin.service.tlsKeyFileDescription": "Plik z kluczem prywatnym który używać.",
   "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": "Name: ",
+  "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.userAccessTokensIdLabel": "Token ID: ",
+  "admin.service.userAccessTokensTitle": "Enable Personal Access Tokens: ",
   "admin.service.webSessionDays": "Długość sesji AD/LDAP i email (dni):",
   "admin.service.webSessionDaysDesc": "Ilość dni od momentu, gdy użytkownik się zaloguje do wygaśnięcia jego sesji. Po zmianie tej wartości, nowa długość sesji będzie brana pod uwagę po kolejnym zalogowaniu się użytkownika. ",
   "admin.service.webhooksDescription": "Gdy prawda, przychodzące webhooki zostaną włączone. Aby pomóc w zwalczaniu ataków typu phishing, wszystkie posty ze stron internetowych będą oznaczone tagiem BOT. Zobacz <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>dokumentację</a>, aby dowiedzieć się więcej.",
@@ -769,6 +859,7 @@
   "admin.sidebar.customization": "Dostosowywanie",
   "admin.sidebar.database": "Baza danych",
   "admin.sidebar.developer": "Twórca",
+  "admin.sidebar.elasticsearch": "Elasticsearch (Beta)",
   "admin.sidebar.email": "E-mail",
   "admin.sidebar.emoji": "Emoji",
   "admin.sidebar.external": "Zewnętrzne usługi",
@@ -776,6 +867,7 @@
   "admin.sidebar.general": "Ogólne",
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.integrations": "Integracje",
+  "admin.sidebar.jira": "JIRA (Beta)",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Informacje prawne i wsparcie",
   "admin.sidebar.license": "Licencja",
@@ -883,9 +975,9 @@
   "admin.team.restrictTitle": "Ogranicz tworzenie kont tylko do podanym domen email:",
   "admin.team.restrict_direct_message_any": "Dowolny użytkownik na serwerze Mattermost",
   "admin.team.restrict_direct_message_team": "Dowolny uczestnik zespołu",
-  "admin.team.showFullname": "Show first and last name (default)",
+  "admin.team.showFullname": "Pokaż imię i nazwisko",
   "admin.team.showNickname": "Pokaż nick, jeśli taki istnieje, w przeciwnym przypadku wyświetl imię i nazwisko",
-  "admin.team.showUsername": "Pokaż nazwę użytkownika",
+  "admin.team.showUsername": "Pokaż nazwę użytkownika (domyślnie)",
   "admin.team.siteNameDescription": "Nazwa usługi wyświetlona na stronie logowania i w interfejsie użytkownika.",
   "admin.team.siteNameExample": "Np.: \"Mattermost\"",
   "admin.team.siteNameTitle": "Nazwa witryny",
@@ -915,7 +1007,9 @@
   "admin.user_item.makeMember": "Uczyń użytkownikiem",
   "admin.user_item.makeSysAdmin": "Zrób Adminem Systemu",
   "admin.user_item.makeTeamAdmin": "Uczyń administratorem zespołu",
+  "admin.user_item.manageRoles": "Manage Roles",
   "admin.user_item.manageTeams": "Zarządzaj Zespołami",
+  "admin.user_item.manageTokens": "Manage Tokens",
   "admin.user_item.member": "Użytkownik",
   "admin.user_item.mfaNo": "<strong>MFA</strong>: Nie",
   "admin.user_item.mfaYes": "<strong>MFA</strong>: Tak",
@@ -924,6 +1018,9 @@
   "admin.user_item.switchToEmail": "Przełącz na adres e-mail/hasło",
   "admin.user_item.sysAdmin": "Administrator Systemu",
   "admin.user_item.teamAdmin": "Administrator zespołu",
+  "admin.user_item.userAccessTokenPostAll": "(with post:all personal access tokens)",
+  "admin.user_item.userAccessTokenPostAllPublic": "(with post:channels personal access tokens)",
+  "admin.user_item.userAccessTokenYes": "(with personal access tokens)",
   "admin.webrtc.enableDescription": "Jeśli włączone, Mattermost umożliwia połączenia video <strong>jeden-do-jednego</strong>. Połączenia WebRTC są dostępne w Chromie, Firefoxie i aplikacjach desktopowych.",
   "admin.webrtc.enableTitle": "Włącz WebRTC: ",
   "admin.webrtc.gatewayAdminSecretDescription": "Wpisz swoje hasło administratora aby uzyskać adres URL do bramki administracyjnej",
@@ -1314,14 +1411,14 @@
   "emoji_picker.custom": "Niestandardowe",
   "emoji_picker.emojiPicker": "Wybieracz Emoji",
   "emoji_picker.flags": "Flagi",
-  "emoji_picker.food": "Jedzenie",
+  "emoji_picker.foods": "Jedzenie",
   "emoji_picker.nature": "Natura",
   "emoji_picker.objects": "Obiekty",
   "emoji_picker.people": "Ludzie",
+  "emoji_picker.places": "Places",
   "emoji_picker.recent": "Ostatnio Używane",
   "emoji_picker.search": "Znajdź",
   "emoji_picker.symbols": "Symbole",
-  "emoji_picker.travel": "Podróże",
   "error.local_storage.help1": "Włącz ciasteczka",
   "error.local_storage.help2": "Wyłącz prywatne przeglądanie",
   "error.local_storage.help3": "Użyj wspieranej przeglądarki (IE 11, Chrome 43+, Firefox 38+, Safari 9, Edge)",
@@ -1688,6 +1785,10 @@
   "mobile.account_notifications.threads_mentions": "Wzmianki w wątkach",
   "mobile.account_notifications.threads_start": "Wątki, które rozpocząłem",
   "mobile.account_notifications.threads_start_participate": "Wątki, które rozpocząłem lub w których uczestniczę",
+  "mobile.advanced_settings.reset_button": "Reset",
+  "mobile.advanced_settings.reset_message": "\nThis will reset all offline data and restart the app. You will be automatically logged back in once the app restarts.\n",
+  "mobile.advanced_settings.reset_title": "Reset Cache",
+  "mobile.advanced_settings.title": "Zaawansowane ustawienia",
   "mobile.channel_drawer.search": "Przeskocz do konwersacji",
   "mobile.channel_info.alertMessageDeleteChannel": "Jesteś pewien, że chcesz usunąć {term} {name}?",
   "mobile.channel_info.alertMessageLeaveChannel": "Jesteś pewien, że chcesz opuścić {term} {name}?",
@@ -1741,11 +1842,17 @@
   "mobile.loading_members": "Wczytuję członków...",
   "mobile.loading_posts": "Wczytuję wiadomości...",
   "mobile.login_options.choose_title": "Wybierz metodę logowania",
+  "mobile.more_dms.start": "Start",
+  "mobile.more_dms.title": "New Conversation",
+  "mobile.notice_mobile_link": "mobile apps",
+  "mobile.notice_platform_link": "platform",
+  "mobile.notice_text": "Mattermost is made possible by the open source software used in our {platform} and {mobile}.",
   "mobile.notification.in": " w ",
   "mobile.offlineIndicator.connected": "Połączono",
   "mobile.offlineIndicator.connecting": "Łączenie...",
   "mobile.offlineIndicator.offline": "Brak połączenia z internetem",
   "mobile.open_dm.error": "We couldn't open a direct message with {displayName}. Please check your connection and try again.",
+  "mobile.open_gm.error": "We couldn't open a group message with those users. Please check your connection and try again.",
   "mobile.post.cancel": "Anuluj",
   "mobile.post.delete_question": "Czy na pewno chcesz usunąć ten post?",
   "mobile.post.delete_title": "Usuń wiadomość",
@@ -1775,6 +1882,8 @@
   "mobile.routes.thread_dm": "Direct Message Thread",
   "mobile.routes.user_profile": "Profil",
   "mobile.routes.user_profile.send_message": "Wyślij wiadomość",
+  "mobile.search.jump": "JUMP",
+  "mobile.search.no_results": "Brak wyników",
   "mobile.select_team.choose": "Twóje zespoły:",
   "mobile.select_team.join_open": "Inne zespoły, do których możesz dołączyć.",
   "mobile.select_team.no_teams": "There are no available teams for you to join.",
@@ -1788,6 +1897,7 @@
   "mobile.settings.clear_button": "Clear",
   "mobile.settings.clear_message": "\nThis will clear all offline data and restart the app. You will be automatically logged back in once the app restarts.\n",
   "mobile.settings.team_selection": "Wybór zespołu",
+  "mobile.suggestion.members": "Użytkownicy",
   "modal.manaul_status.ask": "Nie pytaj ponownie",
   "modal.manaul_status.button": "Tak, ustaw mój status na \"Online\"",
   "modal.manaul_status.cancel": "Nie, pozostaw \"{status}\"",
@@ -1884,6 +1994,8 @@
   "post_focus_view.beginning": "Początek archiwum kanału",
   "post_info.del": "Usuń",
   "post_info.edit": "Edytuj",
+  "post_info.message.visible": "(Only visible to you)",
+  "post_info.message.visible.compact": " (Only visible to you)",
   "post_info.mobile.flag": "Oflaguj",
   "post_info.mobile.unflag": "Usuń flagę",
   "post_info.permalink": "Odnośnik bezpośredni",
@@ -1928,7 +2040,7 @@
   "rename_channel.displayNameHolder": "Wpisz wyświetlaną nazwę",
   "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": "To pole może mieć max. 22 znaki",
+  "rename_channel.maxLength": "This field must be less than {maxLength, number} characters",
   "rename_channel.required": "To pole jest wymagane",
   "rename_channel.save": "Zapisz",
   "rename_channel.title": "Zmień nazwę kanału",
@@ -1967,6 +2079,7 @@
   "search_item.jump": "Przejdź",
   "search_results.because": "<ul><li>Jeśli szukasz częściowej frazy (np. \"rea\" w poszukiwaniu \"reach\" lub \"reaction\"), dołącz * do wyszukiwanego hasła.</li><li>Dwu literowe wyszukiwanie oraz niektóre słowa mogą nie pokazać się w wynikach wyszukiwania z powodu nadmiernej ilości zwracanych wyników.</li></ul>",
   "search_results.noResults": "Nie znaleziono wyników. Spróbować jeszcze raz?",
+  "search_results.searching": "Searching...",
   "search_results.usage": "<ul><li>Użyj <b>\"cudzysłowów\"</b> aby wyszukać frazy</li><li>Użyj<b>from:</b> aby znaleźć posty od określonych użytkowników oraz <b>in:</b> aby znaleźć posty na poszczególnych kanałach</li></ul>",
   "search_results.usageFlag1": "Nie masz oznaczonych żadnych postów.",
   "search_results.usageFlag2": "Możesz dodawać flagę na wiadomości i komentarze, naciskając ",
@@ -1999,8 +2112,7 @@
   "sidebar.tutorialScreen1": "<h4>Kanały</h4><p><strong>Kanały</strong> organizują rozmowy o różnych tematach. Są dostępne dla wszystkich członków zespołu. Do prywatnych rozmów proszę używać <strong>Wiadomości bezpośrednich</strong> do pojedynczych użytkowników lub <strong>Prywatnych grup</strong> dla rozmów w grupie użytkowników.</p>",
   "sidebar.tutorialScreen2": "<h4>\"{townsquare}\" i \"{offtopic}\"</h4><p> oto dwa startowe kanały publiczne:</p><p><strong>{townsquare}</strong> - to miejsce do szerokiej komunikacji. Każda osoba w zespole jest członkiem tego kanału.</p><p><strong>{offtopic}</strong> - jest to miejsce do zabawy poza kanałami związanych z pracą. Ty i Twój zespół zdecydować, jakie inne kanały utworzyć.</p>",
   "sidebar.tutorialScreen3": "<h4>Tworzenie i dołączanie do kanałów</h4><p>Kliknij <strong>\"Więcej...\"</strong> aby stworzyć nowy kanał lub dołączyć do istniejącego.</p><p>Możesz również stworzyć nowy kanał lub grupę prywatną poprzez kliknięcie na symbol <strong>\"+\"</strong> obok nagłówka kanałów lub prywatnych kanałów.</p>",
-  "sidebar.unreadAbove": "Nieprzeczytanych postów powyżej",
-  "sidebar.unreadBelow": "Nieprzeczytanych postów poniżej",
+  "sidebar.unreads": "More unreads",
   "sidebar_header.tutorial": "<h4>Menu główne</h4><p><strong>Menu główne</strong> to miejsce gdzie możesz <strong>Zaprosić nowych użytkowników</strong>, zarządzać <strong>Ustawieniami konta</strong> oraz ustawić <strong>Motyw</strong>.</p><p>Administratorzy zespołu natomiast mają dostęp do <strong>Ustawień zespołu</strong>.</p><p>Administratorzy systemu znajdą tu <strong>Konsole systemową</strong> z której zarządzać mogą całym systemem.</p>",
   "sidebar_right_menu.accountSettings": "Ustawienia konta",
   "sidebar_right_menu.addMemberToTeam": "Dodaj członków do zespołu",
@@ -2220,10 +2332,6 @@
   "user.settings.display.nameOptsDesc": "Ustawia jak wyświetlać nazwy innych użytkowników w postach i wiadomościach bezpośrednich.",
   "user.settings.display.normalClock": "12-godzinny (przykład: 4:00 pm)",
   "user.settings.display.preferTime": "Wybierz, jak wyświetlany jest czas.",
-  "user.settings.display.showFullname": "Pokaż imię i nazwisko",
-  "user.settings.display.showNickname": "Pokaż nick, jeśli taki istnieje, w przeciwnym przypadku wyświetl imię i nazwisko",
-  "user.settings.display.showUsername": "Pokaż nazwę użytkownika (domyślnie)",
-  "user.settings.display.teammateNameDisplay": "Wyświetlana nazwa",
   "user.settings.display.theme.applyToAllTeams": "Zastosuj nowy motyw do wszystkich moich zespołów",
   "user.settings.display.theme.customTheme": "Motyw użytkownika",
   "user.settings.display.theme.describe": "Otwórz, aby zarządzać motywem",
@@ -2320,19 +2428,19 @@
   "user.settings.notifications.commentsNever": "Do not trigger notifications on messages in reply threads unless I'm mentioned",
   "user.settings.notifications.commentsRoot": "Wyzwalaj powiadomienia o wiadomościach w wątkach, które rozpocząłem",
   "user.settings.notifications.desktop": "Wyświetlanie powiadomień na pulpicie",
-  "user.settings.notifications.desktop.allFirefoxForever": "Dla wszystkich aktywności, pokazuj zawsze",
-  "user.settings.notifications.desktop.allFirefoxTimed": "Dla wszystkich aktywności, pokazuj przez {seconds} sekund",
   "user.settings.notifications.desktop.allNoSoundForever": "Dla wszystkich aktywności, bez dźwięku, pokazuj zawsze",
   "user.settings.notifications.desktop.allNoSoundTimed": "Dla wszystkich aktywności, bez dźwięku, pokazuj przez {seconds} sekund",
   "user.settings.notifications.desktop.allSoundForever": "Dla wszystkich aktywności, z dźwiękiem, pokazuj zawsze",
+  "user.settings.notifications.desktop.allSoundHiddenForever": "Dla wszystkich aktywności, pokazuj zawsze",
+  "user.settings.notifications.desktop.allSoundHiddenTimed": "Dla wszystkich aktywności, pokazuj przez {seconds} sekund",
   "user.settings.notifications.desktop.allSoundTimed": "Dla wszystkich aktywności, z dźwiękiem, pokazuj przez {seconds} sekund",
   "user.settings.notifications.desktop.duration": "Czas trwania powiadomienia",
   "user.settings.notifications.desktop.durationInfo": "Określa, jak długo powiadomienia pojawiać się mają na ekranie podczas korzystania z przeglądarki Firefox lub Chrome. Powiadomienia na pulpicie w Edge i Safari może pozostać na ekranie maksymalnie 5 sekund.",
-  "user.settings.notifications.desktop.mentionsFirefoxForever": "Dla wzmianek i wiadomości bezpośrednich, pokazuj zawsze",
-  "user.settings.notifications.desktop.mentionsFirefoxTimed": "Dla wzmianek i wiadomości bezpośrednich, pokazuj przez {seconds} sekund",
   "user.settings.notifications.desktop.mentionsNoSoundForever": "Dla wzmianek i wiadomości bezpośrednich, bez dźwięku, pokazuj zawsze",
   "user.settings.notifications.desktop.mentionsNoSoundTimed": "Dla wzmianek i wiadomości bezpośrednich, bez dźwięku, pokazuj przez {seconds} sekund",
   "user.settings.notifications.desktop.mentionsSoundForever": "Dla wzmianek i wiadomości bezpośrednich, z dźwiękiem, pokazuj zawsze",
+  "user.settings.notifications.desktop.mentionsSoundHiddenForever": "Dla wzmianek i wiadomości bezpośrednich, pokazuj zawsze",
+  "user.settings.notifications.desktop.mentionsSoundHiddenTimed": "Dla wzmianek i wiadomości bezpośrednich, pokazuj przez {seconds} sekund",
   "user.settings.notifications.desktop.mentionsSoundTimed": "Dla wzmianek i wiadomości bezpośrednich, z dźwiękiem, pokazuj przez {seconds} sekund",
   "user.settings.notifications.desktop.seconds": "{seconds} sekund",
   "user.settings.notifications.desktop.sound": "Dźwięk powiadomień",
@@ -2444,6 +2552,28 @@
   "user.settings.security.switchSaml": "Przełącz na SAML",
   "user.settings.security.title": "Ustawienia bezpieczeństwa",
   "user.settings.security.viewHistory": "Zobacz historię dostępu",
+  "user.settings.tokens.cancel": "Anuluj",
+  "user.settings.tokens.clickToEdit": "Click 'Edit' to manage your personal access tokens",
+  "user.settings.tokens.confirmCreateButton": "Yes, Create",
+  "user.settings.tokens.confirmCreateMessage": "You are generating a personal access token with System Admin permissions. Are you sure want to create this token?",
+  "user.settings.tokens.confirmCreateTitle": "Create System Admin Personal Access Token",
+  "user.settings.tokens.confirmDeleteButton": "Yes, Delete",
+  "user.settings.tokens.confirmDeleteMessage": "Any integrations using this token will no longer be able to access the Mattermost API. You cannot undo this action. <br /><br />Are you sure want to delete the <strong>{description}</strong> token?",
+  "user.settings.tokens.confirmDeleteTitle": "Delete Token?",
+  "user.settings.tokens.copy": "Please copy the access token below. You won't be able to see it again!",
+  "user.settings.tokens.create": "Create New Token",
+  "user.settings.tokens.delete": "Usuń",
+  "user.settings.tokens.description": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Personal access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>.",
+  "user.settings.tokens.description_mobile": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Personal access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>. Create new tokens on your desktop.",
+  "user.settings.tokens.id": "Identyfikator: ",
+  "user.settings.tokens.name": "Nazwa:",
+  "user.settings.tokens.nameHelp": "Enter a description for your token to remember what it does.",
+  "user.settings.tokens.nameRequired": "Please enter a description.",
+  "user.settings.tokens.save": "Zapisz",
+  "user.settings.tokens.title": "Personal Access Tokens",
+  "user.settings.tokens.token": "Access Token: ",
+  "user.settings.tokens.tokenId": "Token ID: ",
+  "user.settings.tokens.userAccessTokensNone": "No personal access tokens.",
   "user_list.notFound": "Nie odnaleziono użytkowników",
   "user_profile.send.dm": "Wyślij wiadomość",
   "user_profile.webrtc.call": "Rozpocznij rozmowę wideo",
diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json
index 9d7342519..5f43c4d44 100644
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -203,8 +203,6 @@
   "admin.compliance_table.userId": "Solicitado Por",
   "admin.connectionSecurityNone": "Nenhum",
   "admin.connectionSecurityNoneDescription": "Mattermost irá conectar usando uma conexão não segura.",
-  "admin.connectionSecurityPlain": "PLAIN",
-  "admin.connectionSecurityPlainDescription": "Mattermost irá conectar e autenticar usando uma conexão não segura.",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "Obtém uma conexão insegura existente e tenta atualizá-la para uma conexão segura usando TLS.",
   "admin.connectionSecurityTest": "Testar Conexão",
@@ -235,31 +233,87 @@
   "admin.customization.support": "Legal e Suporte",
   "admin.database.title": "Configurações do Banco de dados",
   "admin.developer.title": "Configurações de Desenvolvedor",
+  "admin.elasticsearch.bulkIndexButton.error": "Falha ao agendar Bulk Index Job: {error}",
+  "admin.elasticsearch.connectionUrlDescription": "O endereço do servidor de Elasticsearch. {documentationLink}",
+  "admin.elasticsearch.connectionUrlExample": "Ex.: \"https://elasticsearch.example.org:9200\"",
+  "admin.elasticsearch.connectionUrlExample.documentationLinkText": "Por favor verifique a documentação para as instruções para configurar o servidor.",
+  "admin.elasticsearch.connectionUrlTitle": "Endereço de Conexão do servidor:",
+  "admin.elasticsearch.elasticsearch_test_button": "Testar a Conexão",
+  "admin.elasticsearch.enableIndexingDescription": "Quando verdadeiro, a indexação dos posts irá acontecer automaticamente. Consultas de procura irá utilizar o banco de procura enquanto \"Habilitar Elasticsearch para consultas de procura\" esteja habilitado. {documentationLink}",
+  "admin.elasticsearch.enableIndexingDescription.documentationLinkText": "Leia mais sobre Elasticsearch na nossa documentação.",
+  "admin.elasticsearch.enableIndexingTitle": "Habilitar Elasticsearch Indexing:",
+  "admin.elasticsearch.enableSearchingDescription": "Necessita uma conexão funcional com o servidor de Elasticsearch. Quando verdadeiro, Elasticsearch será utilizado para as consultas de procura usando a última indexação. Resultados da procura podem estar incompletos até que  todos os posts do banco de dados sejam indexados. Quando falso, será utilizado o banco de dados para procura.",
+  "admin.elasticsearch.enableSearchingTitle": "Habilitar Elasticsearch para consultas de procura:",
+  "admin.elasticsearch.indexButton.inProgress": "Indexação em progresso",
+  "admin.elasticsearch.indexButton.ready": "Construir Índice",
+  "admin.elasticsearch.indexHelpText.buildIndex": "Todas as postagens no banco de dados serão indexadas do mais antigo ao mais novo. Elasticsearch fica disponível durante a indexação, mas os resultados da pesquisa podem estar incompletos até o trabalho de indexação estar completo.",
+  "admin.elasticsearch.indexHelpText.cancelIndexing": "Cancelamento para o job de indexação e o remove da fila. As mensagens que já foram indexadas não serão excluídas.",
+  "admin.elasticsearch.noteDescription": "Alterando as propriedades nesta seção irá exigir que o servidor seja reiniciado para que tenha efeito.",
+  "admin.elasticsearch.password": "Ex.: \"suasenha\"",
+  "admin.elasticsearch.passwordDescription": "(Opcional) Senha para autenticar no servidor de Elasticsearch.",
+  "admin.elasticsearch.passwordTitle": "Senha do Servidor:",
+  "admin.elasticsearch.purgeIndexesButton": "Apagar Índices",
+  "admin.elasticsearch.purgeIndexesButton.error": "Falha ao apagar índices: {error}",
+  "admin.elasticsearch.purgeIndexesButton.label": "Apagar Índices:",
+  "admin.elasticsearch.purgeIndexesButton.success": "Índices apagados com sucesso:",
+  "admin.elasticsearch.purgeIndexesHelpText": "Purging irá remover completamente o índice no servidor Elasticsearch. Os resultados da pesquisa podem ficar incompletos até um índice em massa do banco de dados de postagem existente for reconstruído.",
+  "admin.elasticsearch.sniffDescription": "Quando verdadeiro, sniffing irá procurar e conectar em todos os data nodes no seu cluster automaticamente.",
+  "admin.elasticsearch.sniffTitle": "Habilitar Cluster Sniffing:",
+  "admin.elasticsearch.testConfigSuccess": "Teste bem sucedido. Configuração salva.",
+  "admin.elasticsearch.testHelpText": "Verifica se o servidor Mattermost pode conectar no servidor de Elasticsearch especificado. Testar a conexão apenas salva a configuração se o teste for bem-sucedido. Consulte o arquivo de log para obter mensagens de erro mais detalhadas.",
+  "admin.elasticsearch.title": "Elasticsearch (Beta)",
+  "admin.elasticsearch.usernameDescription": "(Opcional) O nome do usuário para autenticar no servidor de Elasticsearch.",
+  "admin.elasticsearch.usernameExample": "Ex.: \"elastic\"",
+  "admin.elasticsearch.usernameTitle": "Nome do Usuário do Servidor:",
+  "admin.elasticsearchStatus.bulkIndexLabel": "Indexação em massa:",
+  "admin.elasticsearchStatus.cancelButton": "Cancelar",
+  "admin.elasticsearchStatus.status": "Status: ",
+  "admin.elasticsearchStatus.statusCancelled": "Job de indexação cancelado.",
+  "admin.elasticsearchStatus.statusError": "Erro na indexação.",
+  "admin.elasticsearchStatus.statusError.help": "Mattermost encontrou um erro ao construir o índice Elasticsearch: {error}",
+  "admin.elasticsearchStatus.statusInProgress": "Job em progresso. {percent}% completo.",
+  "admin.elasticsearchStatus.statusInProgress.help": "Indexação está em progresso no servidor de job. Se o Elasticsearch estiver ativado, os resultados das pesquisas podem estar incompletos até o termino do job.",
+  "admin.elasticsearchStatus.statusIndexingDisabled": "Indexação desativada.",
+  "admin.elasticsearchStatus.statusLoading": "Carregando...",
+  "admin.elasticsearchStatus.statusNoJobs": "Nenhum job de indexação na fila.",
+  "admin.elasticsearchStatus.statusPending": "Job pendente.",
+  "admin.elasticsearchStatus.statusPending.help": "Indexação está na fila de job do servidor. Se o Elasticsearch estiver ativado, os resultados das pesquisas podem estar incompletos até o termino do job.",
+  "admin.elasticsearchStatus.statusRequestCancel": "Cancelando o Job...",
+  "admin.elasticsearchStatus.statusSuccess": "indexação completa.",
+  "admin.elasticsearchStatus.statusSuccess.help": "A indexação está completa e as novas postagens estão sendo indexadas automaticamente.",
   "admin.email.agreeHPNS": " Eu entendo e aceito o serviço de notificação por push do Mattermost Hosted <a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">Termos do Serviço</a> e <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Política de Privacidade</a>.",
   "admin.email.allowEmailSignInDescription": "Quando verdadeiro, Mattermost permite aos usuários fazer login usando o e-mail e senha.",
   "admin.email.allowEmailSignInTitle": "Habilitar login por email:",
-  "admin.email.allowSignupDescription": "Quando verdadeiro, Mattermost permite a criação de equipe e conta de inscrição através de e-mail e senha.  Este valor deve ser falso somente quando você deseja limitar a entrada para o single-sign-on service como OAuth ou AD/LDAP.",
+  "admin.email.allowSignupDescription": "Quando verdadeiro, Mattermost permite a criação de conta através de e-mail e senha. Este valor deve ser falso somente quando você deseja limitar a entrada para o sign-on service como AD/LDAP, SAML ou GitLab.",
   "admin.email.allowSignupTitle": "Habilitar criação de contas com email: ",
-  "admin.email.allowUsernameSignInDescription": "Quando verdadeiro, Mattermost permite os usuários fazer login usando seu nome de usuário e senha.  Esta configuração é normalmente utilizado apenas quando a verificação de e-mail está desativada.",
+  "admin.email.allowUsernameSignInDescription": "Quando verdadeiro, usuários com login por email podem usar seus nomes de usuários e senha para fazer login. Esta configuração não afeta o login AD/LDAP.",
   "admin.email.allowUsernameSignInTitle": "Habilitar login com nome de usuário:",
   "admin.email.connectionSecurityTest": "Testar Conexão",
-  "admin.email.easHelp": "Leia mais sobre compilar e publicar seu próprio aplicativo móvel em <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target=\"_blank\">Enterprise App Store</a>.",
+  "admin.email.easHelp": "Leia mais sobre compilar e publicar seu próprio aplicativo móvel em <a href=\"https://about.mattermost.com/default-enterprise-app-store\" target='_blank'>Enterprise App Store</a>.",
   "admin.email.emailFail": "Conexão falhou: {error}",
   "admin.email.emailSuccess": "Nenhum erro foram relatados durante o envio de um e-mail.  Por favor verifique a sua caixa de entrada para se certificar.",
   "admin.email.enableEmailBatching.clusterEnabled": "Email em lote não pode ser ativado quando modo de Alta Disponibilidade está ativo.",
   "admin.email.enableEmailBatching.siteURL": "Email em lote não pode ser ativo a menos que o SiteURL estiver configurado em <b>Configurações > SiteURL</b>.",
-  "admin.email.enableEmailBatchingDesc": "Quando verdadeiro, os usuários podem ter notificações de e-mail para várias mensagens diretas e menções combinados em um único e-mail, configurável em <b>Configurações de Conta > Notificações</b>.",
+  "admin.email.enableEmailBatchingDesc": "When true, users will have email notifications for multiple direct messages and mentions combined into a single email. Batching will occur at a default interval of 15 minutes, configurable in Account Settings > Notifications.",
   "admin.email.enableEmailBatchingTitle": "Ativar Email em Lote:",
+  "admin.email.enableSMTPAuthDesc": "When enabled, username and password are used for authenticating to the SMTP server.",
+  "admin.email.enableSMTPAuthTitle": "Ativar Autenticação SMTP:",
   "admin.email.fullPushNotification": "Enviar trecho de mensagem",
+  "admin.email.genericNoChannelPushNotification": "Enviar descrições genericas com somente o nome do remetente",
   "admin.email.genericPushNotification": "Enviar descrição genérica com nomes do usuário e canal",
   "admin.email.inviteSaltDescription": "Salt de 32-caracteres adicionados a assinatura de convites por e-mail. Aleatoriamente gerados na instalação. Click \"Re-Gerar\" para criar um novo salt.",
   "admin.email.inviteSaltExample": "Ex.: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.inviteSaltTitle": "Salt Email Convite:",
   "admin.email.mhpns": "Use criptografado, com qualidade de produção conexão HPNS com aplicativos Android e iOS",
-  "admin.email.mhpnsHelp": "Download <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS app</a> no iTunes. Download <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android app</a> no Google Play. Leia mais sobre <a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target='_blank'>HPNS</a>.",
+  "admin.email.mhpnsHelp": "Download <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS app</a> no iTunes. Download <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android app</a> no Google Play. Saiba mais sobre <a href=\"https://about.mattermost.com/default-hpns\" target='_blank'>HPNS</a>.",
   "admin.email.mtpns": "Use apps iOS e Android no iTunes e Google Play com TPMS",
-  "admin.email.mtpnsHelp": "Download <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS app</a> no iTunes. Download <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android app</a> no Google Play. Leia mais sobre <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target='_blank'>TPNS</a>.",
+  "admin.email.mtpnsHelp": "Download <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS app</a> no iTunes. Download <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android app</a> no Google Play. Saiba mais sobre <a href=\"https://about.mattermost.com/default-tpns/\" target='_blank'>TPNS</a>.",
   "admin.email.nofificationOrganizationExample": "Ex. \"® Empresa ABC, Av. Paulista, 1000, São Paulo, SP, 12345-150, BRA\"",
+  "admin.email.notification.contents.full": "Enviar conteúdo completo da mensagem",
+  "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.generic": "Enviar descrições genéricas com somente o nome do remetente",
+  "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": "Conteúdo Notificação Email: ",
   "admin.email.notificationDisplayDescription": "Mostra o nome da conta de e-mail usada quando a notificação de e-mail é enviado do Mattermost.",
   "admin.email.notificationDisplayExample": "Ex: \"Mattermost Notificação\", \"Sistema\", \"Não-Responda\"",
   "admin.email.notificationDisplayTitle": "Notificação Nome de Exibição:",
@@ -274,11 +328,11 @@
   "admin.email.passwordSaltDescription": "Salt de 32-caracteres adicionado para assinar o redefinição de senha por e-mail. Gerada aleatoriamente na instalação. Clique em \"Re-Gerar\" para criar um novo salt.",
   "admin.email.passwordSaltExample": "Ex.: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "Salt Reset Senha:",
-  "admin.email.pushContentDesc": "Selecionar \"Enviar descrição genérica com nomes de usuário e canal\" fornece envio de notificações push com mensagens genéricas, inclui nomes de usuários e canais mas não específica detalhes do texto da mensagem.<br /><br />Selecionar \"Enviar trecho da mensagem\" envia trechos da mensagem que desencadearam as notificações e pode incluir informações confidenciais enviadas na mensagem. Se o seu serviço de Envio de Notificação Push está fora de um firewall, é ALTAMENTE RECOMENDADO que está opção somente seja usada com o protocolo \"https\" para encriptar a conexão.",
+  "admin.email.pushContentDesc": "\"Enviar descrição genérica com apenas o nome do remetente\" inclui apenas o nome da pessoa que enviou a mensagem em notificações push, sem informações sobre o nome do canal ou o conteúdo da mensagem.<br /><br />\"Enviar descrição genérica com remetente e nome do canal\" inclui o nome da pessoa que enviou a mensagem e o canal que foi enviado, mas não o texto da mensagem.<br /><br />\"Enviar trecho de mensagem completa\" inclui um trecho de mensagem em notificações push, que pode conter informações confidenciais enviadas em mensagens. Se o seu Serviço de Notificação Push estiver fora do seu firewall, é *altamente recomendável* que esta opção seja usada somente com um protocolo \"https\" para criptografar a conexão.",
   "admin.email.pushContentTitle": "Conteúdo Notificação Push:",
   "admin.email.pushDesc": "Normalmente definida como verdadeiro na produção. Quando verdadeiro, Mattermost tenta enviar notificações push no iOS e Android, através do servidor de notificação push.",
   "admin.email.pushOff": "Não enviar notificações push",
-  "admin.email.pushOffHelp": "Por favor leia <a href=\"http://docs.mattermost.com/deployment/push.html#push-notifications-and-mobile-devices\" target='_blank'>documentação de notificações push</a> para aprender mais sobre as opções de configurações.",
+  "admin.email.pushOffHelp": "Por favor veja a <a href=\"https://about.mattermost.com/default-mobile-push-notifications\" target='_blank'>documentação de notificações push</a> para saber mais sobre as opções de configurações.",
   "admin.email.pushServerDesc": "Localização do serviço de notificação push Mattermost você pode configurar por trás do firewall usando https://github.com/mattermost/push-proxy. Para testar, você pode usar http://push-test.mattermost.com, que liga à amostra do app Mattermost iOS na Apple AppStore pública. Por favor, não use o serviço de teste para implantações de produção.",
   "admin.email.pushServerEx": "Ex: \"http://push-test.mattermost.com\"",
   "admin.email.pushServerTitle": "Servidor de Notificação Push:",
@@ -288,7 +342,7 @@
   "admin.email.selfPush": "Manualmente entre a localização do Serviço de Notificação Push",
   "admin.email.skipServerCertificateVerification.description": "Quando verdadeiro, Mattermost não irá verificar o certificado do servidor de email.",
   "admin.email.skipServerCertificateVerification.title": "Pular a Verificação do Certificado: ",
-  "admin.email.smtpPasswordDescription": " Obter essa credencial do administrador das configurações do servidor de email.",
+  "admin.email.smtpPasswordDescription": "A senha associada com o usuário SMTP.",
   "admin.email.smtpPasswordExample": "Ex: \"suasenha\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "Senha do Servidor de SMTP:",
   "admin.email.smtpPortDescription": "Porta do servidor de e-mail SMTP.",
@@ -297,13 +351,17 @@
   "admin.email.smtpServerDescription": "Localização do servidor de e-mail SMTP.",
   "admin.email.smtpServerExample": "Ex: \"smtp.suaempresa.com\", \"email-smtp.us-east-1.amazonaws.com\"",
   "admin.email.smtpServerTitle": "Servidor SMTP:",
-  "admin.email.smtpUsernameDescription": " Obter essa credencial do administrador das configurações do servidor de email.",
+  "admin.email.smtpUsernameDescription": "O usuário para autenticação no servidor SMTP.",
   "admin.email.smtpUsernameExample": "Ex: \"admin@suaempresa.com\", \"AKIADTOVBGERKLCBV\"",
   "admin.email.smtpUsernameTitle": "Nome do Usuário do Servidor de SMTP:",
   "admin.email.testing": "Testando...",
   "admin.false": "falso",
-  "admin.file.enableFileAttachments": "Habilitar Anexo de Arquivos:",
-  "admin.file.enableFileAttachmentsDesc": "Quando falso, envio de arquivos e imagens serão desabilitados nas mensagens.",
+  "admin.file.enableFileAttachments": "Permitir Compartilhamento de Arquivo:",
+  "admin.file.enableFileAttachmentsDesc": "Quando falso, desativa o compartilhamento de arquivos no servidor. Todos os carregamentos de arquivos e imagens em mensagens são proibidos entre clientes e dispositivos, incluindo dispositivos móveis.",
+  "admin.file.enableMobileDownloadDesc": "Quando falso, desabilita downloads de arquivos em aplicativos para dispositivos móveis. Os usuários ainda podem baixar arquivos de um navegador da Web móvel.",
+  "admin.file.enableMobileDownloadTitle": "Permitir Download de Arquivos em Dispositivos Móveis:",
+  "admin.file.enableMobileUploadDesc": "Quando falso, desativa os carregamentos de arquivos em aplicativos para dispositivos móveis. Se Permitir o Compartilhamento de Arquivos for definido como verdadeiro, os usuários ainda podem carregar arquivos de um navegador da Web móvel.",
+  "admin.file.enableMobileUploadTitle": "Permitir Upload de Arquivos em Dispositivos Móveis:",
   "admin.file_upload.chooseFile": "Escolher Arquivo",
   "admin.file_upload.noFile": "Nenhum arquivo enviado",
   "admin.file_upload.uploadFile": "Enviar",
@@ -529,6 +587,21 @@
   "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.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>",
+  "admin.manage_roles.allowUserAccessTokens": "Permitir que esta conta gere <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">tokens de acesso de usuário</a>.",
+  "admin.manage_roles.cancel": "Cancelar",
+  "admin.manage_roles.manageRolesTitle": "Gerenciar Funções",
+  "admin.manage_roles.postAllPublicRole": "Permissão para postar em todos os canais públicos do Mattermost.",
+  "admin.manage_roles.postAllPublicRoleTitle": "postar:canais",
+  "admin.manage_roles.postAllRole": "Permissão para postar em todos os canais incluindo mensagens diretas no Mattermost.",
+  "admin.manage_roles.postAllRoleTitle": "postar:todos",
+  "admin.manage_roles.save": "Salvar",
+  "admin.manage_roles.saveError": "Não é possível salvar as permissões.",
+  "admin.manage_roles.systemAdmin": "Admin do Sistema",
+  "admin.manage_roles.systemMember": "Membro",
+  "admin.manage_tokens.manageTokensTitle": "Gerenciar Tokens de Acesso de Usuário",
+  "admin.manage_tokens.userAccessTokensDescription": "Os tokens de acesso de usuário funcionam de forma semelhante aos tokens da sessão e podem ser usados por integrações para <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">autenticar contra a API REST</a>. Saiba mais sobre <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">tokens de acesso de usuário</a>.",
+  "admin.manage_tokens.userAccessTokensNone": "Nenhum token de acesso de usuário.",
   "admin.metrics.enableDescription": "Quando verdadeiro, Mattermost irá habilitar a coleta do monitoramento de performance e profiling. Por favor verifique <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>documentação</a> para ler mais sobre como configurar o monitoramento de performance para Mattermost.",
   "admin.metrics.enableTitle": "Habilitar Monitoramento de Performance:",
   "admin.metrics.listenAddressDesc": "O endereço que o servidor irá escutar para expor as métricas de performance.",
@@ -574,6 +647,19 @@
   "admin.password.requirementsDescription": "Tipos de caracteres necessários em uma senha válida.",
   "admin.password.symbol": "Pelo menos um símbolo (ex. \"~!@#$%^&*()\")",
   "admin.password.uppercase": "Pelo menos uma letra maiuscula",
+  "admin.plugins.jira": "JIRA (Beta)",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelname",
+  "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": "Habilitado:",
+  "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 this webhook URL to set up the JIRA integration. See {webhookDocsLink} to learn more.",
+  "admin.plugins.jira.teamParamPlaceholder": "teamname",
+  "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",
   "admin.privacy.showEmailDescription": "Quando falso, o endereço de email dos membros será ocultado para todos exceto para os Administradores do Sistema.",
   "admin.privacy.showEmailTitle": "Mostrar Endereços de Email: ",
   "admin.privacy.showFullNameDescription": "Quando falso, o nome completo dos membros será ocultado para todos exceto para os Administradores do Sistema. O nome de usuário será exibido em vez de o nome completo.",
@@ -751,6 +837,10 @@
   "admin.service.tlsKeyFileDescription": "O arquivo da chave privada a ser usado.",
   "admin.service.useLetsEncrypt": "Usar Let's Encrypt:",
   "admin.service.useLetsEncryptDescription": "Ativar a recuperação automática de certificados do Let's Encrypt. O certificado será recuperado quando um cliente tentar se conectar de um novo domínio. Isso funcionará com vários domínios.",
+  "admin.service.userAccessTokensDescLabel": "Name: ",
+  "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.userAccessTokensIdLabel": "Token ID: ",
+  "admin.service.userAccessTokensTitle": "Ativar Tokens de Acesso de Usuário: ",
   "admin.service.webSessionDays": "Tamanho da sessão AD/LDAP e email (dias):",
   "admin.service.webSessionDaysDesc": "O número de dias desde a última vez que um usuário entrou suas credenciais para expirar a sessão do usuário. Depois de alterar essa configuração, a nova duração da sessão terá efeito após a próxima vez que o usuário digitar suas credenciais.",
   "admin.service.webhooksDescription": "Quando verdadeiro, webhooks de entrada serão permitidos. Para ajudar combater ataques de phishing, todas as postagens por webhook serão marcadas com uma etiqueta BOT. Veja a <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>documentação</a> para saber mais.",
@@ -769,6 +859,7 @@
   "admin.sidebar.customization": "Customização",
   "admin.sidebar.database": "Banco de dados",
   "admin.sidebar.developer": "Desenvolvedor",
+  "admin.sidebar.elasticsearch": "Elasticsearch (Beta)",
   "admin.sidebar.email": "E-mail",
   "admin.sidebar.emoji": "Emoji",
   "admin.sidebar.external": "Serviços Externos",
@@ -776,6 +867,7 @@
   "admin.sidebar.general": "Geral",
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.integrations": "Integrações",
+  "admin.sidebar.jira": "JIRA (Beta)",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Legal e Suporte",
   "admin.sidebar.license": "Edição e Licença",
@@ -883,9 +975,9 @@
   "admin.team.restrictTitle": "Restringir a criação de contas para os domínios de e-mail específicos:",
   "admin.team.restrict_direct_message_any": "Qualquer usuário no Servidor Mattermost",
   "admin.team.restrict_direct_message_team": "Qualquer membro da equipe",
-  "admin.team.showFullname": "Mostrar primeiro nome e sobrenome (padrão)",
+  "admin.team.showFullname": "Mostrar primeiro e último nome",
   "admin.team.showNickname": "Mostrar apelidos se existir, caso contrário mostrar o primeiro e sobrenome",
-  "admin.team.showUsername": "Mostrar nome do usuário",
+  "admin.team.showUsername": "Mostrar nome de usuário (padrão)",
   "admin.team.siteNameDescription": "Nome do serviço mostrado na tela de início da sessão e na UI.",
   "admin.team.siteNameExample": "Ex.: \"Mattermost\"",
   "admin.team.siteNameTitle": "Nome do Site:",
@@ -915,7 +1007,9 @@
   "admin.user_item.makeMember": "Tornar um Membro",
   "admin.user_item.makeSysAdmin": "Tornar Admin do Sistema",
   "admin.user_item.makeTeamAdmin": "Tornar Admin de Equipe",
+  "admin.user_item.manageRoles": "Gerenciar Funções",
   "admin.user_item.manageTeams": "Gerenciar Equipes",
+  "admin.user_item.manageTokens": "Gerenciar Tokens",
   "admin.user_item.member": "Membro",
   "admin.user_item.mfaNo": "<strong>MFA</strong>: Não",
   "admin.user_item.mfaYes": "<strong>MFA</strong>: Sim",
@@ -924,6 +1018,9 @@
   "admin.user_item.switchToEmail": "Trocar para Email/Senha",
   "admin.user_item.sysAdmin": "Admin do Sistema",
   "admin.user_item.teamAdmin": "Admin Equipe",
+  "admin.user_item.userAccessTokenPostAll": "(com post:todos tokens de acesso de usuário)",
+  "admin.user_item.userAccessTokenPostAllPublic": "(com post:canais tokens de acesso de usuário)",
+  "admin.user_item.userAccessTokenYes": "(com tokens de acesso de usuário)",
   "admin.webrtc.enableDescription": "Quando verdadeiro, Mattermost permite fazer vídeo chamadas <strong>ponto-a-ponto</strong>. Chamadas WebRTC estão disponíveis no Chrome, Firefox e Mattermost Desktop Apps.",
   "admin.webrtc.enableTitle": "Ativar Mattermost WebRTC: ",
   "admin.webrtc.gatewayAdminSecretDescription": "Digite sua chave secreta para acessar a URL de Administração do Gateway.",
@@ -992,13 +1089,13 @@
   "analytics.team.totalUsers": "Total de Usuários",
   "api.channel.add_member.added": "{addedUsername} foi adicionado ao canal por {username}",
   "api.channel.delete_channel.archived": "{username} arquivou o canal.",
-  "api.channel.join_channel.post_and_forget": "{username} entrou no canal.",
+  "api.channel.join_channel.post_and_forget": "{username} juntou-se ao canal.",
   "api.channel.leave.left": "{username} saiu do canal.",
   "api.channel.post_update_channel_displayname_message_and_forget.updated_from": "{username} atualizou o nome de exibição do canal de: {old} para: {new}",
   "api.channel.post_update_channel_header_message_and_forget.removed": "{username} removeu o cabeçalho do canal (era: {old})",
   "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} atualizou o cabeçalho do canal de: {old} para: {new}",
   "api.channel.post_update_channel_header_message_and_forget.updated_to": "{username} atualizou o cabeçalho do canal para: {new}",
-  "api.channel.remove_member.removed": "{removedUsername} foi removido do canal",
+  "api.channel.remove_member.removed": "{removedUsername} foi removido do canal.",
   "app.channel.post_update_channel_purpose_message.removed": "{username} removeu o propósito do canal (era: {old})",
   "app.channel.post_update_channel_purpose_message.updated_from": "{username} atualizou o propósito do canal de: {old} para: {new}",
   "app.channel.post_update_channel_purpose_message.updated_to": "{username} atualizou o propósito do canal para: {new}",
@@ -1314,14 +1411,14 @@
   "emoji_picker.custom": "Personalizado",
   "emoji_picker.emojiPicker": "Seleção de Emoji",
   "emoji_picker.flags": "Bandeiras",
-  "emoji_picker.food": "Comida",
+  "emoji_picker.foods": "Comidas",
   "emoji_picker.nature": "Natureza",
   "emoji_picker.objects": "Objetos",
   "emoji_picker.people": "Pessoas",
+  "emoji_picker.places": "Lugares",
   "emoji_picker.recent": "Usados recentemente",
   "emoji_picker.search": "Buscar",
   "emoji_picker.symbols": "Símbolos",
-  "emoji_picker.travel": "Viagens",
   "error.local_storage.help1": "Ativar cookies",
   "error.local_storage.help2": "Desativar navegação privada",
   "error.local_storage.help3": "Use um navegador suportado (IE 11, Chrome 43+, Firefox 38+, Safari 9, Edge)",
@@ -1516,10 +1613,10 @@
   "installed_integrations.creation": "Criado por {creator} em {createAt, date, full}",
   "installed_integrations.delete": "Deletar",
   "installed_integrations.edit": "Editar",
-  "installed_integrations.hideSecret": "Ocultar Segredo",
+  "installed_integrations.hideSecret": "Ocultar Chave Secreta",
   "installed_integrations.regenSecret": "Gerar Novamente Chave Secreta",
   "installed_integrations.regenToken": "Re-gerar Token",
-  "installed_integrations.showSecret": "Mostrar Segredo",
+  "installed_integrations.showSecret": "Mostrar Chave Secreta",
   "installed_integrations.token": "Token: {token}",
   "installed_integrations.triggerWhen": "Gatilho Quando: {triggerWhen}",
   "installed_integrations.triggerWords": "Palavras Gatilho: {triggerWords}",
@@ -1671,7 +1768,7 @@
   "mfa.setup.codeError": "Por favor digite o código do Google Authenticator.",
   "mfa.setup.required": "<strong>Autenticação multi-fator é obrigatória em {siteName}.</strong>",
   "mfa.setup.save": "Salvar",
-  "mfa.setup.secret": "Chave: {secret}",
+  "mfa.setup.secret": "Chave Secreta: {secret}",
   "mfa.setup.step1": "<strong>Passo 1: </strong>No seu smartphone, faça download do Google Authenticator no <a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a> ou <a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a>",
   "mfa.setup.step2": "<strong>Passo 2: </strong>Use o Google Authenticator para escanear este QR code, ou manualmente digite a chave",
   "mfa.setup.step3": "<strong>Passo 3: </strong>Digite o código gerado pelo Google Authenticator",
@@ -1688,6 +1785,10 @@
   "mobile.account_notifications.threads_mentions": "Menções em tópicos",
   "mobile.account_notifications.threads_start": "Tópicos que eu iniciei",
   "mobile.account_notifications.threads_start_participate": "Tópicos que eu iniciei ou participo",
+  "mobile.advanced_settings.reset_button": "Restaurar",
+  "mobile.advanced_settings.reset_message": "\nIsto irá apagar todos os dados offline e reiniciar o aplicativo. Você será automaticamente conectado novamente quando o aplicativo for reiniciado.\n",
+  "mobile.advanced_settings.reset_title": "Limpar Cache",
+  "mobile.advanced_settings.title": "Configurações Avançadas",
   "mobile.channel_drawer.search": "Ir para uma conversa",
   "mobile.channel_info.alertMessageDeleteChannel": "Você tem certeza que quer excluir o {term} {name}?",
   "mobile.channel_info.alertMessageLeaveChannel": "Você tem certeza que quer deixar o {term} {name}?",
@@ -1741,11 +1842,17 @@
   "mobile.loading_members": "Carregando Membros...",
   "mobile.loading_posts": "Carregando Mensagens...",
   "mobile.login_options.choose_title": "Escolha seu método de login",
+  "mobile.more_dms.start": "Início",
+  "mobile.more_dms.title": "Nova Conversa",
+  "mobile.notice_mobile_link": "aplicativos móveis",
+  "mobile.notice_platform_link": "plataforma",
+  "mobile.notice_text": "Mattermost é possível graças ao software open source na nossa {platform} e {mobile}.",
   "mobile.notification.in": " em ",
   "mobile.offlineIndicator.connected": "Conectado",
   "mobile.offlineIndicator.connecting": "Conectando...",
   "mobile.offlineIndicator.offline": "Sem conexão com a internet",
   "mobile.open_dm.error": "Não foi possível entrar nas mensagens diretas com {displayName}. Por favor verifique a sua conexão e tente novamente.",
+  "mobile.open_gm.error": "Não foi possível abrir uma mensagem em grupo com esses usuários. Por favor verifique sua conexão e tente novamente.",
   "mobile.post.cancel": "Cancelar",
   "mobile.post.delete_question": "Tem certeza de que deseja excluir este post?",
   "mobile.post.delete_title": "Deletar Post",
@@ -1775,6 +1882,8 @@
   "mobile.routes.thread_dm": "Tópico Mensagem Direta",
   "mobile.routes.user_profile": "Perfil",
   "mobile.routes.user_profile.send_message": "Enviar Mensagem",
+  "mobile.search.jump": "PULAR",
+  "mobile.search.no_results": "Nenhum Resultado Encontrado",
   "mobile.select_team.choose": "Suas equipes: ",
   "mobile.select_team.join_open": "Equipes abertas que você pode se juntar",
   "mobile.select_team.no_teams": "Não existem equipes disponíveis para você entrar.",
@@ -1788,6 +1897,7 @@
   "mobile.settings.clear_button": "Limpar",
   "mobile.settings.clear_message": "\nIsto irá apagar todos os dados offline e reiniciar o aplicativo. Você será automaticamente conectado novamente quando o aplicativo for reiniciado.\n",
   "mobile.settings.team_selection": "Seleção da Equipe",
+  "mobile.suggestion.members": "Membros",
   "modal.manaul_status.ask": "Não me pergunte novamente",
   "modal.manaul_status.button": "Sim, defina meu status para \"Online\"",
   "modal.manaul_status.cancel": "Não, mantenha como \"{status}\"",
@@ -1884,6 +1994,8 @@
   "post_focus_view.beginning": "Início do Canal de Arquivos",
   "post_info.del": "Deletar",
   "post_info.edit": "Editar",
+  "post_info.message.visible": "(Visível somente para você)",
+  "post_info.message.visible.compact": " (Visível somente para você)",
   "post_info.mobile.flag": "Marcar",
   "post_info.mobile.unflag": "Desmarcar",
   "post_info.permalink": "Permalink",
@@ -1896,7 +2008,7 @@
   "posts_view.loadMore": "Carregar mais mensagens",
   "posts_view.loadingMore": "Carregando mais mensagens...",
   "posts_view.newMsg": "Novas Mensagens",
-  "posts_view.newMsgBelow": "{count} {count, plural, one {nova mensagem} other {novas mensagens}} abaixo",
+  "posts_view.newMsgBelow": "{count, plural, one {Nova mensagem} other {Novas mensagens}}",
   "quick_switch_modal.channels": "Canais",
   "quick_switch_modal.channelsShortcut.mac": "- ⌘K",
   "quick_switch_modal.channelsShortcut.windows": "- CTRL+K",
@@ -1928,7 +2040,7 @@
   "rename_channel.displayNameHolder": "Insira o nome de exibição",
   "rename_channel.handleHolder": "caracteres minúsculos alfanuméricos",
   "rename_channel.lowercase": "Tem de ser caracteres minúsculos alfanuméricos",
-  "rename_channel.maxLength": "Este campo deve ser menor do que 22 caracteres",
+  "rename_channel.maxLength": "Este campo precisa ter menos de {maxLength, number} caracteres",
   "rename_channel.required": "Este campo é obrigatório",
   "rename_channel.save": "Salvar",
   "rename_channel.title": "Renomear Canal",
@@ -1967,6 +2079,7 @@
   "search_item.jump": "Pular",
   "search_results.because": "<ul><li>Se você está pesquisando uma parte da frase (ex. pesquisando \"rea\", procurando por \"reagir\" ou \"reação\"), acrescente um * ao seu termo de pesquisa</li><li>Devido ao grande volume de resultados, pesquisas com duas letras e palavras comuns como \"este\", \"um\" e \"é\" não aparecerão nos resultados de pesquisa</li></ul>",
   "search_results.noResults": "Nenhum resultado encontrado. Tentar novamente?",
+  "search_results.searching": "Pesquisando...",
   "search_results.usage": "<ul><li>Use <b>\"aspas\"</b> para pesquisar frases</li><li>Use <b>from:</b> para encontrar mensagens de usuários específicos e <b>in:</b> para encontrar postagens em canais específicos</li></ul>",
   "search_results.usageFlag1": "Você não marcou nenhuma mensagem ainda.",
   "search_results.usageFlag2": "Você pode marcar uma mensagem e comentários clicando no ",
@@ -1999,8 +2112,7 @@
   "sidebar.tutorialScreen1": "<h4>Canais</h4><p><strong>Canais</strong> organizam conversas em diferentes tópicos. Eles estão abertos a todos em sua equipe. Para enviar comunicações privadas utilize <strong>Mensagens Diretas</strong> para uma única pessoa ou <strong>Canais Privados</strong> para várias pessoas.</p>",
   "sidebar.tutorialScreen2": "<h4>Canais \"{townsquare}\" e \"{offtopic}\"</h4><p>Aqui estão dois canais públicos para começar:</p><p><strong>{townsquare}</strong> é um lugar comunicação de toda equipe. Todo mundo em sua equipe é um membro deste canal.</p><p><strong>{offtopic}</strong> é um lugar para diversão e humor fora dos canais relacionados com o trabalho. Você e sua equipe podem decidir qual outros canais serão criados.</p>",
   "sidebar.tutorialScreen3": "<h4>Criando e Participando de Canais</h4><p>Clique em <strong>\"Mais...\"</strong> para criar um novo canal ou participar de um já existente.</p><p>Você também pode criar um novo canal ao clicar <strong>no símbolo \"+\"</strong> ao lado do cabeçalho canal público ou privado.</p>",
-  "sidebar.unreadAbove": "Post(s) não lidos acima",
-  "sidebar.unreadBelow": "Post(s) não lidos abaixo",
+  "sidebar.unreads": "Mais não lidos",
   "sidebar_header.tutorial": "<h4>Menu Principal</h4><p>O <strong>Menu Principal</strong> é onde você pode <strong>Convidar Para Equipe</strong>, acessar sua <strong>Definição de Conta</strong> e ajustar o seu <strong>Tema de Cores</strong>.</p><p>Administradores de equipe podem também acessar suas <strong>Configurações de Equipe</strong> a partir deste menu.</p><p>Administradores de Sistema vão encontrar em <strong>Console do Sistema</strong> opções para administrar todo o sistema.</p>",
   "sidebar_right_menu.accountSettings": "Definições de Conta",
   "sidebar_right_menu.addMemberToTeam": "Adicionar Membros a Equipe",
@@ -2220,10 +2332,6 @@
   "user.settings.display.nameOptsDesc": "Ajustar como mostrar outros nomes de usuários nas postagens e lista de Mensagens Diretas.",
   "user.settings.display.normalClock": "Relógio de 12 horas (exemplo: 4:00 PM)",
   "user.settings.display.preferTime": "Selecione como você prefere que a hora seja mostrada.",
-  "user.settings.display.showFullname": "Mostrar primeiro e último nome",
-  "user.settings.display.showNickname": "Mostras apelidos se um existir, caso contrário mostrar o primeiro e último nome",
-  "user.settings.display.showUsername": "Mostrar nome de usuário (padrão)",
-  "user.settings.display.teammateNameDisplay": "Nome de Exibição dos Colegas de Trabalho",
   "user.settings.display.theme.applyToAllTeams": "Aplicar novo tema para todas as minhas equipes",
   "user.settings.display.theme.customTheme": "Tema Personalizado",
   "user.settings.display.theme.describe": "Abrir para gerenciar seu tema",
@@ -2300,7 +2408,7 @@
   "user.settings.mfa.removeHelp": "Remoção da autenticação multi-fator significa que você não vai mais exigir um código de acesso baseado no telefone para fazer login na sua conta.",
   "user.settings.mfa.requiredHelp": "Autenticação multi-fator é obrigatória neste servidor. Reset só é recomendado quando você precisa alterar a geração de código para um novo dispositivo. Você será obrigado a configurá-lo novamente imediatamente.",
   "user.settings.mfa.reset": "Remover MFA da sua conta",
-  "user.settings.mfa.secret": "Chave",
+  "user.settings.mfa.secret": "Chave Secreta",
   "user.settings.mfa.title": "Autenticação Multi-Fator",
   "user.settings.modal.advanced": "Avançado",
   "user.settings.modal.confirmBtns": "Sim, Descartar",
@@ -2320,19 +2428,19 @@
   "user.settings.notifications.commentsNever": "Não disparar notificações para respostas mensagens a menos que eu for mencionado",
   "user.settings.notifications.commentsRoot": "Dispara notificações de mensagens em tópicos que eu iniciei",
   "user.settings.notifications.desktop": "Enviar notificações de desktop",
-  "user.settings.notifications.desktop.allFirefoxForever": "Para toda atividade, mostrada indefinidamente",
-  "user.settings.notifications.desktop.allFirefoxTimed": "Para toda atividade, mostrada por {seconds} segundos",
   "user.settings.notifications.desktop.allNoSoundForever": "Para toda atividade, sem som, mostrada indefinidamente",
   "user.settings.notifications.desktop.allNoSoundTimed": "Para toda atividade, sem som, mostrada por {seconds} segundos",
   "user.settings.notifications.desktop.allSoundForever": "Para toda atividade, com som, mostrada indefinidamente",
+  "user.settings.notifications.desktop.allSoundHiddenForever": "Para toda atividade, mostrada indefinidamente",
+  "user.settings.notifications.desktop.allSoundHiddenTimed": "Para toda atividade, mostrada por {seconds} segundos",
   "user.settings.notifications.desktop.allSoundTimed": "Para toda atividade, sem som, mostrada por {seconds} segundos",
   "user.settings.notifications.desktop.duration": "Duração da notificação",
   "user.settings.notifications.desktop.durationInfo": "Define o tempo que as notificações no desktop permanecerão na tela ao usar o Firefox ou o Chrome. As notificações no desktop no Edge e no Safari só podem permanecer na tela por um máximo de 5 segundos.",
-  "user.settings.notifications.desktop.mentionsFirefoxForever": "Para menções e mensagens diretas, mostrada indefinidamente",
-  "user.settings.notifications.desktop.mentionsFirefoxTimed": "Para menções e mensagens diretas, mostradas por {seconds} segundos",
   "user.settings.notifications.desktop.mentionsNoSoundForever": "Para menções e mensagens diretas, sem som, mostrada indefinidamente",
   "user.settings.notifications.desktop.mentionsNoSoundTimed": "Para menções e mensagens diretas, sem som, mostradas por {seconds} segundos",
   "user.settings.notifications.desktop.mentionsSoundForever": "Para menções e mensagens diretas, com som, mostrada indefinidamente",
+  "user.settings.notifications.desktop.mentionsSoundHiddenForever": "Para menções e mensagens diretas, mostrada indefinidamente",
+  "user.settings.notifications.desktop.mentionsSoundHiddenTimed": "Para menções e mensagens diretas, mostradas por {seconds} segundos",
   "user.settings.notifications.desktop.mentionsSoundTimed": "Para menções e mensagens diretas, com som, mostrada por {seconds} segundos",
   "user.settings.notifications.desktop.seconds": "{seconds} segundos",
   "user.settings.notifications.desktop.sound": "Som da notificação",
@@ -2363,7 +2471,7 @@
   "user.settings.notifications.sensitiveUsername": "Seu usuário não sensível a maiúsculas \"{username}\"",
   "user.settings.notifications.sensitiveWords": "Outras palavras não sensível a maiúscula, separadas por virgulas:",
   "user.settings.notifications.soundConfig": "Por favor configurar sons de notificações nas configurações do seu navegador",
-  "user.settings.notifications.sounds_info": "Sons para notificações estão disponíveis no IE11, Edge, Safari, Chrome e Mattermost Desktop Apps.",
+  "user.settings.notifications.sounds_info": "Sons para notificações estão disponíveis no IE11, Safari, Chrome e Mattermost Desktop Apps.",
   "user.settings.notifications.teamWide": "Mencionar toda a equipe \"@all\"",
   "user.settings.notifications.title": "Configurações de Notificação",
   "user.settings.notifications.wordsTrigger": "Palavras que desencadeiam menções",
@@ -2444,6 +2552,28 @@
   "user.settings.security.switchSaml": "Trocar para usar SAML SSO",
   "user.settings.security.title": "Configurações de Segurança",
   "user.settings.security.viewHistory": "Ver Histórico de Acesso",
+  "user.settings.tokens.cancel": "Cancelar",
+  "user.settings.tokens.clickToEdit": "Clique 'Editar' para gerenciar seus tokens de acesso de usuário",
+  "user.settings.tokens.confirmCreateButton": "Sim, Criar",
+  "user.settings.tokens.confirmCreateMessage": "You are generating a personal access token with System Admin permissions. Are you sure want to create this token?",
+  "user.settings.tokens.confirmCreateTitle": "Criar Token de Acesso de Usuário Admin Sistema",
+  "user.settings.tokens.confirmDeleteButton": "Sim, Excluir",
+  "user.settings.tokens.confirmDeleteMessage": "Any integrations using this token will no longer be able to access the Mattermost API. You cannot undo this action. <br /><br />Are you sure want to delete the <strong>{description}</strong> token?",
+  "user.settings.tokens.confirmDeleteTitle": "Excluir Token {name}?",
+  "user.settings.tokens.copy": "Please copy the access token below. You won't be able to see it again!",
+  "user.settings.tokens.create": "Criar Novo Token",
+  "user.settings.tokens.delete": "Excluir",
+  "user.settings.tokens.description": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Personal access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>.",
+  "user.settings.tokens.description_mobile": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Personal access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>. Create new tokens on your desktop.",
+  "user.settings.tokens.id": "ID: ",
+  "user.settings.tokens.name": "Nome:",
+  "user.settings.tokens.nameHelp": "Enter a description for your token to remember what it does.",
+  "user.settings.tokens.nameRequired": "Please enter a description.",
+  "user.settings.tokens.save": "Salvar",
+  "user.settings.tokens.title": "Tokens de Acesso de Usuário",
+  "user.settings.tokens.token": "Token: ",
+  "user.settings.tokens.tokenId": "Token ID: ",
+  "user.settings.tokens.userAccessTokensNone": "Nenhum token de acesso de usuário.",
   "user_list.notFound": "Nenhum usuário encontrado",
   "user_profile.send.dm": "Enviar Mensagem",
   "user_profile.webrtc.call": "Iniciar Video Chamada",
diff --git a/webapp/i18n/ru.json b/webapp/i18n/ru.json
index 2c00ff662..50350d561 100644
--- a/webapp/i18n/ru.json
+++ b/webapp/i18n/ru.json
@@ -142,7 +142,7 @@
   "admin.advance.metrics": "Мониторинг производительности",
   "admin.audits.reload": "Перезагрузить логи активности пользователя",
   "admin.audits.title": "Логи активности пользователя",
-  "admin.authentication.email": "Аутентификация по Email",
+  "admin.authentication.email": "Аутентификация по электронной почте",
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
@@ -203,8 +203,6 @@
   "admin.compliance_table.userId": "Запрошено",
   "admin.connectionSecurityNone": "Нет",
   "admin.connectionSecurityNoneDescription": "Mattermost будет подключаться по незащищенному соединению.",
-  "admin.connectionSecurityPlain": "PLAIN",
-  "admin.connectionSecurityPlainDescription": "Mattermost будет подключаться и аутентифицироваться по незащищенному соединению.",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "Берёт существующее незащищенное соединение и пытается улучшить его до безопасного, используя TLS.",
   "admin.connectionSecurityTest": "Проверка подключения",
@@ -235,12 +233,60 @@
   "admin.customization.support": "Право и поддержка",
   "admin.database.title": "Настройки базы данных",
   "admin.developer.title": "Настройки разработчика",
+  "admin.elasticsearch.bulkIndexButton.error": "Failed to schedule Bulk Index Job: {error}",
+  "admin.elasticsearch.connectionUrlDescription": "Адрес сервера Elasticsearch. {documentationLink}",
+  "admin.elasticsearch.connectionUrlExample": "Пример: \"https://elasticsearch.example.org:9200\"",
+  "admin.elasticsearch.connectionUrlExample.documentationLinkText": "Please see documentation with server setup instructions.",
+  "admin.elasticsearch.connectionUrlTitle": "Server Connection Address:",
+  "admin.elasticsearch.elasticsearch_test_button": "Проверка подключения",
+  "admin.elasticsearch.enableIndexingDescription": "When true, indexing of new posts occurs automatically. Search queries will use database search until \"Enable Elasticsearch for search queries\" is enabled. {documentationLink}",
+  "admin.elasticsearch.enableIndexingDescription.documentationLinkText": "Learn more about Elasticsearch in our documentation.",
+  "admin.elasticsearch.enableIndexingTitle": "Enable Elasticsearch Indexing:",
+  "admin.elasticsearch.enableSearchingDescription": "Requires a successful connection to the Elasticsearch server. When true, Elasticsearch will be used for all search queries using the latest index. Search results may be incomplete until a bulk index of the existing post database is finished. When false, database search is used.",
+  "admin.elasticsearch.enableSearchingTitle": "Enable Elasticsearch for search queries:",
+  "admin.elasticsearch.indexButton.inProgress": "Indexing in progress",
+  "admin.elasticsearch.indexButton.ready": "Build Index",
+  "admin.elasticsearch.indexHelpText.buildIndex": "All posts in the database will be indexed from oldest to newest. Elasticsearch is available during indexing but search results may be incomplete until the indexing job is complete.",
+  "admin.elasticsearch.indexHelpText.cancelIndexing": "Cancelling stops the indexing job and removes it from the queue. Posts that have already been indexed will not be deleted.",
+  "admin.elasticsearch.noteDescription": "Изменение параметров в этой секции потребует перезагрузки сервера.",
+  "admin.elasticsearch.password": "E.g.: \"yourpassword\"",
+  "admin.elasticsearch.passwordDescription": "(Optional) The password to authenticate to the Elasticsearch server.",
+  "admin.elasticsearch.passwordTitle": "Пароль SMTP Сервера:",
+  "admin.elasticsearch.purgeIndexesButton": "Purge Indexes",
+  "admin.elasticsearch.purgeIndexesButton.error": "Failed to purge indexes: {error}",
+  "admin.elasticsearch.purgeIndexesButton.label": "Purge Indexes:",
+  "admin.elasticsearch.purgeIndexesButton.success": "Indexes purged successfully.",
+  "admin.elasticsearch.purgeIndexesHelpText": "Purging will entirely remove the index on the Elasticsearch server. Search results may be incomplete until a bulk index of the existing post database is rebuilt.",
+  "admin.elasticsearch.sniffDescription": "When true, sniffing finds and connects to all data nodes in your cluster automatically.",
+  "admin.elasticsearch.sniffTitle": "Enable Cluster Sniffing:",
+  "admin.elasticsearch.testConfigSuccess": "Test successful. Configuration saved.",
+  "admin.elasticsearch.testHelpText": "Tests if the Mattermost server can connect to the Elasticsearch server specified. Testing the connection only saves the configuration if the test is successful. See log file for more detailed error messages.",
+  "admin.elasticsearch.title": "Elasticsearch (Beta)",
+  "admin.elasticsearch.usernameDescription": "(Optional) The username to authenticate to the Elasticsearch server.",
+  "admin.elasticsearch.usernameExample": "E.g.: \"elastic\"",
+  "admin.elasticsearch.usernameTitle": "Имя пользователя SMTP:",
+  "admin.elasticsearchStatus.bulkIndexLabel": "Bulk Indexing:",
+  "admin.elasticsearchStatus.cancelButton": "Отмена",
+  "admin.elasticsearchStatus.status": "Состояние",
+  "admin.elasticsearchStatus.statusCancelled": "Indexing job cancelled.",
+  "admin.elasticsearchStatus.statusError": "Indexing error.",
+  "admin.elasticsearchStatus.statusError.help": "Mattermost encountered an error building the Elasticsearch index: {error}",
+  "admin.elasticsearchStatus.statusInProgress": "Job in progress. {percent}% complete.",
+  "admin.elasticsearchStatus.statusInProgress.help": "Indexing is in progress on the job server. If Elasticsearch is enabled, search results may be incomplete until the job is finished.",
+  "admin.elasticsearchStatus.statusIndexingDisabled": "Indexing disabled.",
+  "admin.elasticsearchStatus.statusLoading": "Загрузка...",
+  "admin.elasticsearchStatus.statusNoJobs": "No indexing jobs queued.",
+  "admin.elasticsearchStatus.statusPending": "Job pending.",
+  "admin.elasticsearchStatus.statusPending.help": "Elasticsearch index job is queued on the job server. If Elasticsearch is enabled, search results may be incomplete until the job is finished.",
+  "admin.elasticsearchStatus.statusRequestCancel": "Canceling Job...",
+  "admin.elasticsearchStatus.statusSuccess": "Indexing complete.",
+  "admin.elasticsearchStatus.statusSuccess.help": "Indexing is complete and new posts are being automatically indexed.",
   "admin.email.agreeHPNS": " Я понимаю и принимаю <a href=\"https://about.mattermost.com/hpns-terms/\" target='_blank'>Условия использования</a> и <a href=\"https://about.mattermost.com/hpns-privacy/\" target='_blank'>Политику конфиденциальности</a> Mattermost Hosted Push Notification Service.",
   "admin.email.allowEmailSignInDescription": "Если выбрано, Mattermost разрешает пользователям входить используя их емайл и пароль.",
   "admin.email.allowEmailSignInTitle": "Разрешить вход с помощью электронной почты: ",
   "admin.email.allowSignupDescription": "Если истина, Mattermost разрешает создание команд и регистрацию учетных записей с использованием электронной почты и пароля.  Это значение должно быть ложным, только если вы хотите ограничить способы регистрации исключительно службами единого входа, такими как OAuth и AD/LDAP.",
   "admin.email.allowSignupTitle": "Разрешить создание аккаунта с помощью электронной почты: ",
-  "admin.email.allowUsernameSignInDescription": "Если выбрано, Mattermost разрешает пользователям входить используя их имя и пароль. Эта настройка обычно используется только когда отключена проверка по эл. почте.",
+  "admin.email.allowUsernameSignInDescription": "When true, users with email login can sign in using their username and password. This setting does not affect AD/LDAP login.",
   "admin.email.allowUsernameSignInTitle": "Разрешить вход с помощью имени пользователя: ",
   "admin.email.connectionSecurityTest": "Проверка подключения",
   "admin.email.easHelp": "Узнать больше о компиляции и развёртывании ваших собственных мобильных приложений здесь <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target='_blank'>Enterprise App Store</a>.",
@@ -248,18 +294,26 @@
   "admin.email.emailSuccess": "При отправке письма не замечено никаких ошибок.  Пожалуйста, проверьте свою входящую почту, чтобы убедиться.",
   "admin.email.enableEmailBatching.clusterEnabled": "Почтовые объединения нельзя использовать в режиме высокой доступности.",
   "admin.email.enableEmailBatching.siteURL": "Почтовые объединения не могут быть включены, сначала нужно настроить URL сайта в <b>Настройки > SiteURL</b>.",
-  "admin.email.enableEmailBatchingDesc": "Когда включено, пользователи могут получать уведомления о нескольких личных сообщениях и упоминаниях, объединённые в одно письмо (настраивается в <b>Параметры аккаунта > Уведомления</b>).",
+  "admin.email.enableEmailBatchingDesc": "When true, users will have email notifications for multiple direct messages and mentions combined into a single email. Batching will occur at a default interval of 15 minutes, configurable in Account Settings > Notifications.",
   "admin.email.enableEmailBatchingTitle": "Включить почтовые объединения:",
+  "admin.email.enableSMTPAuthDesc": "When enabled, username and password are used for authenticating to the SMTP server.",
+  "admin.email.enableSMTPAuthTitle": "Enable SMTP Authentication:",
   "admin.email.fullPushNotification": "Послать полный фрагмент сообщения",
+  "admin.email.genericNoChannelPushNotification": "Send generic description with only sender name",
   "admin.email.genericPushNotification": "Отправить общее описание с именами пользователей и каналов",
   "admin.email.inviteSaltDescription": "32-символьная соль для подписи приглашений по электронной почте. Случайно генерируется во время инсталляции. Нажмите \"Создать новую\" для генерации новой соли.",
   "admin.email.inviteSaltExample": "Например: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.inviteSaltTitle": "\"Соль\" для почтового приглашения:",
   "admin.email.mhpns": "Используйте шифрованное, качественное HPNS соединение с iOS и Android приложениями",
-  "admin.email.mhpnsHelp": "Загрузить <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS app</a> из iTunes. Загрузить <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android</a> из Google Play. Узнать больше о <a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target='_blank'>HPNS</a>.",
+  "admin.email.mhpnsHelp": "Загрузить <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS app</a> из iTunes. Загрузить <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android</a> из Google Play. Узнать больше о <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target='_blank'>TPNS</a>.",
   "admin.email.mtpns": "Используйте iOS и Android приложения из iTunes и Google Play с TPNS",
   "admin.email.mtpnsHelp": "Загрузить <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS app</a> из iTunes. Загрузить <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android</a> из Google Play. Узнать больше о <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target='_blank'>TPNS</a>.",
   "admin.email.nofificationOrganizationExample": "Например: \"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\"",
+  "admin.email.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.generic": "Send generic description with only sender name",
+  "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": "Содержание push уведомления:",
   "admin.email.notificationDisplayDescription": "Отображаемое имя пользователя учётной записи электронной почты от которого происходит отправка уведомлений Mattermost.",
   "admin.email.notificationDisplayExample": "Например: \"Mattermost Notification\", \"System\", \"No-Reply\"",
   "admin.email.notificationDisplayTitle": "Отображаемое в уведомлении имя:",
@@ -274,7 +328,7 @@
   "admin.email.passwordSaltDescription": "32-символьная соль для подписи сообщений сброса пароля. Случайно генерируется во время инсталляции. Нажмите \"Создать новую\" для генерации новой соли.",
   "admin.email.passwordSaltExample": "Например: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "\"Соль\" при сбросе пароля:",
-  "admin.email.pushContentDesc": "Выбор \"Отправить общее описание с именами пользователей и каналов\" обеспечивает push-уведомления с общими сообщениями, включая имена пользователей и каналов, но без специфических деталей в текстах сообщений.<br /><br />Выбор \"Отправить полную вырезку сообщений\" отправляет выборки из сообщений, инициировавших уведомления со специфическими особенностями, и может включать конфиденциальную информацию, отправленную в сообщениях. Если Ваша служба push-уведомлений находится за пределами Вашего брандмауэра, НАСТОЯТЕЛЬНО РЕКОМЕНДУЕМ использовать эту опцию только с https протоколом для шифрования Вашего соединения.",
+  "admin.email.pushContentDesc": "\"Send generic description with only sender name\" includes only the name of the person who sent the message in push notifications, with no information about channel name or message contents.<br /><br />\"Send generic description with sender and channel names\" includes the name of the person who sent the message and the channel it was sent in, but not the message text.<br /><br />\"Send full message snippet\" includes a message excerpt in push notifications, which may contain confidential information sent in messages. If your Push Notification Service is outside your firewall, it is *highly recommended* this option only be used with an \"https\" protocol to encrypt the connection.",
   "admin.email.pushContentTitle": "Содержание push уведомления:",
   "admin.email.pushDesc": "Обычно в продуктиве включено. Если включено, Mattermost пытается отправить iOS и Android уведомления сервер уведомлений.",
   "admin.email.pushOff": "Не отправлять push-уведомления",
@@ -288,7 +342,7 @@
   "admin.email.selfPush": "Введите адрес сервиса отправки push-уведомлений вручную",
   "admin.email.skipServerCertificateVerification.description": "Если включено, Mattermost не будет проверять сертификат почтового сервера.",
   "admin.email.skipServerCertificateVerification.title": "Пропустить проверку сертификата:",
-  "admin.email.smtpPasswordDescription": " Получите эти данные от администратора, обслуживающего ваш сервер электронной почты.",
+  "admin.email.smtpPasswordDescription": "The password associated with the SMTP username.",
   "admin.email.smtpPasswordExample": "Например: \"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "Пароль SMTP Сервера:",
   "admin.email.smtpPortDescription": "Порт SMTP сервера.",
@@ -297,13 +351,17 @@
   "admin.email.smtpServerDescription": "Адрес SMTP сервера.",
   "admin.email.smtpServerExample": "Например: \"smtp.yourcompany.com\", \"email-smtp.us-east-1.amazonaws.com\"",
   "admin.email.smtpServerTitle": "SMTP Сервер:",
-  "admin.email.smtpUsernameDescription": " Получите эти сведения от администратора вашего сервера электронной почты.",
+  "admin.email.smtpUsernameDescription": "The username for authenticating to the SMTP server.",
   "admin.email.smtpUsernameExample": "Например: \"admin@yourcompany.com\", \"AKIADTOVBGERKLCBV\"",
   "admin.email.smtpUsernameTitle": "Имя пользователя SMTP:",
   "admin.email.testing": "Проверка...",
   "admin.false": "нет",
-  "admin.file.enableFileAttachments": "Включить вложения:",
-  "admin.file.enableFileAttachmentsDesc": "Если отключить, прикрепление файлов и изображений к сообщениям будет недоступно.",
+  "admin.file.enableFileAttachments": "Allow File Sharing:",
+  "admin.file.enableFileAttachmentsDesc": "When false, disables file sharing on the server. All file and image uploads on messages are forbidden across clients and devices, including mobile.",
+  "admin.file.enableMobileDownloadDesc": "When false, disables file downloads on mobile apps. Users can still download files from a mobile web browser.",
+  "admin.file.enableMobileDownloadTitle": "Allow File Downloads on Mobile:",
+  "admin.file.enableMobileUploadDesc": "When false, disables file uploads on mobile apps. If Allow File Sharing is set to true, users can still upload files from a mobile web browser.",
+  "admin.file.enableMobileUploadTitle": "Allow File Uploads on Mobile:",
   "admin.file_upload.chooseFile": "Выбрать файл",
   "admin.file_upload.noFile": "Нет загруженный файлов",
   "admin.file_upload.uploadFile": "Загрузить",
@@ -529,6 +587,21 @@
   "admin.logs.bannerDesc": "To look up users by User 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>.",
+  "admin.manage_roles.allowUserAccessTokens": "Allow this account to generate <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a>.",
+  "admin.manage_roles.cancel": "Отмена",
+  "admin.manage_roles.manageRolesTitle": "Manage Roles",
+  "admin.manage_roles.postAllPublicRole": "Access to post to all Mattermost public channels.",
+  "admin.manage_roles.postAllPublicRoleTitle": "post:channels",
+  "admin.manage_roles.postAllRole": "Access to post to all Mattermost channels including direct messages.",
+  "admin.manage_roles.postAllRoleTitle": "post:all",
+  "admin.manage_roles.save": "Сохранить",
+  "admin.manage_roles.saveError": "Unable to save roles.",
+  "admin.manage_roles.systemAdmin": "Администратор системы",
+  "admin.manage_roles.systemMember": "Участник",
+  "admin.manage_tokens.manageTokensTitle": "Manage Personal Access Tokens",
+  "admin.manage_tokens.userAccessTokensDescription": "Personal access tokens function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">interact with this Mattermost server</a>. Learn more about <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a>.",
+  "admin.manage_tokens.userAccessTokensNone": "No personal access tokens.",
   "admin.metrics.enableDescription": "Если включено, в Mattermost будет включен сбор данных о производительности и профилирование. Дополнительную информацию по конфигурации мониторинга производительности смотрите в <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>документации</a>.",
   "admin.metrics.enableTitle": "Включить мониторинг производительности",
   "admin.metrics.listenAddressDesc": "Адрес, прослушиваемый сервером для предоставления метрик производительности",
@@ -574,6 +647,19 @@
   "admin.password.requirementsDescription": "Виды символов требуемых для пароля.",
   "admin.password.symbol": "Хотя бы один символ (\"~!@#$%^&*()\")",
   "admin.password.uppercase": "Хотя бы одна заглавная буква",
+  "admin.plugins.jira": "JIRA (Beta)",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelname",
+  "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.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.userDescription": "Select the username that this integration is attached to.",
+  "admin.plugins.jira.userLabel": "Пользователи",
+  "admin.plugins.jira.webhookDocsLink": "документация",
   "admin.privacy.showEmailDescription": "Отключите, чтобы скрыть email адреса пользователей от всех, кроме системных администраторов.",
   "admin.privacy.showEmailTitle": "Показать Email: ",
   "admin.privacy.showFullNameDescription": "Когда выключено, имена и фамилии участников видны только Системному Администратору. Вместо имени и фамилии отображается Имя пользователя.",
@@ -751,6 +837,10 @@
   "admin.service.tlsKeyFileDescription": "Приватный ключ для использования.",
   "admin.service.useLetsEncrypt": "Использовать Let's Encrypt:",
   "admin.service.useLetsEncryptDescription": "Включить автоматическое получение сертификатов от Let's Encrypt. Сертификат будет получен, когда клиент попытается установить соединение с нового домена. Это будет работать для множества разных доменов.",
+  "admin.service.userAccessTokensDescLabel": "Name: ",
+  "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.userAccessTokensIdLabel": "Token ID: ",
+  "admin.service.userAccessTokensTitle": "Enable Personal Access Tokens: ",
   "admin.service.webSessionDays": "Продолжительность сессии AD/LDAP и электронной почты (в днях):",
   "admin.service.webSessionDaysDesc": "Количество дней с последнего ввода пользователем своих учетных данных до истечения срока пользовательской сессии. После изменения этого параметра, новая продолжительность сессии вступит в силу после следующего ввода пользователями своих учетных данных.",
   "admin.service.webhooksDescription": "Если истина, входящие вебхуки будут разрешены. В целях борьбы с фишинговыми атаками, все посты от имени вебхуков будут помечены тэгом БОТ. Смотрите <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>документацию</a>, чтобы узнать больше.",
@@ -769,6 +859,7 @@
   "admin.sidebar.customization": "Настройка",
   "admin.sidebar.database": "База данных",
   "admin.sidebar.developer": "Разработчик",
+  "admin.sidebar.elasticsearch": "Elasticsearch (Beta)",
   "admin.sidebar.email": "Электронная почта",
   "admin.sidebar.emoji": "Эмодзи",
   "admin.sidebar.external": "Внешние службы",
@@ -776,6 +867,7 @@
   "admin.sidebar.general": "Общие",
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.integrations": "Интеграции",
+  "admin.sidebar.jira": "JIRA (Beta)",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Право и поддержка",
   "admin.sidebar.license": "Редакция и Лицензия",
@@ -883,9 +975,9 @@
   "admin.team.restrictTitle": "Ограничить создание аккаунтов с указанных почтовых доменов:",
   "admin.team.restrict_direct_message_any": "Все пользователи сервера Mattermost",
   "admin.team.restrict_direct_message_team": "Все участники команды",
-  "admin.team.showFullname": "Показывать имя и фамилию (по умолчанию)",
+  "admin.team.showFullname": "Показывать имя и фамилию",
   "admin.team.showNickname": "Показывать псевдоним, если существует, иначе показывать имя и фамилию",
-  "admin.team.showUsername": "Показывать имя пользователя",
+  "admin.team.showUsername": "Показывать имя пользователя (по умолчанию)",
   "admin.team.siteNameDescription": "Отображаемое имя сервиса в окне входа и пользовательском интерфейсе.",
   "admin.team.siteNameExample": "Например: \"Mattermost\"",
   "admin.team.siteNameTitle": "Название сайта:",
@@ -915,7 +1007,9 @@
   "admin.user_item.makeMember": "Сделать участником",
   "admin.user_item.makeSysAdmin": "Сделать администратором системы",
   "admin.user_item.makeTeamAdmin": "Сделать администратором команды",
+  "admin.user_item.manageRoles": "Manage Roles",
   "admin.user_item.manageTeams": "Управление командами",
+  "admin.user_item.manageTokens": "Manage Tokens",
   "admin.user_item.member": "Участник",
   "admin.user_item.mfaNo": ", <strong>MFA</strong>: Нет",
   "admin.user_item.mfaYes": ", <strong>MFA</strong>: Да",
@@ -924,6 +1018,9 @@
   "admin.user_item.switchToEmail": "Переключение на E-Mail/Пароль",
   "admin.user_item.sysAdmin": "Администратор системы",
   "admin.user_item.teamAdmin": "Team Admin",
+  "admin.user_item.userAccessTokenPostAll": "(with post:all personal access tokens)",
+  "admin.user_item.userAccessTokenPostAllPublic": "(with post:channels personal access tokens)",
+  "admin.user_item.userAccessTokenYes": "(with personal access tokens)",
   "admin.webrtc.enableDescription": "При выборе Mattermost позволяет совершать <strong>тет-а-тет</strong> видеозвонки. WebRTC звонки доступны в браузерах Chrome и Firefox, а так же в приложениях Mattermost.",
   "admin.webrtc.enableTitle": "Включить Mattermost WebRTC:",
   "admin.webrtc.gatewayAdminSecretDescription": "Введите пароль для доступа к узлу администрирования.",
@@ -1314,14 +1411,14 @@
   "emoji_picker.custom": "По выбору",
   "emoji_picker.emojiPicker": "Выбор эмодзи",
   "emoji_picker.flags": "Флаги",
-  "emoji_picker.food": "Еда",
+  "emoji_picker.foods": "Еда",
   "emoji_picker.nature": "Природа",
   "emoji_picker.objects": "Объекты",
   "emoji_picker.people": "Люди",
+  "emoji_picker.places": "Places",
   "emoji_picker.recent": "Недавно использованные",
   "emoji_picker.search": "Поиск",
   "emoji_picker.symbols": "Символы",
-  "emoji_picker.travel": "Путешествия",
   "error.local_storage.help1": "Включить cookies",
   "error.local_storage.help2": "Отключите режим инкогнито",
   "error.local_storage.help3": "Воспользуйтесь поддерживаемым браузером (IE 11, Chrome 43+, Firefox 38+, Safari 9, Edge)",
@@ -1688,6 +1785,10 @@
   "mobile.account_notifications.threads_mentions": "Упоминания в тредах",
   "mobile.account_notifications.threads_start": "Ветки начатые мной",
   "mobile.account_notifications.threads_start_participate": "Threads that I start or participate in",
+  "mobile.advanced_settings.reset_button": "Reset",
+  "mobile.advanced_settings.reset_message": "\nДанное действие приведёт к очистке локальных данных и перезапуску приложения.\n",
+  "mobile.advanced_settings.reset_title": "Reset Cache",
+  "mobile.advanced_settings.title": "Дополнительные параметры",
   "mobile.channel_drawer.search": "Перейти к беседе",
   "mobile.channel_info.alertMessageDeleteChannel": "Вы действительно хотите удалить {term} {name}?",
   "mobile.channel_info.alertMessageLeaveChannel": "Вы действительно хотите покинуть {term} {name}?",
@@ -1741,11 +1842,17 @@
   "mobile.loading_members": "Загрузка списка участников...",
   "mobile.loading_posts": "Загрузка сообщений...",
   "mobile.login_options.choose_title": "Выберите метод входа",
+  "mobile.more_dms.start": "Start",
+  "mobile.more_dms.title": "New Conversation",
+  "mobile.notice_mobile_link": "mobile apps",
+  "mobile.notice_platform_link": "platform",
+  "mobile.notice_text": "Mattermost is made possible by the open source software used in our {platform} and {mobile}.",
   "mobile.notification.in": " в ",
   "mobile.offlineIndicator.connected": "Подключено",
   "mobile.offlineIndicator.connecting": "Подключение...",
   "mobile.offlineIndicator.offline": "Нет соединения с интернетом",
   "mobile.open_dm.error": "We couldn't open a direct message with {displayName}. Please check your connection and try again.",
+  "mobile.open_gm.error": "We couldn't open a group message with those users. Please check your connection and try again.",
   "mobile.post.cancel": "Отмена",
   "mobile.post.delete_question": "Вы действительно хотите удалить запись?",
   "mobile.post.delete_title": "Удалить пост",
@@ -1775,6 +1882,8 @@
   "mobile.routes.thread_dm": "Direct Message Thread",
   "mobile.routes.user_profile": "Профиль",
   "mobile.routes.user_profile.send_message": "Отправить сообщение",
+  "mobile.search.jump": "JUMP",
+  "mobile.search.no_results": "Ничего не найдено",
   "mobile.select_team.choose": "Ваши команды: ",
   "mobile.select_team.join_open": "Другие команды, к которым вы можете присоединиться.",
   "mobile.select_team.no_teams": "Нет доступных команд, к которым вы можете присоединиться.",
@@ -1788,6 +1897,7 @@
   "mobile.settings.clear_button": "Очистить",
   "mobile.settings.clear_message": "\nДанное действие приведёт к очистке локальных данных и перезапуску приложения.\n",
   "mobile.settings.team_selection": "Выбор команды",
+  "mobile.suggestion.members": "Участники",
   "modal.manaul_status.ask": "Не задавать больше этот вопрос",
   "modal.manaul_status.button": "Да, установите мой статус \"В сети\"",
   "modal.manaul_status.cancel": "Нет, оставьте статус \"{status}\"",
@@ -1884,6 +1994,8 @@
   "post_focus_view.beginning": "Начало архива канала",
   "post_info.del": "Удалить",
   "post_info.edit": "Редактировать",
+  "post_info.message.visible": "(Only visible to you)",
+  "post_info.message.visible.compact": " (Only visible to you)",
   "post_info.mobile.flag": "Отметить",
   "post_info.mobile.unflag": "Не помечено",
   "post_info.permalink": "Постоянная ссылка",
@@ -1928,7 +2040,7 @@
   "rename_channel.displayNameHolder": "Введите имя",
   "rename_channel.handleHolder": "буквы или цифры в нижнем регистре",
   "rename_channel.lowercase": "Должны быть буквы или цифры в нижнем регистре",
-  "rename_channel.maxLength": "Содержание поля должно быть короче 22 байт",
+  "rename_channel.maxLength": "This field must be less than {maxLength, number} characters",
   "rename_channel.required": "Обязательное поле",
   "rename_channel.save": "Сохранить",
   "rename_channel.title": "Переименовать канал",
@@ -1967,6 +2079,7 @@
   "search_item.jump": "Переход",
   "search_results.because": "<ul><li>Если вы ищете часть фразы (например, \"rea\", как часть фразы \"reach\" или \"reaction\"), добавьте * в маску поиска.</li><li>Двухбуквенные слова и общие слова, такие как \"this\", \"a\" и \"is\" не появятся в результатах поиска для исключения лишних результатов.</li></ul>",
   "search_results.noResults": "Ничего не найдено. Попробовать еще?",
+  "search_results.searching": "Searching...",
   "search_results.usage": "<ul><li>Используйте <b>\"кавычки\"</b> для поиска фраз</li><li>Используйте <b>from:</b> для поиска сообщений пользователя и <b>in:</b> для поиска в канале</li></ul>",
   "search_results.usageFlag1": "Вы не имеете отмеченных сообщений.",
   "search_results.usageFlag2": "Вы можете добавить флаг в сообщения и комментарии, нажав",
@@ -1999,8 +2112,7 @@
   "sidebar.tutorialScreen1": "<h4>Каналы</h4><p><strong>Каналы</strong> предназначены для организации обсуждений на разные темы. Они открыты для всех в вашей команде. Чтобы отправлять приватные коммуникации, используйте <strong>личные сообщения</strong> для диалогов или <strong>приватные каналы</strong> для общения с несколькими человеками.</p>",
   "sidebar.tutorialScreen2": "<h4>Каналы \"{townsquare}\" и \"{offtopic}\"</h4><p>Для начала вам будут доступны два публичных канала:</p><p><strong>{townsquare}</strong> используется для внутрикомандного общения. Каждый из вашей команды является участником этого канала.</p><p><strong>{offtopic}</strong> предназначен для юмора и развлечений отдельно от рабочих каналов. Вы и Ваша команда может выбрать какие другие каналы вам потребуются.</p>",
   "sidebar.tutorialScreen3": "<h4>Создание и присоединение к каналу</h4><p>Нажмите <strong>\"Больше...\"</strong> для создания или присоединения к одному из каналов.</p><p>Вы также можете создать канал или приватную группу, нажав на <strong>\"+\" symbol</strong>, идущего после заголовка канала или приватной группы.</p>",
-  "sidebar.unreadAbove": "Непрочтённые сообщения выше",
-  "sidebar.unreadBelow": "Непрочтённые сообщения ниже",
+  "sidebar.unreads": "More unreads",
   "sidebar_header.tutorial": "<h4>Main Menu</h4><p>The <strong>Main Menu</strong> is where you can <strong>Invite New Members</strong>, access your <strong>Account Settings</strong> and set your <strong>Theme Color</strong>.</p><p>Team administrators can also access their <strong>Team Settings</strong> from this menu.</p><p>System administrators will find a <strong>System Console</strong> option to administrate the entire system.</p>",
   "sidebar_right_menu.accountSettings": "Учетная запись",
   "sidebar_right_menu.addMemberToTeam": "Добавить пользователей в команду",
@@ -2220,10 +2332,6 @@
   "user.settings.display.nameOptsDesc": "Установите, как отображать Ваши имена в постах и в списке выбора личных сообщений.",
   "user.settings.display.normalClock": "12-часовой формат (пример: 4:00 PM)",
   "user.settings.display.preferTime": "Выберите предпочитаемый формат времени.",
-  "user.settings.display.showFullname": "Показывать имя и фамилию",
-  "user.settings.display.showNickname": "Показывать псевдоним, если существует, иначе показывать имя и фамилию",
-  "user.settings.display.showUsername": "Показывать имя пользователя (по умолчанию)",
-  "user.settings.display.teammateNameDisplay": "Отображение имени в команде",
   "user.settings.display.theme.applyToAllTeams": "Применить новую тему для всех моих команд",
   "user.settings.display.theme.customTheme": "Пользовательская Тема",
   "user.settings.display.theme.describe": "Откройте для настройки темы",
@@ -2320,19 +2428,19 @@
   "user.settings.notifications.commentsNever": "Не показывать уведомления о сообщениях в нити, пока я не буду упомянут",
   "user.settings.notifications.commentsRoot": "Срабатывают уведомления о сообщениях в темах, которые я начинаю",
   "user.settings.notifications.desktop": "Отправлять уведомления на рабочий стол",
-  "user.settings.notifications.desktop.allFirefoxForever": "Для всей активности, показывать бесконечно",
-  "user.settings.notifications.desktop.allFirefoxTimed": "Для всей активности, показывать на {seconds} секунд",
   "user.settings.notifications.desktop.allNoSoundForever": "Для всей активности без звука, показывать бесконечно",
   "user.settings.notifications.desktop.allNoSoundTimed": "Для всей активности без звука, показывать {seconds} секунд",
   "user.settings.notifications.desktop.allSoundForever": "Для всей активности со звуком, показывать бесконечно",
+  "user.settings.notifications.desktop.allSoundHiddenForever": "Для всей активности, показывать бесконечно",
+  "user.settings.notifications.desktop.allSoundHiddenTimed": "Для всей активности, показывать на {seconds} секунд",
   "user.settings.notifications.desktop.allSoundTimed": "Для всей активности со звуком, показывать на {seconds} секунд",
   "user.settings.notifications.desktop.duration": "Длительность уведомления",
   "user.settings.notifications.desktop.durationInfo": "Определяет, сколько времени уведомления рабочего стола будут оставаться на экране при использовании Firefox или Chrome. При использовании Edge и Safari уведомления могут оставаться на экране максимум 5 секунд.",
-  "user.settings.notifications.desktop.mentionsFirefoxForever": "При упоминаниях и личных сообщениях, не скрывать автоматически",
-  "user.settings.notifications.desktop.mentionsFirefoxTimed": "При упоминаниях и личных сообщениях, скрыть через {seconds} секунд",
   "user.settings.notifications.desktop.mentionsNoSoundForever": "При упоминаниях и личных сообщениях, без звука, не скрывать автоматически",
   "user.settings.notifications.desktop.mentionsNoSoundTimed": "При упоминаниях и личных сообщениях, без звука, скрыть через {seconds} секунд",
   "user.settings.notifications.desktop.mentionsSoundForever": "При упоминаниях и личных сообщениях, со звуком, не скрывать автоматически",
+  "user.settings.notifications.desktop.mentionsSoundHiddenForever": "При упоминаниях и личных сообщениях, не скрывать автоматически",
+  "user.settings.notifications.desktop.mentionsSoundHiddenTimed": "При упоминаниях и личных сообщениях, скрыть через {seconds} секунд",
   "user.settings.notifications.desktop.mentionsSoundTimed": "При упоминаниях и личных сообщениях, со звуком, скрыть через {seconds} секунд",
   "user.settings.notifications.desktop.seconds": "{seconds} секунд",
   "user.settings.notifications.desktop.sound": "Звук уведомления",
@@ -2444,6 +2552,28 @@
   "user.settings.security.switchSaml": "Перейти к использованию SAML SSO",
   "user.settings.security.title": "Настройки безопасности",
   "user.settings.security.viewHistory": "Просмотр истории активности",
+  "user.settings.tokens.cancel": "Отмена",
+  "user.settings.tokens.clickToEdit": "Click 'Edit' to manage your personal access tokens",
+  "user.settings.tokens.confirmCreateButton": "Yes, Create",
+  "user.settings.tokens.confirmCreateMessage": "You are generating a personal access token with System Admin permissions. Are you sure want to create this token?",
+  "user.settings.tokens.confirmCreateTitle": "Create System Admin Personal Access Token",
+  "user.settings.tokens.confirmDeleteButton": "Yes, Delete",
+  "user.settings.tokens.confirmDeleteMessage": "Any integrations using this token will no longer be able to access the Mattermost API. You cannot undo this action. <br /><br />Are you sure want to delete the <strong>{description}</strong> token?",
+  "user.settings.tokens.confirmDeleteTitle": "Delete Token?",
+  "user.settings.tokens.copy": "Please copy the access token below. You won't be able to see it again!",
+  "user.settings.tokens.create": "Create New Token",
+  "user.settings.tokens.delete": "Удалить",
+  "user.settings.tokens.description": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Personal access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>.",
+  "user.settings.tokens.description_mobile": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Personal access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>. Create new tokens on your desktop.",
+  "user.settings.tokens.id": "ID: ",
+  "user.settings.tokens.name": "Имя:",
+  "user.settings.tokens.nameHelp": "Enter a description for your token to remember what it does.",
+  "user.settings.tokens.nameRequired": "Please enter a description.",
+  "user.settings.tokens.save": "Сохранить",
+  "user.settings.tokens.title": "Personal Access Tokens",
+  "user.settings.tokens.token": "Access Token: ",
+  "user.settings.tokens.tokenId": "Token ID: ",
+  "user.settings.tokens.userAccessTokensNone": "No personal access tokens.",
   "user_list.notFound": "Пользователи не найдены",
   "user_profile.send.dm": "Отправить сообщение",
   "user_profile.webrtc.call": "Видеовызов",
diff --git a/webapp/i18n/tr.json b/webapp/i18n/tr.json
index 536688696..f8c852bc7 100644
--- a/webapp/i18n/tr.json
+++ b/webapp/i18n/tr.json
@@ -203,8 +203,6 @@
   "admin.compliance_table.userId": "İsteyen",
   "admin.connectionSecurityNone": "Yok",
   "admin.connectionSecurityNoneDescription": "Mattermost güvenli olmayan şekilde bağlanacak.",
-  "admin.connectionSecurityPlain": "DÜZ",
-  "admin.connectionSecurityPlainDescription": "Mattermost güvenli olmayan şekilde bağlanacak ve kimlik doğrulaması yapacak.",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "Var olan güvenli olmayan bir bağlantıyı alarak TLS ile güvenli bağlantıya çevirmeyi dener.",
   "admin.connectionSecurityTest": "Bağlantıyı Sına",
@@ -235,31 +233,87 @@
   "admin.customization.support": "Hükümler ve Destek",
   "admin.database.title": "Veritabanı Ayarları",
   "admin.developer.title": "Geliştirici Ayarları",
+  "admin.elasticsearch.bulkIndexButton.error": "Toplu Dizine Ekleme İşlemi Zamanlanamadı: {error}",
+  "admin.elasticsearch.connectionUrlDescription": "Elasticsearch sunucusunun adresi. {documentationLink}",
+  "admin.elasticsearch.connectionUrlExample": "Örnek: \"https://elasticsearch.websitem.org:9200\"",
+  "admin.elasticsearch.connectionUrlExample.documentationLinkText": "Sunucu kurulumu ile ilgili bilgi almak için belgelere bakın.",
+  "admin.elasticsearch.connectionUrlTitle": "Sunucu Bağlantı Adresi:",
+  "admin.elasticsearch.elasticsearch_test_button": "Bağlantıyı Sına",
+  "admin.elasticsearch.enableIndexingDescription": "Bu seçenek etkinleştirildiğinde, yeni iletiler otomatik olarak dizine eklenir. \"Arama sorguları için Elasticsearch kullanılsın\" seçeneği etkinleştirilene kadar arama sorguları veritabanını kullanır. {documentationLink}",
+  "admin.elasticsearch.enableIndexingDescription.documentationLinkText": "Elasticsearch hakkında ayrıntılı bilgi almak için belgelere bakın.",
+  "admin.elasticsearch.enableIndexingTitle": "Elasticsearch Dizini Kullanılsın:",
+  "admin.elasticsearch.enableSearchingDescription": "Çalışan bir Elasticsearch sunucu bağlantısı gereklidir. Bu seçenek etkinleştirildiğinde, tüm arama sorguları için son Elasticsearch dizini kullanılır. Varolan ileti veritabanının dizine eklenmesi tamamlanana kadar arama sonuçları eksik olabilir. Bu seçenek devre dışı bırakıldığında veritabanı araması kullanılır.",
+  "admin.elasticsearch.enableSearchingTitle": "Arama sorguları için Elasticsearch kullanılsın:",
+  "admin.elasticsearch.indexButton.inProgress": "Dizine ekleme işlemi sürüyor",
+  "admin.elasticsearch.indexButton.ready": "Dizin Oluştur",
+  "admin.elasticsearch.indexHelpText.buildIndex": "Veritabanındaki tüm iletiler eskiden yeniye doğru dizine eklenecek. Dizine ekleme sırasında Elasticsearch kullanılabilir ancak dizine ekleme işlemi tamamlanana kadar arama sonuçları eksik olabilir.",
+  "admin.elasticsearch.indexHelpText.cancelIndexing": "İşlemin iptal edilmesi dizine ekleme işlemini durdurur ve kuyruktan kaldırır. Dizine eklenmiş olan iletiler silinmez.",
+  "admin.elasticsearch.noteDescription": "Bu bölümde yapılan değişikliklerin etkin olması için sunucu yeniden başlatılmalıdır.",
+  "admin.elasticsearch.password": "Örnek: \"parolanız\"",
+  "admin.elasticsearch.passwordDescription": "(İsteğe bağlı) Elasticsearch sunucusunda kimlik doğrulaması için kullanılacak parola.",
+  "admin.elasticsearch.passwordTitle": "Sunucu Parolası:",
+  "admin.elasticsearch.purgeIndexesButton": "Dizinleri Sil",
+  "admin.elasticsearch.purgeIndexesButton.error": "Dizinler silinemedi: {error}",
+  "admin.elasticsearch.purgeIndexesButton.label": "Dizinleri Sil:",
+  "admin.elasticsearch.purgeIndexesButton.success": "Dizinler silindi.",
+  "admin.elasticsearch.purgeIndexesHelpText": "Silme işlemi Elasticsearch sunucusu üzerindeki tüm dizinleri siler. Varolan ileti veritabanı için toplu dizine ekleme işlemi yürütülene kadar arama sonuçları eksik olabilir.",
+  "admin.elasticsearch.sniffDescription": "Bu seçenek etkinleştirildiğinde, kümenizdeki tüm veri düğümleri koklama ile otomatik olarak bulunur ve bağlanılır.",
+  "admin.elasticsearch.sniffTitle": "Küme Koklama Kullanılsın:",
+  "admin.elasticsearch.testConfigSuccess": "Sınama tamamlandı. Yapılandırma kaydedildi.",
+  "admin.elasticsearch.testHelpText": "Mattermost sunucusunun belirtilen Elasticsearch sunucusu ile bağlantı kurup kuramadığını sınar. Yapılandırma ayarları yalnız bağlantının sınaması başarılı olduğunda kaydedilir. Ayrıntılı hata iletilerini görmek için günlük dosyasına bakın.",
+  "admin.elasticsearch.title": "Elasticsearch (Beta)",
+  "admin.elasticsearch.usernameDescription": "(İsteğe bağlı) Elasticsearch sunucusunda kimlik doğrulaması için kullanılacak kullanıcı adı.",
+  "admin.elasticsearch.usernameExample": "Örnek: \"elastic\"",
+  "admin.elasticsearch.usernameTitle": "Sunucu Kullanıcı Adı:",
+  "admin.elasticsearchStatus.bulkIndexLabel": "Toplu Dizine Ekleme:",
+  "admin.elasticsearchStatus.cancelButton": "İptal",
+  "admin.elasticsearchStatus.status": "Durum: ",
+  "admin.elasticsearchStatus.statusCancelled": "Dizine ekleme işlemi iptal edildi",
+  "admin.elasticsearchStatus.statusError": "Dizine ekleme sorunu.",
+  "admin.elasticsearchStatus.statusError.help": "Elasticsearch dizine ekleme işlemi sırasında Mattermost üzerinde bir sorun çıktı: {error}",
+  "admin.elasticsearchStatus.statusInProgress": "İşlem sürüyor. %{percent} tamamlandı.",
+  "admin.elasticsearchStatus.statusInProgress.help": "Sunucu üzerinde dizine ekleme işlemi sürüyor. Elasticsearch etkinleştirilmiş ise, işlem tamamlanana kadar arama sonuçları eksik olabilir.",
+  "admin.elasticsearchStatus.statusIndexingDisabled": "Dizine ekleme devre dışı.",
+  "admin.elasticsearchStatus.statusLoading": "Yükleniyor...",
+  "admin.elasticsearchStatus.statusNoJobs": "Herhangi bir dizine ekleme işi yok.",
+  "admin.elasticsearchStatus.statusPending": "İşlem bekliyor.",
+  "admin.elasticsearchStatus.statusPending.help": "Sunucu üzerinde Elasticsearch dizine ekleme işlemi kuyruğa eklenmiş. Elasticsearch etkinleştirilmiş ise işlem tamamlanana kadar arama sonuçları eksik olabilir.",
+  "admin.elasticsearchStatus.statusRequestCancel": "İşlem İptal Ediliyor...",
+  "admin.elasticsearchStatus.statusSuccess": "Dizine ekleme işlemi tamamlandı.",
+  "admin.elasticsearchStatus.statusSuccess.help": "Dizine ekleme işlemi tamamlandı ve yeni iletiler otomatik olarak dizine eklenecek.",
   "admin.email.agreeHPNS": " Mattermost Anında Bildirim Hizmeti <a href=\"https://about.mattermost.com/hpns-terms/\" target='_blank'>Hüküm ve Koşulları</a> ile <a href=\"https://about.mattermost.com/hpns-privacy/\" target='_blank'>Gizlilik Politikasını</a> anladım ve onaylıyorum.",
   "admin.email.allowEmailSignInDescription": "Bu seçenek etkinleştirildiğinde, kullanıcılar e-posta ve parola ile Mattermost oturumu açabilir.",
   "admin.email.allowEmailSignInTitle": "E-posta ile oturum açılabilsin: ",
-  "admin.email.allowSignupDescription": "Bu seçenek etkinleştirildiğinde, kullanıcılar Mattermost üzerine e-posta ve parola kullanarak takım ve hesap eklenebilir. Bu seçeneği yalnız hesap açma işlemleri için OAuth ya da AD/LDAP gibi bir tek oturum açma hizmeti kullanıyorsanız devre dışı bırakın.",
+  "admin.email.allowSignupDescription": "Bu seçenek etkinleştirildiğinde, kullanıcılar Mattermost üzerinde e-posta ve parola kullanarak hesap açabilir. Hesap açma işlemlerini AD/LDAP, SAML ya da GitLab gibi bir tek oturum açma hizmeti ile sınırlamak istiyorsanız bu seçeneği devre dışı bırakın.",
   "admin.email.allowSignupTitle": "E-posta ile hesap açılabilsin: ",
-  "admin.email.allowUsernameSignInDescription": "Bu seçenek etkinleştiriliğinde, kullanıcılar Mattermost üzerinde kullanıcı adı ve parola kullanarak oturum açabilir. Bu seçenek genellikle yalnız e-posta doğrulaması devre dışı bırakıldığında kullanılır.",
+  "admin.email.allowUsernameSignInDescription": "Bu seçenek etkinleştirildiğinde, e-posta ile hesap açan kullanıcılar kullanıcı adı ve parola kullanarak da oturum açabilir. Bu seçenek AD/LDAP oturum açma özelliğini etkilemez.",
   "admin.email.allowUsernameSignInTitle": "Kullanıcı adı ile oturum açılabilsin: ",
   "admin.email.connectionSecurityTest": "Bağlantıyı Sına",
-  "admin.email.easHelp": "Kendi mobil uygulamalarınızı derlemek ve yayınlamak için <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target='_blank'>Enterprise Uygulama Mağazasına bakın</a>.",
+  "admin.email.easHelp": "Kendi mobil uygulamalarınızı derlemek ve yayınlamak için <a href=\"https://about.mattermost.com/default-enterprise-app-store\" target='_blank'>Enterprise Uygulama Mağazasına bakın</a>.",
   "admin.email.emailFail": "Bağlantı kurulamadı: {error}",
   "admin.email.emailSuccess": "E-posta gönderilirken herhangi bir sorun bildirilmedi. Lütfen emin olmak için gelen kutunuza bakın.",
   "admin.email.enableEmailBatching.clusterEnabled": "Yüksek Erişilebilirlik kipi etkinken toplu e-posta özelliği etkinleştirilemez.",
   "admin.email.enableEmailBatching.siteURL": "<b>Ayarlar > Site Adresi</b> bölümünden site adresi ayarlanmadan toplu e-posta özelliği etkinleştirilemez.",
-  "admin.email.enableEmailBatchingDesc": "Bu seçenek etkinleştirildiğinde, doğrudan iletiler ve anmalar kullanıcılara <b>Hesap Ayarları > Bildirimler</b> bölümünden ayarlanabilen tek bir e-posta içinde gönderilir.",
+  "admin.email.enableEmailBatchingDesc": "Bu seçenek etkinleştirildiğinde, kullanıcılar birden çok doğrudan ileti ve anma bildirimini tek bir e-posta içinde alır. Toplu işlem varsayılan olarak 15 dakikada bir yapılır ve bu süre Hesap Ayarları > Bildirimler bölümünden ayarlanabilir.",
   "admin.email.enableEmailBatchingTitle": "Toplu E-posta Kullanılsın:",
-  "admin.email.fullPushNotification": "Tam ileti bölümü gönderilsin",
-  "admin.email.genericPushNotification": "Kullanıcı ve kanal adları ile genel açıklama gönderilsin",
+  "admin.email.enableSMTPAuthDesc": "Bu seçenek etkinleştirildiğinde, SMTP sunucuda kimlik doğrulaması için kullanıcı adı ve parola kullanılır.",
+  "admin.email.enableSMTPAuthTitle": "SMTP Kimlik Doğrulaması Kullanılsın",
+  "admin.email.fullPushNotification": "İleti bölümünün tümü gönderilsin",
+  "admin.email.genericNoChannelPushNotification": "Genel açıklama yalnız gönderen adıyla gönderilsin",
+  "admin.email.genericPushNotification": "Genel açıklama kullanıcı ve kanal adları ile gönderilsin",
   "admin.email.inviteSaltDescription": "E-posta çağrılarını imzalamak için eklenecek 32 karakter uzunluğundaki çeşni. Kurulum sırasında rastgele olarak üretilir. Yeni bir çeşni oluşturmak için \"Yeniden Oluştur\" üzerine tıklayın.",
   "admin.email.inviteSaltExample": "Örnek: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.inviteSaltTitle": "E-posta Çağrı Çeşnisi:",
   "admin.email.mhpns": "iOS ve Android uygulamaları için üretim kalitesinde şifrelenmiş HPNS bağlantısı kullanılsın",
-  "admin.email.mhpnsHelp": "<a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS uygulamasını</a> iTunes üzerinden indirin. <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android app</a>Mattermost Android uygulamasını</a> Google Play üzerinden indirin. <a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target='_blank'>HPNS</a> hakkında ayrıntılı bilgi alın.",
+  "admin.email.mhpnsHelp": "<a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS uygulamasını</a> iTunes üzerinden indirin. <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android uygulamasını</a> Google Play üzerinden indirin. <a href=\"https://about.mattermost.com/default-hpns\" target='_blank'>HPNS</a> hakkında ayrıntılı bilgi alın.",
   "admin.email.mtpns": "iOS ve Android uygulamalarını iTunes ve Google Play üzerinden TPNS ile kullanın",
-  "admin.email.mtpnsHelp": "<a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS uygulamasını</a> iTunes üzerinden indirin. <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android uygulamasını</a> Google Play üzerinden indirin. <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target='_blank'>TPNS</a> hakkında ayrıntılı bilgi alın.",
+  "admin.email.mtpnsHelp": "<a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS uygulamasını</a> iTunes üzerinden indirin. <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android uygulamasını</a> Google Play üzerinden indirin. <a href=\"https://about.mattermost.com/default-tpns/\" target='_blank'>TPNS</a> hakkında ayrıntılı bilgi alın.",
   "admin.email.nofificationOrganizationExample": "Örnek \"© ABC Ltd., 565 Atatürk Cad, Ankara, 06000, Türkiye\"",
+  "admin.email.notification.contents.full": "Tam ileti içeriği gönderilsin",
+  "admin.email.notification.contents.full.description": "E-posta bildirimlerinde gönderen adı ve kanal bulunur.</br>Genellikle uyumluluk nedeniyle, Mattermost üzerinde gizli bilgiler varsa ve güvenlik ilkesi gereği bu bilgiler e-posta olarak kaydedilemiyorsa kullanılır.",
+  "admin.email.notification.contents.generic": "Yalnız gönderen adıyla genel açıklama gönderilsin",
+  "admin.email.notification.contents.generic.description": "E-posta bildirimlerinde, herhangi bir kanal adı ya da ileti içeriği olmadan yalnız iletiyi gönderen kişinin adı bulunur. </br>Genellikle uyumluluk nedeniyle, Mattermost üzerinde gizli bilgiler varsa ve güvenlik ilkesi gereği bu bilgiler e-posta olarak kaydedilemiyorsa kullanılır.",
+  "admin.email.notification.contents.title": "E-posta Bildirimi İçerikleri: ",
   "admin.email.notificationDisplayDescription": "Matermost bildirim e-postaları gönderilirken kullanılacak e-posta hesabı için görüntülenecek ad.",
   "admin.email.notificationDisplayExample": "Örnek: \"Mattermost Bildirimi\", \"Sistem\", \"No-Reply\"",
   "admin.email.notificationDisplayTitle": "Görüntülenecek Bildirim Adı:",
@@ -274,11 +328,11 @@
   "admin.email.passwordSaltDescription": "Parola sıfırlama e-postalarını imzalamak için eklenecek 32 karakter uzunluğundaki çeşni. Kurulum sırasında rastgele olarak üretilir. Yeni bir çeşni oluşturmak için \"Yeniden Oluştur\" üzerine tıklayın.",
   "admin.email.passwordSaltExample": "Örnek: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "Parola Sıfırlama Çeşnisi:",
-  "admin.email.pushContentDesc": "\"Kullanıcı ve kanal adları ile genel açıklama gönderilsin\" olarak seçildiğinde, anında bildirimlere genel iletiler, kullanıcı ve kanal adları eklenir ancak ileti metni ile ilgili belirli bilgiler eklenmez.<br /><br />\"Tam ileti bölümü gönderilsin\" olarak seçildiğinde, ileti tetikleme bildirimleri özellikleri ve gizli bilgiler gönderilebilir. Anında Bildirim Hizmetiniz güvenlik duvarınızın dışındaysa bu seçeneğin \"https\" iletişim kuralı ile kullanılarak bağlantının şifrelenmesi ÖNEMLE ÖNERİLİR.",
+  "admin.email.pushContentDesc": "\"Genel açıklama yalnız gönderen adıyla gönderilsin\" seçeneği kullanıldığında, yalnız anında bildirimi gönderen kişinin adı görüntülenir, kanal adı ya da ileti içeriği görüntülenmez.<br /><br />\"Genel açıklama yalnız gönderen adıyla gönderilsin\" seçeneği kullanıldığında, iletiyi gönderen kişinin adı ve gönderilen kanal adı görüntülenir, ileti metni görüntülenmez.<br /><br />\"İleti bölümünün tümü gönderilsin\" seçeneği kullanıldığında, gizli bilgilerin de bulunabileceği anında bildirim metni görüntülenir. AnındaBildirim Hizmetniiz bir güvenlik duvarının dışındaysa bu seçeneği şifrelenmiş iletişim sağlayan \"https\" iletişim kuralıyla birlikte kullanmanız *önemle önerilir*.",
   "admin.email.pushContentTitle": "Anında Bildirim İçerikleri:",
   "admin.email.pushDesc": "Bu seçenek genel olarak üretim ortamında etkinleştirilir. Etkinleştirildiğinde, Mattermost bildirim sunucu üzerinden iOS ve Android uygulamasına anında bildirim göndermeyi dener.",
   "admin.email.pushOff": "Anında bildirimler gönderilmesin",
-  "admin.email.pushOffHelp": "Kurulum seçenekleri hakkında ayrıntılı bilgi almak için <a href=\"http://docs.mattermost.com/deployment/push.html#push-notifications-and-mobile-devices\" target='_blank'>anında bildirim belgelerine bakın</a>.",
+  "admin.email.pushOffHelp": "Kurulum seçenekleri hakkında ayrıntılı bilgi almak için <a href=\"https://about.mattermost.com/default-mobile-push-notifications\" target='_blank'>anında bildirim belgelerine bakın</a>.",
   "admin.email.pushServerDesc": "Mattermost anında bildirim hizmetinin konumu. Güvenlik duvarı arkasında iseniz https://github.com/mattermost/push-proxy adresini kullanın. Denemek için Apple Uygulama Mağazasındaki örnek Mattermost iOS uygulamasına bağlanan http://push-test.mattermost.com adresini kullanabilirsiniz. Lütfen üretim ortamları için deneme hizmetini kullanmayın.",
   "admin.email.pushServerEx": "Örnek: \"http://push-test.mattermost.com\"",
   "admin.email.pushServerTitle": "Anında Bildirim Sunucusu:",
@@ -288,7 +342,7 @@
   "admin.email.selfPush": "Anında Bildirim Hizmeti konumunu el ile yazın",
   "admin.email.skipServerCertificateVerification.description": "Bu seçenek etkinleştirildiğinde, Mattermost e-posta sunucusu sertifikasını doğrulamaz.",
   "admin.email.skipServerCertificateVerification.title": "Sunucu Sertifika Doğrulaması Atlansın: ",
-  "admin.email.smtpPasswordDescription": " E-posta sunucunuzu ayarlayan yöneticiden bu kimlik doğrulama bilgilerini isteyin.",
+  "admin.email.smtpPasswordDescription": "SMTP hesabının parolası.",
   "admin.email.smtpPasswordExample": "Örnek: \"parolanız\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "SMTP Sunucu Parolası:",
   "admin.email.smtpPortDescription": "SMTP e-posta sunucu kapı numarası.",
@@ -297,13 +351,17 @@
   "admin.email.smtpServerDescription": "SMTP e-posta sunucusunun konumu.",
   "admin.email.smtpServerExample": "Örnek: \"smtp.kurulusunuz.com\", \"email-smtp.us-east-1.amazonaws.com\"",
   "admin.email.smtpServerTitle": "SMTP Sunucusu:",
-  "admin.email.smtpUsernameDescription": " E-posta sunucunuzu ayarlayan yöneticiden bu kimlik doğrulama bilgilerini isteyin.",
+  "admin.email.smtpUsernameDescription": "SMTP hesabının kullanıcı adı.",
   "admin.email.smtpUsernameExample": "Örnek: \"admin@kurulusunuz.com\", \"AKIADTOVBGERKLCBV\"",
   "admin.email.smtpUsernameTitle": "SMTP Sunucu Kullanıcı Adı:",
   "admin.email.testing": "Sınanıyor...",
   "admin.false": "yanlış",
-  "admin.file.enableFileAttachments": "Dosyalar Eklenebilsin:",
-  "admin.file.enableFileAttachmentsDesc": "Bu seçenek devre dışı bırakıldığında, iletilere dosya ve görsel eklenemez.",
+  "admin.file.enableFileAttachments": "Dosya Paylaşılabilsin:",
+  "admin.file.enableFileAttachmentsDesc": "Bu seçenek devre dışı bırakıldığında, sunucu üzerinde dosya paylaşımı yapılamaz. İletilere yüklenmiş dosya ve görsellere mobil aygıtlar dahil olmak üzere hiç bir istemci ve aygıt tarafından erişilemez.",
+  "admin.file.enableMobileDownloadDesc": "Bu seçenek devre dışı bırakıldığında, dosyalar mobil uygulamalardan indirilemez. Ancak kullanıcılar dosyaları mobil web tarayıcılar üzerinden indirebilir.",
+  "admin.file.enableMobileDownloadTitle": "Dosyalar Mobil Uygulamalardan İndirilebilsin:",
+  "admin.file.enableMobileUploadDesc": "Bu seçenek devre dışı bırakıldığında, dosyalar mobil uygulamalardan yüklenemez. Ancak Dosya Paylaşılabilsin seçeneği etkinleştirilmiş ise, kullanıcılar dosyaları mobil web tarayıcılar üzerinden yükleyebilir.",
+  "admin.file.enableMobileUploadTitle": "Dosyalar Mobil Uygulamalardan Yüklenebilsin:",
   "admin.file_upload.chooseFile": "Dosyayı Seçin",
   "admin.file_upload.noFile": "Herhangi bir dosya yüklenmemiş",
   "admin.file_upload.uploadFile": "Yükle",
@@ -529,6 +587,21 @@
   "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.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>.",
+  "admin.manage_roles.allowUserAccessTokens": "Bu hesabın <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">kullanıcı erişim kodları</a> oluşturmasına izin verin.",
+  "admin.manage_roles.cancel": "İptal",
+  "admin.manage_roles.manageRolesTitle": "Rol Yönetimi",
+  "admin.manage_roles.postAllPublicRole": "Herkese açık tüm Mattermost kanallarındaki iletilere erişim.",
+  "admin.manage_roles.postAllPublicRoleTitle": "ileti:kanallar",
+  "admin.manage_roles.postAllRole": "Doğrudan iletiler dahil tüm Mattermost kanallarına erişim.",
+  "admin.manage_roles.postAllRoleTitle": "ileti:tümü",
+  "admin.manage_roles.save": "Kaydet",
+  "admin.manage_roles.saveError": "Roller kaydedilemedi.",
+  "admin.manage_roles.systemAdmin": "Sistem Yöneticisi",
+  "admin.manage_roles.systemMember": "Üye",
+  "admin.manage_tokens.manageTokensTitle": "Kullanıcı Erişim Kodları Yönetimi",
+  "admin.manage_tokens.userAccessTokensDescription": "Kullanıcı erişim kodları, oturum kodlarına benzer ve bütünleştirmelerin <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">REST API ile kimlik doğrulamasını sağlar</a>. <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Kullanıcı erişim kodları hakkında ayrıntılı bilgi almak için buraya tıklayın</a>.",
+  "admin.manage_tokens.userAccessTokensNone": "Herhangi bir kullanıcı erişim kodu yok.",
   "admin.metrics.enableDescription": "Bu seçenek etkinleştirildiğinde, Mattermost başarım izleme derleme ve profillemesi kullanılır. Lütfen Mattermost başarım izlemesi ayarları hakkında ayrıntılı bilgi almak için <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>belgelere bakın</a>.",
   "admin.metrics.enableTitle": "Başarım İzlemesi Kullanılsın:",
   "admin.metrics.listenAddressDesc": "Başarım ölçütlerinin dinleneceği sunucu adresi.",
@@ -574,6 +647,19 @@
   "admin.password.requirementsDescription": "Karakter türleri için geçerli bir parola olmalıdır.",
   "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.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.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.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",
   "admin.privacy.showEmailDescription": "Bu seçenek devre dışı bırakıldığında, e-posta adresi Sistem Yöneticileri dışındaki kullanıcılara görüntülenmez.",
   "admin.privacy.showEmailTitle": "E-posta Adresi Görüntülensin: ",
   "admin.privacy.showFullNameDescription": "Bu seçenek devre dışı bırakıldığında, tam ad Sistem Yöneticileri dışındaki kullanıcılara görüntülenmez. Tam ad yerine kullanıcı adı görüntülenir.",
@@ -751,6 +837,10 @@
   "admin.service.tlsKeyFileDescription": "Kullanılacak özel anahtar.",
   "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": "Name: ",
+  "admin.service.userAccessTokensDescription": "Bu seçenek etkinleştirildiğinde, kullanıcılar <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">kullanıcı 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/>Kullanıcı 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.userAccessTokensIdLabel": "Erişim Kodu: ",
+  "admin.service.userAccessTokensTitle": "Kullanıcı Erişim Kodları Kullanılsın: ",
   "admin.service.webSessionDays": "AD/LDAP ve e-posta oturum süresi (gün):",
   "admin.service.webSessionDaysDesc": "Oturumunun sonlandırılması için bir kullanıcının kimlik bilgilerini son kez yazmasından sonra geçmesi gereken gün sayısı. Bu değer değiştirildikten sonra yeni oturum süresi, kullanıcı kimlik bilgileri yeniden yazdıktan sonra geçerli olur.",
   "admin.service.webhooksDescription": "Bu seçenek etkinleştirildiğinde gelen web bağlantıları kullanılır. Saldırıları engellemek için tüm web bağlantılarındaki tüm iletilere bir BOT etiketi eklenir. Ayrıntılı bilgi almak için <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>belgelere</a> bakın.",
@@ -769,6 +859,7 @@
   "admin.sidebar.customization": "Özelleştirme",
   "admin.sidebar.database": "Veritabanı",
   "admin.sidebar.developer": "Geliştirici",
+  "admin.sidebar.elasticsearch": "Elasticsearch (Beta)",
   "admin.sidebar.email": "E-posta",
   "admin.sidebar.emoji": "Emoji",
   "admin.sidebar.external": "Dış Hizmetler",
@@ -776,6 +867,7 @@
   "admin.sidebar.general": "Genel",
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.integrations": "Bütünleştirmeler",
+  "admin.sidebar.jira": "JIRA (Beta)",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Hükümler ve Destek",
   "admin.sidebar.license": "Sürüm ve Lisans",
@@ -883,9 +975,9 @@
   "admin.team.restrictTitle": "Hesap ekleme belirtilen etki alanları ile kısıtlansın:",
   "admin.team.restrict_direct_message_any": "Mattermost sunucusundaki herhangi bir kullanıcı",
   "admin.team.restrict_direct_message_team": "Takımdaki herhangi bir kullanıcı",
-  "admin.team.showFullname": "Ad ve soyad görüntülensin (varsayılan)",
+  "admin.team.showFullname": "Ad ve soyad görüntülensin",
   "admin.team.showNickname": "Varsa takma ad görüntülensin, yoksa ad ve soyad görüntülensin",
-  "admin.team.showUsername": "Kullanıcı adı görüntülensin",
+  "admin.team.showUsername": "Kullanıcı adı görüntülensin (varsayılan)",
   "admin.team.siteNameDescription": "Oturum açma sayfaları ve kullanıcı arayüzünde görüntülenecek hizmet adı.",
   "admin.team.siteNameExample": "Örnek: \"Mattermost\"",
   "admin.team.siteNameTitle": "Site Adı:",
@@ -915,7 +1007,9 @@
   "admin.user_item.makeMember": "Üye Yap",
   "admin.user_item.makeSysAdmin": "Sistem Yöneticisi Yap",
   "admin.user_item.makeTeamAdmin": "Takım Yönetici Yap",
+  "admin.user_item.manageRoles": "Rol Yönetimi",
   "admin.user_item.manageTeams": "Takım Yönetimi",
+  "admin.user_item.manageTokens": "Kod Yönetimi",
   "admin.user_item.member": "Üye",
   "admin.user_item.mfaNo": "<strong>ÇAKD</strong>: Hayır",
   "admin.user_item.mfaYes": "<strong>ÇAKD</strong>: Evet",
@@ -924,6 +1018,9 @@
   "admin.user_item.switchToEmail": "E-posta/Parola Kipine Geç",
   "admin.user_item.sysAdmin": "Sistem Yöneticisi",
   "admin.user_item.teamAdmin": "Takım Yöneticisi",
+  "admin.user_item.userAccessTokenPostAll": "(ileti: tüm kullanıcı erişim kodları ile)",
+  "admin.user_item.userAccessTokenPostAllPublic": "(ileti: kanalların kullanıcı erişim kodları ile)",
+  "admin.user_item.userAccessTokenYes": "(kullanıcı erişim kodları ile)",
   "admin.webrtc.enableDescription": "Bu seçenek etkinleştirildiğinde, Mattermost <strong>bire-bir</strong> görüntülü görüşme yapabilir. WebRTC görüşmeleri Chrome, Firefox ve Mattermost Masaüstü uygulaması üzerinden yapılabilir.",
   "admin.webrtc.enableTitle": "Mattermost WebRTC Kullanılsın: ",
   "admin.webrtc.gatewayAdminSecretDescription": "Ağ Geçidi Yönetici Adresine erişmek için gizli yönetici parolanızı yazın.",
@@ -998,7 +1095,7 @@
   "api.channel.post_update_channel_header_message_and_forget.removed": "{username} kanal başlığını kaldırdı (önceki: {old})",
   "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username}, {old} eski kanal başlığını {new} olarak değiştirdi",
   "api.channel.post_update_channel_header_message_and_forget.updated_to": "{username} kanal başlığını {new} olarak güncelledi",
-  "api.channel.remove_member.removed": "{removedUsername} kanaldan çıkarıldı",
+  "api.channel.remove_member.removed": "{removedUsername} kanaldan çıkarıldı.",
   "app.channel.post_update_channel_purpose_message.removed": "{username} kanal amacını kaldırdı (önceki: {old})",
   "app.channel.post_update_channel_purpose_message.updated_from": "{username}, {old} eski kanal amacını {new} olarak değiştirdi",
   "app.channel.post_update_channel_purpose_message.updated_to": "{username} kanal amacını {new} olarak güncelledi",
@@ -1314,14 +1411,14 @@
   "emoji_picker.custom": "Özel",
   "emoji_picker.emojiPicker": "Emoji Seçici",
   "emoji_picker.flags": "İşaretler",
-  "emoji_picker.food": "Yemek",
+  "emoji_picker.foods": "Yiyecek",
   "emoji_picker.nature": "Doğa",
   "emoji_picker.objects": "Nesneler",
   "emoji_picker.people": "Kişiler",
+  "emoji_picker.places": "Yerler",
   "emoji_picker.recent": "Son Kullanılanlar",
   "emoji_picker.search": "Arama",
   "emoji_picker.symbols": "Simgeler",
-  "emoji_picker.travel": "Gezi",
   "error.local_storage.help1": "Çerezler kullanılsın",
   "error.local_storage.help2": "Gizli taramayı kapat",
   "error.local_storage.help3": "Desteklenen bir tarayıcı kullanın (IE 11, Chrome 43+, Firefox 38+, Safari 9, Edge)",
@@ -1688,6 +1785,10 @@
   "mobile.account_notifications.threads_mentions": "Konulardaki anmalar",
   "mobile.account_notifications.threads_start": "Başlattığım konular",
   "mobile.account_notifications.threads_start_participate": "Başlattığım ya da katıldığım konular",
+  "mobile.advanced_settings.reset_button": "Sıfırla",
+  "mobile.advanced_settings.reset_message": "\nBu işlem çevrimdışı verileri temizleyerek uygulamayı yeniden başlatır. Uygulama yeniden başlatıldığında oturumunuz otomatik olarak yeniden açılacak.\n",
+  "mobile.advanced_settings.reset_title": "Ön Belleği Sıfırla",
+  "mobile.advanced_settings.title": "Gelişmiş Ayarlar",
   "mobile.channel_drawer.search": "Bir sohbete geç",
   "mobile.channel_info.alertMessageDeleteChannel": "{term} {name} kanalını silmek istediğinize emin misiniz?",
   "mobile.channel_info.alertMessageLeaveChannel": "{term} {name} kanalından ayrılmak istediğinize emin misiniz?",
@@ -1741,11 +1842,17 @@
   "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.more_dms.start": "Başlat",
+  "mobile.more_dms.title": "Yeni Konuşma",
+  "mobile.notice_mobile_link": "mobil uygulamalar",
+  "mobile.notice_platform_link": "mimari",
+  "mobile.notice_text": "Mattermost kullandığımız {platform} ve {mobile} üzerinde açık kaynaklı yazılım sayesinde var.",
   "mobile.notification.in": " içinde ",
   "mobile.offlineIndicator.connected": "Bağlandı",
   "mobile.offlineIndicator.connecting": "Bağlanıyor...",
   "mobile.offlineIndicator.offline": "İnternet bağlantısı yok",
   "mobile.open_dm.error": "{displayName} kanalına doğrudan ileti açılamadı. Lütfen bağlantınızı denetleyip yeniden deneyin.",
+  "mobile.open_gm.error": "Bu kullanıcılar ile bir grup iletisi açılamadı. Lütfen bağlantınızı denetleyip yeniden deneyin.",
   "mobile.post.cancel": "İptal",
   "mobile.post.delete_question": "Bu iletiyi silmek istediğinize emin misiniz?",
   "mobile.post.delete_title": "İletisi Sil",
@@ -1775,6 +1882,8 @@
   "mobile.routes.thread_dm": "Doğrudan İleti Konusu",
   "mobile.routes.user_profile": "Profil",
   "mobile.routes.user_profile.send_message": "İleti Gönder",
+  "mobile.search.jump": "ATLA",
+  "mobile.search.no_results": "Herhangi bir sonuç bulunamadı",
   "mobile.select_team.choose": "Takımlarınız:",
   "mobile.select_team.join_open": "Katılabileceğiniz diğer açık takımlar",
   "mobile.select_team.no_teams": "Katılabileceğiniz herhangi bir takım yok.",
@@ -1788,6 +1897,7 @@
   "mobile.settings.clear_button": "Temizle",
   "mobile.settings.clear_message": "\nBu işlem çevrimdışı verileri temizleyerek uygulamayı yeniden başlatır. Uygulama yeniden başlatıldığında oturumunuz otomatik olarak açılacak.\n",
   "mobile.settings.team_selection": "Takım Seçimi",
+  "mobile.suggestion.members": "Üyeler",
   "modal.manaul_status.ask": "Bir daha sorma",
   "modal.manaul_status.button": "Evet, durumumu \"Çevrimiçi\" yap",
   "modal.manaul_status.cancel": "Hayır, durumum \"{status}\" olarak kalsın",
@@ -1884,6 +1994,8 @@
   "post_focus_view.beginning": "Kanal Arşivlerinin Başlangıcı",
   "post_info.del": "Sil",
   "post_info.edit": "Düzenle",
+  "post_info.message.visible": "(Yalnız siz görebilirsiniz)",
+  "post_info.message.visible.compact": " (Yalnız siz görebilirsiniz)",
   "post_info.mobile.flag": "İşaretle",
   "post_info.mobile.unflag": "İşareti Kaldır",
   "post_info.permalink": "Kalıcı Bağlantı",
@@ -1896,7 +2008,7 @@
   "posts_view.loadMore": "Daha fazla ileti yükle",
   "posts_view.loadingMore": "Diğer iletiler yükleniyor...",
   "posts_view.newMsg": "Yeni İletiler",
-  "posts_view.newMsgBelow": "Aşağıda yeni {count, plural, bir {message} diğer {messages}} var",
+  "posts_view.newMsgBelow": "Yeni {count, plural, one {message} other {messages}} var",
   "quick_switch_modal.channels": "Kanallar",
   "quick_switch_modal.channelsShortcut.mac": "- ⌘K",
   "quick_switch_modal.channelsShortcut.windows": "- CTRL+K",
@@ -1928,7 +2040,7 @@
   "rename_channel.displayNameHolder": "Görüntülenecek adı yazın",
   "rename_channel.handleHolder": "küçük alfasayısal karakterler",
   "rename_channel.lowercase": "Küçük alfasayısal karakterler olmalı",
-  "rename_channel.maxLength": "Bu alanda en fazla 22 karakter bulunabilir",
+  "rename_channel.maxLength": "Bu alana en fazla {maxLength, number} karakter yazılabilir",
   "rename_channel.required": "Bu alan zorunludur",
   "rename_channel.save": "Kaydet",
   "rename_channel.title": "Kanalı Yeniden Adlandır",
@@ -1967,6 +2079,7 @@
   "search_item.jump": "Görüntüle",
   "search_results.because": "<ul><li>Belirli bir ifade parçasını arıyorsanız (\"tepki\" ya da \"tepe\" için \"tep\" ifadesi gibi), arama ifadenize * ekleyin.</li><li>Çok kullanılan sözcükler ve iki harfli aramalar çok fazla sayıda sonuç döndüreceği için görüntülenmez.</li></ul>",
   "search_results.noResults": "Herhangi bir sonuç bulunamadı. Yeniden denemek ister misiniz?",
+  "search_results.searching": "Aranıyor...",
   "search_results.usage": "<ul><li>İfadeleri aramak için <b>\"tırnak işaretlerini\"</b> kullanın</li><li>Belirli bir kullanıcının iletilerini bulmak için <b>from:</b> belirli bir kanaldaki iletileri bulmak için <b>in:</b> kullanın</li></ul>",
   "search_results.usageFlag1": "Henüz işaretlediğiniz bir ileti yok.",
   "search_results.usageFlag2": "İleti ve yorumları işaretlemek için ",
@@ -1999,8 +2112,7 @@
   "sidebar.tutorialScreen1": "<h4>Kanallar</h4><p><strong>Kanallar</strong> farklı konulardaki konuşmaları düzenlemek için kullanılır. Kanallar takımınızdaki herkese açıktır. Özel iletişim kurmak gerektiğinde bir kişi için <strong>Doğrudan İletileri</strong>, bir kaç kişi için <strong>Özel Kanalları</strong> kullanabilirsiniz.</p>",
   "sidebar.tutorialScreen2": "<h4>\"{townsquare}\" ve \"{offtopic}\" kanalları</h4><p>Başlangıçta herkese açık iki kanal bulunur:</p><p><strong>{townsquare}</strong> tüm takımla iletişim kurmak için kullanılır. Takımınızdaki herkes bu kanalın bir üyesidir.</p><p><strong>{offtopic}</strong> iş dışı kanallar dışında eğlence için kullanılır. Siz ve takımınız başka kanallar eklemeye karar verebilirsiniz.</p>",
   "sidebar.tutorialScreen3": "<h4>Kanal Eklemek ve Katılmak</h4><p>Yeni bir kanal eklemek ve varolan bir kanala katılmak için <strong>\"Diğer...\"</strong> üzerine tıklayın.</p><p>Ayrıca herkese açık ya da özel bir kanal başlığının yanındaki <strong>\"+\" simgesine</strong> tıklayarak da yeni bir kanal ekleyebilirsiniz.</p>",
-  "sidebar.unreadAbove": "Yukarıdaki okunmamış iletiler",
-  "sidebar.unreadBelow": "Aşağıdaki okunmamış iletiler",
+  "sidebar.unreads": "Diğer okunmamışlar",
   "sidebar_header.tutorial": "<h4>Ana Menü</h4><p><strong>Ana Menüde</strong>, <strong>Yeni Üyeleri Çağırmak</strong>, <strong>Hesap Ayarlarına</strong> erişmek ve <strong>Tema Renklerini</strong> ayarlamak gibi işlemler yapabilirsiniz.</p><p>Takım yöneticileri ayrıca bu menüden kendi <strong>Takım Ayarlarını</strong> yapabilirler.</p><p>Sistem Yöneticileri için de tüm sistemin yönetilebileceği <strong>Sistem Konsolu</strong> seçeneği bulunur.</p>",
   "sidebar_right_menu.accountSettings": "Hesap Ayarları",
   "sidebar_right_menu.addMemberToTeam": "Takıma Üye Ekle",
@@ -2220,10 +2332,6 @@
   "user.settings.display.nameOptsDesc": "İleti ve Doğrudan İleti listelerinde kullanıcı adının nasıl görüntüleneceğini ayarlayın.",
   "user.settings.display.normalClock": "12 saat (4:00 PM gibi)",
   "user.settings.display.preferTime": "Saatin nasıl görüntüleneceğini ayarlayın.",
-  "user.settings.display.showFullname": "Ad ve soyad görüntülensin",
-  "user.settings.display.showNickname": "Varsa takma ad görüntülensin, yoksa ad ve soyad görüntülensin",
-  "user.settings.display.showUsername": "Kullanıcı adı görüntülensin (varsayılan)",
-  "user.settings.display.teammateNameDisplay": "Takım Arkadaşı Adı Görünümü",
   "user.settings.display.theme.applyToAllTeams": "Yeni tema tüm takımlarıma uygulansın",
   "user.settings.display.theme.customTheme": "Özel Tema",
   "user.settings.display.theme.describe": "Temanızı düzenlemek için açın",
@@ -2320,19 +2428,19 @@
   "user.settings.notifications.commentsNever": "Benim anılmadığım konu yanıtlarındaki iletiler için bildirim gönderilmesin",
   "user.settings.notifications.commentsRoot": "Benim başlattığım konulardaki iletiler için bildirim gönderilsin",
   "user.settings.notifications.desktop": "Masaüstü bildirimleri gönderilsin",
-  "user.settings.notifications.desktop.allFirefoxForever": "Tüm işlemler için süresiz görüntülensin",
-  "user.settings.notifications.desktop.allFirefoxTimed": "Tüm işlemler için {seconds} saniye görüntülensin",
   "user.settings.notifications.desktop.allNoSoundForever": "Tüm işlemler için, ses çalınmadan süresiz görüntülensin",
   "user.settings.notifications.desktop.allNoSoundTimed": "Tüm işlemler için, ses çalınmadan {seconds} saniye görüntülensin",
   "user.settings.notifications.desktop.allSoundForever": "Tüm işlemler için, ses çalınarak süresiz görüntülensin",
+  "user.settings.notifications.desktop.allSoundHiddenForever": "Tüm işlemler için süresiz olarak görüntülensin",
+  "user.settings.notifications.desktop.allSoundHiddenTimed": "Tüm işlemler için {seconds} saniye görüntülensin",
   "user.settings.notifications.desktop.allSoundTimed": "Tüm işlemler için, ses çalınarak {seconds} saniye görüntülensin",
   "user.settings.notifications.desktop.duration": "Bildirim süresi",
   "user.settings.notifications.desktop.durationInfo": "Firefox ya da Chrome kullanırken masaüstü bildirimlerinin ekranda görüntülenme süresi. Edge ve Safari kullanırken masaüstü bildirimleri en fazla 5 saniye görüntülenir.",
-  "user.settings.notifications.desktop.mentionsFirefoxForever": "Anma ve doğrudan iletiler için süresiz görüntülensin",
-  "user.settings.notifications.desktop.mentionsFirefoxTimed": "Anma ve doğrudan iletiler için {seconds} saniye görüntülensin",
   "user.settings.notifications.desktop.mentionsNoSoundForever": "Anma ve doğrudan iletiler için, ses çalınmadan süresiz görüntülensin",
   "user.settings.notifications.desktop.mentionsNoSoundTimed": "Anma ve doğrudan iletiler için, ses çalınarak {seconds} saniye görüntülensin",
   "user.settings.notifications.desktop.mentionsSoundForever": "Anma ve doğrudan iletiler için, ses çalınarak süresiz görüntülensin",
+  "user.settings.notifications.desktop.mentionsSoundHiddenForever": "Anma ve doğrudan iletiler için süresiz olarak görüntülensin",
+  "user.settings.notifications.desktop.mentionsSoundHiddenTimed": "Anma ve doğrudan iletiler için {seconds} saniye görüntülensin",
   "user.settings.notifications.desktop.mentionsSoundTimed": "Anma ve doğrudan iletiler için, ses çalınarak {seconds} saniye görüntülensin",
   "user.settings.notifications.desktop.seconds": "{seconds} saniye",
   "user.settings.notifications.desktop.sound": "Bildirim sesi",
@@ -2363,7 +2471,7 @@
   "user.settings.notifications.sensitiveUsername": "Büyük küçük harfe duyarsız adınız \"{username}\"",
   "user.settings.notifications.sensitiveWords": "Diğer büyük küçük harfe duyarsız sözcükler, virgül ile ayırarak yazın:",
   "user.settings.notifications.soundConfig": "Web tarayıcısı ayarlarınızdan bildirim seslerini ayarlayın",
-  "user.settings.notifications.sounds_info": "Bildirim sesleri IE11, Edge, Safari, Chrome ve Mattermost Masaüstü Uygulaması ile kullanılabilir.",
+  "user.settings.notifications.sounds_info": "Bildirim sesleri IE11, Safari, Chrome ve Mattermost Masaüstü Uygulaması ile kullanılabilir.",
   "user.settings.notifications.teamWide": "Takım geneli anmalar \"@all\"",
   "user.settings.notifications.title": "Bildirim Ayarları",
   "user.settings.notifications.wordsTrigger": "Anmaları Tetikleyecek Sözcükler",
@@ -2444,6 +2552,28 @@
   "user.settings.security.switchSaml": "SAML SSO kullanımına geç",
   "user.settings.security.title": "Güvenlik Ayarları",
   "user.settings.security.viewHistory": "Erişim Geçmişini Görüntüle",
+  "user.settings.tokens.cancel": "İptal",
+  "user.settings.tokens.clickToEdit": "Kullanıcı erişim kodlarınızı yönetmek için 'Düzenle' üzerine tıklayın",
+  "user.settings.tokens.confirmCreateButton": "Evet, Oluştur",
+  "user.settings.tokens.confirmCreateMessage": "Sistem Yöneticisi yetkileri ile bir kullanıcı erişimi kodu üretiyorsunuz. Bu kodu oluşturmak istediğinize emin misiniz?",
+  "user.settings.tokens.confirmCreateTitle": "Sistem Yöneticisi Kullanıcı Erişimi Kodu Oluştur",
+  "user.settings.tokens.confirmDeleteButton": "Evet, Sil",
+  "user.settings.tokens.confirmDeleteMessage": "Bu kodu kullanan tüm bütünleştirmeler artık Mattermost API üzerine erişemeyecek. Bu işlem geri alınamaz. Bu kodu silmek istediğinize emin misiniz?",
+  "user.settings.tokens.confirmDeleteTitle": "{name} kodu silinsin mi?",
+  "user.settings.tokens.copy": "Lütfen aşağıdaki kodu kopyalayın. Bu kodu bir daha göremezsiniz!",
+  "user.settings.tokens.create": "Yeni Kod Oluştur",
+  "user.settings.tokens.delete": "Sil",
+  "user.settings.tokens.description": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Kullanıcı erişim kodları</a> oturum kodlarına benzer ve bütünleştirmelerde <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">REST API üzerinden kimlik doğrulaması</a> için kullanılır.",
+  "user.settings.tokens.description_mobile": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Kullanıcı erişim kodları</a> oturum kodlarına benzer ve bütünleştirmelerde <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">REST API üzerinden kimlik doğrulaması</a> için kullanılır. Yeni kodları masaüstünüzden oluşturun.",
+  "user.settings.tokens.id": "Kod: ",
+  "user.settings.tokens.name": "Ad: ",
+  "user.settings.tokens.nameHelp": "Enter a description for your token to remember what it does.",
+  "user.settings.tokens.nameRequired": "Please enter a description.",
+  "user.settings.tokens.save": "Kaydet",
+  "user.settings.tokens.title": "Kullanıcı Erişim Kodları",
+  "user.settings.tokens.token": "Kod: ",
+  "user.settings.tokens.tokenId": "Erişim Kodu: ",
+  "user.settings.tokens.userAccessTokensNone": "Herhangi bir erişim kodu yok.",
   "user_list.notFound": "Herhangi bir kullanıcı bulunamadı",
   "user_profile.send.dm": "İletiyi Gönder",
   "user_profile.webrtc.call": "Görüntülü Görüşme Başlat",
diff --git a/webapp/i18n/zh-CN.json b/webapp/i18n/zh-CN.json
index 796cc7b2a..f4cbc55d0 100644
--- a/webapp/i18n/zh-CN.json
+++ b/webapp/i18n/zh-CN.json
@@ -203,8 +203,6 @@
   "admin.compliance_table.userId": "被...要求",
   "admin.connectionSecurityNone": "无",
   "admin.connectionSecurityNoneDescription": "Mattermost 将创建一个不安全的连接。",
-  "admin.connectionSecurityPlain": "PLAIN",
-  "admin.connectionSecurityPlainDescription": "Mattermost 将会连接并验证一个不安全的连接。",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "将一现有不安全的连接尝试使用TLS升级值一个安全的连接。",
   "admin.connectionSecurityTest": "测试连接",
@@ -235,31 +233,87 @@
   "admin.customization.support": "法律和支持",
   "admin.database.title": "数据库设置",
   "admin.developer.title": "开发人员设置",
+  "admin.elasticsearch.bulkIndexButton.error": "Failed to schedule Bulk Index Job: {error}",
+  "admin.elasticsearch.connectionUrlDescription": "Elasticsearch 服务器地址。{documentationLink}",
+  "admin.elasticsearch.connectionUrlExample": "例如：\"https://elasticsearch.example.org:9200\"",
+  "admin.elasticsearch.connectionUrlExample.documentationLinkText": "请见服务器架设说明文档，",
+  "admin.elasticsearch.connectionUrlTitle": "服务器连接地址：",
+  "admin.elasticsearch.elasticsearch_test_button": "测试连接",
+  "admin.elasticsearch.enableIndexingDescription": "当设为是时，新消息将自动被索引。搜索查询将在 \"开启 Elasticsearch 搜索\" 前使用数据库查询。{documentationLink}",
+  "admin.elasticsearch.enableIndexingDescription.documentationLinkText": "在我们的文档里了解更多关于 Elasticsearch。",
+  "admin.elasticsearch.enableIndexingTitle": "开启 Elasticsearch 索引：",
+  "admin.elasticsearch.enableSearchingDescription": "Requires a successful connection to the Elasticsearch server. When true, Elasticsearch will be used for all search queries using the latest index. Search results may be incomplete until a bulk index of the existing post database is finished. When false, database search is used.",
+  "admin.elasticsearch.enableSearchingTitle": "开启 Elasticsearch 搜索查询：",
+  "admin.elasticsearch.indexButton.inProgress": "索引中",
+  "admin.elasticsearch.indexButton.ready": "创建索引",
+  "admin.elasticsearch.indexHelpText.buildIndex": "数据库中所有的消息将从旧到新顺序索引。Elasticsearch 可以在索引过程中使用但搜索结果可能不完整。",
+  "admin.elasticsearch.indexHelpText.cancelIndexing": "取消将停止索引任务并从列队移除。已索引的消息将不会被删除。",
+  "admin.elasticsearch.noteDescription": "修改这段属性需要重启服务器才能生效。",
+  "admin.elasticsearch.password": "例如：\"yourpassword\"",
+  "admin.elasticsearch.passwordDescription": "(可选) Elasticsearch 服务器验证密码。",
+  "admin.elasticsearch.passwordTitle": "服务器密码：",
+  "admin.elasticsearch.purgeIndexesButton": "清除索引",
+  "admin.elasticsearch.purgeIndexesButton.error": "清除索引失败：{error}",
+  "admin.elasticsearch.purgeIndexesButton.label": "清除索引：",
+  "admin.elasticsearch.purgeIndexesButton.success": "索引清除完成。",
+  "admin.elasticsearch.purgeIndexesHelpText": "清除将从 Elasticsearch 服务器完全移除索引。搜索结果在重建现有消息索引前不完整。",
+  "admin.elasticsearch.sniffDescription": "当设为是时，嗅探自动查找并连接您的机群里所有节点。",
+  "admin.elasticsearch.sniffTitle": "开启机群嗅探：",
+  "admin.elasticsearch.testConfigSuccess": "测试成功。配置已保存。",
+  "admin.elasticsearch.testHelpText": "测试 Mattermost 是否可以连接指定的 Elasticsearch 服务器。配置只有在测试连接成功后保存。查看日志文件了解详细错误信息。",
+  "admin.elasticsearch.title": "Elasticsearch (Beta)",
+  "admin.elasticsearch.usernameDescription": "(设定) Elasticsearch 服务器验证用户名。",
+  "admin.elasticsearch.usernameExample": "例如：\"elastic\"",
+  "admin.elasticsearch.usernameTitle": "服务器用户名：",
+  "admin.elasticsearchStatus.bulkIndexLabel": "批量创建索引：",
+  "admin.elasticsearchStatus.cancelButton": "取消",
+  "admin.elasticsearchStatus.status": "状态：",
+  "admin.elasticsearchStatus.statusCancelled": "索引任务已取消。",
+  "admin.elasticsearchStatus.statusError": "索引错误。",
+  "admin.elasticsearchStatus.statusError.help": "Mattermost 建立 Elasticsearch 索引时发送错误：{error}",
+  "admin.elasticsearchStatus.statusInProgress": "任务进行中。{percent}% 已完成。",
+  "admin.elasticsearchStatus.statusInProgress.help": "Indexing is in progress on the job server. If Elasticsearch is enabled, search results may be incomplete until the job is finished.",
+  "admin.elasticsearchStatus.statusIndexingDisabled": "索引已禁用。",
+  "admin.elasticsearchStatus.statusLoading": "加载中...",
+  "admin.elasticsearchStatus.statusNoJobs": "列队里没有索引任务。",
+  "admin.elasticsearchStatus.statusPending": "任务等待中。",
+  "admin.elasticsearchStatus.statusPending.help": "Elasticsearch index job is queued on the job server. If Elasticsearch is enabled, search results may be incomplete until the job is finished.",
+  "admin.elasticsearchStatus.statusRequestCancel": "取消任务中...",
+  "admin.elasticsearchStatus.statusSuccess": "索引已完成。",
+  "admin.elasticsearchStatus.statusSuccess.help": "索引已完成并且新消息将自动被索引。",
   "admin.email.agreeHPNS": " 我理解并同意 Mattermost 推送提醒服务<a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">服务条款</a>和<a href=\"https://about.mattermost.com/hpns-privacy/\" target='_blank'>隐私策略</a>。",
   "admin.email.allowEmailSignInDescription": "当设置为是时，Mattermost允许用户使用电子邮件地址和密码登入。",
   "admin.email.allowEmailSignInTitle": "开启使用邮件地址登入：",
-  "admin.email.allowSignupDescription": "当设置为是时，Mattermost 允许团队创建和使用电子邮件地址与密码注册帐户。此值唯一设为否的情况是你想使用 OAuth 或者 AD/LDAP 这种单点登录服务注册。",
+  "admin.email.allowSignupDescription": "当设置为是时，Mattermost 允许团队创建和使用电子邮件地址与密码注册帐户。此值唯一设为否的情况是您想使用 OAuth、AD/LDAP、GitLab 这种单点登录服务注册。",
   "admin.email.allowSignupTitle": "开启使用邮件地址创建帐号：",
-  "admin.email.allowUsernameSignInDescription": "当设置为是时，Mattermost允许用户使用用户名和密码登录。此设置通常只用于当电子邮件验证被禁用时。",
+  "admin.email.allowUsernameSignInDescription": "当设为是时，使用邮箱地址的用户可以使用他们的用户名和密码登入，此设定不影响 AD/LDAP 登入。",
   "admin.email.allowUsernameSignInTitle": "开启使用用户名登入：",
   "admin.email.connectionSecurityTest": "测试连接",
-  "admin.email.easHelp": "了解更多关于编译和部署您自己的移动应用程序从一个<a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target='_blank'>Enterprise App Store</a>。",
+  "admin.email.easHelp": "了解更多关于编译和部署您自己的移动应用程序从一个<a href=\"https://about.mattermost.com/default-enterprise-app-store\" target='_blank'>Enterprise App Store</a>。",
   "admin.email.emailFail": "连接失败: {error}",
   "admin.email.emailSuccess": "发送电子邮件时没有发生错误。请检查您的收件箱并确认。",
   "admin.email.enableEmailBatching.clusterEnabled": "批量电子邮件无法在高可用性下开启。",
   "admin.email.enableEmailBatching.siteURL": "<b>设置 > 站点网址</b>中的站点网址配置后才能开启批量电子邮件。",
-  "admin.email.enableEmailBatchingDesc": "当设为是时，用户可以将多条私信和提及合并到一条电子邮件通知，可在<b>帐号设置 > 通知</b>里设定。",
+  "admin.email.enableEmailBatchingDesc": "When true, users will have email notifications for multiple direct messages and mentions combined into a single email. Batching will occur at a default interval of 15 minutes, configurable in Account Settings > Notifications.",
   "admin.email.enableEmailBatchingTitle": "开启批量电子邮件：",
+  "admin.email.enableSMTPAuthDesc": "当开启时，与 SMTP 服务器验证将使用用户名和密码。",
+  "admin.email.enableSMTPAuthTitle": "开启 SMTP 验证：",
   "admin.email.fullPushNotification": "发送完整的消息片段",
-  "admin.email.genericPushNotification": "发送包含用户名称和频道名称的一般性描述",
+  "admin.email.genericNoChannelPushNotification": "Send generic description with only sender name",
+  "admin.email.genericPushNotification": "发送包含发送者称和频道名称的一般性描述",
   "admin.email.inviteSaltDescription": "32字符的盐值用于签署电子邮件邀请。安装时随机生成。点击 \"重新生成\" 生成新的盐值。",
   "admin.email.inviteSaltExample": "例如 \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.inviteSaltTitle": "电子邮件邀请盐值：",
   "admin.email.mhpns": "使用加密的，产品及质量的HPNS连接到iOS和Android应用程序",
-  "admin.email.mhpnsHelp": "从 iTunes下载 <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS app</a>。从 Google Play 下载 <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android app</a>。 了解更多 <a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target='_blank'>HPNS</a>。",
+  "admin.email.mhpnsHelp": "从 iTunes下载 <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS app</a>。从 Google Play 下载 <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android app</a>。 了解更多 <a href=\"https://about.mattermost.com/default-hpns\" target='_blank'>TPNS</a>。",
   "admin.email.mtpns": "在iTunes和TPNS的谷歌Play使用iOS和Android应用程序",
-  "admin.email.mtpnsHelp": "从 iTunes下载 <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS app</a>。从 Google Play 下载 <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android app</a>。 了解更多 <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target='_blank'>TPNS</a>。",
+  "admin.email.mtpnsHelp": "从 iTunes下载 <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS app</a>。从 Google Play 下载 <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android app</a>。 了解更多 <a href=\"https://about.mattermost.com/default-tpns/\" target='_blank'>TPNS</a>。",
   "admin.email.nofificationOrganizationExample": "例如：\"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\"",
+  "admin.email.notification.contents.full": "发送完整消息内容",
+  "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.generic": "Send generic description with only sender name",
+  "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": "电子邮件通知内容：",
   "admin.email.notificationDisplayDescription": "从 Mattermost 发送的电子邮件通知时显示的电子邮件帐号名。",
   "admin.email.notificationDisplayExample": "例如：\"Mattermost通知\", \"系统\", \"无答复\"",
   "admin.email.notificationDisplayTitle": "通知显示名称：",
@@ -274,11 +328,11 @@
   "admin.email.passwordSaltDescription": "32字盐值用来签署重置密码邮件。由安装时随机生成。点击 \"重新生成\" 生成新的盐。",
   "admin.email.passwordSaltExample": "例如 \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "密码重设盐值：",
-  "admin.email.pushContentDesc": "选择“发送包含用户名称和频道名称的一般性描述”提供一般性的推送通知，包括用户名称和频道名称，但不包含具体信息内容。<br /><br />选择“发送完整的信息片段”，则推送详细的消息摘要，可能包括发送信息中的敏感数据。如果您的推送通知服务在防火墙之外，强烈建议此选项仅在使用 \"https\"加密连接协议时启用。",
+  "admin.email.pushContentDesc": "\"Send generic description with only sender name\" includes only the name of the person who sent the message in push notifications, with no information about channel name or message contents.<br /><br />\"Send generic description with sender and channel names\" includes the name of the person who sent the message and the channel it was sent in, but not the message text.<br /><br />\"Send full message snippet\" includes a message excerpt in push notifications, which may contain confidential information sent in messages. If your Push Notification Service is outside your firewall, it is *highly recommended* this option only be used with an \"https\" protocol to encrypt the connection.",
   "admin.email.pushContentTitle": "推送通知内容：",
   "admin.email.pushDesc": "通常在正式环境中设置为是。当设为是时，Mattermost尝试给iOS和安卓从推送通知服务器发送通知。",
   "admin.email.pushOff": "不发送推送通知",
-  "admin.email.pushOffHelp": "请参考 <a href=\"http://docs.mattermost.com/deployment/push.html#push-notifications-and-mobile-devices\" target='_blank'>文件推送通知</a>了解更多关于安装选项。",
+  "admin.email.pushOffHelp": "请参考 <a href=\"https://about.mattermost.com/default-mobile-push-notifications\" target='_blank'>推送通知文档</a>了解更多关于安装选项。",
   "admin.email.pushServerDesc": "Mattermost推送消息服务时可以设置防火墙使用代理 https://github.com/mattermost/push-proxy。你可以使用 http://push-test.mattermost.com 测试，连接AppStore中Mattermost iOS演示版。请不要使用行生产机上测试服务。",
   "admin.email.pushServerEx": "例如: \"http://push-test.mattermost.com\"",
   "admin.email.pushServerTitle": "推送通知服务器：",
@@ -288,7 +342,7 @@
   "admin.email.selfPush": "手动输入推送通知服务位置",
   "admin.email.skipServerCertificateVerification.description": "当设为是时，Mattermost 将不会验证电子邮件服务器证书。",
   "admin.email.skipServerCertificateVerification.title": "跳过服务器证书验证：",
-  "admin.email.smtpPasswordDescription": "从邮件服务器管理员获得此凭据。",
+  "admin.email.smtpPasswordDescription": "SMTP 用户名的密码。",
   "admin.email.smtpPasswordExample": "例如：\"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "SMTP服务器密码：",
   "admin.email.smtpPortDescription": "SMTP邮件服务器端口。",
@@ -297,13 +351,17 @@
   "admin.email.smtpServerDescription": "SMTP邮件服务器的位置。",
   "admin.email.smtpServerExample": "例如：\"smtp.yourcompany.com\", \"email-smtp.us-east-1.amazonaws.com\"",
   "admin.email.smtpServerTitle": "SMTP服务器：",
-  "admin.email.smtpUsernameDescription": "从邮件服务器管理员获得此凭据。",
+  "admin.email.smtpUsernameDescription": "与 SMTP 服务器验证的用户名。",
   "admin.email.smtpUsernameExample": "例如：\"admin@yourcompany.com\", \"AKIADTOVBGERKLCBV\"",
   "admin.email.smtpUsernameTitle": "SMTP服务器用户名：",
   "admin.email.testing": "测试中...",
   "admin.false": "否",
-  "admin.file.enableFileAttachments": "开启文件附件：",
-  "admin.file.enableFileAttachmentsDesc": "当设为否时，消息里上传文件和图片将被禁用。",
+  "admin.file.enableFileAttachments": "允许文件共享：",
+  "admin.file.enableFileAttachmentsDesc": "当设为否时，文件共享将在本服务器停用。所有消息里上传的文件和图片将在所有客户端和设备禁止访问。",
+  "admin.file.enableMobileDownloadDesc": "当设为否时，将禁止使用移动应用下载文件。用户将仍可以使用移动网页浏览器下载。",
+  "admin.file.enableMobileDownloadTitle": "允许在移动设备下载文件：",
+  "admin.file.enableMobileUploadDesc": "当设为否时，移动设备应用将禁止文件上传。如果开启允许文件共享，用户仍可以从移动网页浏览器上传文件。",
+  "admin.file.enableMobileUploadTitle": "允许移动设备文件上传：",
   "admin.file_upload.chooseFile": "选择文件",
   "admin.file_upload.noFile": "没有上传文件",
   "admin.file_upload.uploadFile": "上传",
@@ -529,6 +587,21 @@
   "admin.logs.bannerDesc": "到 报告 > 用户 并在搜索过滤器输入 ID 以用户 ID 查找用户。",
   "admin.logs.reload": "重载",
   "admin.logs.title": "服务器日志",
+  "admin.manage_roles.additionalRoles": "选择帐号额外的权限。<a href=\"https://about.mattermost.com/default-permissions\" target=\"_blank\">阅读更多关于角色于权限</a>。",
+  "admin.manage_roles.allowUserAccessTokens": "允许此帐号生成<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">用户访问令牌</a>。",
+  "admin.manage_roles.cancel": "取消",
+  "admin.manage_roles.manageRolesTitle": "管理角色",
+  "admin.manage_roles.postAllPublicRole": "允许发送消息到所有 Mattermost 公开频道。",
+  "admin.manage_roles.postAllPublicRoleTitle": "post:channels",
+  "admin.manage_roles.postAllRole": "允许发送消息到所有 Mattermost 频道包括私信。",
+  "admin.manage_roles.postAllRoleTitle": "post:all",
+  "admin.manage_roles.save": "保存",
+  "admin.manage_roles.saveError": "无法保存角色。",
+  "admin.manage_roles.systemAdmin": "系统管理员",
+  "admin.manage_roles.systemMember": "成员",
+  "admin.manage_tokens.manageTokensTitle": "管理用户访问令牌",
+  "admin.manage_tokens.userAccessTokensDescription": "用户访问令牌功能于会话令牌类似并可以让整合用来<a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">与 REST API 验证</a>。了解更多关于<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">用户访问令牌</a>。",
+  "admin.manage_tokens.userAccessTokensNone": "没有用户访问令牌。",
   "admin.metrics.enableDescription": "当设置为是时，Mattermost 会启用性能监控收集和分析。请查看<a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>文档</a>了解更多Mattermost 性能监控配置信息。",
   "admin.metrics.enableTitle": "开启性能监视：",
   "admin.metrics.listenAddressDesc": "服务端监听的地址以公开性能指标数据。",
@@ -574,6 +647,19 @@
   "admin.password.requirementsDescription": "有效的密码所需的字符类型。",
   "admin.password.symbol": "至少有一个符号 (例如：\"~!@#$%^&*()\")",
   "admin.password.uppercase": "至少有一个大写字母",
+  "admin.plugins.jira": "JIRA (Beta)",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelname",
+  "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": "已启用：",
+  "admin.plugins.jira.secretDescription": "This secret is used to authenticate to Mattermost.",
+  "admin.plugins.jira.secretLabel": "秘钥：",
+  "admin.plugins.jira.secretParamPlaceholder": "secret",
+  "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.userDescription": "选择此整合关联的用户名。",
+  "admin.plugins.jira.userLabel": "用户：",
+  "admin.plugins.jira.webhookDocsLink": "文档",
   "admin.privacy.showEmailDescription": "当设为否时，从除了系统管理员外隐藏成员的电子邮件。",
   "admin.privacy.showEmailTitle": "显示电子邮箱地址：",
   "admin.privacy.showFullNameDescription": "当设为否时，从除了系统管理员外隐藏成员的姓名。姓名将被用户名取代。",
@@ -751,6 +837,10 @@
   "admin.service.tlsKeyFileDescription": "使用的私钥文件。",
   "admin.service.useLetsEncrypt": "使用 Let's Encrypt：",
   "admin.service.useLetsEncryptDescription": "开启自动从 Let's Encrypt 获取证书。证书将在客户端尝试从新的域名连接时获取。此功能可以在多域名使用。",
+  "admin.service.userAccessTokensDescLabel": "Name: ",
+  "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.userAccessTokensIdLabel": "令牌 ID：",
+  "admin.service.userAccessTokensTitle": "开启用户访问令牌：",
   "admin.service.webSessionDays": "AD/LDAP 和电子邮件的会话时长 (天)：",
   "admin.service.webSessionDaysDesc": "从用户上一次输入他们的认证到会话过期的天数。修改此设定后，新的会话时常将在用户下一次输入认证后生效。",
   "admin.service.webhooksDescription": "设为是时，允许传入webhooks。为了避免钓鱼攻击，所有webhooks的帖文会标上BOT标签。参见 <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>文档</a> 了解详情。",
@@ -769,6 +859,7 @@
   "admin.sidebar.customization": "自定义",
   "admin.sidebar.database": "数据库",
   "admin.sidebar.developer": "开发人员",
+  "admin.sidebar.elasticsearch": "Elasticsearch (Beta)",
   "admin.sidebar.email": "电子邮件",
   "admin.sidebar.emoji": "表情符",
   "admin.sidebar.external": "外部服务",
@@ -776,6 +867,7 @@
   "admin.sidebar.general": "常规",
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.integrations": "集成",
+  "admin.sidebar.jira": "JIRA (Beta)",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "法律和支持",
   "admin.sidebar.license": "版本和许可证",
@@ -883,9 +975,9 @@
   "admin.team.restrictTitle": "只允许特定电子邮件域名创建帐号：",
   "admin.team.restrict_direct_message_any": "在Mattermost服务器上的任何用户",
   "admin.team.restrict_direct_message_team": "任何团队成员",
-  "admin.team.showFullname": "显示姓名 (默认)",
+  "admin.team.showFullname": "显示姓名",
   "admin.team.showNickname": "若存在昵称显示昵称，否则显示姓名",
-  "admin.team.showUsername": "显示用户名",
+  "admin.team.showUsername": "显示用户名（默认)",
   "admin.team.siteNameDescription": "登录画面和界面所显示的服务名称。",
   "admin.team.siteNameExample": "例如 \"Mattermost\"",
   "admin.team.siteNameTitle": "网站名称：",
@@ -915,7 +1007,9 @@
   "admin.user_item.makeMember": "设置为成员",
   "admin.user_item.makeSysAdmin": "设置为系统管理员",
   "admin.user_item.makeTeamAdmin": "设置为团队管理员",
+  "admin.user_item.manageRoles": "管理角色",
   "admin.user_item.manageTeams": "管理团队",
+  "admin.user_item.manageTokens": "管理令牌",
   "admin.user_item.member": "成员",
   "admin.user_item.mfaNo": "<strong>多重验证</strong>：否",
   "admin.user_item.mfaYes": "<strong>多重验证</strong>：是",
@@ -924,6 +1018,9 @@
   "admin.user_item.switchToEmail": "切换到电子邮件/密码",
   "admin.user_item.sysAdmin": "系统管理员",
   "admin.user_item.teamAdmin": "团队管理员",
+  "admin.user_item.userAccessTokenPostAll": "(with post:all personal access tokens)",
+  "admin.user_item.userAccessTokenPostAllPublic": "(with post:channels personal access tokens)",
+  "admin.user_item.userAccessTokenYes": "(使用用户访问令牌)",
   "admin.webrtc.enableDescription": "当设为是时，Mattermost 允许<strong>一对一</strong>视频通话。WebRTC 通话可在 Chrome，火狐以及 Mattermost 桌面应用使用。",
   "admin.webrtc.enableTitle": "开启 Mattermost WebRTC：",
   "admin.webrtc.gatewayAdminSecretDescription": "输入您访问网关管理网址的管理密码。",
@@ -998,7 +1095,7 @@
   "api.channel.post_update_channel_header_message_and_forget.removed": "{username} 删除了频道标题 (曾是：{old})",
   "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} 更新了频道标题从：{old} 到：{new}",
   "api.channel.post_update_channel_header_message_and_forget.updated_to": "{username} 更新了频道标题到：{new}",
-  "api.channel.remove_member.removed": "{removedUsername} 被移出频道",
+  "api.channel.remove_member.removed": "{removedUsername} 被移出频道。",
   "app.channel.post_update_channel_purpose_message.removed": "{username} 移除了频道作用 (曾是：{old})",
   "app.channel.post_update_channel_purpose_message.updated_from": "{username} 更新了频道作用从：{old} 到：{new}",
   "app.channel.post_update_channel_purpose_message.updated_to": "{username} 更新了频道作用到：{new}",
@@ -1314,14 +1411,14 @@
   "emoji_picker.custom": "自定义",
   "emoji_picker.emojiPicker": "表情选择器",
   "emoji_picker.flags": "标记",
-  "emoji_picker.food": "食物",
+  "emoji_picker.foods": "食品",
   "emoji_picker.nature": "自然",
   "emoji_picker.objects": "物品",
   "emoji_picker.people": "人物",
+  "emoji_picker.places": "地点",
   "emoji_picker.recent": "最近使用",
   "emoji_picker.search": "搜索",
   "emoji_picker.symbols": "符号",
-  "emoji_picker.travel": "旅游",
   "error.local_storage.help1": "开启 cookies",
   "error.local_storage.help2": "关闭隐私浏览",
   "error.local_storage.help3": "使用一个支持的浏览器 (IE 11, Chrome 43+, Firefox 38+, Safari 9, Edge)",
@@ -1688,6 +1785,10 @@
   "mobile.account_notifications.threads_mentions": "串中的提及",
   "mobile.account_notifications.threads_start": "我创建的串",
   "mobile.account_notifications.threads_start_participate": "我创建的或参与的串",
+  "mobile.advanced_settings.reset_button": "复位",
+  "mobile.advanced_settings.reset_message": "\n这将清除所有离线数据并重启应用。您将会在应用重启后自动登入。\n",
+  "mobile.advanced_settings.reset_title": "重置缓存",
+  "mobile.advanced_settings.title": "高级设置",
   "mobile.channel_drawer.search": "移至到会话",
   "mobile.channel_info.alertMessageDeleteChannel": "您确定要删除{term} {name}？",
   "mobile.channel_info.alertMessageLeaveChannel": "您确定要离开{term} {name}？",
@@ -1741,11 +1842,17 @@
   "mobile.loading_members": "正在加载成员...",
   "mobile.loading_posts": "正在加载消息...",
   "mobile.login_options.choose_title": "选择您的登入方式",
+  "mobile.more_dms.start": "开始",
+  "mobile.more_dms.title": "新建对话",
+  "mobile.notice_mobile_link": "移动应用",
+  "mobile.notice_platform_link": "平台",
+  "mobile.notice_text": "Mattermost 通过开源软件实现了我们的 {platform} 以及 {mobile}。",
   "mobile.notification.in": " 在 ",
   "mobile.offlineIndicator.connected": "已连接",
   "mobile.offlineIndicator.connecting": "正在连接...",
   "mobile.offlineIndicator.offline": "无网络连接",
   "mobile.open_dm.error": "我们无法打开私信 {displayName}。请检查您的网络连接再尝试。",
+  "mobile.open_gm.error": "我们无法打开和这些用户的团体消息。请检查您的网络连接再尝试。",
   "mobile.post.cancel": "取消",
   "mobile.post.delete_question": "您确认要删除此消息？",
   "mobile.post.delete_title": "删除消息",
@@ -1775,6 +1882,8 @@
   "mobile.routes.thread_dm": "私信串",
   "mobile.routes.user_profile": "个人资料",
   "mobile.routes.user_profile.send_message": "发送消息",
+  "mobile.search.jump": "转跳",
+  "mobile.search.no_results": "未找到结果",
   "mobile.select_team.choose": "您的团队：",
   "mobile.select_team.join_open": "您可以加入的开放团队",
   "mobile.select_team.no_teams": "没有您可以加入的团队。",
@@ -1788,6 +1897,7 @@
   "mobile.settings.clear_button": "清除",
   "mobile.settings.clear_message": "\n这将清除所有离线数据并重启应用。您将会在应用重启后自动登入。\n",
   "mobile.settings.team_selection": "团队选择",
+  "mobile.suggestion.members": "成员",
   "modal.manaul_status.ask": "不要再次询问",
   "modal.manaul_status.button": "是，设置我的状态为 \"在线\"",
   "modal.manaul_status.cancel": "不，保留为 \"{status}\"",
@@ -1884,6 +1994,8 @@
   "post_focus_view.beginning": "开始频道归档",
   "post_info.del": "删除",
   "post_info.edit": "编辑",
+  "post_info.message.visible": "(只有您可见)",
+  "post_info.message.visible.compact": " (只有您可见)",
   "post_info.mobile.flag": "标记",
   "post_info.mobile.unflag": "取消标记",
   "post_info.permalink": "永久链接",
@@ -1896,7 +2008,7 @@
   "posts_view.loadMore": "载入更多消息",
   "posts_view.loadingMore": "载入更多消息中...",
   "posts_view.newMsg": "新消息",
-  "posts_view.newMsgBelow": "以下有 {count} 个新消息",
+  "posts_view.newMsgBelow": "{count} 条新消息",
   "quick_switch_modal.channels": "频道",
   "quick_switch_modal.channelsShortcut.mac": "- ⌘K",
   "quick_switch_modal.channelsShortcut.windows": "- CTRL+K",
@@ -1928,7 +2040,7 @@
   "rename_channel.displayNameHolder": "输入显示名",
   "rename_channel.handleHolder": "小写字母符",
   "rename_channel.lowercase": "必须小写字母数字字符",
-  "rename_channel.maxLength": "这个字段必须少于22个字符",
+  "rename_channel.maxLength": "此字段必须小于 {maxLength, number} 个字符",
   "rename_channel.required": "该字段不能为空",
   "rename_channel.save": "保存",
   "rename_channel.title": "重命名频道",
@@ -1967,6 +2079,7 @@
   "search_item.jump": "跳转",
   "search_results.because": "<ul><li>如果您需搜索一个部分词组（例如搜索 \"rea\"，查找 \"reach\" 或 \"reaction\"），请在结尾附上 *。</li><li>由于搜索结果的数量限制，双字母的搜索和 \"this\"，\"a\" 及 \"is\" 等常用词不会出现在搜索结果中。</li></ul>",
   "search_results.noResults": "没任何结果。重试？",
+  "search_results.searching": "正在搜索...",
   "search_results.usage": "<ul><li>使用<b>\"双引号\"</b>搜索词组</li><li>使用<b>from：</b>查找来自特定用户的信息；使用<b>in：</b>查找特定频道中的信息</li></ul>",
   "search_results.usageFlag1": "您还没标记任何信息。",
   "search_results.usageFlag2": "您可以点击时间戳旁的",
@@ -1999,8 +2112,7 @@
   "sidebar.tutorialScreen1": "<h4>频道</h4><p><strong>频道</strong>组织不同主题的会话。他们对您所在团队的每一个人开放。针对单人发送私人消息使用<strong>私信</strong>针对多人使用<strong>私有频道</strong>。</p>",
   "sidebar.tutorialScreen2": "<h4>“{townsquare}”和“{offtopic}”频道</h4><p>这里启用了两个公共频道: </p><p><strong>公共频道</strong>是一个团队范围内沟通的地方。团队中的每一个人都是这个频道的一个成员。</p><p><strong>闲聊频道</strong>是一个娱乐幽默与工作无关的频道。您和您的团队可以决定创建其他频道。</p>",
   "sidebar.tutorialScreen3": "<h4>创建和加入频道</h4><p>点击<strong>“更多...”</strong>创建一个新频道或加入一个现有频道。</p><p>您还可以通过点击频道或私有频道旁的<strong>“+”符号</strong>，创建一个新频道或私有频道标题。</p>",
-  "sidebar.unreadAbove": "上面有未读信息",
-  "sidebar.unreadBelow": "下面有未读信息",
+  "sidebar.unreads": "更多未读",
   "sidebar_header.tutorial": "<h4>主菜单</h4><p><strong>在主菜单中</strong>您可以<strong>邀请新成员</strong>，访问您的<strong>账户设置</strong>和设置您的<strong>主题颜色</strong>。</p><p>团队管理员也能通过此菜单访问他们的<strong>团队设置</strong>。</p><p>系统管理员将找到一个<strong>系统控制台</strong>选项管理整个系统。</p>",
   "sidebar_right_menu.accountSettings": "账户设置",
   "sidebar_right_menu.addMemberToTeam": "添加成员到团队",
@@ -2220,10 +2332,6 @@
   "user.settings.display.nameOptsDesc": "设置在信息和私信列表中如何显示其他用户的名字。",
   "user.settings.display.normalClock": "12小时格式（例如：4:00 PM）",
   "user.settings.display.preferTime": "选择您喜欢的时间显示格式。",
-  "user.settings.display.showFullname": "显示姓名",
-  "user.settings.display.showNickname": "若存在昵称显示昵称，否则显示姓名",
-  "user.settings.display.showUsername": "显示用户名（默认)",
-  "user.settings.display.teammateNameDisplay": "团队队友的名字显示",
   "user.settings.display.theme.applyToAllTeams": "应用新主题到所有我的团队",
   "user.settings.display.theme.customTheme": "自定义主题",
   "user.settings.display.theme.describe": "打开管理您的主题",
@@ -2320,19 +2428,19 @@
   "user.settings.notifications.commentsNever": "回复串信息只有在我被提及时触发通知",
   "user.settings.notifications.commentsRoot": "在我开头的消息串触发通知",
   "user.settings.notifications.desktop": "发送桌面通知",
-  "user.settings.notifications.desktop.allFirefoxForever": "所有活动，一直显示",
-  "user.settings.notifications.desktop.allFirefoxTimed": "所有活动，显示 {seconds} 秒",
   "user.settings.notifications.desktop.allNoSoundForever": "所有活动，无声，一直显示",
   "user.settings.notifications.desktop.allNoSoundTimed": "所有活动，无声，显示 {seconds} 秒",
   "user.settings.notifications.desktop.allSoundForever": "所有活动，有声，一直显示",
+  "user.settings.notifications.desktop.allSoundHiddenForever": "所有活动，一直显示",
+  "user.settings.notifications.desktop.allSoundHiddenTimed": "所有活动，显示 {seconds} 秒",
   "user.settings.notifications.desktop.allSoundTimed": "所有活动，有声，显示 {seconds} 秒",
   "user.settings.notifications.desktop.duration": "通知时长",
   "user.settings.notifications.desktop.durationInfo": "设置在火狐或 Chrome 下桌面通知在屏幕显示的时间。在 Edge 以及 Safari 下只能最多 5 秒。",
-  "user.settings.notifications.desktop.mentionsFirefoxForever": "提及和私信，一直显示",
-  "user.settings.notifications.desktop.mentionsFirefoxTimed": "提及和私信，显示 {seconds} 秒",
   "user.settings.notifications.desktop.mentionsNoSoundForever": "提及和私信，无声，一直显示",
   "user.settings.notifications.desktop.mentionsNoSoundTimed": "提及和私信，无声，显示 {seconds} 秒",
   "user.settings.notifications.desktop.mentionsSoundForever": "提及和私信，有声，一直显示",
+  "user.settings.notifications.desktop.mentionsSoundHiddenForever": "提及和私信，一直显示",
+  "user.settings.notifications.desktop.mentionsSoundHiddenTimed": "提及和私信，显示 {seconds} 秒",
   "user.settings.notifications.desktop.mentionsSoundTimed": "提及和私信，有声，显示 {seconds} 秒",
   "user.settings.notifications.desktop.seconds": "{seconds} 秒",
   "user.settings.notifications.desktop.sound": "通知声音",
@@ -2444,6 +2552,28 @@
   "user.settings.security.switchSaml": "切换到使用 SAML SSO",
   "user.settings.security.title": "安全设置",
   "user.settings.security.viewHistory": "查看访问历史",
+  "user.settings.tokens.cancel": "取消",
+  "user.settings.tokens.clickToEdit": "点击 '更改' 以管理您的用户访问令牌",
+  "user.settings.tokens.confirmCreateButton": "是，创建",
+  "user.settings.tokens.confirmCreateMessage": "您正在创建拥有系统管理权限的用户访问令牌。您确定要创建此令牌吗？",
+  "user.settings.tokens.confirmCreateTitle": "船舰系统管理员用户访问令牌",
+  "user.settings.tokens.confirmDeleteButton": "是，删除",
+  "user.settings.tokens.confirmDeleteMessage": "任何使用此令牌的整合将无法访问 Mattermost API。此操作无法撤销。您确定要伤处此令牌吗？",
+  "user.settings.tokens.confirmDeleteTitle": "删除 {name} 令牌？",
+  "user.settings.tokens.copy": "请复制以下令牌。您将不会再次看到它！",
+  "user.settings.tokens.create": "创建新令牌",
+  "user.settings.tokens.delete": "删除",
+  "user.settings.tokens.description": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">用户访问令牌</a>功能于会话令牌类似并可以让整合用来<a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">与 REST API 验证</a>。",
+  "user.settings.tokens.description_mobile": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">用户访问令牌</a>功能于会话令牌类似并可以让整合用来<a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">与 REST API 验证</a>。在您的桌面创建新令牌。",
+  "user.settings.tokens.id": "ID：",
+  "user.settings.tokens.name": "名称：",
+  "user.settings.tokens.nameHelp": "Enter a description for your token to remember what it does.",
+  "user.settings.tokens.nameRequired": "Please enter a description.",
+  "user.settings.tokens.save": "保存",
+  "user.settings.tokens.title": "用户访问令牌",
+  "user.settings.tokens.token": "令牌: ",
+  "user.settings.tokens.tokenId": "令牌 ID：",
+  "user.settings.tokens.userAccessTokensNone": "没有用户访问令牌。",
   "user_list.notFound": "没有找到用户",
   "user_profile.send.dm": "发送消息",
   "user_profile.webrtc.call": "开始视频通话",
diff --git a/webapp/i18n/zh-TW.json b/webapp/i18n/zh-TW.json
index cb2d07a8e..5b1736dc3 100644
--- a/webapp/i18n/zh-TW.json
+++ b/webapp/i18n/zh-TW.json
@@ -203,8 +203,6 @@
   "admin.compliance_table.userId": "要求者",
   "admin.connectionSecurityNone": "無",
   "admin.connectionSecurityNoneDescription": "Mattermost 將使用不安全的連線。",
-  "admin.connectionSecurityPlain": "PLAIN",
-  "admin.connectionSecurityPlainDescription": "Mattermost 將使用不安全的連線來連線跟認證。",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "不安全的連線，嘗試提升為 TLS 安全連線",
   "admin.connectionSecurityTest": "測試連線",
@@ -235,31 +233,87 @@
   "admin.customization.support": "法律與支援",
   "admin.database.title": "資料庫設定",
   "admin.developer.title": "開發者設定",
+  "admin.elasticsearch.bulkIndexButton.error": "排程批次索引工作時失敗：{error}",
+  "admin.elasticsearch.connectionUrlDescription": "Elasticsearch 伺服器的位址。{documentationLink}",
+  "admin.elasticsearch.connectionUrlExample": "如：\"https://elasticsearch.example.org:9200\"",
+  "admin.elasticsearch.connectionUrlExample.documentationLinkText": "請參閱設定伺服器步驟的文件",
+  "admin.elasticsearch.connectionUrlTitle": "伺服器連線位址：",
+  "admin.elasticsearch.elasticsearch_test_button": "測試連線",
+  "admin.elasticsearch.enableIndexingDescription": "啟用時，新訊息將會被自動索引。在\"啟用 Elasticsearch 檢索\"前，檢索將會使用資料庫搜尋。{documentationLink}",
+  "admin.elasticsearch.enableIndexingDescription.documentationLinkText": "Elasticsearch 詳情請參閱文件。",
+  "admin.elasticsearch.enableIndexingTitle": "啟用 Elasticsearch 索引：",
+  "admin.elasticsearch.enableSearchingDescription": "需要成功連至 Elasticsearch 伺服器的連線。啟用時 Elasticsearch 將會使用最新的索引執行檢索。在對現有的訊息資料庫完成批次索引前檢索結果可能為不完全的結果。停用時檢索將使用資料庫搜尋。",
+  "admin.elasticsearch.enableSearchingTitle": "啟用 Elasticsearch 檢索：",
+  "admin.elasticsearch.indexButton.inProgress": "建立索引中",
+  "admin.elasticsearch.indexButton.ready": "建立索引",
+  "admin.elasticsearch.indexHelpText.buildIndex": "將從舊至新依序對資料庫中所有的訊息建立索引。在建立索引時 Elasticsearch 依然可用，但是在建立索引完成前檢索結果可能會不完整。",
+  "admin.elasticsearch.indexHelpText.cancelIndexing": "停止建立索引的工作並將期從佇列中移除。已經被索引的訊息不會被刪除。",
+  "admin.elasticsearch.noteDescription": "變更此段落設定必須重啟伺服器以生效。",
+  "admin.elasticsearch.password": "如：\"yourpassword\"",
+  "admin.elasticsearch.passwordDescription": "(非必要) 用以跟 Elasticsearch 伺服器認證的密碼。",
+  "admin.elasticsearch.passwordTitle": "伺服器密碼：",
+  "admin.elasticsearch.purgeIndexesButton": "清除索引",
+  "admin.elasticsearch.purgeIndexesButton.error": "清除索引時失敗：{error}",
+  "admin.elasticsearch.purgeIndexesButton.label": "清除索引：",
+  "admin.elasticsearch.purgeIndexesButton.success": "成功的清除索引",
+  "admin.elasticsearch.purgeIndexesHelpText": "清除將會將 Elasticsearch 伺服器上的索引完全移除。在對現有訊息的資料庫重新批次索引前檢索結果可能會不完整。",
+  "admin.elasticsearch.sniffDescription": "啟用時，探查將自動找尋並連接叢集中全部的資料節點。",
+  "admin.elasticsearch.sniffTitle": "啟用叢集探查：",
+  "admin.elasticsearch.testConfigSuccess": "測試成功。設定已儲存。",
+  "admin.elasticsearch.testHelpText": "測試 Mattermost 伺服器是否可連線至給定的 Elasticsearch 伺服器。測試連線將只在測試成功時才儲存設定。詳細的錯誤訊息請看紀錄檔。",
+  "admin.elasticsearch.title": "Elasticsearch (Beta)",
+  "admin.elasticsearch.usernameDescription": "(非必要) 用以跟 Elasticsearch 伺服器認證的使用者名稱。",
+  "admin.elasticsearch.usernameExample": "如：\"elastic\"",
+  "admin.elasticsearch.usernameTitle": "伺服器使用者名稱：",
+  "admin.elasticsearchStatus.bulkIndexLabel": "批次索引：",
+  "admin.elasticsearchStatus.cancelButton": "取消",
+  "admin.elasticsearchStatus.status": "狀態：",
+  "admin.elasticsearchStatus.statusCancelled": "索引工作已取消。",
+  "admin.elasticsearchStatus.statusError": "索引錯誤。",
+  "admin.elasticsearchStatus.statusError.help": "建立 Elasticsearch 索引時 Mattermost 遇到錯誤：{error}",
+  "admin.elasticsearchStatus.statusInProgress": "工作進行中。完成度 {percent}% 。",
+  "admin.elasticsearchStatus.statusInProgress.help": "建立索引正在工作伺服器上執行。如果啟用了 Elasticsearch，在工作完成前檢索結果可能會不完整。",
+  "admin.elasticsearchStatus.statusIndexingDisabled": "已停用建立索引。",
+  "admin.elasticsearchStatus.statusLoading": "讀取中…",
+  "admin.elasticsearchStatus.statusNoJobs": "沒有建立索引的工作在佇列中。",
+  "admin.elasticsearchStatus.statusPending": "工作擱置中。",
+  "admin.elasticsearchStatus.statusPending.help": "建立 Elasticsearch 索引已在工作伺服器上被排入佇列。如果啟用了 Elasticsearch，在工作完成前檢索結果可能會不完整。",
+  "admin.elasticsearchStatus.statusRequestCancel": "取消工作中...",
+  "admin.elasticsearchStatus.statusSuccess": "索引完成。",
+  "admin.elasticsearchStatus.statusSuccess.help": "完成索引，新的訊息將會被自動索引。",
   "admin.email.agreeHPNS": " 我理解並接受 Mattermost Hosted 推播通知服務<a href=\"https://about.mattermost.com/hpns-terms/\" target='_blank'>服務條款</a>與<a href=\"https://about.mattermost.com/hpns-privacy/\" target='_blank'>隱私政策</a>。",
   "admin.email.allowEmailSignInDescription": "啟用時 Mattermost 允許使用者用他們的電子郵件與密碼登入。",
   "admin.email.allowEmailSignInTitle": "啟用電子郵件登入：",
-  "admin.email.allowSignupDescription": "啟用時 Mattermost 允許團隊以電子郵件與密碼註冊帳號。應該只在想限制使用者以 OAuth 或 AD/LDAP 一類的單一登入服務註冊時，設為停用。",
+  "admin.email.allowSignupDescription": "啟用時 Mattermost 允許團隊以電子郵件與密碼註冊帳號。應該只在想限制使用者以 AD/LDAP、SAML 或 GitLab 一類的單一登入服務註冊時，設為停用。",
   "admin.email.allowSignupTitle": "啟用以電子郵件建立帳號：",
-  "admin.email.allowUsernameSignInDescription": "啟用時 Mattermost 允許使用者用他們的名稱與密碼登入。通常只有停用電子郵件地址驗證時才啟用。",
+  "admin.email.allowUsernameSignInDescription": "啟用時以電子郵件登入的使用者可以用帳號與密碼登入。此設定不會影響 AD/LDAP 登入。",
   "admin.email.allowUsernameSignInTitle": "啟用以使用者名稱登入：",
   "admin.email.connectionSecurityTest": "測試連線",
-  "admin.email.easHelp": "從<a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target='_blank'>企業 App 商店</a>瞭解編譯與佈署自已的行動應用程式。",
+  "admin.email.easHelp": "從<a href=\"https://about.mattermost.com/default-enterprise-app-store\" target='_blank'>企業 App 商店</a>瞭解編譯與佈署自已的行動應用程式。",
   "admin.email.emailFail": "連線失敗：{error}",
   "admin.email.emailSuccess": "成功傳送電子郵件。請檢查收件匣並確認。",
   "admin.email.enableEmailBatching.clusterEnabled": "高可用性模式啟用時不能啟用批次郵件。",
   "admin.email.enableEmailBatching.siteURL": "啟用批次郵件前必須先設定站台網址 (<b>設定 > 站台網址</b>)。",
-  "admin.email.enableEmailBatchingDesc": "啟用時，使用者可以讓多個直接訊息跟提及合併成單一封郵件，可在<b>帳號設定 > 通知</b>處設定。",
+  "admin.email.enableEmailBatchingDesc": "啟用時，使用者的電子郵件通知將會把多個直接傳訊以及提及合併成單一通知郵件。批次將以預設的15分鐘間隔作業，可以在 帳號設定 > 通知 設定。",
   "admin.email.enableEmailBatchingTitle": "啟用批次郵件：",
-  "admin.email.fullPushNotification": "發送完整的訊息",
+  "admin.email.enableSMTPAuthDesc": "啟用時使用者名稱與密碼將被用與跟 SMTP 伺服器認證。",
+  "admin.email.enableSMTPAuthTitle": "啟用 SMTP 認證：",
+  "admin.email.fullPushNotification": "發送完整的訊息片段",
+  "admin.email.genericNoChannelPushNotification": "以使用者發送一般說明",
   "admin.email.genericPushNotification": "以使用者與頻道名稱發送一般說明",
   "admin.email.inviteSaltDescription": "32字元的 Salt 用來簽署電子郵件邀請。於安裝時隨機產生。按\"重新產生\"建立新的 Salt。",
   "admin.email.inviteSaltExample": "如：\"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.inviteSaltTitle": "電子郵件邀請 Salt：",
   "admin.email.mhpns": "使用有加密、產品品質的 HPNS 連線到 iOS 與 Android 應用程式",
-  "admin.email.mhpnsHelp": "從iTunes下載 <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS 應用程式</a>。從Google Play 下載 <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android 應用程式</a>。瞭解更多關於<a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target='_blank'>HPNS</a>.",
+  "admin.email.mhpnsHelp": "從 iTunes 下載 <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS 應用程式</a>。從Google Play下載 <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android 應用程式</a>。瞭解更多關於 <a href=\"https://about.mattermost.com/default-hpns\" target='_blank'>HPNS</a>。",
   "admin.email.mtpns": "使用 TPNS 以及 iTunes 和 GooglePlay 上的 iOS 與 Android 應用程式",
-  "admin.email.mtpnsHelp": "從 iTunes 下載 <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS 應用程式</a>。從Google Play下載 <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android 應用程式</a>。瞭解更多關於 <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target='_blank'>TPNS</a>。",
+  "admin.email.mtpnsHelp": "從 iTunes 下載 <a href=\"https://about.mattermost.com/mattermost-ios-app\" target='_blank'>Mattermost iOS 應用程式</a>。從Google Play下載 <a href=\"https://about.mattermost.com/mattermost-android-app\" target='_blank'>Mattermost Android 應用程式</a>。瞭解更多關於 <a href=\"https://about.mattermost.com/default-tpns/\" target='_blank'>TPNS</a>。",
   "admin.email.nofificationOrganizationExample": "如：\"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\"",
+  "admin.email.notification.contents.full": "發送完整訊息內容",
+  "admin.email.notification.contents.full.description": "郵件通知將包含寄送者跟頻道名稱。</br>通常用於在 Mattermost 含有機敏訊息且政策要求不得儲存於郵件時為了合乎規範而設定。",
+  "admin.email.notification.contents.generic": "發送僅含有寄送者名稱的一般說明",
+  "admin.email.notification.contents.generic.description": "郵件通知只包含寄送者，將不帶有頻道及訊息內容。</br>通常用於在 Mattermost 含有機敏訊息且政策要求不得儲存於郵件時為了合乎規範而設定。",
+  "admin.email.notification.contents.title": "電子郵件通知內容：",
   "admin.email.notificationDisplayDescription": "從 Mattermost 傳送通知電子郵件時發件者的顯示名稱。",
   "admin.email.notificationDisplayExample": "例如：\"Mattermost 通知\"、\"系統\"、\"勿回信\"",
   "admin.email.notificationDisplayTitle": "通知顯示名稱：",
@@ -274,11 +328,11 @@
   "admin.email.passwordSaltDescription": "32字元的 Salt 用來簽署重設密碼之電子郵件。於安裝時隨機產生。按\"重新產生\"建立新的 salt。",
   "admin.email.passwordSaltExample": "如：\"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "密碼重設 Salt：",
-  "admin.email.pushContentDesc": "選取\"發送帶有使用者跟頻道名稱的一般性描述\"時，推播會寄送一般性訊息，包含使用者與頻道名稱，但不包含訊息內容。<br /><br />選取\"發送完整的訊息\"時，則會引用觸發通知的訊息內文，有可能會帶有機密資料。如果推播服務在防火牆之外，那麼強烈建議本選項只在協定為 \"https\" 加密連線時使用。",
+  "admin.email.pushContentDesc": "\"以使用者發送一般說明 \"在推播通知中只包含發送訊息的使用者名稱，不包含頻道名稱跟訊息。<br /><br />\"以使用者與頻道名稱發送一般說明\"在推播通知中包含發送訊息的使用者名稱以及頻道名稱，但不包含訊息。<br /><br />\"發送完整的訊息片段\"將在推播通知中包含訊息節錄，該節錄可能帶有訊息當中的機密資訊。如果推播通知服務在防火牆之外，我們*強烈建議*此選項僅在使用\"https\"協定時選用以確保連線加密。",
   "admin.email.pushContentTitle": "推播內容：",
   "admin.email.pushDesc": "正式環境通常為啟用。啟用時 Mattermost 會嘗試從推播主機發送推播通知。",
   "admin.email.pushOff": "不要發送推播通知",
-  "admin.email.pushOffHelp": "詳細設置請參閱<a href=\"http://docs.mattermost.com/deployment/push.html#push-notifications-and-mobile-devices\" target='_blank'>推播通知文件</a>。",
+  "admin.email.pushOffHelp": "詳細設置請參閱<a href=\"https://about.mattermost.com/default-mobile-push-notifications\" target='_blank'>推播通知文件</a>。",
   "admin.email.pushServerDesc": "在防火牆後方設置 Mattermost 推播通知服務時請使用 https://github.com/mattermost/push-proxy。可以使用 http://push-test.mattermost.com 測試，這個服務會連接到 Apple AppStore 的 Mattermost iOS 樣本應用程式。請勿在正式環境使用此測試服務。",
   "admin.email.pushServerEx": "例如：\"http://push-test.mattermost.com\"",
   "admin.email.pushServerTitle": "推播通知伺服器：",
@@ -288,7 +342,7 @@
   "admin.email.selfPush": "手動輸入推播通知服務位址",
   "admin.email.skipServerCertificateVerification.description": "啟用時 Mattermost 將不會驗證電子郵件伺服器憑證。",
   "admin.email.skipServerCertificateVerification.title": "跳過驗證伺服器憑證：",
-  "admin.email.smtpPasswordDescription": " 跟電子郵件管理員取得認證。",
+  "admin.email.smtpPasswordDescription": "SMTP 使用者名稱對應的密碼。",
   "admin.email.smtpPasswordExample": "例如：\"您的密碼\"、\"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.email.smtpPasswordTitle": "SMTP 伺服器密碼：",
   "admin.email.smtpPortDescription": "SMTP 電子郵件伺服器連接埠：",
@@ -297,13 +351,17 @@
   "admin.email.smtpServerDescription": "SMTP 電子郵件伺服器位置。",
   "admin.email.smtpServerExample": "例如：\"smtp.yourcompany.com\"、\"email-smtp.us-east-1.amazonaws.com\"",
   "admin.email.smtpServerTitle": "SMTP 伺服器：",
-  "admin.email.smtpUsernameDescription": " 跟電子郵件管理員取得認證。",
+  "admin.email.smtpUsernameDescription": "用以與 SMTP 伺服器認證的使用者名稱。",
   "admin.email.smtpUsernameExample": "例如：\"admin@yourcompany.com\"、\"AKIADTOVBGERKLCBV\"",
   "admin.email.smtpUsernameTitle": "SMTP 伺服器使用者名稱：",
   "admin.email.testing": "測試中...",
   "admin.false": "否",
-  "admin.file.enableFileAttachments": "啟用檔案附件：",
-  "admin.file.enableFileAttachmentsDesc": "停用時，關閉在訊息中上傳檔案及圖像的功能。",
+  "admin.file.enableFileAttachments": "允許檔案分享：",
+  "admin.file.enableFileAttachmentsDesc": "停用時，關閉此伺服器的檔案分享。所有的用戶端與裝置將禁止附加檔案及圖片於訊息，包括行動裝置。",
+  "admin.file.enableMobileDownloadDesc": "停用時，關閉行動裝置 App 的檔案下載。使用者依然可以由行動裝置的網頁瀏覽器下載檔案。",
+  "admin.file.enableMobileDownloadTitle": "允許從行動裝置下載檔案：",
+  "admin.file.enableMobileUploadDesc": "停用時，關閉行動裝置 App 的上傳檔案。如果啟用允許檔案分享，使用者依然可以由行動裝置的網頁瀏覽器上傳檔案。 ",
+  "admin.file.enableMobileUploadTitle": "允許從行動裝置上傳檔案：",
   "admin.file_upload.chooseFile": "選擇檔案",
   "admin.file_upload.noFile": "未上傳任何檔案",
   "admin.file_upload.uploadFile": "上傳",
@@ -529,6 +587,21 @@
   "admin.logs.bannerDesc": "前往 報告 > 使用者 並在搜尋過濾條件貼上 ID 以根據使用者 ID 查詢使用者。",
   "admin.logs.reload": "重新載入",
   "admin.logs.title": "主機記錄",
+  "admin.manage_roles.additionalRoles": "為此帳號選取額外的權限。 <a href=\"https://about.mattermost.com/default-permissions\" target=\"_blank\">關於角色與權限</a>。",
+  "admin.manage_roles.allowUserAccessTokens": "允許此帳號產生 <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">使用者存取 Token</a>.",
+  "admin.manage_roles.cancel": "取消",
+  "admin.manage_roles.manageRolesTitle": "管理角色",
+  "admin.manage_roles.postAllPublicRole": "允許在所有的公開頻道發布訊息。",
+  "admin.manage_roles.postAllPublicRoleTitle": "post:channels",
+  "admin.manage_roles.postAllRole": "允許在所有的頻道發布訊息，包含直接通訊。",
+  "admin.manage_roles.postAllRoleTitle": "post:all",
+  "admin.manage_roles.save": "儲存",
+  "admin.manage_roles.saveError": "無法儲存角色。",
+  "admin.manage_roles.systemAdmin": "系統管理員",
+  "admin.manage_roles.systemMember": "成員",
+  "admin.manage_tokens.manageTokensTitle": "管理使用者存取 Token",
+  "admin.manage_tokens.userAccessTokensDescription": "使用者存取 Token 的功能類似工作階段 Token，可被外部整合用於 <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">與 REST API 認證</a>。詳情請參閱<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">使用者存取 Token</a>。",
+  "admin.manage_tokens.userAccessTokensNone": "沒有使用者存取 Token。",
   "admin.metrics.enableDescription": "啟用時，Mattermost 會啟用效能監視的收集與分析。詳細如何設定 Mattermost 的效能監視，請參閱<a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>文件</a>。",
   "admin.metrics.enableTitle": "啟用效能監視：",
   "admin.metrics.listenAddressDesc": "伺服器將監聽以公開效能計量值的位址。",
@@ -574,6 +647,19 @@
   "admin.password.requirementsDescription": "有效密碼所應有的字元類型。",
   "admin.password.symbol": "至少一個符號(\"~!@#$%^&*()\")",
   "admin.password.uppercase": "至少一個大寫英文字母",
+  "admin.plugins.jira": "JIRA (Beta)",
+  "admin.plugins.jira.channelParamNamePlaceholder": "頻道名稱",
+  "admin.plugins.jira.enabledDescription": "啟用時可以設定 JIRA Webhook 在 Mattermost 上發布訊息。為了避免釣魚攻擊，所有貼文都會被標上 BOT 標籤。",
+  "admin.plugins.jira.enabledLabel": "已啟用：",
+  "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.userDescription": "選擇此外部整合依附的使用者名稱。",
+  "admin.plugins.jira.userLabel": "使用者：",
+  "admin.plugins.jira.webhookDocsLink": "說明文件",
   "admin.privacy.showEmailDescription": "選擇否時，對系統管理員以外的所有人隱藏成員的電子郵件位址",
   "admin.privacy.showEmailTitle": "顯示電子郵件地址：",
   "admin.privacy.showFullNameDescription": "選擇否時，對系統管理員以外的所有人隱藏成員的全名。顯示全名處改為顯示使用者名稱。",
@@ -751,6 +837,10 @@
   "admin.service.tlsKeyFileDescription": "TLS 將使用的私有金鑰檔案。",
   "admin.service.useLetsEncrypt": "使用 Let's Encrypt：",
   "admin.service.useLetsEncryptDescription": "啟用自動擷取 Let's Encrypt 的憑證。將會在來自新網域的用戶端嘗試連線時擷取憑證。此功能可以跟多個網域同時運作。",
+  "admin.service.userAccessTokensDescLabel": "Name: ",
+  "admin.service.userAccessTokensDescription": "啟用時使用者能在<strong>帳號設定 > 安全</strong>為外部整合建立<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">使用者存取 Token</a>。它們能用來與 API 認證並賦予等同該帳號的完整權限。<br/><br/>在<strong>系統控制台 > 使用者</strong>管理哪些使用者能建立使用者存取 Token。",
+  "admin.service.userAccessTokensIdLabel": "Token ID：",
+  "admin.service.userAccessTokensTitle": "啟用使用者存取 Token：",
   "admin.service.webSessionDays": "AD/LDAP 和電子郵件的工作階段長度(以天計)：",
   "admin.service.webSessionDaysDesc": "從使用者最後一次輸入他們的認證到工作階段過期之間的天數。修改設定之後新的工作階段長度會在下次使用者輸入認證之後開始生效。",
   "admin.service.webhooksDescription": "啟用時，允許傳入的 Webhook。為了避免釣魚攻擊，所有來自 Webhook 的貼文都會被標上 BOT 標籤。請參閱<a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>文件</a>。",
@@ -769,6 +859,7 @@
   "admin.sidebar.customization": "自訂",
   "admin.sidebar.database": "資料庫",
   "admin.sidebar.developer": "開發者",
+  "admin.sidebar.elasticsearch": "Elasticsearch (Beta)",
   "admin.sidebar.email": "電子郵件",
   "admin.sidebar.emoji": "繪文字",
   "admin.sidebar.external": "外部服務",
@@ -776,6 +867,7 @@
   "admin.sidebar.general": "一般",
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.integrations": "整合",
+  "admin.sidebar.jira": "JIRA (Beta)",
   "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "法律與支援",
   "admin.sidebar.license": "版本與授權",
@@ -883,9 +975,9 @@
   "admin.team.restrictTitle": "限制僅有特定的電子郵件網域能建立帳號：",
   "admin.team.restrict_direct_message_any": "任何 Mattermost 伺服器上的使用者",
   "admin.team.restrict_direct_message_team": "任何團隊成員",
-  "admin.team.showFullname": "顯示姓跟名(預設)",
+  "admin.team.showFullname": "顯示姓跟名",
   "admin.team.showNickname": "有暱稱時顯示暱稱，沒有時顯示姓跟名",
-  "admin.team.showUsername": "顯示使用者名稱",
+  "admin.team.showUsername": "顯示使用者名稱(預設)",
   "admin.team.siteNameDescription": "顯示於登入畫面與界面上的服務名稱.",
   "admin.team.siteNameExample": "如：\"Mattermost\"",
   "admin.team.siteNameTitle": "站台名稱：",
@@ -915,7 +1007,9 @@
   "admin.user_item.makeMember": "設為成員",
   "admin.user_item.makeSysAdmin": "設為系統管理員",
   "admin.user_item.makeTeamAdmin": "設為團隊管理員",
+  "admin.user_item.manageRoles": "管理角色",
   "admin.user_item.manageTeams": "管理團隊",
+  "admin.user_item.manageTokens": "管理 Token",
   "admin.user_item.member": "成員",
   "admin.user_item.mfaNo": "<strong>多重要素驗證</strong>：無",
   "admin.user_item.mfaYes": "<strong>多重要素驗證</strong>：是",
@@ -924,6 +1018,9 @@
   "admin.user_item.switchToEmail": "切換帳戶到電子郵件地址/密碼",
   "admin.user_item.sysAdmin": "系統管理",
   "admin.user_item.teamAdmin": "團隊管理員",
+  "admin.user_item.userAccessTokenPostAll": "(與 post:all 使用者存取 Token)",
+  "admin.user_item.userAccessTokenPostAllPublic": "(與 post:channels 使用者存取 Token)",
+  "admin.user_item.userAccessTokenYes": "(與使用者存取 Token)",
   "admin.webrtc.enableDescription": "啟用時，Mattermost 將可以展開<strong>一對一</strong>的視訊通話。WebRTC 通話可在 Chrome, Firefox 和 Mattermost 桌面應用程式上使用。",
   "admin.webrtc.enableTitle": "啟用 Mattermost WebRTC：",
   "admin.webrtc.gatewayAdminSecretDescription": "輸入管理員密碼以存取閘道管理員網址。",
@@ -998,7 +1095,7 @@
   "api.channel.post_update_channel_header_message_and_forget.removed": "{username} 已移除頻道標題(原為：{old})",
   "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} 已更新頻道標題：從 {old} 改為 {new}",
   "api.channel.post_update_channel_header_message_and_forget.updated_to": "{username} 已更新頻道標題為：{new}",
-  "api.channel.remove_member.removed": "{removedUsername} 已被從頻道中移除",
+  "api.channel.remove_member.removed": "{removedUsername} 已從頻道中移除",
   "app.channel.post_update_channel_purpose_message.removed": "{username} 已移除頻道用途(原為：{old})",
   "app.channel.post_update_channel_purpose_message.updated_from": "{username} 已更新頻道用途：從 {old} 改為 {new}",
   "app.channel.post_update_channel_purpose_message.updated_to": "{username} 已更新頻道用途為：{new}",
@@ -1314,14 +1411,14 @@
   "emoji_picker.custom": "自訂",
   "emoji_picker.emojiPicker": "繪文字選取器",
   "emoji_picker.flags": "旗幟",
-  "emoji_picker.food": "食物",
+  "emoji_picker.foods": "食物",
   "emoji_picker.nature": "自然",
   "emoji_picker.objects": "物件",
   "emoji_picker.people": "人物",
+  "emoji_picker.places": "地方",
   "emoji_picker.recent": "最近曾使用",
   "emoji_picker.search": "搜尋",
   "emoji_picker.symbols": "符號",
-  "emoji_picker.travel": "旅遊",
   "error.local_storage.help1": "啟用 Cookies",
   "error.local_storage.help2": "關閉隱私瀏覽",
   "error.local_storage.help3": "使用支援的瀏覽器 (IE 11, Chrome 43+, Firefox 38+, Safari 9, Edge)",
@@ -1688,6 +1785,10 @@
   "mobile.account_notifications.threads_mentions": "被提及的討論串",
   "mobile.account_notifications.threads_start": "我開啟的討論串",
   "mobile.account_notifications.threads_start_participate": "我開啟或參與的討論串",
+  "mobile.advanced_settings.reset_button": "重置",
+  "mobile.advanced_settings.reset_message": "\n這將會清除所有離線資料並重新啟動 app 。在重啟 app 後會自動重新登入。\n",
+  "mobile.advanced_settings.reset_title": "清除快取",
+  "mobile.advanced_settings.title": "進階設定",
   "mobile.channel_drawer.search": "移動至對話",
   "mobile.channel_info.alertMessageDeleteChannel": "確定要刪除{term} {name} 嘛？",
   "mobile.channel_info.alertMessageLeaveChannel": "確定要離開{term} {name} 嘛？",
@@ -1741,11 +1842,17 @@
   "mobile.loading_members": "正在載入成員...",
   "mobile.loading_posts": "正在載入訊息...",
   "mobile.login_options.choose_title": "選擇登入方式",
+  "mobile.more_dms.start": "開始",
+  "mobile.more_dms.title": "新對話",
+  "mobile.notice_mobile_link": "行動裝置 App",
+  "mobile.notice_platform_link": "平台",
+  "mobile.notice_text": "藉由在{platform}與{mobile}上的開源軟體，才得以實現 Mattermost。",
   "mobile.notification.in": " 在 ",
   "mobile.offlineIndicator.connected": "已連線",
   "mobile.offlineIndicator.connecting": "連線中",
   "mobile.offlineIndicator.offline": "沒有網際網路連線",
   "mobile.open_dm.error": "無法開啟與{displayName}的直接傳訊。請檢查連線並再試一次。 ",
+  "mobile.open_gm.error": "無法開啟與這些使用者的直接傳訊。請檢查連線並再試一次。 ",
   "mobile.post.cancel": "取消",
   "mobile.post.delete_question": "確定要刪除此訊息嘛？",
   "mobile.post.delete_title": "刪除訊息",
@@ -1775,6 +1882,8 @@
   "mobile.routes.thread_dm": "直接傳訊討論串",
   "mobile.routes.user_profile": "個人檔案",
   "mobile.routes.user_profile.send_message": "發送訊息",
+  "mobile.search.jump": "移動",
+  "mobile.search.no_results": "找不到任何資料",
   "mobile.select_team.choose": "您所屬的團隊：",
   "mobile.select_team.join_open": "能加入的開放團隊。",
   "mobile.select_team.no_teams": "沒有能加入的團隊。",
@@ -1788,6 +1897,7 @@
   "mobile.settings.clear_button": "清除",
   "mobile.settings.clear_message": "\n這將會清除所有離線資料並重新啟動 app 。在重啟 app 後會自動重新登入。\n",
   "mobile.settings.team_selection": "選擇團隊",
+  "mobile.suggestion.members": "成員",
   "modal.manaul_status.ask": "別再問我",
   "modal.manaul_status.button": "是，將狀態設定為\"線上\"",
   "modal.manaul_status.cancel": "否，保持為\"{status}\"",
@@ -1884,6 +1994,8 @@
   "post_focus_view.beginning": "頻道封存的開頭",
   "post_info.del": "刪除",
   "post_info.edit": "編輯",
+  "post_info.message.visible": "(只有您看得見)",
+  "post_info.message.visible.compact": " (只有您看得見)",
   "post_info.mobile.flag": "標記",
   "post_info.mobile.unflag": "取消標記",
   "post_info.permalink": "永久網址",
@@ -1896,7 +2008,7 @@
   "posts_view.loadMore": "載入更多訊息",
   "posts_view.loadingMore": "載入更多訊息",
   "posts_view.newMsg": "新訊息",
-  "posts_view.newMsgBelow": "下面還有 {count} 個新訊息",
+  "posts_view.newMsgBelow": "{count} 個新訊息",
   "quick_switch_modal.channels": "頻道",
   "quick_switch_modal.channelsShortcut.mac": "- ⌘K",
   "quick_switch_modal.channelsShortcut.windows": "- CTRL+K",
@@ -1928,7 +2040,7 @@
   "rename_channel.displayNameHolder": "請輸入顯示名稱",
   "rename_channel.handleHolder": "請用小寫英數字",
   "rename_channel.lowercase": "請用小寫英數字",
-  "rename_channel.maxLength": "此欄位必須少於22個字元",
+  "rename_channel.maxLength": "此欄位必須少於 {maxLength, number} 字",
   "rename_channel.required": "此欄位是必需的",
   "rename_channel.save": "儲存",
   "rename_channel.title": "變更頻道名稱",
@@ -1967,6 +2079,7 @@
   "search_item.jump": "跳至",
   "search_results.because": "<ul><li>如果要搜尋部份語句(如搜尋\"rea\"以尋找\"reach\"或\"reaction\")，請在搜尋詞尾附上*。</li><li>為了減少收尋結果，兩個字母的搜尋跟常用字像\"this\"、\"a\"跟\"is\"不會顯示在結果當中。</li></ul>",
   "search_results.noResults": "沒有任何結果。再嘗試一次？",
+  "search_results.searching": "搜尋中…",
   "search_results.usage": "<ul><li>用<b>\"雙引號\"</b>來搜尋語句</li><li>用<b>from:</b>來搜尋特定使用者的訊息，用<b>in:</b>來搜尋特定頻道</li></ul>",
   "search_results.usageFlag1": "尚未標記任何訊息。",
   "search_results.usageFlag2": "可以藉由按下位於時間戳記旁邊的這 ",
@@ -1999,8 +2112,7 @@
   "sidebar.tutorialScreen1": "<h4>頻道</h4><p><strong>頻道</strong>用來展開關於各種話題的對話。頻道對團隊全體都是開放可以任意讀寫的。需要私密通訊時，對單獨一人時使用<strong>直接訊息</strong>，對多人時使用<strong>私人頻道</strong>。</p>",
   "sidebar.tutorialScreen2": "<h4>\"{townsquare}\"跟\"{offtopic}\"頻道</h4><p>以下為兩個一開始就建立好的公開頻道：</p><p><strong>{townsquare}</strong>是個給團隊之間溝通的地方，您的團隊全員都是這個頻道的成員。</p><p><strong>{offtopic}</strong>是個放鬆心情、聊與工作無關事情的地方。您和團隊可以決定要建立其他怎樣的頻道。</p>",
   "sidebar.tutorialScreen3": "<h4>建立和加入頻道</h4><p>按<strong>\"更多...\"</strong>來建立新頻道或是加入現有的頻道。</p><p>您也可以藉由按在公開或私人頻道標題旁邊的<strong>\"+\"符號</strong>來建立新的公開或私人頻道。</p>",
-  "sidebar.unreadAbove": "上面有未讀訊息",
-  "sidebar.unreadBelow": "下面有未讀訊息",
+  "sidebar.unreads": "更多未讀訊息",
   "sidebar_header.tutorial": "<h4>主選單</h4><p>在<strong>主選單</strong>可以<strong>邀請新成員</strong>，存取<strong>帳號設定</strong>並設定<strong>主題顏色</strong>。</p><p>團隊管理員也可以在此存取<strong>團隊設定</strong>。</p><p>系統管理員會在此看到<strong>系統控制台</strong>以管理整個系統。</p>",
   "sidebar_right_menu.accountSettings": "帳號設定",
   "sidebar_right_menu.addMemberToTeam": "新增成員",
@@ -2220,10 +2332,6 @@
   "user.settings.display.nameOptsDesc": "設定在訊息及直接訊息列表該如何顯示其他使用者的名字。",
   "user.settings.display.normalClock": "12 小時制(如：4:00 PM)",
   "user.settings.display.preferTime": "選擇時間顯示方式。",
-  "user.settings.display.showFullname": "顯示姓跟名",
-  "user.settings.display.showNickname": "有暱稱時顯示暱稱，沒有時顯示姓跟名",
-  "user.settings.display.showUsername": "顯示使用者名稱(預設)",
-  "user.settings.display.teammateNameDisplay": "團隊成員名稱顯示",
   "user.settings.display.theme.applyToAllTeams": "將新主題套用到所有的團隊上",
   "user.settings.display.theme.customTheme": "自訂主題",
   "user.settings.display.theme.describe": "管理主題",
@@ -2320,19 +2428,19 @@
   "user.settings.notifications.commentsNever": "回覆串訊息只有在提及時觸發通知。",
   "user.settings.notifications.commentsRoot": "我開啟的討論串有訊息時觸發通知",
   "user.settings.notifications.desktop": "發送桌面通知",
-  "user.settings.notifications.desktop.allFirefoxForever": "所有的活動，一直顯示",
-  "user.settings.notifications.desktop.allFirefoxTimed": "所有的活動，顯示 {seconds} 秒",
   "user.settings.notifications.desktop.allNoSoundForever": "所有的活動，無通知音效，一直顯示",
   "user.settings.notifications.desktop.allNoSoundTimed": "所有的活動，無通知音效，顯示 {seconds} 秒",
   "user.settings.notifications.desktop.allSoundForever": "所有的活動，有通知音效，一直顯示",
+  "user.settings.notifications.desktop.allSoundHiddenForever": "所有的活動，一直顯示",
+  "user.settings.notifications.desktop.allSoundHiddenTimed": "所有的活動，顯示 {seconds} 秒",
   "user.settings.notifications.desktop.allSoundTimed": "所有的活動，有通知音效，顯示 {seconds} 秒",
   "user.settings.notifications.desktop.duration": "通知長度",
   "user.settings.notifications.desktop.durationInfo": "設定在 Firefox 或 Chrome 中桌面通知將停留在畫面上多久。Edge 與 Safari 的桌面通知最多僅能停留5秒。",
-  "user.settings.notifications.desktop.mentionsFirefoxForever": "提及跟直接訊息，一直顯示",
-  "user.settings.notifications.desktop.mentionsFirefoxTimed": "提及跟直接訊息，顯示 {seconds} 秒",
   "user.settings.notifications.desktop.mentionsNoSoundForever": "提及跟直接訊息，無通知音效，一直顯示",
   "user.settings.notifications.desktop.mentionsNoSoundTimed": "提及跟直接訊息，無通知音效，顯示 {seconds} 秒",
   "user.settings.notifications.desktop.mentionsSoundForever": "提及跟直接訊息，有通知音效，一直顯示",
+  "user.settings.notifications.desktop.mentionsSoundHiddenForever": "提及跟直接訊息，一直顯示",
+  "user.settings.notifications.desktop.mentionsSoundHiddenTimed": "提及跟直接訊息，顯示 {seconds} 秒",
   "user.settings.notifications.desktop.mentionsSoundTimed": "提及跟直接訊息，有通知音效，顯示 {seconds} 秒",
   "user.settings.notifications.desktop.seconds": "{seconds} 秒",
   "user.settings.notifications.desktop.sound": "通知音效",
@@ -2363,7 +2471,7 @@
   "user.settings.notifications.sensitiveUsername": "您的使用者名稱，不區分大小寫：\"{username}\"",
   "user.settings.notifications.sensitiveWords": "其他不區分大小寫的字，用逗號分隔：",
   "user.settings.notifications.soundConfig": "請在瀏覽器設置中設定通知聲音",
-  "user.settings.notifications.sounds_info": "通知音效支援 IE11、Edge、Safari、Chrome 跟 Mattermost 桌面應用程式。",
+  "user.settings.notifications.sounds_info": "通知音效支援 IE11、Safari、Chrome 跟 Mattermost 桌面應用程式。",
   "user.settings.notifications.teamWide": "對團隊全員的提及 \"@all\"",
   "user.settings.notifications.title": "通知設定",
   "user.settings.notifications.wordsTrigger": "觸發提及的字",
@@ -2444,6 +2552,28 @@
   "user.settings.security.switchSaml": "改為使用 SAML SSO",
   "user.settings.security.title": "安全性設定",
   "user.settings.security.viewHistory": "檢視存取紀錄",
+  "user.settings.tokens.cancel": "取消",
+  "user.settings.tokens.clickToEdit": "點擊'編輯'以管理使用者存取 Token",
+  "user.settings.tokens.confirmCreateButton": "是，建立",
+  "user.settings.tokens.confirmCreateMessage": "正在產生有系統管理員權限的使用者存取 Token。請確認要產生此 Token。",
+  "user.settings.tokens.confirmCreateTitle": "產生系統管理員使用者存取 Token",
+  "user.settings.tokens.confirmDeleteButton": "是，刪除",
+  "user.settings.tokens.confirmDeleteMessage": "任何使用此 Token 的外部整合將無法存取 Mattermost API。此動作無法取消。請確認要刪除此 Token。",
+  "user.settings.tokens.confirmDeleteTitle": "刪除 {name} Token？",
+  "user.settings.tokens.copy": "請複製下面的 Token。您將無法再次見到它。",
+  "user.settings.tokens.create": "建立新 Token",
+  "user.settings.tokens.delete": "刪除",
+  "user.settings.tokens.description": "使用者存取 Token 的功能類似工作階段 Token，可被外部整合用於 <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">與 REST API 認證</a>",
+  "user.settings.tokens.description_mobile": "使用者存取 Token 的功能類似工作階段 Token，可被外部整合用於 <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">與 REST API 認證</a>。請用電腦建立新 Token。",
+  "user.settings.tokens.id": "ID：",
+  "user.settings.tokens.name": "名字：",
+  "user.settings.tokens.nameHelp": "Enter a description for your token to remember what it does.",
+  "user.settings.tokens.nameRequired": "Please enter a description.",
+  "user.settings.tokens.save": "儲存",
+  "user.settings.tokens.title": "使用者存取 Token",
+  "user.settings.tokens.token": "Token：",
+  "user.settings.tokens.tokenId": "Token ID：",
+  "user.settings.tokens.userAccessTokensNone": "沒有使用者存取 Token。",
   "user_list.notFound": "找不到任何使用者",
   "user_profile.send.dm": "發送訊息",
   "user_profile.webrtc.call": "開始視訊通話",