daily translations 20160809 (#3772)

9 files changed, 1341 insertions, 900 deletions

diff --git a/webapp/i18n/de.json b/webapp/i18n/de.json
index 591428cf4..099dd30d6 100644
--- a/webapp/i18n/de.json
+++ b/webapp/i18n/de.json
@@ -30,21 +30,21 @@
   "activity_log_modal.androidNativeApp": "Android App",
   "activity_log_modal.iphoneNativeApp": "iPhone App",
   "add_command.autocomplete": "Auto-Vervollständigung",
-  "add_command.autocomplete.help": "(Optional) Show slash command in autocomplete list.",
+  "add_command.autocomplete.help": "(Optional) Zeige Slash Befehle in Autovervollständigen Liste.",
   "add_command.autocompleteDescription": "Autovervollständigung Beschreibung",
-  "add_command.autocompleteDescription.help": "Optionale kurze Beschreibung des Slash Befehls für die Autovervollständigungsliste.",
+  "add_command.autocompleteDescription.help": "(Optional) Kurze Beschreibung des Slash Befehls für die Autovervollständigungsliste.",
   "add_command.autocompleteDescription.placeholder": "Beispiel: \"Gibt Suchergebnisse für Patientenakten zurück\"",
   "add_command.autocompleteHint": "Autovervollständigungshinweis",
-  "add_command.autocompleteHint.help": "(Optional) Arguments associated with your slash command, displayed as help in the autocomplete list.",
+  "add_command.autocompleteHint.help": "(Optional) Argumente für den Slash Befehl als Hilfestellung in der Autovervollständigungsliste anzeigen.",
   "add_command.autocompleteHint.placeholder": "Beispiel: [Patientenname]",
   "add_command.cancel": "Abbrechen",
   "add_command.description": "Beschreibung",
-  "add_command.description.help": "Description for your incoming webhook.",
+  "add_command.description.help": "Beschreibung des eingehenden Webhooks.",
   "add_command.displayName": "Anzeigename",
-  "add_command.displayName.help": "Display name for your slash command made of up to 64 characters.",
+  "add_command.displayName.help": "Anzeigename für den Slash Befehl mit bis zu 64 Zeichen.",
   "add_command.header": "Hinzufügen",
   "add_command.iconUrl": "Antwort Icon",
-  "add_command.iconUrl.help": "Wählen Sie ein überschreibendes Profilbild für die Antwort für diesen Slash Befehl. Geben Sie eine URL zu einem .png oder .jpg mit mind. 128x128 Pixeln.",
+  "add_command.iconUrl.help": "(optional) Wählen Sie ein überschreibendes Profilbild für die Antwort für diesen Slash Befehl. Geben Sie eine URL zu einem .png oder .jpg mit mind. 128x128 Pixeln.",
   "add_command.iconUrl.placeholder": "https://www.example.com/myicon.png",
   "add_command.method": "Anforderungsmethode",
   "add_command.method.get": "GET",
@@ -52,10 +52,10 @@
   "add_command.method.post": "POST",
   "add_command.save": "Speichern",
   "add_command.trigger": "Befehl Trigger Wort",
-  "add_command.trigger.help": "Trigger word must be unique, and cannot begin with a slash or contain any spaces.",
-  "add_command.trigger.helpExamples": "Examples: client, employee, patient, weather",
-  "add_command.trigger.helpReserved": "Reserved: {link}",
-  "add_command.trigger.helpReservedLinkText": "see list of built-in slash commands",
+  "add_command.trigger.help": "Auslösewort muss eindeutig sein, und kann nicht mit einem Slash beginnen oder Leerzeichen enthalten.",
+  "add_command.trigger.helpExamples": "Beispiele: client, mitarbeiter, patient, wetter",
+  "add_command.trigger.helpReserved": "Reserviert: {link}",
+  "add_command.trigger.helpReservedLinkText": "zeige eine Liste von eingebauten Slash Befehlen",
   "add_command.trigger.placeholder": "Befehlstrigger wie \"hallo\"",
   "add_command.triggerInvalidLength": "Ein Triggerwort darf nur aus mindestens {min} und maximal {max} Buchstaben bestehen",
   "add_command.triggerInvalidSlash": "Ein Triggerwort darf nicht mit / anfangen",
@@ -66,7 +66,7 @@
   "add_command.url.placeholder": "Muss mit http:// oder https:// anfangen",
   "add_command.urlRequired": "Eine Anfrage URL wird benötigt",
   "add_command.username": "Benutzername der Antwort",
-  "add_command.username.help": "Wählen Sie einen überschreibenden Benutzernamen für Antworten für diesen Slash Befehl. Benutzernamen können bis zu 22 Zeichen lang sein und Kleinbuchstaben, Ziffern und die Symbole \"-\", \"_\", und \".\" enthalten.",
+  "add_command.username.help": "(Optional) Wählen Sie einen überschreibenden Benutzernamen für Antworten für diesen Slash Befehl. Benutzernamen können bis zu 22 Zeichen lang sein und Kleinbuchstaben, Ziffern und die Symbole \"-\", \"_\", und \".\" enthalten.",
   "add_command.username.placeholder": "Benutzername",
   "add_emoji.cancel": "Abbrechen",
   "add_emoji.header": "Hinzufügen",
@@ -84,39 +84,51 @@
   "add_emoji.save": "Speichern",
   "add_incoming_webhook.cancel": "Abbrechen",
   "add_incoming_webhook.channel": "Kanal",
-  "add_incoming_webhook.channel.help": "Public channel or private group that receives the webhook payloads. You must belong to the private group when setting up the webhook.",
+  "add_incoming_webhook.channel.help": "Öffentlicher Kanal oder private Gruppe welche die Webhook Daten empfängt. Sie müssen zur privaten Gruppe gehören sobald Sie den Webhook erstellen.",
   "add_incoming_webhook.channelRequired": "Ein gültiger Kanal ist notwendig",
   "add_incoming_webhook.description": "Beschreibung",
-  "add_incoming_webhook.description.help": "Description for your incoming webhook.",
+  "add_incoming_webhook.description.help": "Beschreibung des eingehenden Webhooks.",
   "add_incoming_webhook.displayName": "Anzeigename",
-  "add_incoming_webhook.displayName.help": "Display name for your incoming webhook made of up to 64 characters.",
+  "add_incoming_webhook.displayName.help": "Anzeigename des eingehenden Webhooks mit bis zu 64 Zeichen.",
   "add_incoming_webhook.header": "Hinzufügen",
   "add_incoming_webhook.name": "Name",
   "add_incoming_webhook.save": "Speichern",
+  "add_oauth_app.callbackUrls.help": "Die Weiterleitungs-URI zu der der Service weiterleiten wird sobald der Benutzer die Autorisation Ihrer Anwendung erlaubt oder abgelehnt hat, behandelt außerdem Autorisationscodes bzw. Zugriffstokens. Muss eine gültige URL sein und mit http:// oder https:// beginnen.",
+  "add_oauth_app.callbackUrlsRequired": "Eine oder mehere Callback URLs werden benötigt",
+  "add_oauth_app.description.help": "Beschreibung für Ihre OAuth 2.0 Anwendung.",
+  "add_oauth_app.descriptionRequired": "Beschreibung für die OAuth 2.0 Anwendung ist erforderlich.",
+  "add_oauth_app.header": "Hinzufügen",
+  "add_oauth_app.homepage.help": "Die URL für die Homepage der OAuth 2.0 Anwendung. Stellen Sie sicher das Sie HTTP oder HTTPS in Ihrer URL basierend Ihrer Serverkonfiguration verwenden.",
+  "add_oauth_app.homepageRequired": "Homepage der OAuth 2.0 Anwendung ist erforderlich.",
+  "add_oauth_app.icon.help": "(Optional) Die URL des Bildes welches für Ihre OAuth 2.0 Anwendung verwendet wird. Stellen Sie sicher Sie verwenden HTTP oder HTTPS in Ihrer URL.",
+  "add_oauth_app.name.help": "Anzeigename für Ihre OAuth 2.0 Anwendung aus bis zu 64 Zeichen.",
+  "add_oauth_app.nameRequired": "Name der OAuth 2.0 Anwendung ist erforderlich.",
+  "add_oauth_app.trusted.help": "Wenn wahr wird die OAuth 2.0 Anwendung durch den Mattermost Server als vertrauenswürdig markiert und fordert den Benutzer nicht auf die Autorisation zu akzeptieren. Wenn falsch wird ein zusätzliches Fenster angezeigt in dem der Benutzer gebeten wird die Autorisierung zu akzeptieren oder abzulehnen.",
   "add_outgoing_webhook.callbackUrls": "Callback URLs (eine pro Zeile)",
-  "add_outgoing_webhook.callbackUrls.help": "The URL that messages will be sent to.",
+  "add_outgoing_webhook.callbackUrls.help": "Die URL an die die Nachricht gesendet wird.",
   "add_outgoing_webhook.callbackUrlsRequired": "Eine oder mehere Callback URLs werden benötigt",
   "add_outgoing_webhook.cancel": "Abbrechen",
   "add_outgoing_webhook.channel": "Kanal",
-  "add_outgoing_webhook.channel.help": "Public channel to receive webhook payloads. Optional if at least one Trigger Word is specified.",
-  "add_outgoing_webhook.contentType.help1": "Choose the content type by which the response will be sent.",
-  "add_outgoing_webhook.contentType.help2": "If application/x-www-form-urlencoded is chosen, the server assumes you will be encoding the parameters in a URL format.",
-  "add_outgoing_webhook.contentType.help3": "If application/json is chosen, the server assumes you will posting JSON data.",
+  "add_outgoing_webhook.channel.help": "Öffentlicher Kanal welcher die Webhook Daten empfängt. Optional wenn mindestens ein Auslösewort definiert ist.",
+  "add_outgoing_webhook.contentType.help1": "Wählen Sie den Inhaltstyp mit dem die Antwort gesendet wird.",
+  "add_outgoing_webhook.contentType.help2": "Wenn application/x-www-form-urlencoded gewählt wird nimmt der Server an dass die Parameter im URL Format kodiert werden sollen.",
+  "add_outgoing_webhook.contentType.help3": "Wenn application/json gewählt wird nimmt der Server an Sie möchten JSON Daten senden.",
   "add_outgoing_webhook.content_Type": "Art des Inhalts",
   "add_outgoing_webhook.description": "Beschreibung",
-  "add_outgoing_webhook.description.help": "Description for your outgoing webhook.",
+  "add_outgoing_webhook.description.help": "Beschreibung für Ihren ausgehenden Webhook.",
   "add_outgoing_webhook.displayName": "Anzeigename",
-  "add_outgoing_webhook.displayName.help": "Display name for your outgoing webhook made of up to 64 characters.",
+  "add_outgoing_webhook.displayName.help": "Anzeigename für Ihren ausgehenden Webhook aus bis zu 64 Zeichen.",
   "add_outgoing_webhook.header": "Hinzufügen",
   "add_outgoing_webhook.name": "Name",
   "add_outgoing_webhook.save": "Speichern",
   "add_outgoing_webhook.triggerWords": "Triggerwörter (eine pro Zeile)",
-  "add_outgoing_webhook.triggerWords.help": "Messages that start with one of the specified words will trigger the outgoing webhook. Optional if Channel is selected.",
+  "add_outgoing_webhook.triggerWords.help": "Nachrichten die mit mit einem der spezifizierten Wörtern beginnen lösen den ausgehenden Webhook aus. Optional wenn Kanal gewählt wird.",
   "add_outgoing_webhook.triggerWordsOrChannelRequired": "Ein gültiger Kanal oder eine Liste von Triggerwörtern wird benötigt",
   "add_outgoing_webhook.triggerWordsTriggerWhen": "Auslösen sobald",
-  "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choose when to trigger the outgoing webhook; if the first word of a message matches a Trigger Word exactly, or if it starts with a Trigger Word.",
+  "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Auswählen wann der ausgehende Webhook ausgelöst werden soll. Wenn das erste Wort der Nachricht einem Auslösewort exakt entspricht, oder wenn es mit dem Auslösewort beginnt.",
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "Erstes Wort entspricht exakt einem Auslösewort",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "Erstes Wort startet mit dem Auslösewort",
+  "admin.advance.cluster": "High Availability (Beta)",
   "admin.audits.reload": "Benutzeraktivitäten Log neuladen",
   "admin.audits.title": "Benutzeraktivitäten Log",
   "admin.authentication.email": "E-Mail Authentisierung",
@@ -124,6 +136,24 @@
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "Notiz:",
+  "admin.cluster.enableDescription": "Wenn wahr, erlaubt Mattermost Login mit SAML. Bitte sehen Sie sich die <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">Dokumentation</a> an um mehr über die SAML Konfiguration für Mattermost zu lernen.",
+  "admin.cluster.enableTitle": "High Availability Modus aktivieren:",
+  "admin.cluster.interNodeListenAddressDesc": "Die Adresse auf der der Server für die Kommunikation mit anderen Servern horchen wird.",
+  "admin.cluster.interNodeListenAddressEx": "z.B.: \":8075\"",
+  "admin.cluster.interNodeListenAddressTitle": "Internode Abhören Adresse:",
+  "admin.cluster.interNodeUrlsDesc": "Die internen/privaten URLs aller Mattermost Server separiert durch Kommas.",
+  "admin.cluster.interNodeUrlsEx": "z.B.: \"http://10.10.10.30, http://10.10.10.31\"",
+  "admin.cluster.interNodeUrlsTitle": "Internode URLs:",
+  "admin.cluster.loadedFrom": "Diese Konfigurationsdatei wurde von Node ID {clusterId} geladen. Bitte schauen Sie im Troubleshooting Guide der <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">Dokumentation</a> nach wenn Sie die Systemkonsole über einen Loadbalancer erreichen und Probleme feststellen.",
+  "admin.cluster.noteDescription": "Ändern von Einstellungen in diesem Bereich erfordern einen Neustart des Servers bevor sie gültig werden. Wenn High Availability aktiviert ist, ist die Systemkonsole nur lesend erreichbar und kann nur über die Konfigurationsdatei geändert werden.",
+  "admin.cluster.should_not_change": "WARNUNG: Diese Einstellungen Synchronisieren sich eventuell nicht mit anderen Servern im Cluster. High Availability Internode Kommunikation startet erst wenn die config.json auf allen Servern identisch ist und Mattermost neugestartet wurde. Bitte schauen Sie in die <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">Dokumentation</a> um zu Erfahren wie Sie einen Server in den Cluster hinzufügen oder entfernen können. Wenn Sie die Systemkonsole über einen Loadbalancer erreichen und Probleme feststellen, bitte schauen Sie in den Troubleshooting Guide der <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">Dokumentation</a>.",
+  "admin.cluster.status_table.config_hash": "MD5 der Konfigurationsdatei",
+  "admin.cluster.status_table.hostname": "Hostname",
+  "admin.cluster.status_table.id": "Node ID",
+  "admin.cluster.status_table.reload": " Cluster Status neu laden",
+  "admin.cluster.status_table.status": "Status",
+  "admin.cluster.status_table.url": "Inter-Node URL",
+  "admin.cluster.status_table.version": "Version",
   "admin.compliance.directoryDescription": "Verzeichnis in welchem die Bilddateien gespeichert werden. Standardwert: ./data/.",
   "admin.compliance.directoryExample": "Bsp.: \"./data/\"",
   "admin.compliance.directoryTitle": "Compliance Report Verzeichnis:",
@@ -252,7 +282,7 @@
   "admin.files.storage": "Speicher",
   "admin.general.configuration": "Konfiguration",
   "admin.general.localization": "Lokalisation",
-  "admin.general.localization.availableLocalesDescription": "Legt fest, welche Sprachen für Benutzer in den Kontoeinstellungen verfügbar sind. (Lassen Sie es leer um alle unterstützten Sprachen zur Verfügung zu haben)",
+  "admin.general.localization.availableLocalesDescription": "Festlegen welche Sprachen für die Benutzer in den Benutzereinstellungen verfügbar sein sollen (dieses Feld leer lassen um alle unterstützten Sprachen verfügbar zu machen).<br /><br />Möchten Sie uns bei der Übersetzung unterstützen? Treten Sie dem <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> bei um Ihren Beitrag zu leisten.",
   "admin.general.localization.availableLocalesTitle": "Verfügbare Sprachen:",
   "admin.general.localization.clientLocaleDescription": "Standard Sprache für neu angelegte Nutzer und Seiten wo sich der Nutzer noch nicht angemeldet hat.",
   "admin.general.localization.clientLocaleTitle": "Standardsprache Client:",
@@ -345,8 +375,8 @@
   "admin.image.thumbWidthDescription": "Breite der Vorschaubilder welche beim Hochladen von Bildern generiert werden. Änderungen dieses Wertes wirken sich auf die zukünftige Darstellung der Vorschaubilder aus, aber nicht auf bereits bestehende Bilder.",
   "admin.image.thumbWidthExample": "z.B.: \"120\"",
   "admin.image.thumbWidthTitle": "Breite des Vorschaubildes:",
+  "admin.integrations.custom": "Benutzerdefinierte Integrationen",
   "admin.integrations.external": "Externe Dienste",
-  "admin.integrations.webhook": "Webhooks und Kommandos",
   "admin.ldap.baseDesc": "Die Basisdomäne ist der ausgezeichnete Name, mit dem Mattermost mit der Suche nach Nutzern im LDAP Baum beginnen soll.",
   "admin.ldap.baseEx": "z.B.: \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "Basisdomäne:",
@@ -448,6 +478,8 @@
   "admin.oauth.google": "Google Apps",
   "admin.oauth.off": "Anmelden mit OAuth 2.0 Provider nicht erlauben",
   "admin.oauth.office365": "Office 365",
+  "admin.oauth.providerDescription": "Wenn wahr kann Mattermost als OAuth 2.0 Dienstprovider auftreten und API Anfragen von externen Anwendungen erlauben.",
+  "admin.oauth.providerTitle": "Aktiviere OAuth 2.0 Dienstprovider: ",
   "admin.oauth.select": "OAuth 2.0 Service Provider auswählen:",
   "admin.office365.EnableHtmlDesc": "<ol><li>Melden Sie sich in Ihrem <a href='https://login.microsoftonline.com/'>Microsoft oder Office 365</a> Konto an. Stellen Sie sicher das der Account zum selben <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>Mandant</a> gehört mit dem sich die Nutzer anmelden können sollen.</li><li>Wechseln Sie zu <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, klicken auf <strong>App hinzufügen</strong> und verwenden <strong>Mattermost - <your-company-name></strong> als den Namen der App.</li><li>Unter <strong>Geheime Anwendungsschlüssel</strong> klicken Sie auf <strong>Generiere neues Passwort</strong> und speichern es um die Felder unten später zu vervollständigen.</li><li>Unter <strong>Platform</strong> klicken Sie auf <strong>Plattform hinzufügen</strong>, wählen <strong>Web</strong> und geben <strong><your-mattermost-url>/signup/office365/complete</strong> (zum Beispiel: http://localhost:8065/signup/office365/complete) unter <strong>Umleitungs-URI</strong> ein. Außerdem sollten Sie <strong>Erlaube Implizite Weiterleitung</strong> deaktivieren.</li><li>Abschließend klicken Sie auf <strong>Speichern</strong> und vervollständigen die <strong>Anwendungs-ID</strong> und <strong>geheimer Anwendungsschlüssel</strong> Felder unten.</li></ol>",
   "admin.office365.authTitle": "Auth Endpunkt:",
@@ -595,7 +627,7 @@
   "admin.service.mfaDesc": "Wenn wahr erhalten Nutzer die Möglichkeit Multi-Faktor-Authentifizierung zu ihren Zugängen hinzuzufügen. Sie benötigen ein Smartphone und eine Authenticator App wie Google Authenticator.",
   "admin.service.mfaTitle": "Multi-Faktor Authentifizierung einschalten:",
   "admin.service.mobileSessionDays": "Sessiondauer für mobile Anwendungen (Tage):",
-  "admin.service.mobileSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
+  "admin.service.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.",
   "admin.service.outWebhooksDesc": "Wenn wahr werden ausgehende Webhooks erlaubt. <a href='http://docs.mattermost.com/developer/webhooks-outgoing.html' target='_blank'>Dokumentation</a> für mehr Details.",
   "admin.service.outWebhooksTitle": "Aktiviere ausgehende Webhooks: ",
   "admin.service.overrideDescription": "Wenn wahr werden Webhooks und Slash Befehle erlaubt das Icon, mit dem Sie posten, zu ändern. Hinweis: Zusammen mit dem Erlauben den Nutzernamen zu ändern könnten Phishing Attacken auf die Nutzer ermöglicht werden.",
@@ -608,23 +640,28 @@
   "admin.service.sessionCache": "Session Cache (Minuten):",
   "admin.service.sessionCacheDesc": "Die Anzahl von Minuten in denen der Sitzungs-Cache im Speicher gehalten wird.",
   "admin.service.sessionDaysEx": "z.B.: \"30\"",
+  "admin.service.siteURL": "Site URL:",
+  "admin.service.siteURLDescription": "The URL, including port number and protocol, from which users will access Mattermost. Leave blank to automatically configure based on incoming traffic.",
+  "admin.service.siteURLExample": "Ex \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "Sessiondauer für SSO Anwendungen (Tage):",
-  "admin.service.ssoSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.",
+  "admin.service.ssoSessionDaysDesc": "Die Anzahl der Tage seit der letzten Anmeldung des Benutzers bis zum Ablauf der Sitzung. Wenn die Authentifizierungsmethode SAML oder GitLab ist, wird der Benutzer automatisch wieder angemeldet sofern er noch bei SAML oder GitLab angemeldet ist. Bei Änderung dieser Einstellung tritt die neue Sitzungsdauer in Kraft nachdem der Benutzer sich das nächste Mal anmeldet.",
   "admin.service.testingDescription": "Wenn wahr wird der /loadtest Slash Befehl aktiviert um Testaccounts, -daten und -Textformatierungen zu laden. Änderung erfordern einen Server Neustart.",
   "admin.service.testingTitle": "Aktiviere Testkommandos: ",
-  "admin.service.webSessionDays": "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.webSessionDays": "Sitzungsdauer LDAP und E-Mail (in Tagen):",
+  "admin.service.webSessionDaysDesc": "Die Anzahl der Tage seit der letzten Anmeldung des Benutzers bis zum Ablauf der Sitzung. Bei Änderung dieser Einstellung tritt die neue Sitzungsdauer in Kraft nachdem der Benutzer sich das nächste Mal anmeldet.",
   "admin.service.webhooksDescription": "Wenn wahr werden eingehende Webhooks erlaubt. Um Phishing Attacken vorzubeugen werden alle Posts von Webhooks mit dem BOT Tag versehen. <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>Dokumentation</a> für mehr Details.",
   "admin.service.webhooksTitle": "Aktiviere eingehende Webhooks: ",
   "admin.sidebar.addTeamSidebar": "Team aus dem Seitenmenü hinzufügen",
   "admin.sidebar.advanced": "Erweitert",
   "admin.sidebar.audits": "Compliance und Prüfung",
   "admin.sidebar.authentication": "Authentifizierung",
+  "admin.sidebar.cluster": "High Availability (Beta)",
   "admin.sidebar.compliance": "Compliance",
   "admin.sidebar.configuration": "Konfiguration",
   "admin.sidebar.connections": "Verbindungen",
   "admin.sidebar.customBrand": "Eigenes Branding",
   "admin.sidebar.customEmoji": "Eigene Emoji",
+  "admin.sidebar.customIntegrations": "Benutzerdefinierte Integrationen",
   "admin.sidebar.customization": "Anpassung",
   "admin.sidebar.database": "Datenbank",
   "admin.sidebar.developer": "Entwickler",
@@ -666,7 +703,6 @@
   "admin.sidebar.users": "Benutzer",
   "admin.sidebar.usersAndTeams": "Benutzer und Teams",
   "admin.sidebar.view_statistics": "System Statistiken",
-  "admin.sidebar.webhooks": "Webhooks und Kommandos",
   "admin.sidebarHeader.systemConsole": "System Konsole",
   "admin.sql.dataSource": "Datenquelle:",
   "admin.sql.driverName": "Treibername:",
@@ -697,15 +733,15 @@
   "admin.support.privacyTitle": "Datenschutzerklärung Link:",
   "admin.support.problemDesc": "Link zur Hilfe Dokumentation im Teamseiten Hauptmenü. Zeigt typischerweise auf das Peer-to-Peer Troubleshooting Forum in dem Nutzer nach Hilfe zu technischen Problemen suchen und nachfragen können.",
   "admin.support.problemTitle": "Ein Problem melden link:",
-  "admin.support.termsDesc": "Link to the terms under which users may use your online service. By default, this includes the \"Mattermost Conditions of Use (End Users)\" explaining the terms under which Mattermost software is provided to end users. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Conditions of Use (End User) for Mattermost software.",
+  "admin.support.termsDesc": "Link zu den Bedingungen unter denen Benutzer diesen Onlinedienst verwenden dürfen. In der Voreinstellung beinhaltet dies die \"Mattermost Nutzungsbedingungen (Endnutzer)\", welche die Konditionen erklärt unter denen die Mattermost Software für die Benutzer bereitgestellt wird. Wenn Sie den voreingestellten Link auf eine angepasste Version ändern, muss diese ebenfalls einen Link zu den voreingestellten Bedingungen enthalten, damit die Benutzer die Mattermost Nutzungsbedingungen (Endnutzer) zur Kenntnis nehmen.",
   "admin.support.termsTitle": "AGB Link:",
   "admin.system_analytics.activeUsers": "Aktive Benutzer mit Nachrichten",
   "admin.system_analytics.title": "das System",
   "admin.system_analytics.totalPosts": "Alle Nachrichten",
   "admin.team.brandDesc": "Aktiviere individuelles Branding um ein Bild Ihrer Wahl, unten hoch geladen, sowie einige Hilfetexte, unten angegeben, auf der Login Seite anzuzeigen.",
-  "admin.team.brandDescriptionExample": "Die gesamte Team Kommunikation an einem Ort, sofort durchsuchbar und überall verfügbar",
-  "admin.team.brandDescriptionHelp": "Name des Dienstes, der auf der Anmeldeseite und der Seiten angezeigt wird.",
-  "admin.team.brandDescriptionTitle": "Site Description",
+  "admin.team.brandDescriptionExample": "Die gesamte Teamkommunikation an einem Ort, durchsuchbar und überall verfügbar",
+  "admin.team.brandDescriptionHelp": "Beschreibung des Dienstes, wird auf der Anmeldeseite und der Oberfläche angezeigt.",
+  "admin.team.brandDescriptionTitle": "Seitenbeschreibung",
   "admin.team.brandImageTitle": "Eigenes Markenlogo:",
   "admin.team.brandTextDescription": "Der eigene Markentext im Markdown-Format der unter dem eigenen Markenlogo auf der Anmeldeseite angezeigt werden soll.",
   "admin.team.brandTextTitle": "Individueller Markentext:",
@@ -861,12 +897,13 @@
   "authorize.allow": "Erlauben",
   "authorize.app": "Die Anwendung <strong>{appName}</strong> möchte auf Ihre Daten zugreifen und sie bearbeiten können.",
   "authorize.deny": "Ablehnen",
-  "authorize.title": "Eine Anwendung möchte sich mit Ihrem {teamName} Account verbinden",
+  "authorize.title": "<strong>{appName}</strong> möchte sich mit Ihrem <strong>Mattermost</strong> Benutzerkonto verbinden",
   "backstage_list.search": "Suche",
   "backstage_navbar.backToMattermost": "Zurück zu {siteName}",
   "backstage_sidebar.integrations": "Integration",
   "backstage_sidebar.integrations.commands": "Slash Befehle",
   "backstage_sidebar.integrations.incoming_webhooks": "Eingehende Webhooks",
+  "backstage_sidebar.integrations.oauthApps": "OAuth 2.0 Applikationen",
   "backstage_sidebar.integrations.outgoing_webhooks": "Ausgehende Webhooks",
   "center_panel.recent": "Klicken Sie hier um zu vorherigen Mittelungen zurückzukehren. ",
   "chanel_header.addMembers": "Mitglieder hinzufügen",
@@ -1111,6 +1148,8 @@
   "find_team.placeholder": "ihrname@domain.de",
   "find_team.send": "Senden",
   "find_team.submitError": "Bitte eine gültige E-Mail-Adresse eingeben",
+  "flag_post.flag": "zur Nachverfolgung markieren",
+  "flag_post.unflag": "Demarkieren",
   "general_tab.chooseName": "Bitte wählen Sie einen neuen Namen für Ihr Team",
   "general_tab.codeDesc": "Auf 'Bearbeiten' klicken um den Einladungscode neu zu generieren.",
   "general_tab.codeLongDesc": "Der Einladungscode ist Teil der URL im Team Einladungslink, welcher über <strong>Team Einladungslink erhalten</strong> im Hauptmenü generiert wird. Eine Neugenerierung erstellt einen neuen Team Einladungslink und macht den vorherigen Link ungültig.",
@@ -1128,15 +1167,15 @@
   "general_tab.teamNameInfo": "Setzen Sie den Namen Ihres Teams wie er beim Anmelden und auf der Sidebar erscheinen soll.",
   "general_tab.title": "Allgemeine Einstellungen",
   "general_tab.yes": "Ja",
-  "get_app.alreadyHaveIt": "Already have it?",
-  "get_app.androidAppName": "Mattermost for Android",
-  "get_app.androidHeader": "Mattermost works best if you switch to our Android app",
-  "get_app.continue": "continue",
-  "get_app.continueWithBrowser": "Or {link}",
-  "get_app.continueWithBrowserLink": "continue with browser",
-  "get_app.iosHeader": "Mattermost works best if you switch to our iPhone app",
+  "get_app.alreadyHaveIt": "Haben Sie bereits?",
+  "get_app.androidAppName": "Mattermost für Android",
+  "get_app.androidHeader": "Mattermost funktioniert am besten, wenn Sie unsere Android App benutzen",
+  "get_app.continue": "fortfahren",
+  "get_app.continueWithBrowser": "Oder {link}",
+  "get_app.continueWithBrowserLink": "mit Browser fortfahren",
+  "get_app.iosHeader": "Mattermost funktioniert am besten, wenn Sie unsere iPhone App benutzen",
   "get_app.mattermostInc": "Mattermost, Inc",
-  "get_app.openMattermost": "Open Mattermost",
+  "get_app.openMattermost": "Öffne Mattermost",
   "get_link.clipboard": " Link in Zwischenablage kopiert.",
   "get_link.close": "Schließen",
   "get_link.copy": "Link kopieren",
@@ -1161,14 +1200,35 @@
   "installed_incoming_webhooks.search": "Suche nach eingehenden Webhooks",
   "installed_incoming_webhooks.unknown_channel": "Ein privater Webhook",
   "installed_integrations.callback_urls": "Callback URLs: {urls}",
+  "installed_integrations.client_id": "Client ID: <strong>{clientId}</strong>",
+  "installed_integrations.client_secret": "Client Secret: <strong>{clientSecret}</strong>",
   "installed_integrations.content_type": "Content-Type: {contentType}",
   "installed_integrations.creation": "Erstellt durch {creator} am {createAt, date, full}",
   "installed_integrations.delete": "Löschen",
+  "installed_integrations.hideSecret": "Secret ausblenden",
   "installed_integrations.regenToken": "Token neu generieren",
+  "installed_integrations.showSecret": "Secret einblenden",
   "installed_integrations.token": "Token: {token}",
   "installed_integrations.triggerWhen": "Auslösen sobald: {triggerWhen}",
   "installed_integrations.triggerWords": "Triggerwörter: {triggerWords}",
+  "installed_integrations.unnamed_oauth_app": "Unbenannte OAuth 2.0 Applikation",
   "installed_integrations.url": "URL: {url}",
+  "installed_oauth_apps.add": "OAuth 2.0 Applikation hinzufügen",
+  "installed_oauth_apps.callbackUrls": "Callback URLs (eine pro Zeile)",
+  "installed_oauth_apps.cancel": "Abbrechen",
+  "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": "OAuth 2.0 Applikationen sind für jeden auf dem Server verfügbar",
+  "installed_oauth_apps.homepage": "Homepage",
+  "installed_oauth_apps.iconUrl": "Icon URL",
+  "installed_oauth_apps.is_trusted": "Ist vertrauenswürdig: <strong>{isTrusted}</strong>",
+  "installed_oauth_apps.name": "Anzeigename",
+  "installed_oauth_apps.save": "Speichern",
+  "installed_oauth_apps.search": "Durchsuche OAuth 2.0 Applikationen",
+  "installed_oauth_apps.trusted": "Vertrauenswürdig",
+  "installed_oauth_apps.trusted.no": "Nein",
+  "installed_oauth_apps.trusted.yes": "Ja",
   "installed_outgoing_webhooks.add": "Ausgehenden Webhook hinzufügen",
   "installed_outgoing_webhooks.empty": "Keine ausgehenden Webhooks gefunden",
   "installed_outgoing_webhooks.header": "Ausgehende Webhooks",
@@ -1181,6 +1241,8 @@
   "integrations.header": "Integration",
   "integrations.incomingWebhook.description": "Eingehende Webhooks erlauben externe Integrationen Nachrichten zu senden",
   "integrations.incomingWebhook.title": "Eingehende Webhooks",
+  "integrations.oauthApps.description": "OAuth 2.0 erlaubt externen Applikationen autorisierte Anfragen an die Mattermost API.",
+  "integrations.oauthApps.title": "OAuth 2.0 Applikationen",
   "integrations.outgoingWebhook.description": "Ausgehende Webhooks erlauben ext. Integrationen Nachrichten zu erhalten und zu antworten",
   "integrations.outgoingWebhook.title": "Ausgehende Webhooks",
   "intro_messages.DM": "Dies ist der Start der Privatnachrichten mit {teammate}.<br /> Privatenachrichten oder versendete Dateien sind außerhalb dieses Bereichs nicht für andere sichtbar.",
@@ -1334,29 +1396,12 @@
   "post_focus_view.beginning": "Anfang des Kanal-Archivs",
   "post_info.del": "Löschen",
   "post_info.edit": "Bearbeiten",
+  "post_info.mobile.flag": "Markieren",
+  "post_info.mobile.unflag": "Demarkieren",
   "post_info.permalink": "Dauerhafter Link",
   "post_info.reply": "Antworten",
   "posts_view.loadMore": "Weitere Nachrichten laden",
   "posts_view.newMsg": "Neue Nachrichten",
-  "register_app.callback": "Callback URL",
-  "register_app.callbackError": "Zumindest eine Callback URL muss eingetragen werden.",
-  "register_app.cancel": "Abbrechen",
-  "register_app.clientId": "Client-ID",
-  "register_app.clientSecret": "Client Secret",
-  "register_app.close": "Schließen",
-  "register_app.credentialsDescription": "Heben die dieses irgendwo SICHER und ZUVERLÄSSIG auf. Behandeln Sie Ihre Client-ID als Ihren App's Benutzernamen und das Client Secret als das Passwort der App.",
-  "register_app.credentialsSave": "Ich habe beides, meine Client-ID und das Client Secret, irgendwo sicher aufgehoben",
-  "register_app.credentialsTitle": "Ihre Anwendungszugangsdaten",
-  "register_app.description": "Beschreibung",
-  "register_app.dev": "Entwicklungsanwendungen",
-  "register_app.homepage": "Adresse der Internetseite",
-  "register_app.homepageError": "Internetseite muss ausgefüllt sein.",
-  "register_app.name": "Name der Anwendung",
-  "register_app.nameError": "Name der Anwendung muss ausgefüllt werden.",
-  "register_app.optional": "Optional",
-  "register_app.register": "Registrieren",
-  "register_app.required": "Erforderlich",
-  "register_app.title": "Neue Anwendung registrieren",
   "removed_channel.channelName": "der Kanal",
   "removed_channel.from": "Entfernt von ",
   "removed_channel.okay": "Ok",
@@ -1376,7 +1421,10 @@
   "rhs_comment.comment": "Kommentar",
   "rhs_comment.del": "Löschen",
   "rhs_comment.edit": "Bearbeiten",
+  "rhs_comment.mobile.flag": "Markieren",
+  "rhs_comment.mobile.unflag": "Demarkieren",
   "rhs_comment.permalink": "Dauerhafter Link",
+  "rhs_header.backToFlaggedTooltip": "Zurück zu markierten Nachrichten",
   "rhs_header.backToResultsTooltip": "Zurück zu den Suchergebnissen",
   "rhs_header.closeSidebarTooltip": "Sidebar schließen",
   "rhs_header.details": "Nachrichtendetails",
@@ -1385,12 +1433,15 @@
   "rhs_root.del": "Löschen",
   "rhs_root.direct": "Direktnachricht",
   "rhs_root.edit": "Bearbeiten",
+  "rhs_root.mobile.flag": "Markieren",
+  "rhs_root.mobile.unflag": "Demarkieren",
   "rhs_root.permalink": "Dauerhafter Link",
   "search_bar.cancel": "Abbrechen",
   "search_bar.search": "Suche",
   "search_bar.usage": "<h4>Suchoptionen</h4><ul><li><span>Verwenden Sie </span><b>\"Anführungszeichen\"</b><span> zur Suche nach Phrasen</span></li><li><span>Verwenden Sie </span><b>from:</b><span> um nach Nachrichten eines bestimmten Absenders zu suchen und </span><b>in:</b><span> für Nachrichten in einem bestimmten Kanal</span></li></ul>",
   "search_header.results": "Suchergebnisse",
   "search_header.title2": "Letzte Erwähnungen",
+  "search_header.title3": "Markierte Nachrichten",
   "search_item.direct": "Direktnachricht",
   "search_item.jump": "Sprung",
   "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>",
@@ -1423,6 +1474,7 @@
   "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.console": "System Konsole",
+  "sidebar_right_menu.flagged": "Markierte Nachrichten",
   "sidebar_right_menu.help": "Hilfe",
   "sidebar_right_menu.inviteNew": "Neues Mitglied einladen",
   "sidebar_right_menu.logout": "Abmelden",
@@ -1581,10 +1633,6 @@
   "user.settings.custom_theme.sidebarTextHoverBg": "Seitenleiste Text Hover Hintergrund",
   "user.settings.custom_theme.sidebarTitle": "Aussehen der Sidebar",
   "user.settings.custom_theme.sidebarUnreadText": "Seitenleiste Ungelesen Text",
-  "user.settings.developer.applicationsPreview": "Anwendungen (Vorschau)",
-  "user.settings.developer.register": "Neue Anwendung registrieren",
-  "user.settings.developer.thirdParty": "Öffnen um neue Fremdanwendungen zu registrieren",
-  "user.settings.developer.title": "Entwickler Einstellungen",
   "user.settings.display.channelDisplayTitle": "Kanalanzeige-Modus",
   "user.settings.display.channeldisplaymode": "Wählen Sie die Breite den mittleren Kanals.",
   "user.settings.display.clockDisplay": "Uhrzeit Format",
@@ -1668,6 +1716,7 @@
   "user.settings.import_theme.submit": "Absenden",
   "user.settings.import_theme.submitError": "Falsches Format, bitte mit erneut kopieren und einfügen ausprobieren.",
   "user.settings.languages.change": "Interface Sprache ändern",
+  "user.settings.languages.promote": "Auswählen welche Sprache Mattermost im Benutzerinterface anzeigt.<br /><br />Möchten Sie mit der Übersetzung helfen? Treten Sie dem <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> bei um beizusteuern.",
   "user.settings.mfa.add": "MFA zu Ihrem Account hinzufügen",
   "user.settings.mfa.addHelp": "Sie könnten einen zusätzlichen Token zu Ihrem Passwort anfordern, um sich an Mattermost anmelden zu können.<br/><br/>Zur Aktivierung laden Sie den Google Authenticator bei <a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a> oder <a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a> passend zu Ihrem Smartphone herunter, um dann<br/><br/>1. Auf <strong>MFA zu Ihrem Account hinzufügen</strong> zu klicken.<br/>2. Scannen Sie mit Google Authenticator den QR-Code.<br/>3. Geben Sie den von Google Authenticator generierten Token ein und klicken Sie auf <strong>Speichern</strong>.<br/><br/>Bei der Anmeldung werden Sie neben den üblichen Anmeldeinformationen auch nach einem Token aus Google Authenticator gefragt.",
   "user.settings.mfa.addHelpQr": "Bitte scannen die den QR-Code mit der Google Authenticator App auf Ihrem Smartphone und geben Sie den Token ein.",
@@ -1675,19 +1724,17 @@
   "user.settings.mfa.qrCode": "QR-Code",
   "user.settings.mfa.remove": "MFA von Ihrem Zugang entfernen",
   "user.settings.mfa.removeHelp": "Entfernen des MFA multi-factor authentication bedeutet das Sie nicht länger einen zusätzlichen Zugangs-Token für die Anmeldung benötigen.",
+  "user.settings.mfa.title": "Multi-Faktor Authentifizierung einschalten",
   "user.settings.modal.advanced": "Erweitert",
   "user.settings.modal.confirmBtns": "Ja, verwerfen",
   "user.settings.modal.confirmMsg": "Sie haben nicht gespeicherte Änderungen, möchten Sie diese wirklich verwerfen?",
   "user.settings.modal.confirmTitle": "Änderungen verwerfen?",
-  "user.settings.modal.developer": "Entwickler",
   "user.settings.modal.display": "Anzeige",
   "user.settings.modal.general": "Allgemein",
   "user.settings.modal.notifications": "Benachrichtigungen",
   "user.settings.modal.security": "Sicherheit",
   "user.settings.modal.title": "Kontoeinstellungen",
-  "user.settings.notification.allActivity": "Für alle Aktivitäten",
-  "user.settings.notification.push": "Mobile Push-Nachrichten",
-  "user.settings.notification.soundConfig": "Bitte konfigurieren Sie die Benachrichtigungstöne in Ihren Browsereinstellungen",
+  "user.settings.notifications.allActivity": "Für alle Aktivitäten",
   "user.settings.notifications.channelWide": "Kanalweite Nennungen \"@channel\", \"@all\"",
   "user.settings.notifications.close": "Schließen",
   "user.settings.notifications.comments": "Benachrichtigungen bei Kommentaren",
@@ -1706,9 +1753,11 @@
   "user.settings.notifications.off": "Aus",
   "user.settings.notifications.on": "Ein",
   "user.settings.notifications.onlyMentions": "Nur für Nennungen und Direktnachrichten",
+  "user.settings.notifications.push": "Mobile Push-Nachrichten",
   "user.settings.notifications.sensitiveName": "Ihr groß-/kleinschreibungsabhängiger Vorname \"{first_name}\"",
   "user.settings.notifications.sensitiveUsername": "Ihr groß-/kleinschreibungsabhängiger Benutzername \"{username}\"",
   "user.settings.notifications.sensitiveWords": "Weitere nicht groß-/kleinschreibungsabhängige Wörter, getrennt mit Komma:",
+  "user.settings.notifications.soundConfig": "Bitte konfigurieren Sie die Benachrichtigungstöne in Ihren Browsereinstellungen",
   "user.settings.notifications.sounds_info": "Töne für Desktopbenachrichtigung sind für Firefox, Safari, Chrome, Internet Explorer und Edge verfügbar.",
   "user.settings.notifications.teamWide": "Team-weite Nennungen \"@all\"",
   "user.settings.notifications.title": "Benachrichtigungseinstellungen",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index c44e53b86..625a5026e 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -42,7 +42,7 @@
   "add_command.description.help": "Descripción del webhook de entrada.",
   "add_command.displayName": "Nombre a mostrar",
   "add_command.displayName.help": "Nombre a mostrar para el comando de barra el cual puede tener hasta 64 caracteres.",
-  "add_command.header": "Agragar un Comando de Barra",
+  "add_command.header": "Agregar un Comando de Barra",
   "add_command.iconUrl": "Icono de Respuesta",
   "add_command.iconUrl.help": "(Opcional) Escoge una imagen de perfil que reemplazara los mensajes publicados por este comando de barra. Ingresa el URL de un archivo .png o .jpg de al menos 128 pixels por 128 pixels.",
   "add_command.iconUrl.placeholder": "https://www.example.com/myicon.png",
@@ -93,6 +93,17 @@
   "add_incoming_webhook.header": "Agregar un Webhook de Entrada",
   "add_incoming_webhook.name": "Nombre",
   "add_incoming_webhook.save": "Guardar",
+  "add_oauth_app.callbackUrls.help": "Las URIs de redirección al cual el servicio redirigirá a los usuarios luego de permitir o denegar la autorización para tu aplicación, y el cual manejará los códigos de autorización o tokens de acceso.Debe ser una URL válida y comenzar con http:// o https://.",
+  "add_oauth_app.callbackUrlsRequired": "Se require uno o más URLs para los callback",
+  "add_oauth_app.description.help": "Descripción para tu aplicación de OAuth 2.0.",
+  "add_oauth_app.descriptionRequired": "La descripción para tu aplicación de OAuth 2.0 es obligatoria.",
+  "add_oauth_app.header": "Agregar",
+  "add_oauth_app.homepage.help": "La dirección URL de la página web de la aplicación OAuth 2.0. Asegúrese de utilizar HTTP o HTTPS en la dirección URL dependiendo de la configuración del servidor.",
+  "add_oauth_app.homepageRequired": "La página web para la aplicación OAuth 2.0 es obligatoria.",
+  "add_oauth_app.icon.help": "(Opcional) La URL de la imagen que se utiliza para la aplicación OAuth 2.0. Asegúrese de utilizar HTTP o HTTPS en la dirección URL.",
+  "add_oauth_app.name.help": "Nombre a mostrar para la aplicación OAuth 2.0 el cual puede tener hasta 64 caracteres.",
+  "add_oauth_app.nameRequired": "El nombre de la aplicación OAuth 2.0 es obligatorio.",
+  "add_oauth_app.trusted.help": "Cuando es verdadero, la aplicación OAuth 2.0 es considerada de confianza para el servidor Mattermost y no requiere que el usuario otorgue autorización. Cuando es falso, aparecerá una pantalla adicional, preguntando al usuario si desea permitir o denegar la autorización.",
   "add_outgoing_webhook.callbackUrls": "Callback URLs (Uno por Línea)",
   "add_outgoing_webhook.callbackUrls.help": "El URL a donde serán enviados los mensajes.",
   "add_outgoing_webhook.callbackUrlsRequired": "Se require uno o más URLs para los callback",
@@ -117,6 +128,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Escoge cuando se gatillan los webhooks de salida; si la primera palabra del mensaje coincide exactamente con una Palabra Gatilladora o si comienza con una Palabra Gatilladora.",
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "La primera palabra coincide exactamente con una palabra gatilladora",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "La primera palabra empieza con una palabra gatilladora",
+  "admin.advance.cluster": "Alta Disponibilidad (Beta)",
   "admin.audits.reload": "Recargar",
   "admin.audits.title": "Auditorías del Servidor",
   "admin.authentication.email": "Correo Electrónico",
@@ -124,6 +136,24 @@
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "Nota:",
+  "admin.cluster.enableDescription": "Cuando es verdadero, Mattermost se ejecutará en modo de Alta Disponibilidad. Por favor, consulta la <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentación</a> para obtener más información acerca de la configuración de Alta Disponibilidad para Mattermost.",
+  "admin.cluster.enableTitle": "Habilitar el Modo De Alta Disponibilidad:",
+  "admin.cluster.interNodeListenAddressDesc": "La dirección en la que escuchará el servidor para comunicarse con otros servidores.",
+  "admin.cluster.interNodeListenAddressEx": "Ej \":8075\"",
+  "admin.cluster.interNodeListenAddressTitle": "Dirección de Escucha del Inter-Nodo:",
+  "admin.cluster.interNodeUrlsDesc": "Las direcciones Url interna/privada de todos los servidores Mattermost separados por comas.",
+  "admin.cluster.interNodeUrlsEx": "Ej \"http://10.10.10.30, http://10.10.10.31\"",
+  "admin.cluster.interNodeUrlsTitle": "Inter-Nodo URLs:",
+  "admin.cluster.loadedFrom": "El archivo de configuración fue cargado desde el Nodo ID {clusterId}. Por favor consulta la Guía para resolver problemas en nuestra <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentación</a> si estás accesando la Consola de Sistema desde un balanceador de cargas y estás experimentando problemas.",
+  "admin.cluster.noteDescription": "Al cambiar propiedades en esta sección es necesario reiniciar el servidor para que surjan efecto. Cuando el modo de Alta Disponibilidad está habilitada, la Consola del Sistema se establece en sólo lectura y sólo se pueden cambiar desde el archivo de configuración.",
+  "admin.cluster.should_not_change": "ADVERTENCIA: Estos ajustes pueden no sincronizarse con los otros servidores del agrupamiento. La comunicación entre nodos en Alta Disponibilidad no se iniciará hasta que se realicen las modificaciones al config.json para que sean identicos en todos los servidores y se reinicie Mattermost. Por favor consulte la <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentación</a> sobre como agregar o remover un servidor del agrupamiento. Si estás accesando la Consola de Sistema desde un balanceador de cargas y estás experimentando problemas, por favor consulta la Guía para resolver problemas en nuestra <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentación</a>.",
+  "admin.cluster.status_table.config_hash": "MD5 del Archivo de Configuración",
+  "admin.cluster.status_table.hostname": "Nombre del servidor",
+  "admin.cluster.status_table.id": "ID del Nodo",
+  "admin.cluster.status_table.reload": " Volver a cargar el Estado del Agrupamiento",
+  "admin.cluster.status_table.status": "Estado",
+  "admin.cluster.status_table.url": "Inter-Nodo URL",
+  "admin.cluster.status_table.version": "Versión:",
   "admin.compliance.directoryDescription": "Directorio en el que se escriben los informes de cumplimiento. Si se deja en blanco, se utilizará ./data/.",
   "admin.compliance.directoryExample": "Ej \"./data/\"",
   "admin.compliance.directoryTitle": "Directorio del Informe De Cumplimiento:",
@@ -252,7 +282,7 @@
   "admin.files.storage": "Almacenamiento",
   "admin.general.configuration": "Configuración",
   "admin.general.localization": "Idiomas",
-  "admin.general.localization.availableLocalesDescription": "Determina qué idiomas están disponibles para los usuarios en la Configuración de la Cuenta. (Al dejar en blanco se tiene todos los idiomas disponibles)",
+  "admin.general.localization.availableLocalesDescription": "Asigna que idiomas están disponibles para los usuarios en Configuración de la Cuenta (deja este campo en blanco para habilitar todos los idiomas soportados).<br /><br />¿Te gustaría ayudar con las traducciones? Únete al <a href='http://translate.mattermost.com/' target='_blank'>Servidor de Traducciones de Mattermost</a> para contribuir.",
   "admin.general.localization.availableLocalesTitle": "Idiomas disponibles:",
   "admin.general.localization.clientLocaleDescription": "Idioma predeterminado para nuevos usuarios y páginas donde el usuario no ha iniciado sesión.",
   "admin.general.localization.clientLocaleTitle": "Idioma predeterminado para el Cliente:",
@@ -290,7 +320,7 @@
   "admin.gitlab.userDescription": "Ingresar <tu-url-de-gitlab>/api/v3/user.   Asegurate que si utilizas HTTPS o HTTPS tus URLS sean correctas.",
   "admin.gitlab.userExample": "Ej \"https://<tu-url-de-gitlab>/api/v3/user\"",
   "admin.gitlab.userTitle": "URL para obtener datos de usuario:",
-  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>Iniciar Sesión</a> con tu cuenta de Google.</li><li>Ir a <a href='https://console.developers.google.com'>https://console.developers.google.com</a>, pincha en <strong>Credenciales</strong> en la barra lateral izquierda e ingresa <strong>Mattermost - <el-nombre-de-tu-empresa></string> como nombre del proyecto.</li><li> Pincha en el encabezado de la <strong>pantalla de autorización de OAuth</strong> e ingresa <strong>Mattermost</strong> como el <strong>Nombre de producto mostrado a los usuarios</strong>. Pincha <strong>Guardar</strong>.</li><li>En el encabezado de <strong>Credenciales</strong>, Pincha en <strong>Crear credenciales</strong>, escoje el <strong>ID de cliente de OAuth</strong> y selecciona <strong>Web</strong>.</li><li> En <strong>Restricciones</strong> y <strong>URIs de redireccionamiento autorizados</strong> ingresa <strong><tu-url-de-mattermost>/signup/google/complete</strong> (ejemplo: http://localhost:8065/signup/google/complete). Pincha en <strong>Crear</strong>.</li><li>Guarda el <strong>ID del cliente</strong> y el <strong>secreto de cliente</strong> para luego completar los campos que se presentan.</li><li>Finalmente, ve a <a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> y pincha <strong>Habilitar</strong>/ Está acción puede que demore unos minutos en propagarse por los sistemas de Google.</li><li>Completa los capos de <strong>ID de Cliente</strong> y <strong>Secreto de Cliente</strong> que se encuentran más abajo.</li></ol>",
+  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>Inicia sesión</a> con tu cuenta de Google.</li><li>Dirigete a <a href='https://console.developers.google.com'>https://console.developers.google.com</a>, pincha <strong>Credenciales</strong> el la barra lateral izquierda e ingresa \"Mattermost - el-nombre-de-tu-empresa\" como el <strong>Nombre del Proyecto</strong>, luego pincha <strong>Crear</strong>.</li><li>Pincha el encabezado de <strong>Pantalla de autorización de OAuth</strong> e ingresa \"Mattermost\" como el <strong>Nombre de producto mostrado a los usuarios</strong>, luego pincha <strong>Guardar</strong>.</li><li>En el encabezado de <strong>Credenciales</strong>, pincha <strong>Crear credenciales</strong>, escoge <strong>ID de cliente de OAuth</strong> y selecciona <strong>Web</strong>.</li><li>En <strong>Restricciones</strong> y <strong>URIs de redireccionamiento autorizados</strong> ingresa <strong>tu-url-de-mattermost/signup/google/complete</strong> (ejemplo: http://localhost:8065/signup/google/complete). Pincha <strong>Crear</strong>.</li><li>Pega el <strong>ID de Cliente</strong> y el <strong>Secreto de Cliente</strong> en los campos que se encuentran en la parte inferior, luego pincha <strong>Guardar</strong>.</li><li>Finalmente, dirigete a <a href='https://console.developers.google.com/apis/plus/overview'>Google+ API</a> y pincha <strong>Habilitar</strong>. Puede que esta acción tome unos minutos en propagarse por los sistemas de Google.</li></ol>",
   "admin.google.authTitle": "URL para autentificación:",
   "admin.google.clientIdDescription": "El ID de Cliente que recibiste al registrar la aplicación con Google.",
   "admin.google.clientIdExample": "Ej \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -345,8 +375,8 @@
   "admin.image.thumbWidthDescription": "Ancho de imágen miniatura subida. Actualizando este valor la imagen miniatura cambia en el futuro, pero no cambia para imagenes creadas en el pasado.",
   "admin.image.thumbWidthExample": "Ej \"120\"",
   "admin.image.thumbWidthTitle": "Ancho de las Miniaturas de los Adjuntos:",
+  "admin.integrations.custom": "Integraciones Personalizadas",
   "admin.integrations.external": "Servicios Externos",
-  "admin.integrations.webhook": "Webhooks y Comandos",
   "admin.ldap.baseDesc": "El DN Base es el Nombre Distinguido de la ubicación donde Mattermost debe comenzar a buscar a los usuarios en el árbol del LDAP.",
   "admin.ldap.baseEx": "Ej \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "DN Base:",
@@ -448,8 +478,10 @@
   "admin.oauth.google": "Google Apps",
   "admin.oauth.off": "No permitir el inicio de sesión por medio de un proveedor de OAuth 2.0",
   "admin.oauth.office365": "Office 365",
+  "admin.oauth.providerDescription": "Cuando es verdadero, Mattermost puede actuar como proveedor de servicios de OAuth 2.0 permitiendo que Mattermost autorize solicitudes a las API por aplicaciones externas.",
+  "admin.oauth.providerTitle": "Habilitar el Proveedor de Servicios de OAuth 2.0: ",
   "admin.oauth.select": "Selecciona un proveedor de servicio de OAuth 2.0",
-  "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>Incia Sessión</a> con tu cuenta de Microsoft u Office 365. Asegurate que la cuenta esté sea un <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>inquilino</a> de los usuarios que puedan iniciar sesión.</li><li>Ve a <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, pincha en <strong>Agregar una app</strong> y usa <strong>Mattermost - <el-nombre-de-tu-empresa></strong> como el nombre de la aplicación.</li><li>Bajo <strong>Secretos de la Aplicación</strong>, pincha <strong>Generar Nueva Contraseña</strong> y guardale para luego llenar los campos en la parte inferior.</li><li>Bajo <strong>Platformas</strong>, pincha <strong>Agregar Platforma</strong>, selecciona <strong>Web</strong> e ingresa <strong><tu-url-de-mattermost>/signup/office365/complete</strong> (ejemplo: http://localhost:8065/signup/office365/complete) bajo <strong>URIs de redirección</strong>. Tambi'n quita la selección de <strong>Permitir el flujo implicito</strong>.</li><li>Finalmente, pincha <strong>Guardar</strong> y completa los campos de <strong>ID de Aplicación</strong> y <strong>Contraseña Secreta de la Aplicación</strong> en la parte inferior.</li></ol>",
+  "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>Inicia sesión</a> con tu cuenta de Microsoft u Office 365. Asegurate que la cuenta sea un <a href='https://msdn.microsoft.com/es-es/library/azure/jj573650.aspx#Anchor_0'>inquilino de Azure AD</a> para que los usuarios puedan iniciar sesión.</li><li>Dirigete a <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>. pincha <strong>Ir a la lista de aplicaciones</strong> > <strong>Agregar una aplicación</strong> y utiliza \"Mattermost - el-nombre-de-tu-empresa\" como el <strong>Nombre de la aplicación</strong>.</li><li>Bajo <strong>Secretos de aplicación</strong>, pincha <strong>Generar nueva contraseña</strong> y pegala en el campo inferior <strong>Contraseña Secreta de la Aplicación</strong>.</li><li>Bajo <strong>Plataformas</strong>, pincha <strong>Agregar plataforma</strong>, selecciona <strong>Web</strong> e ingresa <strong>url-de-tu-mattermost/signup/office365/complete</strong> (ejemplo: http://localhost:8065/signup/office365/complete) en <strong>URI de redireccionamiento</strong>. Tambíen desmarca <strong>Permitir flujo implícito</strong>.</li><li>Finalmente, pincha <strong>Guardar</strong> y pega el <strong>ID de aplicación</strong> en el campo inferior.</li></ol>",
   "admin.office365.authTitle": "URL para autentificación:",
   "admin.office365.clientIdDescription": "El ID de Aplicación/Cliente que recibiste al registrar la aplicación con Microsoft.",
   "admin.office365.clientIdExample": "Ej \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
@@ -608,6 +640,9 @@
   "admin.service.sessionCache": "La Caché de sesión (minutos):",
   "admin.service.sessionCacheDesc": "La cantidad de minutes que el cache de la sesión se guardará en memoria.",
   "admin.service.sessionDaysEx": "Ej \"30\"",
+  "admin.service.siteURL": "URL del Sitio:",
+  "admin.service.siteURLDescription": "La dirección URL, incluyendo el número de puerto y protocolo, a partir de la cual los usuarios tendrán acceso a Mattermost. Dejar en blanco para configurar automáticamente basado en el tráfico entrante.",
+  "admin.service.siteURLExample": "Ej \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "Duración de la sesión para SSO (días):",
   "admin.service.ssoSessionDaysDesc": "El número de días desde la última vez que un usuario ingreso sus credenciales para que la sesión del usuario expire. Si el método de autenticación es SAML o GitLab, el usuario puede iniciar su sesión automáticamente en Mattermost si ya cuenta con una sesión activa en SAML o GitLab.  Luego de cambiar esta configuración, la nueva duración de la sesión tendrá efecto luego de la próxima vez que el usuario ingrese sus credenciales.",
   "admin.service.testingDescription": "Cuando es verdadero, el comando de barra /loadtest es habilitado para cargar cuentas de prueba, datos y formato de texto. Al cambiar este parámetro se requiere un reinicio del servidor para que el cambio tengan efecto.",
@@ -620,11 +655,13 @@
   "admin.sidebar.advanced": "Avanzado",
   "admin.sidebar.audits": "Auditorías",
   "admin.sidebar.authentication": "Autenticación",
+  "admin.sidebar.cluster": "Alta Disponibilidad (Beta)",
   "admin.sidebar.compliance": "Cumplimiento",
   "admin.sidebar.configuration": "Configuración",
   "admin.sidebar.connections": "Conexiones",
   "admin.sidebar.customBrand": "Marca Personalizada",
   "admin.sidebar.customEmoji": "Emoji Personalizados",
+  "admin.sidebar.customIntegrations": "Integraciones Personalizadas",
   "admin.sidebar.customization": "Personalización",
   "admin.sidebar.database": "Base de Datos",
   "admin.sidebar.developer": "Desarrollo",
@@ -666,7 +703,6 @@
   "admin.sidebar.users": "Usuarios",
   "admin.sidebar.usersAndTeams": "Usuarios y Equipos",
   "admin.sidebar.view_statistics": "Estadísticas del Sitio",
-  "admin.sidebar.webhooks": "Webhooks y Comandos",
   "admin.sidebarHeader.systemConsole": "Consola de sistema",
   "admin.sql.dataSource": "Origen de datos:",
   "admin.sql.driverName": "Nombre de controlador:",
@@ -861,12 +897,13 @@
   "authorize.allow": "Permitir",
   "authorize.app": "La app <strong>{appName}</strong> quiere tener la habilidad de accesar y modificar tu información básica.",
   "authorize.deny": "Denegar",
-  "authorize.title": "Una aplicación quiere conectarse con tu cuenta de {teamName}",
+  "authorize.title": "<strong>{appName}</strong> quiere conectarse utilizando tu cuenta de usuario de <strong>Mattermost</strong>",
   "backstage_list.search": "Buscar",
   "backstage_navbar.backToMattermost": "Volver a {siteName}",
   "backstage_sidebar.integrations": "Integraciones",
   "backstage_sidebar.integrations.commands": "Comandos de Barra",
   "backstage_sidebar.integrations.incoming_webhooks": "Webhooks de Entrada",
+  "backstage_sidebar.integrations.oauthApps": "Aplicaciones OAuth 2.0",
   "backstage_sidebar.integrations.outgoing_webhooks": "Webhooks de Salida",
   "center_panel.recent": "Pincha aquí para ir a los mensajes más recientes. ",
   "chanel_header.addMembers": "Agregar Miembros",
@@ -1111,6 +1148,8 @@
   "find_team.placeholder": "tu@ejemplo.com",
   "find_team.send": "Enviar",
   "find_team.submitError": "Por favor ingresa una dirección válida",
+  "flag_post.flag": "Indicador de seguimiento",
+  "flag_post.unflag": "Desmarcar",
   "general_tab.chooseName": "Por favor escoge otro nombre para tu equipo",
   "general_tab.codeDesc": "Pincha 'Editar' para regenerar el código de Invitación.",
   "general_tab.codeLongDesc": "El Código de Invitación es utilizado como parte del URL del enlace creado por la opción <strong>Obtener Enlace de invitación</strong> en el menú principal. Regenerar este código crea un nuevo enlace e invalida los enlaces anteriores.",
@@ -1161,14 +1200,35 @@
   "installed_incoming_webhooks.search": "Buscar Webhooks de Entrada",
   "installed_incoming_webhooks.unknown_channel": "Un Webhook Privado",
   "installed_integrations.callback_urls": "Callback URLs: {urls}",
+  "installed_integrations.client_id": "ID de Cliente: <strong>{clientId}</strong>",
+  "installed_integrations.client_secret": "Clave Secreta de Cliente: <strong>{clientSecret}</strong>",
   "installed_integrations.content_type": "Tipo de contenido: {contentType}",
   "installed_integrations.creation": "Creado por {creator} el {createAt, date, full}",
   "installed_integrations.delete": "Eliminar",
+  "installed_integrations.hideSecret": "Ocultar Clave Secreta",
   "installed_integrations.regenToken": "Regenerar Token",
+  "installed_integrations.showSecret": "Mostrar Clave Secreta",
   "installed_integrations.token": "Token: {token}",
   "installed_integrations.triggerWhen": "Gatillar Cuando: {triggerWhen}",
   "installed_integrations.triggerWords": "Palabras Gatilladoras: {triggerWords}",
+  "installed_integrations.unnamed_oauth_app": "Aplicación OAuth 2.0 sin nombre",
   "installed_integrations.url": "URL: {url}",
+  "installed_oauth_apps.add": "Agregar Aplicación OAuth 2.0",
+  "installed_oauth_apps.callbackUrls": "Callback URLs (Uno por Línea)",
+  "installed_oauth_apps.cancel": "Cancelar",
+  "installed_oauth_apps.description": "Descripción",
+  "installed_oauth_apps.empty": "No se encontraron Aplicaciones OAuth 2.0",
+  "installed_oauth_apps.header": "Apliaciones OAuth 2.0",
+  "installed_oauth_apps.help": "Las Aplicaciones OAuth 2.0 están disponibles para todos los usuarios en el servidor.",
+  "installed_oauth_apps.homepage": "Página web",
+  "installed_oauth_apps.iconUrl": "URI del Icono",
+  "installed_oauth_apps.is_trusted": "De confianza: <strong>{isTrusted}</strong>",
+  "installed_oauth_apps.name": "Nombre a mostrar",
+  "installed_oauth_apps.save": "Guardar",
+  "installed_oauth_apps.search": "Buscar Aplicaciones OAuth 2.0",
+  "installed_oauth_apps.trusted": "De confianza",
+  "installed_oauth_apps.trusted.no": "No",
+  "installed_oauth_apps.trusted.yes": "Sí",
   "installed_outgoing_webhooks.add": "Agregar Webhook de Salida",
   "installed_outgoing_webhooks.empty": "No se encontraron webhooks de salida",
   "installed_outgoing_webhooks.header": "Webhooks de Salida",
@@ -1181,6 +1241,8 @@
   "integrations.header": "Integraciones",
   "integrations.incomingWebhook.description": "Webhooks de entrada permiten a las integraciones externas enviar mensajes",
   "integrations.incomingWebhook.title": "Webhook de Entrada",
+  "integrations.oauthApps.description": "OAuth 2.0 permite a aplicaciones externas realizar consultas autorizadas al API de Mattermost.",
+  "integrations.oauthApps.title": "Aplicaciones OAuth 2.0",
   "integrations.outgoingWebhook.description": "Webhooks de salida permiten a las integraciones externas recibir mensajes y responder a ellos",
   "integrations.outgoingWebhook.title": "Webhook de Salida",
   "intro_messages.DM": "Este es el inicio de tu historial de mensajes directos con {teammate}.<br />Los mensajes directos y archivos que se comparten aquí no son mostrados a personas fuera de esta área.",
@@ -1334,29 +1396,12 @@
   "post_focus_view.beginning": "Inicio de los Archivos del Canal",
   "post_info.del": "Borrar",
   "post_info.edit": "Editar",
+  "post_info.mobile.flag": "Marcar",
+  "post_info.mobile.unflag": "Desmarcar",
   "post_info.permalink": "Enlace permanente",
   "post_info.reply": "Responder",
   "posts_view.loadMore": "Cargar más mensajes",
   "posts_view.newMsg": "Nuevos Mensajes",
-  "register_app.callback": "Callback URL",
-  "register_app.callbackError": "Al menos un callback URL debe ser ingresado.",
-  "register_app.cancel": "Cancelar",
-  "register_app.clientId": "ID del Cliente",
-  "register_app.clientSecret": "Clave secreta del Cliente",
-  "register_app.close": "Cerrar",
-  "register_app.credentialsDescription": "Guarde estos datos en un lugar SEGURO. Siempre podemos obtener el ID si lo pierdes, pero el SECRET se perderá por siempre si lo llegas a perder.",
-  "register_app.credentialsSave": "Ya guarde tanto mi ID como el SECRET en un lugar seguro",
-  "register_app.credentialsTitle": "Las Credenciales de tu Aplicación",
-  "register_app.description": "Descripción",
-  "register_app.dev": "Aplicaciones de Desarrollador",
-  "register_app.homepage": "URL de tu página",
-  "register_app.homepageError": "Se debe ingresar la Página de Inicio.",
-  "register_app.name": "Nombre de la Aplicación",
-  "register_app.nameError": "Se debe ingresar el Nombre de la Aplicación.",
-  "register_app.optional": "Opcional",
-  "register_app.register": "Registrar",
-  "register_app.required": "Requerido",
-  "register_app.title": "Registra una Nueva Aplicación",
   "removed_channel.channelName": "el canal",
   "removed_channel.from": "Removido de ",
   "removed_channel.okay": "OK",
@@ -1376,7 +1421,10 @@
   "rhs_comment.comment": "Comentario",
   "rhs_comment.del": "Borrar",
   "rhs_comment.edit": "Editar",
+  "rhs_comment.mobile.flag": "Marcar",
+  "rhs_comment.mobile.unflag": "Desmarcar",
   "rhs_comment.permalink": "Enlace permanente",
+  "rhs_header.backToFlaggedTooltip": "Volver a los Mensajes Marcados",
   "rhs_header.backToResultsTooltip": "Volver a los Resultados de la Búsqueda",
   "rhs_header.closeSidebarTooltip": "Cerrar barra lateral",
   "rhs_header.details": "Detalles del Mensaje",
@@ -1385,12 +1433,15 @@
   "rhs_root.del": "Borrar",
   "rhs_root.direct": "Mensaje Directo",
   "rhs_root.edit": "Editar",
+  "rhs_root.mobile.flag": "Marcar",
+  "rhs_root.mobile.unflag": "Desmarcar",
   "rhs_root.permalink": "Enlace permanente",
   "search_bar.cancel": "Cancelar",
   "search_bar.search": "Buscar",
   "search_bar.usage": "<h4>Opciones de Búsqueda</h4><ul><li><span>Utiliza </span><b>\"comillas\"</b><span> para buscar frases</span></li><li><span>Utiliza </span><b>from:</b><span> para encontrar mensajes de usuarios en específico e </span><b>in:</b><span> para encontrar mensajes de canales específicos</span></li></ul>",
   "search_header.results": "Resultados de la Búsqueda",
   "search_header.title2": "Menciones Recientes",
+  "search_header.title3": "Mensajes Marcados",
   "search_item.direct": "Mensjae Directo",
   "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>",
@@ -1423,6 +1474,7 @@
   "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.console": "Consola del Sistema",
+  "sidebar_right_menu.flagged": "Mensajes Marcados",
   "sidebar_right_menu.help": "Ayuda",
   "sidebar_right_menu.inviteNew": "Invitar Nuevo Miembro",
   "sidebar_right_menu.logout": "Cerrar sesión",
@@ -1581,10 +1633,6 @@
   "user.settings.custom_theme.sidebarTextHoverBg": "Fondo Texto pasada Barra lateral",
   "user.settings.custom_theme.sidebarTitle": "Estilos de la barra lateral",
   "user.settings.custom_theme.sidebarUnreadText": "Texto No Leidos Barra Lateral",
-  "user.settings.developer.applicationsPreview": "Applicaciones (Vista previa)",
-  "user.settings.developer.register": "Registrar una Nueva Aplicación",
-  "user.settings.developer.thirdParty": "Abrir para registrar una nueva aplicación externa",
-  "user.settings.developer.title": "Configuraciones de Desarrollo",
   "user.settings.display.channelDisplayTitle": "Modo en que se muestra el Canal",
   "user.settings.display.channeldisplaymode": "Selecciona el ancho de la vista central.",
   "user.settings.display.clockDisplay": "Visualización del Reloj",
@@ -1668,6 +1716,7 @@
   "user.settings.import_theme.submit": "Enviar",
   "user.settings.import_theme.submitError": "Formato inválido, por favor intenta copiando y pegando nuevamente.",
   "user.settings.languages.change": "Cambia el idioma con el que se muestra la intefaz de usuario",
+  "user.settings.languages.promote": "Selecciona en que idioma se mostrará la interfaz de usuario de Mattermost.<br /><br />¿Te gustaría ayudar con las traducciones? Únete al <a href='http://translate.mattermost.com/' target='_blank'>Servidor de Traducciones de Mattermost</a> para contribuir.",
   "user.settings.mfa.add": "Agrega AMF a tu cuenta",
   "user.settings.mfa.addHelp": "Puedes requerir de un smartphone basado en token, además de la contraseña para iniciar sesión en Mattermost.<br/><br/>Para habilitarlo, descarga Google Authenticator de <a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a> o <a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a> al teléfono, luego<br/><br/>1. Haz clic en <strong>Agregar AMF a su cuenta</strong> en el botón de arriba.<br/>2. Utiliza Google Authenticator para escanear el código QR que aparece.<br/>3. Escribe el código generado por Google Authenticator y haz clic en <strong>Guardar</strong>.<br/><br/>Al iniciar la sesión, se pedirá que introduzcas un token de Google Authenticator, además de tus credenciales.",
   "user.settings.mfa.addHelpQr": "Por favor escanea el código QR con la app de Google Authenticator en tu teléfono inteligente e ingresa el token provisto por la app.",
@@ -1675,19 +1724,17 @@
   "user.settings.mfa.qrCode": "Código QR",
   "user.settings.mfa.remove": "Remover AMF de tu cuenta",
   "user.settings.mfa.removeHelp": "Al remover la autenticación de múltples factores hará que tu cuenta sea vulnerable a ataques.",
+  "user.settings.mfa.title": "Habilitar Autenticación de Múltiples Factores:",
   "user.settings.modal.advanced": "Avanzada",
   "user.settings.modal.confirmBtns": "Sí, Descartar",
   "user.settings.modal.confirmMsg": "Tienes cambios sin guardar, ¿Estás seguro que los quieres descartar?",
   "user.settings.modal.confirmTitle": "¿Descartar Cambios?",
-  "user.settings.modal.developer": "Desarrollo",
   "user.settings.modal.display": "Visualización",
   "user.settings.modal.general": "General",
   "user.settings.modal.notifications": "Notificaciones",
   "user.settings.modal.security": "Seguridad",
   "user.settings.modal.title": "Configuración de la Cuenta",
-  "user.settings.notification.allActivity": "Para toda actividad",
-  "user.settings.notification.push": "Notificaciones push a móviles",
-  "user.settings.notification.soundConfig": "Por favor configura los sonidos de notificación en las configuraciones de tu navegador",
+  "user.settings.notifications.allActivity": "Para toda actividad",
   "user.settings.notifications.channelWide": "Menciones a todo el canal \"@channel\", \"@all\"",
   "user.settings.notifications.close": "Cerrar",
   "user.settings.notifications.comments": "Notificaciones para Hilo de Comentarios",
@@ -1706,9 +1753,11 @@
   "user.settings.notifications.off": "Apagado",
   "user.settings.notifications.on": "Encendido",
   "user.settings.notifications.onlyMentions": "Sólo para menciones y mensajes directos",
+  "user.settings.notifications.push": "Notificaciones push a móviles",
   "user.settings.notifications.sensitiveName": "Tu nombre con distinción de mayúsculas \"{first_name}\"",
   "user.settings.notifications.sensitiveUsername": "Tu nombre de usuario sin distinción de mayúsculas \"{username}\"",
   "user.settings.notifications.sensitiveWords": "Otras palabras sin distinción de mayúsculas, separadas por comas:",
+  "user.settings.notifications.soundConfig": "Por favor configura los sonidos de notificación en los ajustes de tu navegador",
   "user.settings.notifications.sounds_info": "Las notificaciones de escritorio con sonidos están disponibles en Firefox, Safari, Chrome, Internet Explorer, y Edge.",
   "user.settings.notifications.teamWide": "Menciones para todo el equipo \"@all\"",
   "user.settings.notifications.title": "Configuracón de Notificaciones",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index 68406ae04..0a2591fac 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -30,21 +30,21 @@
   "activity_log_modal.androidNativeApp": "Application Android",
   "activity_log_modal.iphoneNativeApp": "Application pour iPhone",
   "add_command.autocomplete": "Auto-complétion",
-  "add_command.autocomplete.help": "(Optional) Show slash command in autocomplete list.",
+  "add_command.autocomplete.help": "(Facultatif) Afficher les commandes slash dans la liste d'auto-complétion.",
   "add_command.autocompleteDescription": "Description de l'auto-complétion",
-  "add_command.autocompleteDescription.help": "Description facultative de la commande Slash pour la liste d'auto-complétion.",
+  "add_command.autocompleteDescription.help": "(facultatif) Description de la commande Slash pour la liste d'auto-complétion.",
   "add_command.autocompleteDescription.placeholder": "Exemple : \"Retourne les résultats de recherche de dossiers médicaux\"",
   "add_command.autocompleteHint": "Indice de l’auto-complétion",
-  "add_command.autocompleteHint.help": "(Optional) Arguments associated with your slash command, displayed as help in the autocomplete list.",
+  "add_command.autocompleteHint.help": "(Facultatif) Arguments associés à votre commande slash, affichés dans l'aide le la liste d'auto-complétion.",
   "add_command.autocompleteHint.placeholder": "Exemple : [Nom du patient]",
   "add_command.cancel": "Annuler",
   "add_command.description": "Description",
-  "add_command.description.help": "Description for your incoming webhook.",
+  "add_command.description.help": "Description de votre webhook entrant.",
   "add_command.displayName": "Nom d'affichage",
-  "add_command.displayName.help": "Display name for your slash command made of up to 64 characters.",
+  "add_command.displayName.help": "Nom d'affichage pour votre commande slash, avec un maximum de 64 caractères.",
   "add_command.header": "Ajouter",
   "add_command.iconUrl": "Icône de la réponse",
-  "add_command.iconUrl.help": "Choisissez une photo de profil pour les réponses à cette commande Sash. Entrez l'URL d'un fichier .png ou .jpg d'au moins 128x128 pixels.",
+  "add_command.iconUrl.help": "Choisissez une photo de profil pour les réponses à cette commande slash. Entrez l'URL d'un fichier .png ou .jpg d'au moins 128x128 pixels.",
   "add_command.iconUrl.placeholder": "https://www.example.com/myicon.png",
   "add_command.method": "Méthode de requête",
   "add_command.method.get": "GET",
@@ -52,10 +52,10 @@
   "add_command.method.post": "POST",
   "add_command.save": "Enregistrer",
   "add_command.trigger": "Mot-clé de déclenchement",
-  "add_command.trigger.help": "Trigger word must be unique, and cannot begin with a slash or contain any spaces.",
-  "add_command.trigger.helpExamples": "Examples: client, employee, patient, weather",
-  "add_command.trigger.helpReserved": "Reserved: {link}",
-  "add_command.trigger.helpReservedLinkText": "see list of built-in slash commands",
+  "add_command.trigger.help": "Un mot déclencheur doit être unique, ne peut commencer par un slash ni contenir le moindre espace.",
+  "add_command.trigger.helpExamples": "Exemples : client, employé, patient, météo",
+  "add_command.trigger.helpReserved": "Réservé : {link}",
+  "add_command.trigger.helpReservedLinkText": "voir la liste des commandes slash inclues",
   "add_command.trigger.placeholder": "Mot-clé de déclenchement exemple \"hello\"",
   "add_command.triggerInvalidLength": "un mot-clé doit contenir entre {min} à {max} caractères",
   "add_command.triggerInvalidSlash": "Un mot-clé ne peut commencer par un /",
@@ -66,7 +66,7 @@
   "add_command.url.placeholder": "Doit commencer par http:// ou https://",
   "add_command.urlRequired": "Une requête URL est demandée",
   "add_command.username": "Utilisateur affiché dans la réponse",
-  "add_command.username.help": "Choisissez un nom d'utilisateur qui sera affiché dans la réponse de la commande Slash. Les noms d'utilisateurs peuvent contenir jusqu'à 22 caractères, chiffres, lettres minuscules et symboles \"-\", \"_\" et \".\" .",
+  "add_command.username.help": "Choisissez un nom d'utilisateur qui sera affiché dans la réponse de la commande slash. Les noms d'utilisateurs peuvent contenir jusqu'à 22 caractères, chiffres, lettres minuscules et symboles \"-\", \"_\" et \".\" .",
   "add_command.username.placeholder": "Nom d'utilisateur",
   "add_emoji.cancel": "Annuler",
   "add_emoji.header": "Ajouter",
@@ -84,39 +84,51 @@
   "add_emoji.save": "Enregistrer",
   "add_incoming_webhook.cancel": "Annuler",
   "add_incoming_webhook.channel": "Canal",
-  "add_incoming_webhook.channel.help": "Public channel or private group that receives the webhook payloads. You must belong to the private group when setting up the webhook.",
+  "add_incoming_webhook.channel.help": "Canal public ou groupe privé qui reçois les payloads du webhook. Vous devez appartenir au groupe privé pendant la mise en place du webhook.",
   "add_incoming_webhook.channelRequired": "Un canal valide est demandé",
   "add_incoming_webhook.description": "Description",
-  "add_incoming_webhook.description.help": "Description for your incoming webhook.",
+  "add_incoming_webhook.description.help": "Description pour votre webhook entrant.",
   "add_incoming_webhook.displayName": "Nom à afficher",
-  "add_incoming_webhook.displayName.help": "Display name for your incoming webhook made of up to 64 characters.",
+  "add_incoming_webhook.displayName.help": "Nom d'affichage pour votre webhook entrant, avec un maximum de 64 caractères.",
   "add_incoming_webhook.header": "Ajouter",
   "add_incoming_webhook.name": "Nom",
   "add_incoming_webhook.save": "Enregistrer",
+  "add_oauth_app.callbackUrls.help": "Les URIs de redirection vers lesquelles le service dirigera les utilisateurs après avoir accepté ou refusé l'autorisation de votre application, et qui gèreront les codes d'autorisation ou les jeton d'accès. Doit être une URL valide commençant par http:// ou https://.",
+  "add_oauth_app.callbackUrlsRequired": "Saisissez une ou plusieurs URL de callback",
+  "add_oauth_app.description.help": "Description pour votre application OAuth 2.0.",
+  "add_oauth_app.descriptionRequired": "La description pour votre application OAuth 2.0 est requise.",
+  "add_oauth_app.header": "Ajouter",
+  "add_oauth_app.homepage.help": "L'URL de la page d'accueil de votre application OAuth 2.0. Veillez à saisir HTTP ou HTTPS dans l'URL suivant votre configuration.",
+  "add_oauth_app.homepageRequired": "La page d'accueil pour l'application OAuth 2.0 est requise.",
+  "add_oauth_app.icon.help": "(Facultatif) L'URL de l'image utilisée pour votre application OAuth 2.0. Veillez à saisir HTTP ou HTTPS dans l'URL.",
+  "add_oauth_app.name.help": "Nom d'affichage pour votre application OAuth 2.0, avec un maximum de 64 caractères.",
+  "add_oauth_app.nameRequired": "Le nom pour l'application OAuth 2.0 est requis.",
+  "add_oauth_app.trusted.help": "Si activé, l'application OAuth 2.0 est considérée comme étant de confiance par le serveur Mattermost et ne requerra pas l'approbation de l'utilisateur. Si désactivé, une fenêtre additionnelle apparaîtra, demandant à l'utilisateur d'accepter ou de refuser son autorisation.",
   "add_outgoing_webhook.callbackUrls": "URLs de rappel (un par ligne)",
-  "add_outgoing_webhook.callbackUrls.help": "The URL that messages will be sent to.",
+  "add_outgoing_webhook.callbackUrls.help": "L'URL à laquelle les messages seront envoyés.",
   "add_outgoing_webhook.callbackUrlsRequired": "Un ou plusieurs rappel d’URL est demandé",
   "add_outgoing_webhook.cancel": "Annuler",
   "add_outgoing_webhook.channel": "Canal",
-  "add_outgoing_webhook.channel.help": "Public channel to receive webhook payloads. Optional if at least one Trigger Word is specified.",
-  "add_outgoing_webhook.contentType.help1": "Choose the content type by which the response will be sent.",
-  "add_outgoing_webhook.contentType.help2": "If application/x-www-form-urlencoded is chosen, the server assumes you will be encoding the parameters in a URL format.",
-  "add_outgoing_webhook.contentType.help3": "If application/json is chosen, the server assumes you will posting JSON data.",
+  "add_outgoing_webhook.channel.help": "Canal public qui recevra les payloads de webhooks. Facultatif si au moins un mot déclencheur est spécifié.",
+  "add_outgoing_webhook.contentType.help1": "Choisissez le type de contenu par lequel la réponse sera envoyée.",
+  "add_outgoing_webhook.contentType.help2": "Si application/x-www-form-urlencoded est choisi, le serveur suppose que vous aller encoder les paramètres dans un format URL.",
+  "add_outgoing_webhook.contentType.help3": "Si application/json est choisi, le serveur suppose que vous allez envoyer des données JSON.",
   "add_outgoing_webhook.content_Type": "Type de contenu",
   "add_outgoing_webhook.description": "Description",
-  "add_outgoing_webhook.description.help": "Description for your outgoing webhook.",
+  "add_outgoing_webhook.description.help": "Description pour votre webhook sortant.",
   "add_outgoing_webhook.displayName": "Nom à afficher",
-  "add_outgoing_webhook.displayName.help": "Display name for your outgoing webhook made of up to 64 characters.",
+  "add_outgoing_webhook.displayName.help": "Nom d'affichage pour votre webhook sortant, avec un maximum de 64 caractères.",
   "add_outgoing_webhook.header": "Ajouter",
   "add_outgoing_webhook.name": "Nom",
   "add_outgoing_webhook.save": "Enregistrer",
   "add_outgoing_webhook.triggerWords": "Mot-clé (Un par ligne)",
-  "add_outgoing_webhook.triggerWords.help": "Messages that start with one of the specified words will trigger the outgoing webhook. Optional if Channel is selected.",
+  "add_outgoing_webhook.triggerWords.help": "Les messages qui débutent par un des mots spécifiés vont déclencher le webhook sortant. Optionnel si Canal est sélectionné.",
   "add_outgoing_webhook.triggerWordsOrChannelRequired": "Un canal valide ou une liste de mot-clé est demander",
   "add_outgoing_webhook.triggerWordsTriggerWhen": "Déclencher lorsque",
-  "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choose when to trigger the outgoing webhook; if the first word of a message matches a Trigger Word exactly, or if it starts with a Trigger Word.",
+  "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choisissez quand déclencher le webhook sortant; si le premier mot d'un message correspond exactement à un mot déclencheur, ou si il démarre par un mot déclencheur.",
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "Premier mot correspondant exactement à un mot déclencheur",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "Le premier mot commence avec un mot déclencheur",
+  "admin.advance.cluster": "High Availability (Beta)",
   "admin.audits.reload": "Rafraîchir",
   "admin.audits.title": "Activité de l'utilisateur",
   "admin.authentication.email": "Authentification email",
@@ -124,12 +136,30 @@
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "Remarque :",
+  "admin.cluster.enableDescription": "Si activé, Mattermost autorise la connexion en utilisant SAML. Consultez la <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentation</a> pour en apprendre davantage sur la configuration de SAML pour Mattermost.",
+  "admin.cluster.enableTitle": "Enable High Availability Mode:",
+  "admin.cluster.interNodeListenAddressDesc": "The address the server will listen on for communicating with other servers.",
+  "admin.cluster.interNodeListenAddressEx": "Exemple : \":8075\"",
+  "admin.cluster.interNodeListenAddressTitle": "Inter-Node Listen Address:",
+  "admin.cluster.interNodeUrlsDesc": "The internal/private URLs of all the Mattermost servers separated by commas.",
+  "admin.cluster.interNodeUrlsEx": "Ex \"http://10.10.10.30, http://10.10.10.31\"",
+  "admin.cluster.interNodeUrlsTitle": "Inter-Node URLs:",
+  "admin.cluster.loadedFrom": "This configuration file was loaded from Node ID {clusterId}. Please see the Troubleshooting Guide in our <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> if you are accessing the System Console through a load balancer and experiencing issues.",
+  "admin.cluster.noteDescription": "Changing properties in this section will require a server restart before taking effect. When High Availability mode is enabled, the System Console is set to read-only and can only be changed from the configuration file.",
+  "admin.cluster.should_not_change": "WARNING: These settings may not sync with the other servers in the cluster. High Availability inter-node communication will not start until you modify the config.json to be identical on all servers and restart Mattermost. Please see the <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> on how to add or remove a server from the cluster. If you are accessing the System Console through a load balancer and experiencing issues, please see the Troubleshooting Guide in our <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a>.",
+  "admin.cluster.status_table.config_hash": "Config File MD5",
+  "admin.cluster.status_table.hostname": "Hostname",
+  "admin.cluster.status_table.id": "Node ID",
+  "admin.cluster.status_table.reload": " Reload Cluster Status",
+  "admin.cluster.status_table.status": "État",
+  "admin.cluster.status_table.url": "Inter-Node URL",
+  "admin.cluster.status_table.version": "Version",
   "admin.compliance.directoryDescription": "Répertoire des rapports de conformité. Si non spécifié :  ./data/ .",
   "admin.compliance.directoryExample": "Ex : \"./data/\"",
   "admin.compliance.directoryTitle": "Répertoire du rapport de conformité :",
   "admin.compliance.enableDailyDesc": "Si activé, Mattermost générera un rapport quotidien de conformité",
   "admin.compliance.enableDailyTitle": "Activer le rapport quotidien :",
-  "admin.compliance.enableDesc": "When true, Mattermost allows compliance reporting from the <strong>Compliance and Auditing</strong> tab. See <a href=\"https://docs.mattermost.com/administration/compliance.html\" target=\"_blank\">documentation</a> to learn more.",
+  "admin.compliance.enableDesc": "Si activé, Mattermost autorise les rapports de conformité de puis l'onglet <strong>Conformité et vérification</strong>. Consultez la <a href=\"https://docs.mattermost.com/administration/compliance.html\" target=\"_blank\">documentation</a> pour en apprendre davantage.",
   "admin.compliance.enableTitle": "Activer le rapport de conformité :",
   "admin.compliance.false": "non",
   "admin.compliance.noLicense": "<h4 class=\"banner__heading\">Note :</h4><p>La conformité est une option disponible sur l'édition d’Enterprise. Votre licence ne permet pas d'utiliser cette fonction. Cliquez sur <a href=\"http://mattermost.com\" target=\"_blank\">ici</a> pour des informations et des prix sur la licence d’Enterprise.</p>",
@@ -166,15 +196,15 @@
   "admin.connectionSecurityTitle": "Connexion sécurisée",
   "admin.connectionSecurityTls": "Transport Layer Security",
   "admin.connectionSecurityTlsDescription": "Chiffre la communication entre Mattermost et votre serveur.",
-  "admin.customization.androidAppDownloadLinkDesc": "Add a link to download the Android app. Users who access the site on a mobile web browser will be prompted with a page giving them the option to download the app. Leave this field blank to prevent the page from appearing.",
+  "admin.customization.androidAppDownloadLinkDesc": "Ajouter un lien pour télécharger l'application Android. Les utilisateurs qui visitent le site avec un navigateur web mobile seront accueils avec une page leur permettant de télécharger l'application. Laissez ce champ vide pour ne pas afficher cette page.",
   "admin.customization.androidAppDownloadLinkTitle": "Lien vers l'application Android :",
-  "admin.customization.appDownloadLinkDesc": "Add a link to a download page for the Mattermost apps. When a link is present, an option to \"Download Mattermost Apps\" will be added in the Main Menu so users can find the download page. Leave this field blank to hide the option from the Main Menu.",
+  "admin.customization.appDownloadLinkDesc": "Ajouter un lien vers une page de téléchargement des applications Mattermost. Si un lien est présent, une option pour \"Télécharger les applications Mattermost\" sera ajoutée dans le menu principal pour qu'elle soit visible par les utilisateurs. Laissez ce champ vide pour ne pas ajouter l'option dans le menu principal.",
   "admin.customization.appDownloadLinkTitle": "Lien de téléchargement de l'application Mattermost :",
   "admin.customization.customBrand": "Image de marque personnalisée",
   "admin.customization.customEmoji": "Emoji personnalisés",
   "admin.customization.enableCustomEmojiDesc": "Permet aux utilisateurs de créer leurs propres emoji. Si activé, \"Emoji Personnalisés\" est accessible en sélectionnant une équipe, en cliquant sur les trois points en haut de la barre latérale et en choisissant l'option du menu.",
   "admin.customization.enableCustomEmojiTitle": "Activer les Emoji personnalisés :",
-  "admin.customization.iosAppDownloadLinkDesc": "Add a link to download the iOS app. Users who access the site on a mobile web browser will be prompted with a page giving them the option to download the app. Leave this field blank to prevent the page from appearing.",
+  "admin.customization.iosAppDownloadLinkDesc": "Ajouter un lien pour télécharger l'application iOS. Les utilisateurs qui visitent le site avec un navigateur web mobile seront accueils avec une page leur permettant de télécharger l'application. Laissez ce champ vide pour ne pas afficher cette page.",
   "admin.customization.iosAppDownloadLinkTitle": "Lien de téléchargement de l'app iOS :",
   "admin.customization.nativeAppLinks": "Liens vers les applications natives",
   "admin.customization.restrictCustomEmojiCreationAdmin": "Permet aux administrateurs système et d'équipe de créer des emoji personnalisés",
@@ -252,7 +282,7 @@
   "admin.files.storage": "Stockage",
   "admin.general.configuration": "Configuration",
   "admin.general.localization": "Localisation",
-  "admin.general.localization.availableLocalesDescription": "Détermine les langues disponibles dans les paramètres de l'utilisateur (laisser vide pour avoir accès à toutes les langues de Mattermost).",
+  "admin.general.localization.availableLocalesDescription": "Set which languages are available for users in Account Settings (leave this field blank to have all supported languages available).<br /><br />Would like to help with translations? Join the <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> to contribute.",
   "admin.general.localization.availableLocalesTitle": "Langues disponibles :",
   "admin.general.localization.clientLocaleDescription": "La langue par défaut est utilisé pour les nouveaux utilisateurs et les pages créées où l'utilisateur ne s'est pas connecté.",
   "admin.general.localization.clientLocaleTitle": "Langue par défaut :",
@@ -263,11 +293,11 @@
   "admin.general.policy.permissionsAdmin": "Administrateurs d'équipe et administrateurs système",
   "admin.general.policy.permissionsAll": "Tous les membres de l'équipe",
   "admin.general.policy.permissionsSystemAdmin": "Administrateurs système",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "Set policy on who can create, delete, rename, and set the header or purpose for private groups.",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Choisir qui peut créer, supprimer, renommer et définir l'en-tête ou la description pour les groupes privés.",
   "admin.general.policy.restrictPrivateChannelManagementTitle": "Autoriser la gestion des groupes privés pour :",
-  "admin.general.policy.restrictPublicChannelManagementDescription": "Set policy on who can create, delete, rename, and set the header or purpose for public channels.",
+  "admin.general.policy.restrictPublicChannelManagementDescription": "Choisir qui peut créer, supprimer, renommer et définir l'en-tête ou la description pour les canaux publiques.",
   "admin.general.policy.restrictPublicChannelManagementTitle": "Autoriser la gestion des canaux publics pour :",
-  "admin.general.policy.teamInviteDescription": "Set policy on who can invite others to a team using <b>Invite New Member</b> to invite new users by email, or the <b>Get Team Invite Link</b> options from the Main Menu. If <b>Get Team Invite Link</b> is used to share a link, you can expire the invite code from <b>Team Settings</b> > <b>Invite Code</b> after the desired users join the team.",
+  "admin.general.policy.teamInviteDescription": "Choisir qui peut inviter d'autres personnes à une équipe en utilisant <b>Inviter un nouveau membre</b> pour inviter de nouveaux utilisateurs par courrier électronique, ou l'option <b>Obtenir un lien d'invitation d'équipe</b> du menu principal. Si l'option <b>Obtenir un lien d'invitation d'équipe</b> est utilisée pour partager un lien, vous pouvez faire expirer le code d'invitation depuis <b>Configuration de l'équipe</b> > <b>Code d'invitation</b> une fois que les utilisateurs désirés ont rejoint l'équipe.",
   "admin.general.policy.teamInviteTitle": "Autoriser l'envoi d'invitation depuis :",
   "admin.general.privacy": "Confidentialité",
   "admin.general.usersAndTeams": "Utilisateur et équipes",
@@ -290,7 +320,7 @@
   "admin.gitlab.userDescription": "Saisissez https://<your-gitlab-url>/api/v3/user. Veillez à saisir HTTP ou HTTPS dans l'URL suivant votre configuration.",
   "admin.gitlab.userExample": "Exemple \"https://<your-gitlab-url>/api/v3/user\"",
   "admin.gitlab.userTitle": "URL de l'API (User API endpoint) :",
-  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>Log in</a> to your Google account.</li><li>Go to <a href='https://console.developers.google.com'>https://console.developers.google.com</a>, click <strong>Credentials</strong> in the left hand sidebar and enter <strong>Mattermost - <your-company-name></strong> as the project name.</li><li>Click the <strong>OAuth consent screen</strong> header and enter <strong>Mattermost</strong> as the <strong>Product name to show users</strong>. Click <strong>Save</strong>.</li><li>Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.</li><li>Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong><your-mattermost-url>/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.</li><li>Save the <strong>client ID</strong> and <strong>client secret</strong> to later complete the fields below.</li><li>Finally, go to <a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> and click <strong>Enable</strong>. This might take a few minutes to propagate through Google's systems.</li><li>Complete the <strong>Client ID</strong> and <strong>Client Secret</strong> fields below.</li></ol>",
+  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>Log in</a> to your Google account.</li><li>Go to <a href='https://console.developers.google.com'>https://console.developers.google.com</a>, click <strong>Credentials</strong> in the left hand sidebar and enter \"Mattermost - your-company-name\" as the <strong>Project Name</strong>, then click <strong>Create</strong>.</li><li>Click the <strong>OAuth consent screen</strong> header and enter \"Mattermost\" as the <strong>Product name shown to users</strong>, then click <strong>Save</strong>.</li><li>Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.</li><li>Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong>your-mattermost-url/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.</li><li>Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.</li><li>Finally, go to <a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> and click <strong>Enable</strong>. This might take a few minutes to propagate through Google's systems.</li></ol>",
   "admin.google.authTitle": "URL d'authentification (auth endpoint) :",
   "admin.google.clientIdDescription": "Le Client ID que vous avez reçu lorsque vous avez enregistré l'application avec Google.",
   "admin.google.clientIdExample": "Exemple : \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -345,8 +375,8 @@
   "admin.image.thumbWidthDescription": "Largeur des vignettes générées pour les images. Changer cette valeur ne modifie pas les vignettes de l'historique.",
   "admin.image.thumbWidthExample": "Exemple : \"120\"",
   "admin.image.thumbWidthTitle": "Largeur des aperçus de pièces jointes :",
+  "admin.integrations.custom": "Intégrations personnalisées",
   "admin.integrations.external": "Services externes",
-  "admin.integrations.webhook": "Webhooks et commandes",
   "admin.ldap.baseDesc": "Le DN de base est le Distinguished Name à partir du quel Mattermost doit rechercher les utilisateurs dans l'arborescence LDAP.",
   "admin.ldap.baseEx": "Exemple : \"ou=Unit Name, dc=example, dc=com\"",
   "admin.ldap.baseTitle": "DN de base :",
@@ -390,7 +420,7 @@
   "admin.ldap.skipCertificateVerification": "Passer la vérification",
   "admin.ldap.skipCertificateVerificationDesc": "Saute l'étape de vérification des certificats pour les connexions TLS ou STARTTLS . Non recommandé pour les environnements de production où TLS est nécessaire. Pour tester seulement.",
   "admin.ldap.syncFailure": "Erreur de synchronisation : {error}",
-  "admin.ldap.syncIntervalHelpText": "LDAP Synchronization updates Mattermost user information to reflect updates on the LDAP server. For example, when a user’s name changes on the LDAP server, the change updates in Mattermost when synchronization is performed. Accounts removed from or disabled in the LDAP server have their Mattermost accounts set to “Inactive” and have their account sessions revoked. Mattermost performs synchronization on the interval entered. For example, if 60 is entered, Mattermost synchronizes every 60 minutes.",
+  "admin.ldap.syncIntervalHelpText": "La synchronisation LDAP met à jour les informations utilisateurs de Mattermost pour refléter les changements du serveur LDAP. Par exemple, lorsque le nom d'un utilisateur change sur le serveur LDAP, le changement est appliqué sur Mattermost lors de la synchronisation. Les comptes supprimés ou désactivés sur le serveur LDAP auront leur compte Mattermost mis comme \"Inactif\" et auront leur session de révoquée. Mattermost réalise la synchronisation dans l'intervalle entré. Par exemple, si 60 est entré, Mattermost se synchronisera toutes les 60 minutes.",
   "admin.ldap.syncIntervalTitle": "Intervalle de synchronisation (en minutes)",
   "admin.ldap.syncNowHelpText": "Provoque une synchronisation LDAP immédiate.",
   "admin.ldap.sync_button": "Synchroniser maintenant l'annuaire LDAP",
@@ -446,10 +476,12 @@
   "admin.notifications.title": "Paramètres de notification",
   "admin.oauth.gitlab": "GitLab",
   "admin.oauth.google": "Google Apps",
-  "admin.oauth.off": "Do not allow sign-in via an OAuth 2.0 provider",
+  "admin.oauth.off": "Ne pas autoriser la connexion à travers un fournisseur OAuth 2.0",
   "admin.oauth.office365": "Office 365",
+  "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications.",
+  "admin.oauth.providerTitle": "Activer le fournisseur de service OAuth 2.0 : ",
   "admin.oauth.select": "Choisissez un fournisseur de service OAuth 2.0 :",
-  "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>Log in</a> to your Microsoft or Office 365 account. Make sure it's the account on the same <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> that you would like users to log in with.</li><li>Go to <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, click <strong>Add an app</strong> and use <strong>Mattermost - <your-company-name></strong> as the application name.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and save it to later complete the field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong><your-mattermost-url>/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and complete the <strong>Application ID</strong> and <strong>Application Secret Password</strong> fields below.</li></ol>",
+  "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>Log in</a> to your Microsoft or Office 365 account. Make sure it's the account on the same <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> that you would like users to log in with.</li><li>Go to <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, click <strong>Go to app list</strong> > <strong>Add an app</strong> and use \"Mattermost - your-company-name\" as the <strong>Application Name</strong>.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and paste it to the <strong>Application Secret Password</strong> field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong>your-mattermost-url/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and then paste the <strong>Application ID</strong> below.</li></ol>",
   "admin.office365.authTitle": "URL d'authentification (auth endpoint) :",
   "admin.office365.clientIdDescription": "L'Application/Client ID que vous avez reçu lorsque vous avez enregistré l'application avec Microsoft.",
   "admin.office365.clientIdExample": "Exemple : \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
@@ -491,12 +523,12 @@
   "admin.rate.title": "Configuration des limites de débit",
   "admin.recycle.button": "Recycler les connexions à la base de données",
   "admin.recycle.loading": " Recyclage...",
-  "admin.recycle.recycleDescription": "Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating \"config.json\" to the new desired configuration and using the <a href=\"../general/configuration\"><b>Configuration > Reload Configuration from Disk</b></a> feature to load the new settings while the server is running. The administrator should then use <b>Recycle Database Connections</b> feature to recycle the database connections based on the new settings.",
+  "admin.recycle.recycleDescription": "Les déploiements utilisant plusieurs bases de données peuvent basculer d'une base de donnée principale à une autre sans redémarrer le serveur Mattermost en mettant à jour le fichier \"config.json\" avec la nouvelle configuration désirée, et en utilisant l'option <a href=\"../general/configuration\"><b>Configuration > Recharger le fichier de configuration</b></a> pour charger les nouveaux paramètres pendant que le serveur est en activité. L'administrateur devra donc ensuite utiliser l'option <b>Recycler les connexions à la base de données</b> pour recycler les connexions en se basant sur les nouveaux paramètres.",
   "admin.recycle.reloadFail": "Echec du recyclage : {error}",
   "admin.regenerate": "Générer de nouveau",
   "admin.reload.button": "Recharger le fichier de configuration",
   "admin.reload.loading": " Chargement…",
-  "admin.reload.reloadDescription": "Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating \"config.json\" to the new desired configuration and using the <b>Reload Configuration from Disk</b> feature to load the new settings while the server is running. The administrator should then use the <a href=\"../advanced/database\"><b>Database > Recycle Database Connections</b></a> feature to recycle the database connections based on the new settings.",
+  "admin.reload.reloadDescription": "Les déploiements utilisant plusieurs bases de données peuvent basculer d'une base de donnée principale à une autre sans redémarrer le serveur Mattermost en mettant à jour le fichier \"config.json\" avec la nouvelle configuration désirée, et en utilisant l'option <b>Recharger le fichier de configuration</b> pour charger les nouveaux paramètres pendant que le serveur est en activité. L'administrateur devra donc ensuite utiliser l'option <a href=\"../advanced/database\"><b>Base de données > Recycler les connexions à la base de données</b></a> pour recycler les connexions en se basant sur les nouveaux paramètres.",
   "admin.reload.reloadFail": "Échec de la connexion : {error}",
   "admin.reset_password.close": "Quitter",
   "admin.reset_password.newPassword": "Nouveau mot de passe",
@@ -504,13 +536,13 @@
   "admin.reset_password.submit": "Veuillez saisir au moins {chars} caractères.",
   "admin.reset_password.titleReset": "Réinitialiser le mot de passe",
   "admin.reset_password.titleSwitch": "Basculez  vers l’addresse électronique / mot de passe de votre compte",
-  "admin.saml.assertionConsumerServiceURLDesc": "Enter https://<your-mattermost-url>/login/sso/saml. Make sure you use HTTP or HTTPS in your URL depending on your server configuration. This field is also known as the Assertion Consumer Service URL.",
+  "admin.saml.assertionConsumerServiceURLDesc": "Entrez https://<votre-url-mattermost>/login/sso/saml. Veillez à saisir HTTP ou HTTPS dans l'URL suivant votre configuration. Ce champ est aussi connu comme étant l'URL d'Assertion Consumer Service.",
   "admin.saml.assertionConsumerServiceURLEx": "Ex : \"https://<your-mattermost-url>/login/sso/saml\"",
   "admin.saml.assertionConsumerServiceURLTitle": "URL du service d'identification :",
   "admin.saml.emailAttrDesc": "Attribut du SAML pour le champ \"adresse électronique\" dans Mattermost.",
   "admin.saml.emailAttrEx": "Exemple : \"Email\" ou \"PrimaryEmail\"",
   "admin.saml.emailAttrTitle": "Attribut \"adresse électronique\" :",
-  "admin.saml.enableDescription": "When true, Mattermost allows login using SAML. Please see <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentation</a> to learn more about configuring SAML for Mattermost.",
+  "admin.saml.enableDescription": "Si activé, Mattermost autorise la connexion en utilisant SAML. Consultez la <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentation</a> pour en apprendre davantage sur la configuration de SAML pour Mattermost.",
   "admin.saml.enableTitle": "Activer la connexion avec SAML :",
   "admin.saml.encryptDescription": "Si activé, Mattermost déchiffre les commandes SAML chiffrées avec le certificat public de votre serveur d'authentification.",
   "admin.saml.encryptTitle": "Activer le chiffrement :",
@@ -520,10 +552,10 @@
   "admin.saml.idpCertificateFileDesc": "Le certificat public fourni par votre serveur d'authentification.",
   "admin.saml.idpCertificateFileRemoveDesc": "Retirer le certificat public fourni par votre serveur d'authentification.",
   "admin.saml.idpCertificateFileTitle": "Certificat public du service d'identification :",
-  "admin.saml.idpDescriptorUrlDesc": "The issuer URL for the Identity Provider you use for SAML requests.",
+  "admin.saml.idpDescriptorUrlDesc": "L'URL d'émetteur pour le fournisseur d'identité utilisé pour les requêtes SAML.",
   "admin.saml.idpDescriptorUrlEx": "Ex \"https://idp.example.org/SAML2/issuer\"",
   "admin.saml.idpDescriptorUrlTitle": "URL du serveur d'identité :",
-  "admin.saml.idpUrlDesc": "The URL where Mattermost sends a SAML request to start login sequence.",
+  "admin.saml.idpUrlDesc": "L'URL où Mattermost enverra une requête SAML pour démarrer la séquence de connexion.",
   "admin.saml.idpUrlEx": "Ex : \"https://idp.example.org/SAML2/SSO/Login\"",
   "admin.saml.idpUrlTitle": "URL SSO SAML :",
   "admin.saml.lastnameAttrDesc": "Attribut SAML utilisé pour le champ \"nom de famille\" des utilisateurs dans Mattermost.",
@@ -541,8 +573,8 @@
   "admin.saml.privateKeyFileFileDesc": "La clé privée utilisée pour déchiffrer le SAML de votre serveur d'identité.",
   "admin.saml.privateKeyFileFileRemoveDesc": "La clé privée utilisée pour déchiffrer le SAML de votre serveur d'identité.",
   "admin.saml.privateKeyFileTitle": "Clé privée du service d'identité :",
-  "admin.saml.publicCertificateFileDesc": "The certificate used to generate the signature on a SAML request to the Identity Provider for a service provider initiated SAML login, when Mattermost is the Service Provider.",
-  "admin.saml.publicCertificateFileRemoveDesc": "Remove the certificate used to generate the signature on a SAML request to the Identity Provider for a service provider initiated SAML login, when Mattermost is the Service Provider.",
+  "admin.saml.publicCertificateFileDesc": "Le certificat utilisé pour générer la signature d'une requête SAML au fournisseur d'identité pour une connexion SAML initiée par un fournisseur de service, lorsque Mattermost est le fournisseur de service.",
+  "admin.saml.publicCertificateFileRemoveDesc": "Supprimer le certificat utilisé pour générer la signature d'une requête SAML au fournisseur d'identité pour une connexion SAML initiée par un fournisseur de service, lorsque Mattermost est le fournisseur de service.",
   "admin.saml.publicCertificateFileTitle": "Certificat public du service d'identification :",
   "admin.saml.remove.idp_certificate": "Retirer le certificat du service d'identification",
   "admin.saml.remove.privKey": "Clé privée du service d'identité :",
@@ -573,14 +605,14 @@
   "admin.service.attemptDescription": "Nombre de tentatives de connexion autorisées avant que l'utilisateur ne soit bloqué et qu'une réinitialisation du mot de passe par courriel ne soit obligatoire.",
   "admin.service.attemptExample": "Exemple : \"10\"",
   "admin.service.attemptTitle": "Nombre maximum de tentatives de connexion :",
-  "admin.service.cmdsDesc": "When true, custom slash commands will be allowed. See <a href='http://docs.mattermost.com/developer/slash-commands.html' target='_blank'>documentation</a> to learn more.",
+  "admin.service.cmdsDesc": "Si activé, les commandes slash personnalisés seront autorisées. Consultez la <a href='http://docs.mattermost.com/developer/slash-commands.html' target='_blank'>documentation</a> pour en apprendre davantage.",
   "admin.service.cmdsTitle": "Activer les commandes slash : ",
   "admin.service.corsDescription": "Autoriser les requête HTTP cross-origin depuis des domaines spécifiques (séparés par des espaces). Utilisez \"*\" pour autoriser les CORS pour n'importe quel domaine (pas recommandé) ou laissez vide pour les désactiver.",
   "admin.service.corsEx": "http://exemple.com ou https://exemple.com",
   "admin.service.corsTitle": "Autoriser les requêtes cross-origin depuis :",
   "admin.service.developerDesc": "Si activé, les erreurs Javascript sont affichées dans une barre en haut de l'interface. Ceci n'est pas recommandé sur un serveur de production. ",
   "admin.service.developerTitle": "Activer le mode développeur : ",
-  "admin.service.googleDescription": "Set this key to enable the display of titles for embedded YouTube video previews. Without the key, YouTube previews will still be created based on hyperlinks appearing in messages or comments but they will not show the video title. View a <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> for instructions on how to obtain a key.",
+  "admin.service.googleDescription": "Définissez cette clé pour activer l'affichage des titres pour les aperçus de vidéos YouTube. Sans la clé, les aperçus YouTube seront créés à partir des liens apparaissant des messages ou commentaires mais ils ne montreront pas le titre de la vidéo. Regardez un <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">tutoriel Google Developers</a> pour des instructions sur l'obtention d'une clé.",
   "admin.service.googleExample": "Exemple : \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Clé API Google :",
   "admin.service.iconDescription": "Si activé, les webhooks et commandes slash pourront changer l'icône avec lequel ils postent. Attention, si vous autorisez également le changer du nom d'utilisateur, cela augmente le risque d'une attaque par hameçonnage.",
@@ -595,8 +627,8 @@
   "admin.service.mfaDesc": "Si activé, Les utilisateurs auront la possibilité d'ajouter l'authentification multi- facteur à leur compte . Ils auront besoin d'un smartphone et une application d'authentification tels que Google Authenticator .",
   "admin.service.mfaTitle": "Activité l’authentification multi-facteurs:",
   "admin.service.mobileSessionDays": "Durée de la session sur les applis mobiles (en jours) :",
-  "admin.service.mobileSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
-  "admin.service.outWebhooksDesc": "When true, outgoing webhooks will be allowed. See <a href='http://docs.mattermost.com/developer/webhooks-outgoing.html' target='_blank'>documentation</a> to learn more.",
+  "admin.service.mobileSessionDaysDesc": "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.outWebhooksDesc": "Si activé, les webhooks sortants seront autorisés. Consultez la <a href='http://docs.mattermost.com/developer/webhooks-outgoing.html' target='_blank'>documentation</a> pour en apprendre davantage.",
   "admin.service.outWebhooksTitle": "Activer les webhooks sortants : ",
   "admin.service.overrideDescription": "Si activé, les webhooks et commandes slash peuvent changer le nom d'utilisateur avec lequel ils postent. Attention, si le changement d'icône est également autorisé, cela peut conduire à des attaques de type hameçonnage !",
   "admin.service.overrideTitle": "Permettre aux webhooks et commandes slash de changer leur nom d'utilisateur :",
@@ -608,23 +640,28 @@
   "admin.service.sessionCache": "Cache de session en minutes :",
   "admin.service.sessionCacheDesc": "Durée pendant laquelle une session est gardée en mémoire.",
   "admin.service.sessionDaysEx": "Exemple : \"30\"",
-  "admin.service.ssoSessionDays": "Durée de la session sur les applis mobiles (en jours) :",
-  "admin.service.ssoSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.",
+  "admin.service.siteURL": "Site URL:",
+  "admin.service.siteURLDescription": "The URL, including port number and protocol, from which users will access Mattermost. Leave blank to automatically configure based on incoming traffic.",
+  "admin.service.siteURLExample": "Ex \"https://mattermost.example.com:1234\"",
+  "admin.service.ssoSessionDays": "Durée de la session SSO (en jours) :",
+  "admin.service.ssoSessionDaysDesc": "Le nombre de jours entre la dernière fois qu'un utilisateur a entré ses identifiants et l'expiration de la session de l'utilisateur. Si la méthode d'authentification est SAML ou GitLab, l'utilisateur pourra être automatiquement connecté à nouveau dans Mattermost s'ils sont déjà connectés dans SAML ou GitLab. Après le changement de ce paramètre, il prendra effet la prochaine fois que les utilisateurs entreront leurs identifiants.",
   "admin.service.testingDescription": "(Option de développement) Si activé, la commande \"/loadtest\" est active et charge des données de test. Changer ce paramètre nécessite de redémarrer le serveur.",
   "admin.service.testingTitle": "Activer les commandes de test : ",
-  "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.",
+  "admin.service.webSessionDays": "Longueur de la session LDAP et email (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": "Si 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 apprendre davantage.",
   "admin.service.webhooksTitle": "Activer les webhooks entrants : ",
   "admin.sidebar.addTeamSidebar": "Afficher l'équipe dans le menu",
   "admin.sidebar.advanced": "Options avancées",
   "admin.sidebar.audits": "Conformité et vérification",
   "admin.sidebar.authentication": "authentification",
+  "admin.sidebar.cluster": "High Availability (Beta)",
   "admin.sidebar.compliance": "Conformité",
   "admin.sidebar.configuration": "configuration",
   "admin.sidebar.connections": "Connexions",
   "admin.sidebar.customBrand": "Image de marque personnalisée",
   "admin.sidebar.customEmoji": "Emoji personnalisés",
+  "admin.sidebar.customIntegrations": "Intégrations personnalisées",
   "admin.sidebar.customization": "Personnalisation",
   "admin.sidebar.database": "Base de données",
   "admin.sidebar.developer": "Développeur",
@@ -666,7 +703,6 @@
   "admin.sidebar.users": "Utilisateurs",
   "admin.sidebar.usersAndTeams": "Utilisateur et équipes",
   "admin.sidebar.view_statistics": "Statistiques du serveur",
-  "admin.sidebar.webhooks": "Webhooks et commandes",
   "admin.sidebarHeader.systemConsole": "Console système",
   "admin.sql.dataSource": "Source de données :",
   "admin.sql.driverName": "Nom du pilote :",
@@ -697,15 +733,15 @@
   "admin.support.privacyTitle": "Lien vers la politique de confidentialité :",
   "admin.support.problemDesc": "Lien vers la documentation depuis le menu principal de l'équipe. Par défaut ce lien renvoie vers le forum d'entraide où les utilisateurs peuvent trouver de l'aide pour leurs problèmes techniques.",
   "admin.support.problemTitle": "Lien \"Signaler un problème\" :",
-  "admin.support.termsDesc": "Link to the terms under which users may use your online service. By default, this includes the \"Mattermost Conditions of Use (End Users)\" explaining the terms under which Mattermost software is provided to end users. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Conditions of Use (End User) for Mattermost software.",
+  "admin.support.termsDesc": "Lien vers les conditions sous lesquelles les utilisateurs utiliseront votre service. Par défaut, cela inclut les \"Conditions d'Utilisation Mattermost (Utilisateurs Finaux)\" expliquant le termes selon lesquels l'application Mattermost est proposée aux utilisateurs finaux. Si vous changez le lien par défaut pour ajouter vos propres conditions d'utilisation du service que vous proposez, elles devront inclure un lien vers les conditions par défaut pour que les utilisateurs finaux aient connaissance des Conditions d'Utilisation Mattermost (Utilisateurs Finaux) pour l'application Mattermost.",
   "admin.support.termsTitle": "Lien \"Conditions d'utilisation\" :",
   "admin.system_analytics.activeUsers": "Utilisateurs actifs avec des messages",
   "admin.system_analytics.title": "le Système",
   "admin.system_analytics.totalPosts": "Nombre total de messages",
   "admin.team.brandDesc": "Activer l'image nouvelle personnalisé pour afficher une image de votre choix , téléchargé ci-dessous , et un texte d'aide , écrit ci-dessous , sur la page de connexion .",
-  "admin.team.brandDescriptionExample": "Toute la communication de votre équipe à un endroit, accessible de partout",
+  "admin.team.brandDescriptionExample": "Toute la communication de votre équipe au même endroit, accessible de partout",
   "admin.team.brandDescriptionHelp": "Nom du service affiché dans les écrans de connexion et l'interface.",
-  "admin.team.brandDescriptionTitle": "Site Description",
+  "admin.team.brandDescriptionTitle": "Description du site",
   "admin.team.brandImageTitle": "Nouvelle image personnalisée :",
   "admin.team.brandTextDescription": "Le texte de Markdown formaté marque personnalisée que vous souhaitez apparaître votre image de marque personnalisée ci-dessous sur votre écran de connexion .",
   "admin.team.brandTextTitle": "Nouveau texte personnalisé",
@@ -861,12 +897,13 @@
   "authorize.allow": "Autoriser",
   "authorize.app": "L'application <strong>{appName}</strong> souhaite accéder et modifier vos informations de base.",
   "authorize.deny": "Refuser",
-  "authorize.title": "Une application voudrait se connecter au compte de {teamName}",
+  "authorize.title": "<strong>{appName}</strong> voudrait se connecter à votre compte utilisateur <strong>Mattermost</strong>",
   "backstage_list.search": "Rechercher",
   "backstage_navbar.backToMattermost": "retour à {siteName}",
   "backstage_sidebar.integrations": "Intégrations",
   "backstage_sidebar.integrations.commands": "Commande Slash",
   "backstage_sidebar.integrations.incoming_webhooks": "Webhooks entrants",
+  "backstage_sidebar.integrations.oauthApps": "Applications OAuth 2.0",
   "backstage_sidebar.integrations.outgoing_webhooks": "Webhooks sortants",
   "center_panel.recent": "Cliquez ici pour voir les messages les plus récents. ",
   "chanel_header.addMembers": "Ajouter des membres",
@@ -896,7 +933,7 @@
   "channel_header.setHeader": "Choisir l'en-tête de {term}...",
   "channel_header.setPurpose": "Choisir la description de {term}...",
   "channel_header.viewInfo": "Informations",
-  "channel_header.viewMembers": "View Members",
+  "channel_header.viewMembers": "Voir les membres",
   "channel_info.about": "À propos",
   "channel_info.close": "Fermer",
   "channel_info.header": "En-tête :",
@@ -1076,7 +1113,7 @@
   "emoji_list.delete": "Supprimer",
   "emoji_list.empty": "Aucun emoji personnalisé",
   "emoji_list.help": "Les emoji personnalisés sont disponible pour tous les utilisateurs et apparaissent dans le menu d'autocomplétion des emoji. Il faut rafraîchir la page pour que les nouveaux emoji apparaissent.",
-  "emoji_list.help2": "Tip: If you add #, ##, or ### as the first character on a new line containing emoji, you can use larger sized emoji. To try it out, send a message such as: '# :smile:'.",
+  "emoji_list.help2": "Astuce : si vous ajoutez #, ## ou ### comme premier caractère d'une nouvelle ligne contenant un emoji, vous pourrez utiliser un emoji plus grand. Pour essayer, envoyez un message tel que '# :smile:'.",
   "emoji_list.image": "Image",
   "emoji_list.name": "Nom",
   "emoji_list.search": "Rechercher les emoji personnalisés",
@@ -1111,6 +1148,8 @@
   "find_team.placeholder": "vous@domaine.com",
   "find_team.send": "Envoyer",
   "find_team.submitError": "Veuillez entrer une adresse électronique valide",
+  "flag_post.flag": "Flag for follow up",
+  "flag_post.unflag": "Unflag",
   "general_tab.chooseName": "Choisissez un nom pour votre équipe",
   "general_tab.codeDesc": "Cliquez sur \"Modifier\" pour réinitialiser le code d'invitation",
   "general_tab.codeLongDesc": "Le code d'invitation est utilisé dans l'URL contenant l'invitation à votre équipe  créé depuis le menu principal grâce à <strong>Obtenir un lien d’invitation d’équipe</strong>. Regénérer cette clé rend toutes les invitations déjà envoyées invalide.",
@@ -1128,15 +1167,15 @@
   "general_tab.teamNameInfo": "Choisissez le nom de l'équipe tel qu'il apparait sur les pages de connexion et en haut de la barre latérale.",
   "general_tab.title": "Paramètres généraux",
   "general_tab.yes": "Oui",
-  "get_app.alreadyHaveIt": "Already have it?",
-  "get_app.androidAppName": "Mattermost for Android",
-  "get_app.androidHeader": "Mattermost works best if you switch to our Android app",
-  "get_app.continue": "continue",
-  "get_app.continueWithBrowser": "Or {link}",
-  "get_app.continueWithBrowserLink": "continue with browser",
-  "get_app.iosHeader": "Mattermost works best if you switch to our iPhone app",
+  "get_app.alreadyHaveIt": "Vous l'avez déjà ?",
+  "get_app.androidAppName": "Mattermost pour Android",
+  "get_app.androidHeader": "Mattermost fonctionne mieux si vous utilisez notre application Android",
+  "get_app.continue": "continuer",
+  "get_app.continueWithBrowser": "Ou {link}",
+  "get_app.continueWithBrowserLink": "continuer avec le navigateur",
+  "get_app.iosHeader": "Mattermost fonctionne mieux si vous utilisez notre application iPhone",
   "get_app.mattermostInc": "Mattermost, Inc",
-  "get_app.openMattermost": "Open Mattermost",
+  "get_app.openMattermost": "Ouvrir Mattermost",
   "get_link.clipboard": " URL copiée dans le presse-papiers.",
   "get_link.close": "Quitter",
   "get_link.copy": "Copier l'URL",
@@ -1161,14 +1200,35 @@
   "installed_incoming_webhooks.search": "Rechercher les webhooks entrants",
   "installed_incoming_webhooks.unknown_channel": "Webhook privé",
   "installed_integrations.callback_urls": "URLs de callback : {urls}",
+  "installed_integrations.client_id": "ID Client : <strong>{clientId}</strong>",
+  "installed_integrations.client_secret": "Secret client : <strong>{clientSecret}</strong>",
   "installed_integrations.content_type": "Content-Type: {contentType}",
   "installed_integrations.creation": "Créé par {creator} le {createAt, date, full}",
   "installed_integrations.delete": "Supprimer",
+  "installed_integrations.hideSecret": "Cacher le secret",
   "installed_integrations.regenToken": "Re-générer le jeton",
+  "installed_integrations.showSecret": "Afficher le secret",
   "installed_integrations.token": "Token : {token}",
-  "installed_integrations.triggerWhen": "Trigger When: {triggerWhen}",
+  "installed_integrations.triggerWhen": "Déclencher quand : {triggerWhen}",
   "installed_integrations.triggerWords": "Mots de déclenchement : {triggerWords}",
+  "installed_integrations.unnamed_oauth_app": "Application OAuth 2.0 sans nom",
   "installed_integrations.url": "URL : {url}",
+  "installed_oauth_apps.add": "Ajouter une application OAuth 2.0",
+  "installed_oauth_apps.callbackUrls": "URLs de callback (une par ligne)",
+  "installed_oauth_apps.cancel": "Annuler",
+  "installed_oauth_apps.description": "Description",
+  "installed_oauth_apps.empty": "Pas d'applications OAuth 2.0 trouvées",
+  "installed_oauth_apps.header": "Applications OAuth 2.0",
+  "installed_oauth_apps.help": "Les applications OAuth 2.0 sont accessibles à tous sur votre serveur.",
+  "installed_oauth_apps.homepage": "Page d'accueil",
+  "installed_oauth_apps.iconUrl": "URL de l'icône",
+  "installed_oauth_apps.is_trusted": "De confiance : <strong>{isTrusted}</strong>",
+  "installed_oauth_apps.name": "Nom d'affichage",
+  "installed_oauth_apps.save": "Enregistrer",
+  "installed_oauth_apps.search": "Rechercher les applications OAuth 2.0",
+  "installed_oauth_apps.trusted": "De confiance",
+  "installed_oauth_apps.trusted.no": "Non",
+  "installed_oauth_apps.trusted.yes": "Oui",
   "installed_outgoing_webhooks.add": "Ajouter des Webhooks sortants",
   "installed_outgoing_webhooks.empty": "Aucun webhooks sortants trouvés",
   "installed_outgoing_webhooks.header": "Webhooks sortants",
@@ -1181,6 +1241,8 @@
   "integrations.header": "Intégrations",
   "integrations.incomingWebhook.description": "Les webhooks entrants permettent des intégrations externes afin d'envoyer des messages",
   "integrations.incomingWebhook.title": "Webhooks entrants",
+  "integrations.oauthApps.description": "OAuth 2.0 autorise les applications externes à faire des requêtes autorisées à l'API Mattermost.",
+  "integrations.oauthApps.title": "Applications OAuth 2.0",
   "integrations.outgoingWebhook.description": "Les webhooks sortants permettent des intégrations externes afin de recevoir et de répondre aux messages",
   "integrations.outgoingWebhook.title": "Webhooks sortants",
   "intro_messages.DM": "Vous êtes au début de votre historique de messages avec {teammate}.<br />Les messages privés et les fichiers partagés ici ne sont visibles pour personne d'autre.",
@@ -1297,13 +1359,13 @@
   "navbar_dropdown.leave": "Quitter l'équipe",
   "navbar_dropdown.logout": "Se déconnecter",
   "navbar_dropdown.manageMembers": "Gérer les membres",
-  "navbar_dropdown.nativeApps": "Download Native Apps",
+  "navbar_dropdown.nativeApps": "Télécharger les applications natives",
   "navbar_dropdown.report": "Signaler un problème",
   "navbar_dropdown.switchTeam": "Basculer sur {team}",
   "navbar_dropdown.switchTo": "Basculer vers ",
   "navbar_dropdown.teamLink": "Obtenir un lien d'invitation d'équipe",
   "navbar_dropdown.teamSettings": "Configuration de l'équipe",
-  "navbar_dropdown.viewMembers": "View Members",
+  "navbar_dropdown.viewMembers": "Voir les membres",
   "notification.dm": "Message privé",
   "password_form.change": "Modifier mon mot de passe",
   "password_form.click": "Cliquez <a href={url}>ici</a> pour vous connecter.",
@@ -1334,29 +1396,12 @@
   "post_focus_view.beginning": "Début des archives du canal",
   "post_info.del": "Supprimer",
   "post_info.edit": "Éditer",
+  "post_info.mobile.flag": "Flag",
+  "post_info.mobile.unflag": "Unflag",
   "post_info.permalink": "Lien permanent",
   "post_info.reply": "Répondre",
   "posts_view.loadMore": "Charger plus de messages",
   "posts_view.newMsg": "Nouveaux messages",
-  "register_app.callback": "URL Callback",
-  "register_app.callbackError": "Au moins une URL de retour (callback) doit être renseignée.",
-  "register_app.cancel": "Annuler",
-  "register_app.clientId": "ID Client",
-  "register_app.clientSecret": "Secret client",
-  "register_app.close": "Fermer",
-  "register_app.credentialsDescription": "Sauvegardez-les dans un endroit sûr et sécurisé. Considérez votre ID Client comme votre nom d'utilisateur et votre Secret client comme votre mot de passe.",
-  "register_app.credentialsSave": "J'ai sauvegardé à la fois mon Id Client et mon Secret client dans un endroit sûr",
-  "register_app.credentialsTitle": "Vos identifiants d'application",
-  "register_app.description": "Description",
-  "register_app.dev": "Applications développeur",
-  "register_app.homepage": "URL de la page d'accueil",
-  "register_app.homepageError": "La page d'accueil doit être renseignée.",
-  "register_app.name": "Nom de l'application",
-  "register_app.nameError": "Le nom de l'application doit être renseigné.",
-  "register_app.optional": "Optionnel",
-  "register_app.register": "Enregistrer",
-  "register_app.required": "Obligatoire",
-  "register_app.title": "Enregistrer une nouvelle application",
   "removed_channel.channelName": "le canal",
   "removed_channel.from": "Retiré de ",
   "removed_channel.okay": "Ok",
@@ -1376,7 +1421,10 @@
   "rhs_comment.comment": "Commentaire",
   "rhs_comment.del": "Supprimer",
   "rhs_comment.edit": "Éditer",
+  "rhs_comment.mobile.flag": "Flag",
+  "rhs_comment.mobile.unflag": "Unflag",
   "rhs_comment.permalink": "Lien permanent",
+  "rhs_header.backToFlaggedTooltip": "Back to Flagged Posts",
   "rhs_header.backToResultsTooltip": "Retour aux résultats",
   "rhs_header.closeSidebarTooltip": "Fermer la barre latérale",
   "rhs_header.details": "Détails du message",
@@ -1385,12 +1433,15 @@
   "rhs_root.del": "Supprimer",
   "rhs_root.direct": "Messages privés",
   "rhs_root.edit": "Éditer",
+  "rhs_root.mobile.flag": "Flag",
+  "rhs_root.mobile.unflag": "Unflag",
   "rhs_root.permalink": "Lien permanent",
   "search_bar.cancel": "Annuler",
   "search_bar.search": "Rechercher",
   "search_bar.usage": "<h4>Options de recherche</h4><ul><li><span>Utilisez </span><b>\"des guillemets\"</b><span> pour rechercher des phrases</span></li><li><span>Utilisez </span><b>from:</b><span> pour rechercher les messages d'utilisateur spécifiques et </span><b>in:</b><span> pour rechercher les messages sur des canaux spécifiques</span></li></ul>",
   "search_header.results": "Résultats de la recherche",
   "search_header.title2": "Mentions récentes",
+  "search_header.title3": "Flagged Posts",
   "search_item.direct": "Message direct",
   "search_item.jump": "Lien (jump)",
   "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>",
@@ -1423,11 +1474,12 @@
   "sidebar_header.tutorial": "<h4>Menu principal</h4><p>Le <strong>Menu Principal</strong> est l'endroit où vous pouvez <strong>inviter de 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.console": "Console système",
+  "sidebar_right_menu.flagged": "Flagged Posts",
   "sidebar_right_menu.help": "Aide",
   "sidebar_right_menu.inviteNew": "Inviter un nouveau membre",
   "sidebar_right_menu.logout": "Se déconnecter",
   "sidebar_right_menu.manageMembers": "Gérer les membres",
-  "sidebar_right_menu.nativeApps": "Download Native App",
+  "sidebar_right_menu.nativeApps": "Télécharger une application native",
   "sidebar_right_menu.recentMentions": "Mentions récentes",
   "sidebar_right_menu.report": "Signaler un problème",
   "sidebar_right_menu.switch_team": "Sélection de l'équipe",
@@ -1460,7 +1512,7 @@
   "signup_user_completed.lets": "Créer votre compte",
   "signup_user_completed.no_open_server": "Ce serveur ne permet pas d'inscriptions ouvertes. Aller voir avec votre Administrateur pour recevoir une invitation",
   "signup_user_completed.none": "Aucune méthode de création d'utilisateur n'est disponible. Veuillez contacter votre administrateur système pour obtenir un accès.",
-  "signup_user_completed.office365": "with Office 365",
+  "signup_user_completed.office365": "avec Office 365",
   "signup_user_completed.onSite": "activé {siteName}",
   "signup_user_completed.or": "ou",
   "signup_user_completed.passwordLength": "Veuillez entrer au moins {min} caractères",
@@ -1481,7 +1533,7 @@
   "sso_signup.team_error": "Saisissez le nom de votre équipe",
   "suggestion.mention.all": "Avertit tout le monde dans le canal, utilisez dans {townsquare} pour notifier toute l'équipe",
   "suggestion.mention.channel": "Notifier tout le monde dans le canal",
-  "suggestion.mention.here": "Notifies everyone in the channel and online",
+  "suggestion.mention.here": "Notifier toutes les personnes connectées dans ce canal",
   "suggestion.search.private": "Groupes privés",
   "suggestion.search.public": "Canaux publics",
   "team_export_tab.download": "Télécharger",
@@ -1528,8 +1580,8 @@
   "tutorial_intro.allSet": "C'est parti !",
   "tutorial_intro.end": "Cliquez sur \"Suivant\" pour entrer dans {channel}. C'est le premier canal que les membres voient quand ils s'inscrivent. Utilisez-le pour poster des messages que tout le monde doit lire en premier.",
   "tutorial_intro.invite": "Inviter des membres",
-  "tutorial_intro.mobileApps": "Install the apps for {link} for easy access and notifications on the go.",
-  "tutorial_intro.mobileAppsLinkText": "PC, Mac, iOS and Android",
+  "tutorial_intro.mobileApps": "Installer les applications pour {link} pour un accès facile et des notifications en mobilité.",
+  "tutorial_intro.mobileAppsLinkText": "PC, Mac, iOS et Android",
   "tutorial_intro.next": "Suivant",
   "tutorial_intro.screenOne": "<h3>Bienvenue sur :</h3><h1>Mattermost</h1><p>Toute la communication de votre équipe à un seul endroit, instantanément consultable et disponible partout.</p><p>Gardez le lien avec votre équipe pour accomplir les tâches les plus importantes.</p>",
   "tutorial_intro.screenTwo": "<h3>Comment fonctionne Mattermost :</h3><p>Vous pouvez échanger dans des canaux publics, des groupes privés ou des messages privés.</p><p>Tout est archivé et peut être recherché depuis n'importe quel navigateur web de bureau, tablette ou mobile.</p>",
@@ -1581,10 +1633,6 @@
   "user.settings.custom_theme.sidebarTextHoverBg": "Fond de survol (hover) de barre latérale",
   "user.settings.custom_theme.sidebarTitle": "Style des barres latérales",
   "user.settings.custom_theme.sidebarUnreadText": "Texte non-lu de barre latérale",
-  "user.settings.developer.applicationsPreview": "Applications (Aperçu)",
-  "user.settings.developer.register": "Enregistrer une nouvelle application",
-  "user.settings.developer.thirdParty": "Ouvrez pour enregistrer une nouvelle application tierce",
-  "user.settings.developer.title": "Paramètres de développement",
   "user.settings.display.channelDisplayTitle": "Mode d’affichage du canal",
   "user.settings.display.channeldisplaymode": "Sélectionner la largeur du canal central.",
   "user.settings.display.clockDisplay": "Affichage de l'horloge",
@@ -1668,6 +1716,7 @@
   "user.settings.import_theme.submit": "Envoyer",
   "user.settings.import_theme.submitError": "Format invalide, veuillez réessayer de copier-coller.",
   "user.settings.languages.change": "Changer la langue de l'interface",
+  "user.settings.languages.promote": "Select which language Mattermost displays in the user interface.<br /><br />Would like to help with translations? Join the <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> to contribute.",
   "user.settings.mfa.add": "Ajouter une identification à multi-facteur à votre compte",
   "user.settings.mfa.addHelp": "Vous pouvez demander un token provenant d'un smartphone, en plus de votre mot de passe, pour vous connecter à Mattermost.<br/><br/>Pour l'activer, télécharger Google Authenticator depuis <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> pour votre téléphone, puis<br/><br/>1. Cliquez sur le bouton <strong>Ajouter une identification à multi-facteur à votre compte</strong> ci-dessus.<br/>2 . Utilisez Google Authenticator pour scanner le code QR qui apparaît.<br/>3. Tapez le jeton généré par Google Authenticator et cliquez sur <strong >Enregistrer</strong>.<br/><br/> Lors de la connexion, vous serez invité à entrer un jeton de Google Authenticator en plus de vos informations d'identification régulières.",
   "user.settings.mfa.addHelpQr": "Scanner le code-barres avec l'application Google Authenticator sur votre smartphone et remplir le jeton avec celui fourni par l'application.",
@@ -1675,26 +1724,24 @@
   "user.settings.mfa.qrCode": "Code barre",
   "user.settings.mfa.remove": "Retirer l’authentification à facteurs multiples",
   "user.settings.mfa.removeHelp": "Retirer l’authentification multi-facteur signifie que vous n’aurez plus besoin d'un code d'accès basé sur un téléphone pour vous connecter à votre compte.",
+  "user.settings.mfa.title": "Activité l’authentification multi-facteurs:",
   "user.settings.modal.advanced": "Options avancées",
   "user.settings.modal.confirmBtns": "Oui, abandonner",
   "user.settings.modal.confirmMsg": "Certaines modifications ne sont pas sauvegardées, voulez-vous vraiment abandonner ?",
   "user.settings.modal.confirmTitle": "Abandonner les modifications ?",
-  "user.settings.modal.developer": "Développeur",
   "user.settings.modal.display": "Affichage",
   "user.settings.modal.general": "Général",
   "user.settings.modal.notifications": "Notifications",
   "user.settings.modal.security": "Sécurité",
   "user.settings.modal.title": "Paramètres du compte",
-  "user.settings.notification.allActivity": "Pour toute l'activité",
-  "user.settings.notification.push": "Notifications push mobile",
-  "user.settings.notification.soundConfig": "Configurez les sons des notifications dans les préférences de votre navigateur",
+  "user.settings.notifications.allActivity": "Pour toute l'activité",
   "user.settings.notifications.channelWide": "Mentions globales \"@channel\", \"@all\"",
   "user.settings.notifications.close": "Quitter",
-  "user.settings.notifications.comments": "Comment threads notifications",
-  "user.settings.notifications.commentsAny": "Mention any comments in a thread you participated in (This will include both mentions to your root post and any comments after you commented on a post)",
-  "user.settings.notifications.commentsInfo": "Mode of triggering notifications on posts in comment threads you participated in.",
-  "user.settings.notifications.commentsNever": "No mentions for comments",
-  "user.settings.notifications.commentsRoot": "Mention any comments on your post",
+  "user.settings.notifications.comments": "Notifications des fils de commentaires",
+  "user.settings.notifications.commentsAny": "Mentionner tous les commentaires dans un fil auquel vous aviez participé (cela inclus à la fois les mentions à votre message d'origine ainsi que n'importe quel commentaire ajouté par la suite)",
+  "user.settings.notifications.commentsInfo": "Mode de déclenchement des notifications des messages sur les fils de commentaires auxquels vous avez participé.",
+  "user.settings.notifications.commentsNever": "Pas de mentions pour les commentaires",
+  "user.settings.notifications.commentsRoot": "Mentionner n'importe quel commentaire sur votre message",
   "user.settings.notifications.desktop": "Envoyer des notifications sur le bureau",
   "user.settings.notifications.desktopSounds": "Sons des notifications",
   "user.settings.notifications.emailInfo": "Les notifications par courriel sont envoyées pour les mentions et les messages privés après que vous êtes hors-ligne plus de 60 secondes ou parti de {siteName} pendant plus de 5 minutes.",
@@ -1706,9 +1753,11 @@
   "user.settings.notifications.off": "Désactivé",
   "user.settings.notifications.on": "Activé",
   "user.settings.notifications.onlyMentions": "Seulement pour les mentions et messages privés",
+  "user.settings.notifications.push": "Notifications push mobile",
   "user.settings.notifications.sensitiveName": "Votre prénom (respectant la casse) \"{first_name}\"",
   "user.settings.notifications.sensitiveUsername": "Votre nom d'utilisateur (insensible à la casse) \"{username}\"",
   "user.settings.notifications.sensitiveWords": "Autres mots insensibles à la casse, séparés par des virgules :",
+  "user.settings.notifications.soundConfig": "Configurez les sons des notifications dans les préférences de votre navigateur",
   "user.settings.notifications.sounds_info": "Les notifications sur le bureau sont disponibles avec Firefox, Safari, Chrome, Internet Explorer et Edge.",
   "user.settings.notifications.teamWide": "Mentions à toute l'équipe \"@all\"",
   "user.settings.notifications.title": "Paramètres de notification",
@@ -1762,7 +1811,7 @@
   "user.settings.security.switchGitlab": "Utiliser GitLab SSO",
   "user.settings.security.switchGoogle": "Utiliser Google SSO",
   "user.settings.security.switchLdap": "Changer pour utiliser LDAP",
-  "user.settings.security.switchOffice365": "Switch to using Office 365 SSO",
+  "user.settings.security.switchOffice365": "Utiliser l'authentification unique Office 365",
   "user.settings.security.switchSaml": "Utiliser GitLab SSO",
   "user.settings.security.title": "Paramètres de sécurité",
   "user.settings.security.viewHistory": "Voir l'historique des accès",
@@ -1776,6 +1825,6 @@
   "web.footer.privacy": "Confidentialité",
   "web.footer.terms": "Termes",
   "web.header.back": "Précédent",
-  "web.root.signup_info": "Toute la communication de votre équipe à un endroit, accessible de partout",
+  "web.root.signup_info": "Toute la communication de votre équipe au même endroit, accessible de partout",
   "youtube_video.notFound": "Vidéo non trouvé"
 }
diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json
index 24d8d3258..765161b4f 100644
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -30,21 +30,21 @@
   "activity_log_modal.androidNativeApp": "Androidネイティブアプリ",
   "activity_log_modal.iphoneNativeApp": "iPhoneネイティブアプリ",
   "add_command.autocomplete": "自動補完",
-  "add_command.autocomplete.help": "(Optional) Show slash command in autocomplete list.",
+  "add_command.autocomplete.help": "(オプション) 自動補完リストにスラッシュコマンドを表示する。",
   "add_command.autocompleteDescription": "自動補完の説明",
-  "add_command.autocompleteDescription.help": "自動補完リストのスラッシュコマンドについての追加の短い説明",
+  "add_command.autocompleteDescription.help": "(オプション) 自動補完リストのスラッシュコマンドについての短い説明",
   "add_command.autocompleteDescription.placeholder": "例: \"カルテの検索結果を返す\"",
   "add_command.autocompleteHint": "自動補完のヒント",
-  "add_command.autocompleteHint.help": "(Optional) Arguments associated with your slash command, displayed as help in the autocomplete list.",
+  "add_command.autocompleteHint.help": "(オプション) あなたのスラッシュコマンドに紐づく引数です。これは自動補完リストに表示されます。",
   "add_command.autocompleteHint.placeholder": "例: [患者氏名]",
   "add_command.cancel": "キャンセル",
   "add_command.description": "説明",
-  "add_command.description.help": "Description for your incoming webhook.",
+  "add_command.description.help": "内向きのウェブフックについての説明です。",
   "add_command.displayName": "表示名",
-  "add_command.displayName.help": "Display name for your slash command made of up to 64 characters.",
+  "add_command.displayName.help": "最大64文字のスラッシュコマンドの表示名",
   "add_command.header": "追加する",
   "add_command.iconUrl": "応答アイコン",
-  "add_command.iconUrl.help": "このスラッシュコマンドに返信する投稿のプロフィール画像を上書きする画像を選択します。最低128ピクセル×12ピクセルの大きさを持つ.pngまたは.jpgファイルのURLを指定してください。",
+  "add_command.iconUrl.help": "(オプション) このスラッシュコマンドへの返信となる投稿のプロフィール画像を上書きする画像を選択します。最低128ピクセル×128ピクセルの大きさを持つ.pngまたは.jpgファイルのURLを指定してください。",
   "add_command.iconUrl.placeholder": "https://www.example.com/myicon.png",
   "add_command.method": "リクエストメソッド",
   "add_command.method.get": "GET",
@@ -52,10 +52,10 @@
   "add_command.method.post": "POST",
   "add_command.save": "保存する",
   "add_command.trigger": "コマンドトリガーワード",
-  "add_command.trigger.help": "Trigger word must be unique, and cannot begin with a slash or contain any spaces.",
-  "add_command.trigger.helpExamples": "Examples: client, employee, patient, weather",
-  "add_command.trigger.helpReserved": "Reserved: {link}",
-  "add_command.trigger.helpReservedLinkText": "see list of built-in slash commands",
+  "add_command.trigger.help": "トリガーワードは重複してはいけません。また、スラッシュで始めることや、スペースを含めることもできません。",
+  "add_command.trigger.helpExamples": "例: client, employee, patient, weather",
+  "add_command.trigger.helpReserved": "予約語: {link}",
+  "add_command.trigger.helpReservedLinkText": "内蔵スラッシュコマンドのリストを見る",
   "add_command.trigger.placeholder": "コマンドトリガー 例: \"hello\"",
   "add_command.triggerInvalidLength": "トリガーワードは{min}文字以上{max}文字以下にしてください。",
   "add_command.triggerInvalidSlash": "トリガーワードは/で始めることはできません",
@@ -66,7 +66,7 @@
   "add_command.url.placeholder": "http://またはhttps://から始まらなくてはいけません",
   "add_command.urlRequired": "リクエストURLが必要です",
   "add_command.username": "返信ユーザー名",
-  "add_command.username.help": "このスラッシュコマンドに返信する投稿のユーザー名を上書きするユーザー名を選択します。22文字以下の小文字の英数字と記号(\"-\"、\"_\"、\".\"のみ使用可能)で指定してください。",
+  "add_command.username.help": "(オプション) このスラッシュコマンドへの返信となる投稿のユーザー名を上書きするユーザー名を選択します。ユーザー名は英小文字、数字、記号(\"-\"、\"_\"、\".\"のみ)を使用し、22文字以内にしてください。",
   "add_command.username.placeholder": "ユーザー名",
   "add_emoji.cancel": "キャンセル",
   "add_emoji.header": "追加",
@@ -84,39 +84,51 @@
   "add_emoji.save": "保存",
   "add_incoming_webhook.cancel": "キャンセル",
   "add_incoming_webhook.channel": "チャンネル",
-  "add_incoming_webhook.channel.help": "Public channel or private group that receives the webhook payloads. You must belong to the private group when setting up the webhook.",
+  "add_incoming_webhook.channel.help": "ウェブフックのペイロードを受け取る公開チャンネル・非公開グループです。非公開グループにウェブフックを設定する時は、そのグループに属していなければなりません。",
   "add_incoming_webhook.channelRequired": "有効なチャンネルが必要です",
   "add_incoming_webhook.description": "説明",
-  "add_incoming_webhook.description.help": "Description for your incoming webhook.",
+  "add_incoming_webhook.description.help": "内向きのウェブフックについての説明です。",
   "add_incoming_webhook.displayName": "表示名",
-  "add_incoming_webhook.displayName.help": "Display name for your incoming webhook made of up to 64 characters.",
+  "add_incoming_webhook.displayName.help": "最大64文字の内向きのウェブフックの表示名です。",
   "add_incoming_webhook.header": "追加する",
   "add_incoming_webhook.name": "名前",
   "add_incoming_webhook.save": "保存する",
+  "add_oauth_app.callbackUrls.help": "アプリケーションの認可が承諾、もしくは拒否された場合にサービスがユーザーを転送する際や、認証コードやアクセストークンを扱う際のリダイレクトURLです。 http:// もしくは https:// で始まる有効なURLにしてください。",
+  "add_oauth_app.callbackUrlsRequired": "1つ以上のコールバックURLが必要です",
+  "add_oauth_app.description.help": "OAuth 2.0アプリケーションの説明です。",
+  "add_oauth_app.descriptionRequired": "OAuth 2.0アプリケーションの説明は必須です。",
+  "add_oauth_app.header": "追加する",
+  "add_oauth_app.homepage.help": "OAuth 2.0アプリケーションのホームページのURLです。サーバーの設定によりHTTPかHTTPSかは異なりますので注意してください。",
+  "add_oauth_app.homepageRequired": "OAuth 2.0アプリケーションのホームページは必須です。",
+  "add_oauth_app.icon.help": "(オプション) OAuth 2.0アプリケーションで使う画像のURLです。URLのHTTPかHTTPSのどちらを使うか注意してください。",
+  "add_oauth_app.name.help": "最大64文字のOAuth 2.0アプリケーションの表示名",
+  "add_oauth_app.nameRequired": "OAuth 2.0アプリケーションの名前は必須です。",
+  "add_oauth_app.trusted.help": "有効な場合、OAuth 2.0アプリケーションはMattermostサーバによって信頼済みとみなされ、ユーザーに認可を要求しなくなります。無効な場合、ユーザーに認可を許可するか、もしくは拒否するかを確認するウィンドウを表示します。",
   "add_outgoing_webhook.callbackUrls": "コールバックURL(1つにつき1行)",
-  "add_outgoing_webhook.callbackUrls.help": "The URL that messages will be sent to.",
+  "add_outgoing_webhook.callbackUrls.help": "メッセージ送信先のURL",
   "add_outgoing_webhook.callbackUrlsRequired": "1つ以上のコールバックURLが必要です",
   "add_outgoing_webhook.cancel": "キャンセル",
   "add_outgoing_webhook.channel": "チャンネル",
-  "add_outgoing_webhook.channel.help": "Public channel to receive webhook payloads. Optional if at least one Trigger Word is specified.",
-  "add_outgoing_webhook.contentType.help1": "Choose the content type by which the response will be sent.",
-  "add_outgoing_webhook.contentType.help2": "If application/x-www-form-urlencoded is chosen, the server assumes you will be encoding the parameters in a URL format.",
-  "add_outgoing_webhook.contentType.help3": "If application/json is chosen, the server assumes you will posting JSON data.",
+  "add_outgoing_webhook.channel.help": "ウェブフックのペイロードを受け取る公開チャンネルです。少なくとも一つのトリガーワードが指定されている場合のオプションです。",
+  "add_outgoing_webhook.contentType.help1": "レスポンスのコンテントタイプを選択してください。",
+  "add_outgoing_webhook.contentType.help2": "application/x-www-form-urlencoded を選択した場合、サーバーはパラメーターがURLエンコードされていると見なします。",
+  "add_outgoing_webhook.contentType.help3": "application/json を選択した場合、サーバーはあなたがJSONデータをPOSTするものと見なします。",
   "add_outgoing_webhook.content_Type": "コンテントタイプ",
   "add_outgoing_webhook.description": "説明",
-  "add_outgoing_webhook.description.help": "Description for your outgoing webhook.",
+  "add_outgoing_webhook.description.help": "外向きのウェブフックについての説明",
   "add_outgoing_webhook.displayName": "表示名",
-  "add_outgoing_webhook.displayName.help": "Display name for your outgoing webhook made of up to 64 characters.",
+  "add_outgoing_webhook.displayName.help": "最大64文字の外向きのウェブフックの表示名",
   "add_outgoing_webhook.header": "追加する",
   "add_outgoing_webhook.name": "名前",
   "add_outgoing_webhook.save": "保存する",
   "add_outgoing_webhook.triggerWords": "トリガーワード(1つにつき1行)",
-  "add_outgoing_webhook.triggerWords.help": "Messages that start with one of the specified words will trigger the outgoing webhook. Optional if Channel is selected.",
+  "add_outgoing_webhook.triggerWords.help": "ここで指定された単語の一つで始まるメッセージが外向きのウェブフックをトリガーします。チャンネルが選択されている場合のオプションです。",
   "add_outgoing_webhook.triggerWordsOrChannelRequired": "有効なチャンネルまたはトリガーワードのリストが必要です",
-  "add_outgoing_webhook.triggerWordsTriggerWhen": "Trigger When",
-  "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choose when to trigger the outgoing webhook; if the first word of a message matches a Trigger Word exactly, or if it starts with a Trigger Word.",
-  "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "First word matches a trigger word exactly",
-  "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "First word starts with a trigger word",
+  "add_outgoing_webhook.triggerWordsTriggerWhen": "トリガーとなる場合",
+  "add_outgoing_webhook.triggerWordsTriggerWhen.help": "外向きのウェブフックのトリガーとなる場合を選択してください。メッセージの最初の単語がトリガーワードと正確に一致する場合、もしくはトリガーワードで始まる場合。",
+  "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "最初の単語がトリガーワードと正確に一致する",
+  "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "最初の単語がトリガーワードで始まる",
+  "admin.advance.cluster": "高可用(ベータ版)",
   "admin.audits.reload": "再読み込み",
   "admin.audits.title": "ユーザーのアクティビティー",
   "admin.authentication.email": "電子メールアドレス認証",
@@ -124,12 +136,30 @@
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "注意:",
+  "admin.cluster.enableDescription": "有効にした場合、Mattermostは高可用モードで動作するようになります。高可用モードの設定について詳しくは、<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">説明文書</a>を参照してください。",
+  "admin.cluster.enableTitle": "高可用モードを有効にする:",
+  "admin.cluster.interNodeListenAddressDesc": "他のサーバーと通信するための接続待ちアドレスです。",
+  "admin.cluster.interNodeListenAddressEx": "例: \":8075\"",
+  "admin.cluster.interNodeListenAddressTitle": "ノード間接続待ちアドレス:",
+  "admin.cluster.interNodeUrlsDesc": "カンマで区切られた全Mattermostサーバの内部URL/非公開URLです。",
+  "admin.cluster.interNodeUrlsEx": "例 \"http://10.10.10.30, http://10.10.10.31\"",
+  "admin.cluster.interNodeUrlsTitle": "ノード間URL:",
+  "admin.cluster.loadedFrom": "この設定ファイルはノードID {clusterId} からロードされます。ロードバランサーからシステムコンソールにアクセスしている場合や問題が発生している場合は、<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">説明文書</a> のTroubleshooting Guideを参照してください。",
+  "admin.cluster.noteDescription": "このセクションでの設定値の変更を有効にするにはサーバーを再起動させる必要があります。効果用モードを有効にした場合、システムコンソールは読み込み専用となり、設定ファイルからのみ変更可能となります。",
+  "admin.cluster.should_not_change": "警告: これらの設定はクラスター内のほかのサーバーと同期されません。高可用なノード間接続は、全てのサーバーのconfig.jsonを同一に設定し、Mattermostを再起動するまで開始されません。クラスターからサーバーを追加/削除する方法については<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">説明文書</a>を参照してください。 ロードバランサーからシステムコンソールにアクセスしている場合や問題が発生している場合は、<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">説明文書</a> のTroubleshooting Guideを参照してください。",
+  "admin.cluster.status_table.config_hash": "設定ファイルのMD5ハッシュ値",
+  "admin.cluster.status_table.hostname": "ホスト名",
+  "admin.cluster.status_table.id": "ノードID",
+  "admin.cluster.status_table.reload": " クラスターの状態をリロードしてください",
+  "admin.cluster.status_table.status": "状態",
+  "admin.cluster.status_table.url": "ノード間URL",
+  "admin.cluster.status_table.version": "バージョン",
   "admin.compliance.directoryDescription": "コンプライアンスリポートを書き込むディレクトリー。空欄の場合には./data/に書き込みます。",
   "admin.compliance.directoryExample": "例: \"./data/\"",
   "admin.compliance.directoryTitle": "コンプライアンスリポートディレクトリー:",
   "admin.compliance.enableDailyDesc": "有効な場合、Mattermostが毎日コンプライアンスリポートを生成します。",
   "admin.compliance.enableDailyTitle": "日次リポートを有効にする",
-  "admin.compliance.enableDesc": "When true, Mattermost allows compliance reporting from the <strong>Compliance and Auditing</strong> tab. See <a href=\"https://docs.mattermost.com/administration/compliance.html\" target=\"_blank\">documentation</a> to learn more.",
+  "admin.compliance.enableDesc": "有効な場合、Mattermostは<strong>Compliance and Auditing</strong>タブからのコンプライアンスリポートを許可します。詳しくは、<a href=\"https://docs.mattermost.com/administration/compliance.html\" target=\"_blank\">説明文書</a>を参照してください。",
   "admin.compliance.enableTitle": "コンプライアンスリポートを有効にする:",
   "admin.compliance.false": "無効",
   "admin.compliance.noLicense": "<h4 class=\"banner__heading\">注意:</h4><p>コンプライアンスはエンタープライズ版のみの機能です。現在のライセンスはコンプライアンスをサポートしていません。詳しくは<a href=\"http://mattermost.com\" target=\"_blank\">エンタープライズ版についての情報と価格</a>をご覧ください。</p>",
@@ -166,32 +196,32 @@
   "admin.connectionSecurityTitle": "接続のセキュリティー:",
   "admin.connectionSecurityTls": "TLS",
   "admin.connectionSecurityTlsDescription": "Mattermostとあなたのサーバー間のコミュニケーションを暗号化します。",
-  "admin.customization.androidAppDownloadLinkDesc": "Add a link to download the Android app. Users who access the site on a mobile web browser will be prompted with a page giving them the option to download the app. Leave this field blank to prevent the page from appearing.",
-  "admin.customization.androidAppDownloadLinkTitle": "Android App Download Link:",
-  "admin.customization.appDownloadLinkDesc": "Add a link to a download page for the Mattermost apps. When a link is present, an option to \"Download Mattermost Apps\" will be added in the Main Menu so users can find the download page. Leave this field blank to hide the option from the Main Menu.",
-  "admin.customization.appDownloadLinkTitle": "Mattermost Apps Download Page Link:",
+  "admin.customization.androidAppDownloadLinkDesc": "Androidアプリのダウンロードリンクを追加してください。モバイル用ウェブブラウザでサイトにアクセスしたユーザへ、アプリをダウンロードするか選択するページを表示します。空欄にした場合、そのページは表示されません。",
+  "admin.customization.androidAppDownloadLinkTitle": "Androidアプリダウンロード用リンク:",
+  "admin.customization.appDownloadLinkDesc": "Mattermostアプリのダウンロードページへのリンクを追加してください。リンクを追加すると \"Download Mattermost Apps\" のオプションがメインメニューに追加されるため、ユーザがダウンロードページを見つけることができます。空欄にした場合、メインメニューにオプションは追加されません。",
+  "admin.customization.appDownloadLinkTitle": "Mattermostアプリダウンロードページリンク:",
   "admin.customization.customBrand": "独自ブランド設定",
   "admin.customization.customEmoji": "カスタム絵文字",
   "admin.customization.enableCustomEmojiDesc": "ユーザーがメッセージ中で使用するカスタム絵文字の作成を有効にします。有効にした場合、カスタム絵文字は、チームに切り替え、チャンネルのサイドバー3点マークをクリックして、「カスタム絵文字」を選択することで設定できます。",
-  "admin.customization.enableCustomEmojiTitle": "独自の絵文字を有効化する:",
-  "admin.customization.iosAppDownloadLinkDesc": "Add a link to download the iOS app. Users who access the site on a mobile web browser will be prompted with a page giving them the option to download the app. Leave this field blank to prevent the page from appearing.",
-  "admin.customization.iosAppDownloadLinkTitle": "iOS App Download Link:",
-  "admin.customization.nativeAppLinks": "Native App Links",
+  "admin.customization.enableCustomEmojiTitle": "カスタム絵文字を有効にする:",
+  "admin.customization.iosAppDownloadLinkDesc": "iOSアプリのダウンロードリンクを追加してください。モバイル用ウェブブラウザでサイトにアクセスしたユーザへ、アプリをダウンロードするか選択するページを表示します。空欄にした場合、そのページは表示されません。",
+  "admin.customization.iosAppDownloadLinkTitle": "iOSアプリダウンロード用リンク:",
+  "admin.customization.nativeAppLinks": "ネイティブアプリ用リンク",
   "admin.customization.restrictCustomEmojiCreationAdmin": "システム管理者とチーム管理者にカスタム絵文字を作成できるようにする",
-  "admin.customization.restrictCustomEmojiCreationAll": "全員に独自の絵文字を作成できるようにする",
-  "admin.customization.restrictCustomEmojiCreationDesc": "特定のユーザーに独自の絵文字の作成を限定します。",
-  "admin.customization.restrictCustomEmojiCreationSystemAdmin": "システム管理者のみが独自の絵文字を作成できるようにする",
-  "admin.customization.restrictCustomEmojiCreationTitle": "独自の絵文字の作成を制限する:",
+  "admin.customization.restrictCustomEmojiCreationAll": "全員にカスタム絵文字を作成できるようにする",
+  "admin.customization.restrictCustomEmojiCreationDesc": "特定のユーザーにカスタム絵文字の作成を限定します。",
+  "admin.customization.restrictCustomEmojiCreationSystemAdmin": "システム管理者のみがカスタム絵文字を作成できるようにする",
+  "admin.customization.restrictCustomEmojiCreationTitle": "カスタム絵文字の作成を制限する:",
   "admin.customization.support": "法的事項とサポート",
   "admin.database.title": "データベースの設定",
   "admin.developer.title": "開発者の設定",
   "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.allowEmailSignInTitle": "電子メールアドレスでのログインを有効にする: ",
   "admin.email.allowSignupDescription": "有効な場合、Mattermostはチームの作成と電子メールアドレスとパスワードによる利用登録を許可します。この値は利用登録をOAuthまたはLDAPによるシングルサインオンに制限したい時のみ無効にしてください。",
   "admin.email.allowSignupTitle": "電子メールアドレスでのアカウント作成を有効にする: ",
   "admin.email.allowUsernameSignInDescription": "有効な場合、Mattermostはユーザーがユーザー名とパスワードでサインインすることを許可します。この設定は電子メール確認が無効にされている場合にのみ使われます。",
-  "admin.email.allowUsernameSignInTitle": "ユーザー名でのサインインを有効化する: ",
+  "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.emailFail": "接続できません: {error}",
@@ -206,10 +236,10 @@
   "admin.email.mtpns": "TPNSが有効化されたiOSまたはAndroidアプリをiTunesまたはGoogle Playから入手する",
   "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.notificationDisplayDescription": "Mattermostから電子メールによる通知を送信する際に、電子メールアカウントの表示名を使用します。",
+  "admin.email.notificationDisplayDescription": "Mattermostから電子メールによる通知を送信する際に使用される電子メールアカウントの表示名です。",
   "admin.email.notificationDisplayExample": "例: \"Mattermost Notification\", \"System\", \"No-Reply\"",
   "admin.email.notificationDisplayTitle": "通知電子メールでの表示名:",
-  "admin.email.notificationEmailDescription": "Mattermostから電子メールによる通知を送信する際に、電子メールアカウントの電子メールアドレスを使用します。",
+  "admin.email.notificationEmailDescription": "Mattermostから電子メールによる通知を送信する際に使用される電子メールアカウントの電子メールアドレスです。",
   "admin.email.notificationEmailExample": "例: \"mattermost@yourcompany.com\", \"admin@yourcompany.com\"",
   "admin.email.notificationEmailTitle": "通知電子メールでの電子メールアドレス:",
   "admin.email.notificationOrganization": "通知のフッターの住所",
@@ -233,7 +263,7 @@
   "admin.email.selfPush": "プッシュ通知サービスの場所を手入力する",
   "admin.email.smtpPasswordDescription": "電子メールサーバーを設定するために管理者から認証情報を入手してください。",
   "admin.email.smtpPasswordExample": "例: \"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.email.smtpPasswordTitle": "SMTPサーバーパスワード: ",
+  "admin.email.smtpPasswordTitle": "SMTPサーバーパスワード:",
   "admin.email.smtpPortDescription": "SMTP電子メールサーバーのポート番号です。",
   "admin.email.smtpPortExample": "例: \"25\", \"465\"",
   "admin.email.smtpPortTitle": "SMTPサーバーポート:",
@@ -252,7 +282,7 @@
   "admin.files.storage": "ストレージ",
   "admin.general.configuration": "設定",
   "admin.general.localization": "言語",
-  "admin.general.localization.availableLocalesDescription": "ユーザーのアカウント設定で利用可能にする言語を指定します。(空欄にすると全ての言語が利用可能になります)",
+  "admin.general.localization.availableLocalesDescription": "アカウント設定でユーザーが利用可能な言語を設定してください（空欄にすると全てのサポート済み言語が利用可能になります）。<br /><br />翻訳を手伝っていただけますか？ 是非、<a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a>に参加してください。",
   "admin.general.localization.availableLocalesTitle": "利用可能な言語:",
   "admin.general.localization.clientLocaleDescription": "新規作成ユーザーやログインしていない時に使用するデフォルト言語を選択してください。",
   "admin.general.localization.clientLocaleTitle": "デフォルトのクライアントの言語:",
@@ -263,11 +293,11 @@
   "admin.general.policy.permissionsAdmin": "チーム管理者とシステム管理者",
   "admin.general.policy.permissionsAll": "全てのチームメンバー",
   "admin.general.policy.permissionsSystemAdmin": "システム管理者",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "Set policy on who can create, delete, rename, and set the header or purpose for private groups.",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "プライベートグループの管理権限を有効にする範囲:",
-  "admin.general.policy.restrictPublicChannelManagementDescription": "Set policy on who can create, delete, rename, and set the header or purpose for public channels.",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "非公開グループの作成、削除、グループ名の変更、ヘッダーや目的の設定ができるユーザーについてのポリシーを設定してください。",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "非公開グループの管理権限を有効にする範囲:",
+  "admin.general.policy.restrictPublicChannelManagementDescription": "公開チャンネルの作成、削除、チャンネル名の変更、ヘッダーや目的の設定ができるユーザーについてのポリシーを設定してください。",
   "admin.general.policy.restrictPublicChannelManagementTitle": "公開チャンネルの管理権限を有効にする範囲:",
-  "admin.general.policy.teamInviteDescription": "Set policy on who can invite others to a team using <b>Invite New Member</b> to invite new users by email, or the <b>Get Team Invite Link</b> options from the Main Menu. If <b>Get Team Invite Link</b> is used to share a link, you can expire the invite code from <b>Team Settings</b> > <b>Invite Code</b> after the desired users join the team.",
+  "admin.general.policy.teamInviteDescription": "<b>新しいメンバーを招待</b>での電子メールの送信や<b>チーム招待リンクを入手</b>による招待を行うことができるユーザーについてのポリシーを設定してください。<b>チーム招待リンクを入手</b>によるリンクが共有されている場合、希望のユーザーがチームに参加した後、<b>チームの設定</b> > <b>招待コード</b>から招待コードを無効にできます。",
   "admin.general.policy.teamInviteTitle": "チームへの招待ができるユーザー:",
   "admin.general.privacy": "プライバシー",
   "admin.general.usersAndTeams": "ユーザーとチーム",
@@ -280,7 +310,7 @@
   "admin.gitlab.clientIdExample": "例: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.gitlab.clientIdTitle": "アプリケーション ID:",
   "admin.gitlab.clientSecretExample": "例: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.gitlab.clientSecretTitle": "アプリケーションのシークレットキー",
+  "admin.gitlab.clientSecretTitle": "アプリケーションシークレットキー",
   "admin.gitlab.enableDescription": "有効な場合、Mattermostのチームの作成と利用登録をGitLabのOAuthを使って実行できます。",
   "admin.gitlab.enableTitle": "GitLabの認証を有効にする: ",
   "admin.gitlab.settingsTitle": "GitLabの設定",
@@ -290,14 +320,14 @@
   "admin.gitlab.userDescription": "https://<your-gitlab-url>/api/v3/user を入力してください。サーバーの設定によりHTTPかHTTPSかは異なりますので注意してください。",
   "admin.gitlab.userExample": "例: \"https://<your-gitlab-url>/api/v3/user\"",
   "admin.gitlab.userTitle": "ユーザーAPIエンドポイント:",
-  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>Log in</a> to your Google account.</li><li>Go to <a href='https://console.developers.google.com'>https://console.developers.google.com</a>, click <strong>Credentials</strong> in the left hand sidebar and enter <strong>Mattermost - <your-company-name></strong> as the project name.</li><li>Click the <strong>OAuth consent screen</strong> header and enter <strong>Mattermost</strong> as the <strong>Product name to show users</strong>. Click <strong>Save</strong>.</li><li>Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.</li><li>Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong><your-mattermost-url>/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.</li><li>Save the <strong>client ID</strong> and <strong>client secret</strong> to later complete the fields below.</li><li>Finally, go to <a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> and click <strong>Enable</strong>. This might take a few minutes to propagate through Google's systems.</li><li>Complete the <strong>Client ID</strong> and <strong>Client Secret</strong> fields below.</li></ol>",
+  "admin.google.EnableHtmlDesc": "<ol><li>あなたのGoogleアカウントに<a href='https://accounts.google.com/login'>ログイン</a>します。</li><li><a href='https://console.developers.google.com'>https://console.developers.google.com</a>へ行き、左サイドバーの<strong>認証情報</strong>をクリックし、<strong>認証情報を作成</strong>をクリックした後、<strong>プロジェクト名</strong>として\"Mattermost - 会社名\"を入力します。</li><li>ヘッダー部の<strong>OAuth同意画面</strong>をクリックし、<strong>ユーザーに表示するサービス名</strong>として\"Mattermost\"を入力し、<strong>保存</strong>をクリックします。</li><li>ヘッダー部の<strong>認証情報</strong>で、<strong>認証情報を作成</strong>をクリックし、<strong>OAuthクライアント ID</strong>を選び、<strong>ウェブアプリケーション</strong>を選択します。</li><li><strong>制限事項</strong>の<strong>承認済みのリダイレクト URI</strong>で<strong>your-mattermost-url/signup/google/complete</strong>(例: http://localhost:8065/signup/google/complete)を入力します。<strong>作成</strong>クリックします。</li><li><strong>クライアントID</strong>と<strong>クライアントシークレット</strong>を下記にペーストし、<strong>保存</strong>をクリックします。</li><li>最後に、<a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a>へ行き、<strong>有効にする</strong>をクリックします。Googleのシステムに伝播するのに数分かかります。</li></ol>",
   "admin.google.authTitle": "認証エンドポイント:",
-  "admin.google.clientIdDescription": "The Client ID you received when registering your application with Google.",
-  "admin.google.clientIdExample": "Ex \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
-  "admin.google.clientIdTitle": "クライアントID",
-  "admin.google.clientSecretDescription": "The Client Secret you received when registering your application with Google.",
-  "admin.google.clientSecretExample": "Ex \"H8sz0Az-dDs2p15-7QzD231\"",
-  "admin.google.clientSecretTitle": "クライアント秘密情報",
+  "admin.google.clientIdDescription": "Googleにアプリケーションを登録したときに受け取るクライアントIDです。",
+  "admin.google.clientIdExample": "例 \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
+  "admin.google.clientIdTitle": "クライアントID:",
+  "admin.google.clientSecretDescription": "Googleにアプリケーションを登録したときに受け取るクライアント秘密情報です。",
+  "admin.google.clientSecretExample": "例 \"H8sz0Az-dDs2p15-7QzD231\"",
+  "admin.google.clientSecretTitle": "クライアント秘密情報:",
   "admin.google.tokenTitle": "トークンエンドポイント:",
   "admin.google.userTitle": "ユーザーAPIエンドポイント:",
   "admin.image.amazonS3BucketDescription": "AWSでのS3バケットの名前を指定します。",
@@ -345,8 +375,8 @@
   "admin.image.thumbWidthDescription": "アップロードされた画像から生成されるサムネイルの幅を指定します。この値を変更することで、設定以降のサムネイルサイズが変更されます。しかし設定以前の画像は変更されません。",
   "admin.image.thumbWidthExample": "例: \"120\"",
   "admin.image.thumbWidthTitle": "添付サムネイル幅:",
+  "admin.integrations.custom": "カスタム統合機能",
   "admin.integrations.external": "外部のサービス",
-  "admin.integrations.webhook": "ウェブフックとコマンド",
   "admin.ldap.baseDesc": "ベースDNはMattermostがLDAPツリーでユーザー検索を始める場所の識別名です。",
   "admin.ldap.baseEx": "例: \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "ベースDN:",
@@ -358,7 +388,7 @@
   "admin.ldap.emailAttrEx": "例: \"mail\" or \"userPrincipalName\"",
   "admin.ldap.emailAttrTitle": "電子メール属性値:",
   "admin.ldap.enableDesc": "有効な場合、MattermostはログインにLDAPの使用を許可します",
-  "admin.ldap.enableTitle": "LDAPでのログインを有効化する:",
+  "admin.ldap.enableTitle": "LDAPでのログインを有効にする:",
   "admin.ldap.firstnameAttrDesc": "Mattermostのユーザーの名前(ファーストネーム)を設定するために使用されるLDAPサーバーの属性値です。",
   "admin.ldap.firstnameAttrEx": "例: \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "名前(ファーストネーム)の属性値",
@@ -390,7 +420,7 @@
   "admin.ldap.skipCertificateVerification": "証明書の検証をしない",
   "admin.ldap.skipCertificateVerificationDesc": "TLSまたはSTARTTLSの証明書の検証ステップをスキップします。TLSが必要な本番環境では設定することは推奨されません。テスト用の設定です。",
   "admin.ldap.syncFailure": "同期の失敗: {error}",
-  "admin.ldap.syncIntervalHelpText": "LDAP Synchronization updates Mattermost user information to reflect updates on the LDAP server. For example, when a user’s name changes on the LDAP server, the change updates in Mattermost when synchronization is performed. Accounts removed from or disabled in the LDAP server have their Mattermost accounts set to “Inactive” and have their account sessions revoked. Mattermost performs synchronization on the interval entered. For example, if 60 is entered, Mattermost synchronizes every 60 minutes.",
+  "admin.ldap.syncIntervalHelpText": "LDAPの同期は、LDAPサーバでの更新を反映するためにMattermostのユーザー情報を更新します。例えば、LDAPサーバー上でユーザーの名前が変更された場合、その変更はLDAPの同期が実行された時にMattermostへ反映されます。LDAPサーバ上で削除もしくは無効化されたアカウントは、Mattermost上で\"無効\"となり、そのアカウントのセッションは削除されます。Mattermostは入力された同期間隔で同期を実行します。例えば、60が入力された場合、Mattermostは60分ごとに同期を行います。",
   "admin.ldap.syncIntervalTitle": "同期間隔(分)",
   "admin.ldap.syncNowHelpText": "LDAP同期をすぐに実行します。",
   "admin.ldap.sync_button": "LDAP同期を今すぐ実行する",
@@ -417,7 +447,7 @@
   "admin.log.enableWebhookDebugging": "ウェブフックのデバッグを有効にする:",
   "admin.log.enableWebhookDebuggingDescription": "これを無効にすることで、全ての内向きのウェブフックのリクエストボディーのデバッグログの出力を無効化します。",
   "admin.log.fileDescription": "本番環境では有効に設定してください。有効な場合、ログファイルは以下のファイルの場所欄で指定されたファイルに出力されます。",
-  "admin.log.fileLevelDescription": "この設定はどのログイベントをログファイルに出力するか決定します。ERROR: エラーメッセージのみを出力する。INFO: エラーと起動と初期化の情報を出力する。DEBUG: 問題をデバッグする開発者向けの詳細を出力する。",
+  "admin.log.fileLevelDescription": "この設定は、どのログイベントをログファイルに出力するか決定します。ERROR: エラーメッセージのみを出力する。INFO: エラーと起動と初期化の情報を出力する。DEBUG: 問題をデバッグする開発者向けの詳細を出力する。",
   "admin.log.fileLevelTitle": "ファイルログレベル:",
   "admin.log.fileTitle": "ログをファイルに出力する: ",
   "admin.log.formatDateLong": "日付 (2006/01/02)",
@@ -429,7 +459,7 @@
   "admin.log.formatSource": "ソース",
   "admin.log.formatTime": "時刻 (15:04:05 MST)",
   "admin.log.formatTitle": "ログファイルの形式:",
-  "admin.log.levelDescription": "この設定はどのログイベントをコンソールに出力するか決定します。ERROR: エラーメッセージのみを出力する。INFO: エラーと起動と初期化の情報を出力する。DEBUG: 問題をデバッグする開発者向けの詳細を出力する。",
+  "admin.log.levelDescription": "この設定は、どのログイベントをコンソールに出力するか決定します。ERROR: エラーメッセージのみを出力する。INFO: エラーと起動と初期化の情報を出力する。DEBUG: 問題をデバッグする開発者向けの詳細を出力する。",
   "admin.log.levelTitle": "コンソールログレベル:",
   "admin.log.locationDescription": "ログファイルを指定します。空欄の場合には、./logs/mattermostのmattermost.logに設定されます。また、ログローテーションが有効になり、10,000行毎に同じディレクトリーに新しいファイルを作成します。ファイル名は、例えば、mattermost.2015-09-23.001、mattermost.2015-09-23.002のようになります。",
   "admin.log.locationPlaceholder": "ファイルの場所を入力してください",
@@ -445,18 +475,20 @@
   "admin.notifications.push": "モバイルプッシュ",
   "admin.notifications.title": "通知の設定",
   "admin.oauth.gitlab": "GitLab",
-  "admin.oauth.google": "Google Appsでログインする",
-  "admin.oauth.off": "Do not allow sign-in via an OAuth 2.0 provider",
+  "admin.oauth.google": "Google Apps",
+  "admin.oauth.off": "OAuth 2.0プロバイダーを通じてのサインインは許可されていません",
   "admin.oauth.office365": "Office 365",
-  "admin.oauth.select": "Select OAuth 2.0 service provider:",
-  "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>Log in</a> to your Microsoft or Office 365 account. Make sure it's the account on the same <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> that you would like users to log in with.</li><li>Go to <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, click <strong>Add an app</strong> and use <strong>Mattermost - <your-company-name></strong> as the application name.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and save it to later complete the field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong><your-mattermost-url>/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and complete the <strong>Application ID</strong> and <strong>Application Secret Password</strong> fields below.</li></ol>",
+  "admin.oauth.providerDescription": "有効な場合、MattermostへのAPIリクエストの認証を外部アプリケーションが行えるようにするOAuth 2.0サービスプロバイダーとしてMattermostが動作できるようになります。",
+  "admin.oauth.providerTitle": "OAuth 2.0サービスプロバイダーを有効にする: ",
+  "admin.oauth.select": "OAuth 2.0サービスプロバーダーを選択する:",
+  "admin.office365.EnableHtmlDesc": "<ol><li>Microsoftアカウント、もしくはOffice365アカウントに<a href='https://login.microsoftonline.com/'>ログイン</a>します。そのアカウントがユーザーにログインさせたい<a href='https://msdn.microsoft.com/ja-jp/library/azure/jj573650.aspx#Anchor_0'>テナント</a>と同じテナントであることを確認してください。</li><li><a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>へ行き、<strong>アプリの追加</strong>をクリックし、アプリケーションの名前として<strong>Mattermost - <会社名></strong>を使用してください。</li><li><strong>アプリケーション シークレット</strong>の下にある<strong>新しいパスワードを生成</strong>をクリックし、表示されるパスワードを後で下記の項目を完成させるために保存しておいてください。</li><li><strong>プラットフォーム</strong>の下にある<strong>プラットフォームの追加</strong>をクリックし、<strong>ウェブ</strong>を選択した後、<strong>リダイレクト URI</strong>に<strong><your-mattermost-url>/signup/office365/complete</strong>(例: http://localhost:8065/signup/office365/complete)を入力してください。また、<strong>暗黙的フローを許可する</strong>のチェックを外してください。</li><li>最後に <strong>保存</strong>をクリックして、下記の<strong>アプリケーション ID</strong>と<strong>アプリケーション シークレット パスワード</strong>を完成させてください。</li></ol>",
   "admin.office365.authTitle": "認証エンドポイント:",
-  "admin.office365.clientIdDescription": "The Application/Client ID you received when registering your application with Microsoft.",
-  "admin.office365.clientIdExample": "Ex \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
+  "admin.office365.clientIdDescription": "Microsoftにアプリケーションを登録したときに受け取るアプリケーションID/クライアントIDです。",
+  "admin.office365.clientIdExample": "例 \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
   "admin.office365.clientIdTitle": "アプリケーション ID:",
-  "admin.office365.clientSecretDescription": "The Application Secret Password you generated when registering your application with Microsoft.",
-  "admin.office365.clientSecretExample": "Ex \"shAieM47sNBfgl20f8ci294\"",
-  "admin.office365.clientSecretTitle": "Application Secret Password:",
+  "admin.office365.clientSecretDescription": "Microsoftにアプリケーションを登録したときに受け取るアプリケーション秘密パスワードです。",
+  "admin.office365.clientSecretExample": "例 \"shAieM47sNBfgl20f8ci294\"",
+  "admin.office365.clientSecretTitle": "アプリケーション秘密パスワード:",
   "admin.office365.tokenTitle": "トークンエンドポイント:",
   "admin.office365.userTitle": "ユーザーAPIエンドポイント:",
   "admin.password.lowercase": "少なくとも1つの英小文字が必要です",
@@ -469,24 +501,24 @@
   "admin.password.requirementsDescription": "有効なパスワードで求められる文字の種類です。",
   "admin.password.symbol": "少なくとも1つの記号が必要です(例: \"~!@#$%^&*()\")",
   "admin.password.uppercase": "少なくとも1つの英大文字が必要です",
-  "admin.privacy.showEmailDescription": "無効に設定した場合には、チームオーナーやチーム管理者を含んだユーザーは、他のユーザーの電子メールアドレスをユーザーインターフェイス上で参照できません。ユーザーの連絡先を秘密にした上でチームを管理するようにセットアップしたい場合に有効にしてください。",
+  "admin.privacy.showEmailDescription": "無効な場合、チームオーナーやチーム管理者を含んだユーザーは、他のユーザーの電子メールアドレスをユーザーインターフェイス上で参照できません。連絡先を秘密にしたいユーザーがいるチーム向けにシステムをセットアップする場合に使用されます。",
   "admin.privacy.showEmailTitle": "電子メールアドレスを表示する: ",
-  "admin.privacy.showFullNameDescription": "無効に設定した場合には、チームオーナーやチーム管理者を含んだユーザーは、他のユーザーのフルネームをユーザーインターフェイス上で参照できません。ユーザー名がフルネームが使用される場所で使用されます。",
+  "admin.privacy.showFullNameDescription": "無効な場合、チームオーナーやチーム管理者を含んだユーザーは、他のユーザーのフルネームをユーザーインターフェイス上で参照できません。フルネームが使用される場所にはユーザー名が表示されるようになります。",
   "admin.privacy.showFullNameTitle": "フルネームを表示する: ",
   "admin.rate.enableLimiterDescription": "有効な場合、APIは以下で指定した頻度に制限されます。",
   "admin.rate.enableLimiterTitle": "投稿頻度制限を有効にする: ",
-  "admin.rate.httpHeaderDescription": "記入した場合には、指定されたHTTPヘッダーフィールド(例えば、NGINXで設定する場合には\"X-Real-IP\"、AmazonELBの場合には\"X-Forwarded-For\")で投稿頻度を制限を変更できます。",
+  "admin.rate.httpHeaderDescription": "入力した場合、指定されたHTTPヘッダーフィールド(例えば、NGINXで設定する場合には\"X-Real-IP\"、AmazonELBの場合には\"X-Forwarded-For\")で投稿頻度制限を変更できます。",
   "admin.rate.httpHeaderExample": "例: \"X-Real-IP\", \"X-Forwarded-For\"",
   "admin.rate.httpHeaderTitle": "HTTPヘッダーで投稿頻度制限を変更する",
   "admin.rate.memoryDescription": "以下で「リモートアドレスで投稿頻度制限を変更する」または「HTTPヘッダーで投稿頻度制限を変更する」の設定でシステムへ接続するユーザーのセッションの最大数を指定します。",
   "admin.rate.memoryExample": "例: \"10000\"",
   "admin.rate.memoryTitle": "メモリー保存サイズ:",
-  "admin.rate.noteDescription": "このセッションでの設定値の変更は、有効にするにはサーバーを再起動させる必要があります。",
+  "admin.rate.noteDescription": "このセクションでの設定値の変更を有効にするにはサーバーを再起動させる必要があります。",
   "admin.rate.noteTitle": "注意:",
   "admin.rate.queriesDescription": "ここで指定する1秒間当たりのリクエスト数でAPIを制限します。",
   "admin.rate.queriesExample": "例: \"10\"",
   "admin.rate.queriesTitle": "最大クエリー数(1秒当たり):",
-  "admin.rate.remoteDescription": "有効な場合、IPアドレスでAPIアクセスを投稿頻度を制限します。",
+  "admin.rate.remoteDescription": "有効な場合、IPアドレスでAPIアクセスの投稿頻度を制限します。",
   "admin.rate.remoteTitle": "リモートアドレスで投稿頻度制限を変更する: ",
   "admin.rate.title": "投稿頻度の設定",
   "admin.recycle.button": "データベース接続を再利用する",
@@ -511,7 +543,7 @@
   "admin.saml.emailAttrEx": "例: \"Email\"または\"PrimaryEmail\"",
   "admin.saml.emailAttrTitle": "電子メール属性値:",
   "admin.saml.enableDescription": "有効にした場合、MattermostへSAMLを使ったログインが可能になります。詳しくは、<a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>説明文書</a>を参照してください。",
-  "admin.saml.enableTitle": "SAMLでのログインを有効化する:",
+  "admin.saml.enableTitle": "SAMLでのログインを有効にする:",
   "admin.saml.encryptDescription": "有効にした場合、Mattermostは、あなたのサービスプロバイダー公開証明書で暗号化されたSAMLアサーションを復号します。",
   "admin.saml.encryptTitle": "暗号化を有効にする:",
   "admin.saml.firstnameAttrDesc": "Mattermostのユーザーの名前(ファーストネーム)を設定するために使用されるSAMLアサーションの属性値です。",
@@ -570,17 +602,17 @@
   "admin.select_team.close": "閉じる",
   "admin.select_team.select": "選択する",
   "admin.select_team.selectTeam": "チームを選択する",
-  "admin.service.attemptDescription": "ユーザーをロックアウトし、電子メールでパスワードを初期化する必要が発生する前に失敗できるログインの回数を指定します。",
+  "admin.service.attemptDescription": "ユーザがロックアウトされるまでのログイン施行回数を指定します。ロックアウトされるとメールによるパスワードの初期化が必要になります。",
   "admin.service.attemptExample": "例: \"10\"",
   "admin.service.attemptTitle": "最大のログイン試行回数:",
   "admin.service.cmdsDesc": "有効な場合、カスタムスラッシュコマンドが使用できます。詳しくは<a href='http://docs.mattermost.com/developer/slash-commands.html' target='_blank'>説明文書</a>を参照してください。",
-  "admin.service.cmdsTitle": "カスタムスラッシュコマンドを有効化する: ",
+  "admin.service.cmdsTitle": "カスタムスラッシュコマンドを有効にする: ",
   "admin.service.corsDescription": "HTTPクロスオリジンリクエスト(CORS)を特定のドメインで有効にします。全てのドメインでCORSを許可するには\"*\"を指定してください。空欄にした場合、CORSは無効になります。",
   "admin.service.corsEx": "http://example.com",
   "admin.service.corsTitle": "クロスオリジンリクエストを許可する:",
   "admin.service.developerDesc": "有効 にした場合、JavaScriptのエラーはユーザーインターフェイスの上部に赤いバーとして表示されます。本番環境ではお勧めできません。",
   "admin.service.developerTitle": "開発者モードを有効にする: ",
-  "admin.service.googleDescription": "Set this key to enable the display of titles for embedded YouTube video previews. Without the key, YouTube previews will still be created based on hyperlinks appearing in messages or comments but they will not show the video title. View a <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> for instructions on how to obtain a key.",
+  "admin.service.googleDescription": "このキーを設定することで、YouTubeビデオプレビューのタイトルが表示されます。キーを設定しない場合、投稿かコメントにハイパーリンクが含まれると、タイトルが表示されない形式でYouTubeビデオのプレビューが生成されます。キーの取得方法については<a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a>を参照してください。",
   "admin.service.googleExample": "例: \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Google APIキー:",
   "admin.service.iconDescription": "有効な場合、ウェブフックとスラッシュコマンドによって投稿に紐付くアイコンを変更できるようにします。注意: ユーザー名の上書きと組み合わせることによって、フィッシング攻撃の危険性が生じる可能性があります。",
@@ -593,38 +625,43 @@
   "admin.service.listenDescription": "使用するIPアドレスとポート番号を設定します。\":8065\"と入力することで全てのインターフェイスのIPアドレスでアクセスを待ちます。\"127.0.0.1:8065\"と指定することで、一つのIPアドレスでアクセスを待ちます。この設定を変更した場合、サーバーを再起動するまで設定は反映されません。",
   "admin.service.listenExample": "例: \":8065\"",
   "admin.service.mfaDesc": "有効な場合、ユーザーは多要素認証をオプションとして選択できます。ユーザーはスマートフォンとGoogle Authenticatorのような認証アプリが必要になります。",
-  "admin.service.mfaTitle": "多要素認証を有効化する:",
+  "admin.service.mfaTitle": "多要素認証を有効にする:",
   "admin.service.mobileSessionDays": "モバイルアプリのセッション維持期間 (日数):",
-  "admin.service.mobileSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
+  "admin.service.mobileSessionDaysDesc": "ユーザーが最後に認証情報を入力した時から、そのユーザーのセッションが期限切れとなるまでの日数です。この設定を変更した後の新しいセッション維持期間は、次にユーザーが認証情報を入力してから有効になります。",
   "admin.service.outWebhooksDesc": "有効な場合、外向きのウェブフックが使用できます。詳しくは<a href='http://docs.mattermost.com/developer/webhooks-outgoing.html' target='_blank'>説明文書</a>を参照してください。",
-  "admin.service.outWebhooksTitle": "外向きのウェブフックを有効化する: ",
+  "admin.service.outWebhooksTitle": "外向きのウェブフックを有効にする: ",
   "admin.service.overrideDescription": "有効な場合、ウェブフックとスラッシュコマンドによって投稿に紐付くユーザー名を変更できるようにします。注意: アイコンの上書きと組み合わせることによって、フィッシング攻撃の危険性が生じる可能性があります。",
   "admin.service.overrideTitle": "ユーザー名を上書きするウェブフックとスラッシュコマンドを有効にする:",
-  "admin.service.securityDesc": "有効な場合、システム管理者は関係のあるセキュリティー修正が発生した場合、12時間以内に電子メールでお知らせを受信できあす。電子メールが有効になっている必要があります。",
+  "admin.service.securityDesc": "有効な場合、システム管理者は関係のあるセキュリティー修正が発生した場合、12時間以内に電子メールでお知らせを受信できます。電子メールが有効になっている必要があります。",
   "admin.service.securityTitle": "セキュリティー通知を有効にする: ",
   "admin.service.segmentDescription": "システムの詳細な利用状況を追跡するオンラインサービスであるSegment.comを利用することができます。Segment.comに無料で利用登録し、キーを入手してください。",
   "admin.service.segmentExample": "例: \"g3fgGOXJAQ43QV7rAh6iwQCkV4cA1Gs\"",
-  "admin.service.segmentTitle": "セグメント書き込みキー:",
+  "admin.service.segmentTitle": "Segment書き込みキー:",
   "admin.service.sessionCache": "セッションキャッシュの有効期間(分):",
   "admin.service.sessionCacheDesc": "セッションをメモリーにキャッシュしておく期間(分)です。",
   "admin.service.sessionDaysEx": "例: \"30\"",
-  "admin.service.ssoSessionDays": "モバイルアプリのセッション維持期間 (日数):",
-  "admin.service.ssoSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.",
+  "admin.service.siteURL": "Site URL:",
+  "admin.service.siteURLDescription": "The URL, including port number and protocol, from which users will access Mattermost. Leave blank to automatically configure based on incoming traffic.",
+  "admin.service.siteURLExample": "Ex \"https://mattermost.example.com:1234\"",
+  "admin.service.ssoSessionDays": "シングルサインオンのセッション維持期間 (日数):",
+  "admin.service.ssoSessionDaysDesc": "ユーザーが最後に認証情報を入力したときから、そのユーザーのセッションが期限切れとなるまでの日数です。SAMLかGitLabによる認可の場合、SAMLかGitLabに既にログインしていれば、ユーザーは自動的にMattermostへ再ログインされます。この設定を変更した場合、次にユーザーが認証情報を入力してから有効になります。",
   "admin.service.testingDescription": "有効な場合、テストアカウントとテストデータによる /loadtest スラッシュコマンドが使用可能になります。この設定を変更した場合、サーバーを再起動するまで設定は反映されません。",
   "admin.service.testingTitle": "コマンドのテストを有効にする: ",
-  "admin.service.webSessionDays": "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.",
-  "admin.service.webhooksTitle": "外向きのウェブフックを有効化する: ",
+  "admin.service.webSessionDays": "LDAPと電子メールのセッション維持期間 (日数):",
+  "admin.service.webSessionDaysDesc": "ユーザーが最後に認証情報を入力してから、そのユーザーのセッションが期限切れとなるまでの日数です。この設定を変更した後の新しいセッション維持期間は、次にユーザーが認証情報を入力してから有効になります。",
+  "admin.service.webhooksDescription": "有効な場合、内向きのウェブフックが使用できます。フィッシング攻撃対策のため、ウェブフックからの投稿にはBOTタグが表示されます。詳しくは<a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>説明文書</a>を参照してください。",
+  "admin.service.webhooksTitle": "内向きのウェブフックを有効にする: ",
   "admin.sidebar.addTeamSidebar": "サイドバーメニューからチームを追加する",
   "admin.sidebar.advanced": "詳細",
   "admin.sidebar.audits": "コンプライアンスと監査",
   "admin.sidebar.authentication": "認証",
+  "admin.sidebar.cluster": "高可用(ベータ版)",
   "admin.sidebar.compliance": "コンプライアンス",
   "admin.sidebar.configuration": "設定",
   "admin.sidebar.connections": "接続",
   "admin.sidebar.customBrand": "独自ブランド設定",
   "admin.sidebar.customEmoji": "カスタム絵文字",
+  "admin.sidebar.customIntegrations": "カスタム統合機能",
   "admin.sidebar.customization": "カスタマイズ",
   "admin.sidebar.database": "データベース",
   "admin.sidebar.developer": "開発者",
@@ -666,7 +703,6 @@
   "admin.sidebar.users": "ユーザー",
   "admin.sidebar.usersAndTeams": "ユーザーとチーム",
   "admin.sidebar.view_statistics": "システムの使用統計",
-  "admin.sidebar.webhooks": "ウェブフックとコマンド",
   "admin.sidebarHeader.systemConsole": "システムコンソール",
   "admin.sql.dataSource": "データソース:",
   "admin.sql.driverName": "ドライバー名:",
@@ -679,7 +715,7 @@
   "admin.sql.maxOpenDescription": "データベースに接続する稼働接続の最大数を指定します。",
   "admin.sql.maxOpenExample": "例: \"10\"",
   "admin.sql.maxOpenTitle": "最大稼働接続数:",
-  "admin.sql.noteDescription": "このセッションでの設定値の変更を有効にするにはサーバーを再起動させる必要があります。",
+  "admin.sql.noteDescription": "このセクションでの設定値の変更を有効にするにはサーバーを再起動させる必要があります。",
   "admin.sql.noteTitle": "注意:",
   "admin.sql.replicas": "データソースレプリカ:",
   "admin.sql.traceDescription": "(開発モード) 有効な場合、実行されるSQL文がログに出力されます。",
@@ -697,15 +733,15 @@
   "admin.support.privacyTitle": "プライバシーポリシーのリンク:",
   "admin.support.problemDesc": "チームサイトのメインメニューからリンクされたヘルプ文書へのリンクです。デフォルトでは、これは検索のできる相互補助的な問題解決のためのフォーラムへのリンクになっています。技術的な問題への手助けになります。",
   "admin.support.problemTitle": "問題報告のリンク:",
-  "admin.support.termsDesc": "Link to the terms under which users may use your online service. By default, this includes the \"Mattermost Conditions of Use (End Users)\" explaining the terms under which Mattermost software is provided to end users. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Conditions of Use (End User) for Mattermost software.",
+  "admin.support.termsDesc": "あなたのオンラインサービスを利用する際の使用条件へのリンクです。デフォルトでは、ここにはMattermostが利用者に提供される際の使用条件について説明している \"Mattermost Conditions of Use (End Users)\"が含まれています。デフォルトのリンクをあなた自身の使用条件に変更した場合、ユーザーが\"Mattermost Conditions of Use (End Users)\"を認識するために、新しい使用条件にはデフォルトの使用条件へのリンクを含めなくてはなりません。",
   "admin.support.termsTitle": "使用条件のリンク:",
   "admin.system_analytics.activeUsers": "投稿実績のあるアクティブユーザー",
   "admin.system_analytics.title": "システム",
   "admin.system_analytics.totalPosts": "総投稿数",
   "admin.team.brandDesc": "独自ブランド機能により、ログインページで以下でアップロードした画像と助けとなるテキストを表示させることができます。",
-  "admin.team.brandDescriptionExample": "あなたのチームの全てのコミュニケーションを一箇所で、すぐに検索可能で、どこからでもアクセスできます。",
-  "admin.team.brandDescriptionHelp": "ログイン画面とユーザーインターフェースで表示されるサービス名です。",
-  "admin.team.brandDescriptionTitle": "Site Description",
+  "admin.team.brandDescriptionExample": "チームの全てのコミュニケーションを一箇所で、検索可能で、どこからでもアクセスできるものにします",
+  "admin.team.brandDescriptionHelp": "ログイン画面とユーザーインターフェースで表示されるサービスの説明です。",
+  "admin.team.brandDescriptionTitle": "サイトの説明",
   "admin.team.brandImageTitle": "独自ブランド画像:",
   "admin.team.brandTextDescription": "独自ブランドのMarkdownで書かれたテキストをログインスクリーンの独自ブランド画像の下に追加することができます。",
   "admin.team.brandTextTitle": "独自ブランドテキスト:",
@@ -861,12 +897,13 @@
   "authorize.allow": "許可する",
   "authorize.app": "<strong>{appName}</strong>アプリケーションは、あなたの基本情報にアクセスしたり、変更したりすることができるようになります。",
   "authorize.deny": "拒否する",
-  "authorize.title": "あなたの{teamName}のアカウントへアプリケーションを接続する",
+  "authorize.title": "<strong>{appName}</strong>はあなたの<strong>Mattermost</strong>ユーザーアカウントに接続します。",
   "backstage_list.search": "検索",
   "backstage_navbar.backToMattermost": "{siteName}に戻る",
   "backstage_sidebar.integrations": "統合機能",
   "backstage_sidebar.integrations.commands": "スラッシュコマンド",
   "backstage_sidebar.integrations.incoming_webhooks": "内向きのウェブフック",
+  "backstage_sidebar.integrations.oauthApps": "OAuth 2.0アプリケーション",
   "backstage_sidebar.integrations.outgoing_webhooks": "外向きのウェブフック",
   "center_panel.recent": "ここクリックして最近のメッセージへ移動します。 ",
   "chanel_header.addMembers": "メンバーを追加する",
@@ -896,7 +933,7 @@
   "channel_header.setHeader": "{term}のヘッダーを設定する…",
   "channel_header.setPurpose": "{term}の目的を設定する…",
   "channel_header.viewInfo": "情報を表示する",
-  "channel_header.viewMembers": "View Members",
+  "channel_header.viewMembers": "メンバーを見る",
   "channel_info.about": "Mattermostについて",
   "channel_info.close": "閉じる",
   "channel_info.header": "ヘッダー:",
@@ -914,8 +951,8 @@
   "channel_loader.someone": "誰か",
   "channel_loader.something": " が何か新しいことをした",
   "channel_loader.unknown_error": "サーバーから想定していないステータスを受信しました。",
-  "channel_loader.uploadedFile": " がファイルをアップロードした",
-  "channel_loader.uploadedImage": " が画像をアップロードした",
+  "channel_loader.uploadedFile": " がファイルをアップロードしました",
+  "channel_loader.uploadedImage": " が画像をアップロードしました",
   "channel_loader.wrote": " が書きました: ",
   "channel_members_modal.addNew": " 新しいメンバーを追加する",
   "channel_members_modal.close": "閉じる",
@@ -929,7 +966,7 @@
   "channel_modal.edit": "編集する",
   "channel_modal.group": "グループ",
   "channel_modal.header": "ヘッダー",
-  "channel_modal.headerHelp": "Set text that will appear in the header of the {term} beside the {term} name. For example, include frequently used links by typing [Link Title](http://example.com).",
+  "channel_modal.headerHelp": "{term}名の近くの{term}のヘッダー部分に表示されるテキストを設定してください。例えば、よく入力されるリンク [リンクのタイトル](http://example.com) などを含めてください。",
   "channel_modal.modalTitle": "新規 ",
   "channel_modal.name": "名前",
   "channel_modal.nameEx": "例: \"Bugs\", \"Marketing\", \"客户支持\"",
@@ -947,7 +984,7 @@
   "channel_notifications.onlyMentions": "あなたについての投稿のみ",
   "channel_notifications.override": "「デフォルト」以外を選択した場合、システム全体に関する通知の設定は上書きされます。デスクトップ通知は、Firefox、Safari、Chromeで利用可能です。",
   "channel_notifications.preferences": "通知の設定。設定先:",
-  "channel_notifications.sendDesktop": "デスクトップ通知を送ります",
+  "channel_notifications.sendDesktop": "デスクトップ通知を送信する",
   "channel_notifications.unreadInfo": "チャンネル名は未読のメッセージがある場合、サイドバーで太字で表示されます。「あなたについての投稿のみ」を選択することで、あなたについての投稿がある場合のみ太字で表示されます。",
   "channel_select.placeholder": "--- チャンネルを選択してください ---",
   "channel_switch_modal.dm": "(ダイレクトメッセージ)",
@@ -1075,8 +1112,8 @@
   "emoji_list.creator": "作成者",
   "emoji_list.delete": "削除",
   "emoji_list.empty": "カスタム絵文字がありません。",
-  "emoji_list.help": "カスタム絵文字はサーバー上の全員が利用可能で、絵文字自動補完メニューに表示されます。新しい絵文字を表示するには、ページを再読み込みする必要があります。",
-  "emoji_list.help2": "Tip: If you add #, ##, or ### as the first character on a new line containing emoji, you can use larger sized emoji. To try it out, send a message such as: '# :smile:'.",
+  "emoji_list.help": "カスタム絵文字はサーバー上の全員が利用可能です。絵文字選択メニューを表示するために、メッセージボックスに':'を入力してみてください。新しい絵文字を表示するには、ページを再読み込みする必要があります。",
+  "emoji_list.help2": "Tip: 絵文字を含む行の先頭に#, ##, ###のいずれかを追加すると、大きな絵文字を利用できます。'# :smile:'のような投稿で試してみてください。",
   "emoji_list.image": "画像",
   "emoji_list.name": "名前",
   "emoji_list.search": "カスタム絵文字を検索",
@@ -1111,9 +1148,11 @@
   "find_team.placeholder": "you@domain.com",
   "find_team.send": "送信する",
   "find_team.submitError": "有効な電子メールアドレスを入力してください",
+  "flag_post.flag": "追跡フラグ",
+  "flag_post.unflag": "フラグを消す",
   "general_tab.chooseName": "あなたのチームの新しい名称を選択してください",
   "general_tab.codeDesc": "招待コードを再生成するには「編集」をクリックしてください。",
-  "general_tab.codeLongDesc": "招待コードは、<strong>チーム招待リンクを入手する</strong>で作成されたチーム招待リンクのURLの一部として使われます。再生成することで新しいチーム招待リンクが作成され、古いリンクは無効化されます。",
+  "general_tab.codeLongDesc": "招待コードは、<strong>チーム招待リンクを入手</strong>で作成されたチーム招待リンクのURLの一部として使われます。再生成することで新しいチーム招待リンクが作成され、古いリンクは無効化されます。",
   "general_tab.codeTitle": "招待コード",
   "general_tab.dirDisabled": "チーム一覧が無効になっています。システム管理者にシステムコンソールのチームの設定でチーム一覧を有効化するように依頼してください。",
   "general_tab.dirOff": "このシステムでは、チーム一覧は無効になっています。",
@@ -1121,22 +1160,22 @@
   "general_tab.includeDirTitle": "チーム一覧に追加する",
   "general_tab.no": "いいえ",
   "general_tab.openInviteDesc": "許可された場合、このチームへのリンクは、このチームに誰もが参加できるようにランディングページに含まれます。",
-  "general_tab.openInviteTitle": "このサーバーにアカウントのある全てのユーザーに、このチームに参加できるようにする",
+  "general_tab.openInviteTitle": "このサーバーにアカウントを持つ全てのユーザーが、このチームに参加できるようにする",
   "general_tab.regenerate": "再生成する",
   "general_tab.required": "この項目は必須です",
   "general_tab.teamName": "チーム名",
   "general_tab.teamNameInfo": "サインイン画面とサイドバーの左上に表示されるチームの名称を設定します。",
   "general_tab.title": "全般の設定",
   "general_tab.yes": "はい",
-  "get_app.alreadyHaveIt": "Already have it?",
+  "get_app.alreadyHaveIt": "既に使用していますか？",
   "get_app.androidAppName": "Mattermost for Android",
-  "get_app.androidHeader": "Mattermost works best if you switch to our Android app",
-  "get_app.continue": "continue",
+  "get_app.androidHeader": "Androidアプリへ移行するとMattermostは最高の働きをします",
+  "get_app.continue": "続ける",
   "get_app.continueWithBrowser": "Or {link}",
-  "get_app.continueWithBrowserLink": "continue with browser",
-  "get_app.iosHeader": "Mattermost works best if you switch to our iPhone app",
+  "get_app.continueWithBrowserLink": "ブラウザで続ける",
+  "get_app.iosHeader": "iPhoneアプリへ移行するとMattermostは最高の働きをします",
   "get_app.mattermostInc": "Mattermost, Inc",
-  "get_app.openMattermost": "Open Mattermost",
+  "get_app.openMattermost": "Mattermostを開く",
   "get_link.clipboard": " クリップボードにリンクをコピーします。",
   "get_link.close": "閉じる",
   "get_link.copy": "リンクをコピーする",
@@ -1161,14 +1200,35 @@
   "installed_incoming_webhooks.search": "内向きのウェブフックを検索",
   "installed_incoming_webhooks.unknown_channel": "プライベートなウェブフック",
   "installed_integrations.callback_urls": "コールバックURL: {urls}",
+  "installed_integrations.client_id": "クライアントID: <strong>{clientId}</strong>",
+  "installed_integrations.client_secret": "クライアント秘密情報: <strong>{clientSecret}</strong>",
   "installed_integrations.content_type": "Content-Type: {contentType}",
   "installed_integrations.creation": "{creator}により{createAt, date, full}に作成されました",
   "installed_integrations.delete": "削除",
+  "installed_integrations.hideSecret": "秘密情報を隠す",
   "installed_integrations.regenToken": "トークンを再生成する",
+  "installed_integrations.showSecret": "秘密情報を表示する",
   "installed_integrations.token": "トークン: {token}",
-  "installed_integrations.triggerWhen": "Trigger When: {triggerWhen}",
+  "installed_integrations.triggerWhen": "トリガーとなる場合: {triggerWhen}",
   "installed_integrations.triggerWords": "トリガーワード: {triggerWords}",
+  "installed_integrations.unnamed_oauth_app": "名前のないOAuth 2.0アプリケーション",
   "installed_integrations.url": "URL: {url}",
+  "installed_oauth_apps.add": "OAuth 2.0アプリケーションを追加する",
+  "installed_oauth_apps.callbackUrls": "コールバックURL(1つにつき1行)",
+  "installed_oauth_apps.cancel": "キャンセル",
+  "installed_oauth_apps.description": "説明",
+  "installed_oauth_apps.empty": "OAuth 2.0アプリケーションが見つかりませんでした",
+  "installed_oauth_apps.header": "OAuth 2.0アプリケーション",
+  "installed_oauth_apps.help": "OAuth 2.0アプリケーションはサーバー上の全員が利用できます。",
+  "installed_oauth_apps.homepage": "ホームページ",
+  "installed_oauth_apps.iconUrl": "アイコンのURL",
+  "installed_oauth_apps.is_trusted": "信頼済み: <strong>{isTrusted}</strong>",
+  "installed_oauth_apps.name": "表示名",
+  "installed_oauth_apps.save": "保存する",
+  "installed_oauth_apps.search": "OAuth 2.0アプリケーションを検索する",
+  "installed_oauth_apps.trusted": "信頼済み",
+  "installed_oauth_apps.trusted.no": "いいえ",
+  "installed_oauth_apps.trusted.yes": "はい",
   "installed_outgoing_webhooks.add": "外向きのウェブフックを追加する",
   "installed_outgoing_webhooks.empty": "外向きのウェブフックは作成されていません",
   "installed_outgoing_webhooks.header": "外向きのウェブフック",
@@ -1181,6 +1241,8 @@
   "integrations.header": "統合機能",
   "integrations.incomingWebhook.description": "内向きのウェブフックは外部の統合機能がメッセージを投稿するのに使います",
   "integrations.incomingWebhook.title": "内向きのウェブフック",
+  "integrations.oauthApps.description": "OAuth 2.0は外部のアプリケーションからMattermost APIへの権限付きリクエストを許可します。",
+  "integrations.oauthApps.title": "OAuth 2.0アプリケーション",
   "integrations.outgoingWebhook.description": "外向きのウェブフックは外部の統合機能がメッセージを受け取りレスポンスを返してくる場合に使用します",
   "integrations.outgoingWebhook.title": "外向きのウェブフック",
   "intro_messages.DM": "{teammate}とのダイレクトメッセージの履歴の最初です。<br />ダイレクトメッセージとそこで共有されているファイルは、この領域の外のユーザーからは見ることができません。",
@@ -1209,7 +1271,7 @@
   "invite_member.modalButton": "破棄してかまわない",
   "invite_member.modalMessage": "未送信の招待状があります。破棄してよろしいですか?",
   "invite_member.modalTitle": "招待状を破棄しますか?",
-  "invite_member.newMember": "新しいメンバーを招待する",
+  "invite_member.newMember": "新しいメンバーを招待",
   "invite_member.send": "招待状を送信する",
   "invite_member.send2": "招待状を送信する",
   "invite_member.sending": " 送信しています",
@@ -1293,17 +1355,17 @@
   "navbar_dropdown.emoji": "カスタム絵文字",
   "navbar_dropdown.help": "ヘルプ",
   "navbar_dropdown.integrations": "統合機能",
-  "navbar_dropdown.inviteMember": "新しいメンバーを招待する",
+  "navbar_dropdown.inviteMember": "新しいメンバーを招待",
   "navbar_dropdown.leave": "チームを脱退する",
   "navbar_dropdown.logout": "ログアウト",
   "navbar_dropdown.manageMembers": "メンバーを管理する",
-  "navbar_dropdown.nativeApps": "Download Native Apps",
+  "navbar_dropdown.nativeApps": "アプリをダウンロード",
   "navbar_dropdown.report": "問題を報告する",
   "navbar_dropdown.switchTeam": "{team}に切り替える",
   "navbar_dropdown.switchTo": "切り替え先: ",
-  "navbar_dropdown.teamLink": "チーム招待リンクを入手する",
+  "navbar_dropdown.teamLink": "チーム招待リンクを入手",
   "navbar_dropdown.teamSettings": "チームの設定",
-  "navbar_dropdown.viewMembers": "View Members",
+  "navbar_dropdown.viewMembers": "メンバーを見る",
   "notification.dm": "ダイレクトメッセージ",
   "password_form.change": "パスワードを変更する",
   "password_form.click": "<a href={url}>ここ</a>をクリックしてログインする。",
@@ -1334,29 +1396,12 @@
   "post_focus_view.beginning": "チャンネルアーカイブの最初",
   "post_info.del": "削除する",
   "post_info.edit": "編集する",
+  "post_info.mobile.flag": "フラグ",
+  "post_info.mobile.unflag": "フラグを消す",
   "post_info.permalink": "パーマリンク",
   "post_info.reply": "返信する",
   "posts_view.loadMore": "もっとメッセージを読み込む",
   "posts_view.newMsg": "新しいメッセージ",
-  "register_app.callback": "コールバックURL",
-  "register_app.callbackError": "少なくとも1つのコールバックURLを入力してください。",
-  "register_app.cancel": " キャンセル",
-  "register_app.clientId": "クライアントID",
-  "register_app.clientSecret": "クライアント秘密情報",
-  "register_app.close": "閉じる",
-  "register_app.credentialsDescription": "これらは安全でセキュアなどこかに保存してください。あなたのアプリでは、クライアントIDはユーザー名、クライアント秘密情報はパスワードであるとして取り扱ってください。",
-  "register_app.credentialsSave": "クライアントIDとクライアント秘密情報を安全な場所に保存しました",
-  "register_app.credentialsTitle": "あなたのアプリケーションの認証情報",
-  "register_app.description": "説明",
-  "register_app.dev": "開発者アプリケーション",
-  "register_app.homepage": "ホームページの URL",
-  "register_app.homepageError": "ホームページは必須です。",
-  "register_app.name": "アプリケーション名",
-  "register_app.nameError": "アプリケーション名は必須です。",
-  "register_app.optional": "オプション",
-  "register_app.register": "登録する",
-  "register_app.required": "必須",
-  "register_app.title": "新しいアプリケーションを登録する",
   "removed_channel.channelName": "チャンネル",
   "removed_channel.from": "以下から削除する ",
   "removed_channel.okay": "削除する",
@@ -1376,7 +1421,10 @@
   "rhs_comment.comment": "コメント",
   "rhs_comment.del": "削除する",
   "rhs_comment.edit": "編集する",
+  "rhs_comment.mobile.flag": "フラグ",
+  "rhs_comment.mobile.unflag": "フラグを消す",
   "rhs_comment.permalink": "パーマリンク",
+  "rhs_header.backToFlaggedTooltip": "フラグの立てられた投稿へ戻る",
   "rhs_header.backToResultsTooltip": "検索結果に戻る",
   "rhs_header.closeSidebarTooltip": "サイドバーを閉じる",
   "rhs_header.details": "メッセージの詳細",
@@ -1385,12 +1433,15 @@
   "rhs_root.del": "削除する",
   "rhs_root.direct": "ダイレクトメッセージ",
   "rhs_root.edit": "編集する",
+  "rhs_root.mobile.flag": "フラグ",
+  "rhs_root.mobile.unflag": "フラグを消す",
   "rhs_root.permalink": "パーマリンク",
   "search_bar.cancel": "キャンセル",
   "search_bar.search": "検索する",
   "search_bar.usage": "<h4>検索オプション</h4><ul><li><span>文を検索するには</span><b>「引用符」</b><span>を使ってください</span></li><li><span>特定のユーザーの投稿に限定して検索するには</span><b>From:</b><span>を、特定のチャンネルのみ検索するには</span><b>in:</b><span>を使ってください</span></li></ul>",
   "search_header.results": "検索結果",
   "search_header.title2": "最近のあなたについての投稿",
+  "search_header.title3": "フラグの立てられた投稿",
   "search_item.direct": "ダイレクトメッセージ",
   "search_item.jump": "ジャンプする",
   "search_results.because": "<ul><li>語句の一部を検索するには*を付けてください(\"reach\"や\"reaction\"を検索するのに\"rea\"を使う場合等)</li><li>検索結果の件数によっては、2文字の検索、一般的な\"this\"や\"a\"、\"is\"は表示されません</li></ul>",
@@ -1415,23 +1466,24 @@
   "sidebar.otherMembers": "このチームの外側",
   "sidebar.pg": "非公開グループ",
   "sidebar.removeList": "一覧から削除する",
-  "sidebar.tutorialScreen1": "<h4>チャンネル</h4><p><strong>チャンネル</strong>は様々な話題についての会話を扱います。チャンネルはあなたのチームの全員が読み書き可能です。個人的なコミュニケーションには特定の一人との場合には<strong>ダイレクトメッセージ</strong>を、複数の人との場合には<strong>プライベートグループ</strong>を使ってください。</p>",
+  "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.tutorialScreen3": "<h4>チャンネルの作成と参加</h4><p><strong>「もっと…」</strong>をクリックすることで新しいチャンネルを作成したり既存のチャンネルに参加することができます。</p><p>チャンネルや非公開グループのヘッダーの隣にある<strong>「+」記号</strong>をクリックすることで、新しいチャンネルや非公開グループを作成することができます。</p>",
   "sidebar.unreadAbove": "上の未読へ",
   "sidebar.unreadBelow": "下の未読へ",
   "sidebar_header.tutorial": "<h4>メインメニュー</h4><p><strong>メインメニュー</strong>は、<strong>メンバーを招待したり</strong><strong>アカウントの設定</strong>にアクセスしたり、<strong>テーマ色</strong>を設定したりする場所です。</p><p>チーム管理者は<strong>チームの設定</strong>にもこのメニューからアクセスすることができます。</p><p>システム管理者には、システム全体を設定する<strong>システムコンソール</strong>へのリンクもここに表示されます。</p>",
   "sidebar_right_menu.accountSettings": "アカウントの設定",
   "sidebar_right_menu.console": "システムコンソール",
+  "sidebar_right_menu.flagged": "フラグの立てられた投稿",
   "sidebar_right_menu.help": "ヘルプ",
-  "sidebar_right_menu.inviteNew": "新しいメンバーを招待する",
+  "sidebar_right_menu.inviteNew": "新しいメンバーを招待",
   "sidebar_right_menu.logout": "ログアウト",
   "sidebar_right_menu.manageMembers": "メンバーを管理する",
-  "sidebar_right_menu.nativeApps": "Download Native App",
+  "sidebar_right_menu.nativeApps": "ネイティブアプリをダウンロードする",
   "sidebar_right_menu.recentMentions": "最近のあなたについての投稿",
   "sidebar_right_menu.report": "問題を報告する",
   "sidebar_right_menu.switch_team": "チームを切り替える",
-  "sidebar_right_menu.teamLink": "チーム招待リンクを入手する",
+  "sidebar_right_menu.teamLink": "チーム招待リンクを入手",
   "sidebar_right_menu.teamSettings": "チームの設定",
   "signup_team.choose": "あなたの所属チーム: ",
   "signup_team.createTeam": "またはチームを作成する",
@@ -1460,7 +1512,7 @@
   "signup_user_completed.lets": "アカウントを作成しましょう",
   "signup_user_completed.no_open_server": "このサーバーは誰でも利用登録できるように設定されていません。管理者に招待してもらってください。",
   "signup_user_completed.none": "ユーザー作成方法が有効になっていません。使用するにはシステム管理者に連絡してください。",
-  "signup_user_completed.office365": "with Office 365",
+  "signup_user_completed.office365": "Office 365を利用",
   "signup_user_completed.onSite": "{siteName}にて",
   "signup_user_completed.or": "または",
   "signup_user_completed.passwordLength": "少なくとも{min}文字を入力してください。",
@@ -1480,8 +1532,8 @@
   "sso_signup.teamName": "新しいチーム名を入力してください",
   "sso_signup.team_error": "チーム名を入力してください",
   "suggestion.mention.all": "チャンネルの全員に通知します。{townsquare}で使うとチーム全体に通知します。",
-  "suggestion.mention.channel": "チャネルの全員に通知します。",
-  "suggestion.mention.here": "Notifies everyone in the channel and online",
+  "suggestion.mention.channel": "チャンネルの全員に通知します。",
+  "suggestion.mention.here": "チャンネル内のオンラインな全員へ通知します",
   "suggestion.search.private": "非公開グループ",
   "suggestion.search.public": "公開チャンネル",
   "team_export_tab.download": "ダウンロードする",
@@ -1528,11 +1580,11 @@
   "tutorial_intro.allSet": "全て設定しました",
   "tutorial_intro.end": "「次へ」をクリックして{channel}に入ってください。これはチームメイトが利用登録をして最初に入るチャンネルです。知る必要がある新しいことを投稿してください。",
   "tutorial_intro.invite": "チームメイトを招待する",
-  "tutorial_intro.mobileApps": "Install the apps for {link} for easy access and notifications on the go.",
-  "tutorial_intro.mobileAppsLinkText": "PC, Mac, iOS and Android",
+  "tutorial_intro.mobileApps": "どこからでも利用できるように {link} 向けのアプリをインストールしましょう。",
+  "tutorial_intro.mobileAppsLinkText": "PC / Mac / iOS / Android",
   "tutorial_intro.next": "次へ",
   "tutorial_intro.screenOne": "<h3>ようこそ</h3><h1>Mattermostへ</h1><p>あなたのチームの全てのコミュニケーションを一箇所で、すぐに検索可能で、どこからでもアクセスできるものにします。</p><p>チームがつながり、互いに助け合うことで、大切なことを成し遂げましょう</p>",
-  "tutorial_intro.screenTwo": "<h3>Mattermostの使い方</h3><p>公開チャンネル、プライベートグループ、ダイレクトメッセージでコミュニケーションします。</p><p>全てがアーカイブされ、ウェブにアクセスできるデスクトップ、ラップトップ、スマートフォンのいずれからでも検索できます。</p>",
+  "tutorial_intro.screenTwo": "<h3>Mattermostの使い方</h3><p>公開チャンネル、非公開グループ、ダイレクトメッセージでコミュニケーションします。</p><p>全てがアーカイブされ、ウェブにアクセスできるデスクトップ、ラップトップ、スマートフォンのいずれからでも検索できます。</p>",
   "tutorial_intro.skip": "チュートリアルをスキップする",
   "tutorial_intro.support": "必要なことがあったら、電子メールを出してください: ",
   "tutorial_intro.teamInvite": "チームメイトを招待する",
@@ -1581,10 +1633,6 @@
   "user.settings.custom_theme.sidebarTextHoverBg": "サイドバーテキストホバーBG",
   "user.settings.custom_theme.sidebarTitle": "サイドバーのスタイル",
   "user.settings.custom_theme.sidebarUnreadText": "サイドバー未読テキスト",
-  "user.settings.developer.applicationsPreview": "アプリケーション(プレビュー)",
-  "user.settings.developer.register": "新しいアプリケーションを登録する",
-  "user.settings.developer.thirdParty": "新しいサードパーティーのアプリケーションを登録するために開く",
-  "user.settings.developer.title": "開発者の設定",
   "user.settings.display.channelDisplayTitle": "チャンネル表示",
   "user.settings.display.channeldisplaymode": "中央のチャンネルの幅を選択してください。",
   "user.settings.display.clockDisplay": "時計表示",
@@ -1598,7 +1646,7 @@
   "user.settings.display.fullScreen": "全幅",
   "user.settings.display.language": "言語",
   "user.settings.display.messageDisplayClean": "標準",
-  "user.settings.display.messageDisplayCleanDes": "見回しやすく読みやすくします。",
+  "user.settings.display.messageDisplayCleanDes": "見やすく読みやすくします。",
   "user.settings.display.messageDisplayCompact": "コンパクト",
   "user.settings.display.messageDisplayCompactDes": "スクリーンに可能な限り多くのメッセージを表示します。",
   "user.settings.display.messageDisplayDescription": "チャンネルでメッセージがどのように表示されるか選択してください。",
@@ -1608,7 +1656,7 @@
   "user.settings.display.normalClock": "時計の12時間表示(例: 4:00 PM)",
   "user.settings.display.preferTime": "時刻の表示形式を選択します。",
   "user.settings.display.showFullname": "名前を表示する",
-  "user.settings.display.showNickname": "ニックネームが存在すればそれを表示する。存在していなけれな氏名を表示する",
+  "user.settings.display.showNickname": "ニックネームが存在すればそれを表示する。存在していなければ氏名を表示する",
   "user.settings.display.showUsername": "ユーザー名を表示する(デフォルト)",
   "user.settings.display.teammateDisplay": "チームメイトの名前の表示",
   "user.settings.display.theme.customTheme": "カスタムテーマ",
@@ -1624,14 +1672,14 @@
   "user.settings.general.confirmEmail": "電子メールアドレスを確認する",
   "user.settings.general.email": "電子メールアドレス",
   "user.settings.general.emailGitlabCantUpdate": "GitLabからログインしました。電子メールアドレスは更新できません。通知に使われる電子メールアドレスは{email}です。",
-  "user.settings.general.emailGoogleCantUpdate": "GitLabからログインしました。電子メールアドレスは更新できません。通知に使われる電子メールアドレスは{email}です。",
+  "user.settings.general.emailGoogleCantUpdate": "Googleからログインしました。電子メールアドレスは更新できません。通知に使われる電子メールアドレスは{email}です。",
   "user.settings.general.emailHelp1": "電子メールアドレスがサインイン、通知、パスワード初期化に使用されます。電子メールアドレスを変更した場合には、確認が必要です。",
   "user.settings.general.emailHelp2": "電子メールアドレスはシステム管理者によって無効になっています。有効にされるまで通知電子メールは送信されません。",
   "user.settings.general.emailHelp3": "電子メールアドレスがサインイン、通知、パスワード初期化に使用されます。",
   "user.settings.general.emailHelp4": "{email}に電子メールアドレスの確認用電子メールが送信されました。",
   "user.settings.general.emailLdapCantUpdate": "LDAPでログインしました。電子メールアドレスは更新できません。通知に使われる電子メールアドレスは{email}です。",
   "user.settings.general.emailMatch": "あなたの入力した新しい電子メールアドレスが一致しません。",
-  "user.settings.general.emailOffice365CantUpdate": "GitLabからログインしました。電子メールアドレスは更新できません。通知に使われる電子メールアドレスは{email}です。",
+  "user.settings.general.emailOffice365CantUpdate": "Office 365からログインしました。電子メールアドレスは更新できません。通知に使われる電子メールアドレスは{email}です。",
   "user.settings.general.emailSamlCantUpdate": "SAMLでログインしました。電子メールアドレスは更新できません。通知に使われる電子メールアドレスは{email}です。",
   "user.settings.general.emailUnchanged": "あなたの新しい電子メールアドレスは、古いものと変わっていません。",
   "user.settings.general.emptyName": "フルネームを追加するには「編集する」をクリックしてください",
@@ -1643,9 +1691,9 @@
   "user.settings.general.imageUpdated": "画像は{date}に更新されました",
   "user.settings.general.lastName": "苗字(ラストネーム)",
   "user.settings.general.loginGitlab": "GitLabでログインしました({email})",
-  "user.settings.general.loginGoogle": "GitLabでログインしました({email})",
+  "user.settings.general.loginGoogle": "Googleでログインしました({email})",
   "user.settings.general.loginLdap": "LDAPでログインしました({email})",
-  "user.settings.general.loginOffice365": "GitLabでログインしました({email})",
+  "user.settings.general.loginOffice365": "Office 365でログインしました({email})",
   "user.settings.general.loginSaml": "SAMLでログインしました({email})",
   "user.settings.general.newAddress": "新しい電子メールアドレス: {email}<br />この電子メールアドレスを確認するために電子メールを確認してください。",
   "user.settings.general.nickname": "ニックネーム",
@@ -1663,11 +1711,12 @@
   "user.settings.general.validEmail": "有効な電子メールアドレスを入力してください",
   "user.settings.general.validImage": "JPGまたはPNG画像だけがプロフィール画像として使用できます",
   "user.settings.import_theme.cancel": "キャンセル",
-  "user.settings.import_theme.importBody": "テーマをインポートするには、Slackチームへ行き、Preferences -> Sidebar Themeを選択し、custom theme optionを開き、チーム色の値をコピーしここに貼り付けます:",
+  "user.settings.import_theme.importBody": "テーマをインポートするには、Slackチームへ行き、Preferences -> Sidebar Themeを選択し、custom theme optionを開き、テーマカラーの値をコピーしここに貼り付けます:",
   "user.settings.import_theme.importHeader": "Slackテーマをインポートする",
   "user.settings.import_theme.submit": "送信する",
   "user.settings.import_theme.submitError": "不正な形式です。もう一度コピーアンドペーストしてください。",
   "user.settings.languages.change": "インターフェイスの言語を変更する",
+  "user.settings.languages.promote": "ユーザーインターフェイスでMattermostが表示する言語を選択してください。<br /><br />翻訳を手伝っていただけますか？ 是非、<a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a>に参加してください。",
   "user.settings.mfa.add": "MFAをあなたのアカウントに追加する",
   "user.settings.mfa.addHelp": "Mattermostにサインインするのに、パスワードに加え、スマートフォンを使ったトークンの入力が必要です。<br/><br/>有効にするには、<a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a>または<a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a>から、Google Authenicatorをダウンロードしてください。<br/><br/>1. 上の<strong>MFAをアカウントに追加する</strong>ボタンを押してください。<br/>2. 表示されるQRコードをGoogle Authenticatorでスキャンしてください。<br/>3. Google Authenticatorの生成したトークンを入力し、<strong>保存</strong>ボタンを押してください。<br/><br/>ログインする際には、通常の認証情報に加え、Google Authenticatorの生成するトークンが求められます。",
   "user.settings.mfa.addHelpQr": "QRコードをスマートフォン上のGoogle Authenticatorアプリでスキャンしてください。その上で表示されたトークンをここに入力してください。",
@@ -1675,26 +1724,24 @@
   "user.settings.mfa.qrCode": "QRコード",
   "user.settings.mfa.remove": "あなたのアカウントからMFAを削除する",
   "user.settings.mfa.removeHelp": "多要素認証を削除すると、サインインする際にスマートフォンを使ったパスコードの入力は不要になります。",
+  "user.settings.mfa.title": "Multi-factor Authentication",
   "user.settings.modal.advanced": "詳細",
   "user.settings.modal.confirmBtns": "破棄します",
   "user.settings.modal.confirmMsg": "保存されていない変更があります。変更を破棄しますか?",
   "user.settings.modal.confirmTitle": "変更を破棄しますか?",
-  "user.settings.modal.developer": "開発者",
   "user.settings.modal.display": "表示",
   "user.settings.modal.general": "全般",
   "user.settings.modal.notifications": "通知",
   "user.settings.modal.security": "セキュリティー",
   "user.settings.modal.title": "アカウントの設定",
-  "user.settings.notification.allActivity": "全てのアクティビティーについて",
-  "user.settings.notification.push": "モバイルプッシュ通知",
-  "user.settings.notification.soundConfig": "ブラウザーの設定画面で、通知音について設定してください",
+  "user.settings.notifications.allActivity": "For all activity",
   "user.settings.notifications.channelWide": "チャンネル全体についての「@channel」、「@all」",
   "user.settings.notifications.close": "閉じる",
-  "user.settings.notifications.comments": "Comment threads notifications",
-  "user.settings.notifications.commentsAny": "Mention any comments in a thread you participated in (This will include both mentions to your root post and any comments after you commented on a post)",
-  "user.settings.notifications.commentsInfo": "Mode of triggering notifications on posts in comment threads you participated in.",
-  "user.settings.notifications.commentsNever": "No mentions for comments",
-  "user.settings.notifications.commentsRoot": "Mention any comments on your post",
+  "user.settings.notifications.comments": "コメントスレッド通知",
+  "user.settings.notifications.commentsAny": "あなたが参加しているスレッドの全てのコメントを通知 (元となるあなたの投稿や、あなたがコメントした後に投稿されたコメントも含みます)",
+  "user.settings.notifications.commentsInfo": "あなたが参加しているコメントスレッド内の投稿に関する通知のトリガーとなるモードです。",
+  "user.settings.notifications.commentsNever": "コメントを通知しない",
+  "user.settings.notifications.commentsRoot": "あなたの投稿についての全てのコメントを通知する",
   "user.settings.notifications.desktop": "デスクトップ通知を送る",
   "user.settings.notifications.desktopSounds": "デスクトップ通知音",
   "user.settings.notifications.emailInfo": "あなたについての投稿とダイレクトメッセージに関して、電子メール通知を送ります。60秒以上オフラインであるか{siteName}から5分間以上離れている場合に送ります。",
@@ -1706,9 +1753,11 @@
   "user.settings.notifications.off": "オフ",
   "user.settings.notifications.on": "オン",
   "user.settings.notifications.onlyMentions": "あなたについての投稿とダイレクトメッセージに関してのみ",
+  "user.settings.notifications.push": "Mobile push notifications",
   "user.settings.notifications.sensitiveName": "あなたの名(ファーストネーム)は大文字小文字を区別して\"{first_name}\"です",
   "user.settings.notifications.sensitiveUsername": "あなたのユーザー名は、大文字小文字を区別せず\"{username}\"です",
   "user.settings.notifications.sensitiveWords": "他の単語をカンマで区切って入力してください。大文字小文字は区別されません:",
+  "user.settings.notifications.soundConfig": "Please configure notification sounds in your browser settings",
   "user.settings.notifications.sounds_info": "デスクトップ通知は、Firefox、Safari、Chrome、Internet Explorer、Edgeで利用可能です。",
   "user.settings.notifications.teamWide": "チーム全体についての「@all」",
   "user.settings.notifications.title": "通知の設定",
@@ -1762,7 +1811,7 @@
   "user.settings.security.switchGitlab": "GitLabシングルサインオンに切り替える",
   "user.settings.security.switchGoogle": "Googleシングルサインオンに切り替える",
   "user.settings.security.switchLdap": "LDAPシングルサインオンに切り替える",
-  "user.settings.security.switchOffice365": "Switch to using Office 365 SSO",
+  "user.settings.security.switchOffice365": "Office 365のシングルサインオンに切り替える",
   "user.settings.security.switchSaml": "SAMLシングルサインオンに切り替える",
   "user.settings.security.title": "セキュリティーの設定",
   "user.settings.security.viewHistory": "アクセス履歴を見る",
@@ -1776,6 +1825,6 @@
   "web.footer.privacy": "プライバシー",
   "web.footer.terms": "使用条件",
   "web.header.back": "戻る",
-  "web.root.signup_info": "あなたのチームの全てのコミュニケーションを一箇所で、すぐに検索可能で、どこからでもアクセスできます。",
+  "web.root.signup_info": "チームの全てのコミュニケーションを一箇所で、検索可能で、どこからでもアクセスできるものにします",
   "youtube_video.notFound": "ビデオが見つかりません"
 }
diff --git a/webapp/i18n/ko.json b/webapp/i18n/ko.json
index 7d1b2d161..9f2ef93b2 100644
--- a/webapp/i18n/ko.json
+++ b/webapp/i18n/ko.json
@@ -1,6 +1,6 @@
 {
   "about.close": "닫기",
-  "about.copyright": "저작권 2016 Mattermost, Inc. 저작권법에 의해 보호받습니다.",
+  "about.copyright": "Copyright 2016 Mattermost, Inc. All rights reserved",
   "about.database": "데이터베이스:",
   "about.date": "빌드 일자:",
   "about.enterpriseEditionLearn": "엔터프라이즈 에디션에 대한 자세한 정보 ",
@@ -11,7 +11,7 @@
   "about.licensed": "다음 사용자에게 허가되었습니다:",
   "about.number": "빌드 넘버:",
   "about.teamEditionLearn": "Mattermost 커뮤니티에 참여 ",
-  "about.teamEditionSt": "당신의 모든 팀원이 한곳이 있으며, 바로 검색 , 접근 할 수 있습니다.",
+  "about.teamEditionSt": "모든 커뮤니케이션 활동을 한 곳에서, 쉽게 접근하고 빠르게 검색할 수 있습니다.",
   "about.teamEditiont0": "팀 에디션 T0",
   "about.teamEditiont1": "엔터프라이즈 에디션 E1",
   "about.title": "Mattermost에 대해",
@@ -25,23 +25,23 @@
   "activity_log.moreInfo": "상세 정보",
   "activity_log.os": "OS: {os}",
   "activity_log.sessionId": "세션 ID: {id}",
-  "activity_log.sessionsDescription": "세션은 기기의 새 브라우저로 로그인할때 생성됩니다. 세션을 사용하면 시스템에서 정한 시간동안은 다시 로그인할 필요가 없습니다. 'Logout' 버튼을 사용하시면 세션을 종료할 수 있습니다.",
+  "activity_log.sessionsDescription": "세션은 기기의 새 브라우저로 로그인할때 생성됩니다. 세션을 사용하면 시스템에서 정한 시간동안은 다시 로그인할 필요가 없습니다. '로그아웃' 버튼을 사용해서 세션을 종료할 수 있습니다.",
   "activity_log_modal.android": "안드로이드",
   "activity_log_modal.androidNativeApp": "안드로이드 앱",
   "activity_log_modal.iphoneNativeApp": "아이폰 앱",
   "add_command.autocomplete": "자동완성",
-  "add_command.autocomplete.help": "(Optional) Show slash command in autocomplete list.",
+  "add_command.autocomplete.help": "(선택사항) 명령어가 자동완성 목록에서 보이게 합니다.",
   "add_command.autocompleteDescription": "자동완성 설명",
   "add_command.autocompleteDescription.help": "자동완성 목록에서 보여질 부가적인 설명을 입력하세요.",
   "add_command.autocompleteDescription.placeholder": "예시: \"환자 기록에 대한 검색결과를 보여줍니다\"",
-  "add_command.autocompleteHint": "자동완성 Hint",
-  "add_command.autocompleteHint.help": "(Optional) Arguments associated with your slash command, displayed as help in the autocomplete list.",
+  "add_command.autocompleteHint": "자동완성 힌트",
+  "add_command.autocompleteHint.help": "(선택사항) 자동완성 목록에서 보여질, 명령어와 관련된 매개변수 도움말을 입력하세요.",
   "add_command.autocompleteHint.placeholder": "예시: [환자 이름]",
   "add_command.cancel": "취소",
   "add_command.description": "설명",
-  "add_command.description.help": "Description for your incoming webhook.",
+  "add_command.description.help": "명령어에 대한 설명을 입력하세요.",
   "add_command.displayName": "표시명",
-  "add_command.displayName.help": "Display name for your slash command made of up to 64 characters.",
+  "add_command.displayName.help": "명령어의 표시명을 64글자 이내로 입력하세요.",
   "add_command.header": "추가",
   "add_command.iconUrl": "응답 아이콘",
   "add_command.iconUrl.help": "Choose a profile picture override for the post responses to this slash command. Enter the URL of a .png or .jpg file at least 128 pixels by 128 pixels.",
@@ -51,12 +51,12 @@
   "add_command.method.help": "The type of command request issued to the Request URL.",
   "add_command.method.post": "POST",
   "add_command.save": "저장",
-  "add_command.trigger": "Command Trigger 단어",
+  "add_command.trigger": "명령어 트리거 단어",
   "add_command.trigger.help": "Trigger word must be unique, and cannot begin with a slash or contain any spaces.",
-  "add_command.trigger.helpExamples": "Examples: client, employee, patient, weather",
-  "add_command.trigger.helpReserved": "Reserved: {link}",
-  "add_command.trigger.helpReservedLinkText": "see list of built-in slash commands",
-  "add_command.trigger.placeholder": "Command trigger 예시. \"hello\"",
+  "add_command.trigger.helpExamples": "예시: client, employee, patient, weather",
+  "add_command.trigger.helpReserved": "사용할 수 없음: {link}",
+  "add_command.trigger.helpReservedLinkText": "내장된 명령어 목록을 확인하세요.",
+  "add_command.trigger.placeholder": "명령어 트리거 예시. \"hello\"",
   "add_command.triggerInvalidLength": "단어가 {min}글자 이상, {max}글자 이하여야 합니다.",
   "add_command.triggerInvalidSlash": "단어 앞에 /를 사용할 수 없습니다.",
   "add_command.triggerInvalidSpace": "단어에 공백을 포함할 수 없습니다.",
@@ -87,12 +87,23 @@
   "add_incoming_webhook.channel.help": "Public channel or private group that receives the webhook payloads. You must belong to the private group when setting up the webhook.",
   "add_incoming_webhook.channelRequired": "유효한 채널을 선택하세요.",
   "add_incoming_webhook.description": "설명",
-  "add_incoming_webhook.description.help": "Description for your incoming webhook.",
+  "add_incoming_webhook.description.help": "Incoming webhook에 대한 설명을 입력하세요.",
   "add_incoming_webhook.displayName": "표시명",
-  "add_incoming_webhook.displayName.help": "Display name for your incoming webhook made of up to 64 characters.",
+  "add_incoming_webhook.displayName.help": "Incoming webhook의 표시명을 64글자 이내로 입력하세요.",
   "add_incoming_webhook.header": "추가",
   "add_incoming_webhook.name": "이름",
   "add_incoming_webhook.save": "저장",
+  "add_oauth_app.callbackUrls.help": "The redirect URIs to which the service will redirect users after accepting or denying authorization of your application, and which will handle authorization codes or access tokens. Must be a valid URL and start with http:// or https://.",
+  "add_oauth_app.callbackUrlsRequired": "One or more callback URLs are required",
+  "add_oauth_app.description.help": "Description for your OAuth 2.0 application.",
+  "add_oauth_app.descriptionRequired": "Description for the OAuth 2.0 application is required.",
+  "add_oauth_app.header": "추가",
+  "add_oauth_app.homepage.help": "The URL for the homepage of the OAuth 2.0 application. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.",
+  "add_oauth_app.homepageRequired": "Homepage for the OAuth 2.0 application is required.",
+  "add_oauth_app.icon.help": "(Optional) The URL of the image used for your OAuth 2.0 application. Make sure you use HTTP or HTTPS in your URL.",
+  "add_oauth_app.name.help": "Display name for your OAuth 2.0 application made of up to 64 characters.",
+  "add_oauth_app.nameRequired": "Name for the OAuth 2.0 application is required.",
+  "add_oauth_app.trusted.help": "When true, the OAuth 2.0 application is considered trusted by the Mattermost server and doesn't require the user to accept authorization. When false, an additional window will appear, asking the user to accept or deny the authorization.",
   "add_outgoing_webhook.callbackUrls": "Callback URLs (One Per Line)",
   "add_outgoing_webhook.callbackUrls.help": "The URL that messages will be sent to.",
   "add_outgoing_webhook.callbackUrlsRequired": "One or more callback URLs are required",
@@ -102,7 +113,7 @@
   "add_outgoing_webhook.contentType.help1": "Choose the content type by which the response will be sent.",
   "add_outgoing_webhook.contentType.help2": "If application/x-www-form-urlencoded is chosen, the server assumes you will be encoding the parameters in a URL format.",
   "add_outgoing_webhook.contentType.help3": "If application/json is chosen, the server assumes you will posting JSON data.",
-  "add_outgoing_webhook.content_Type": "Content Type",
+  "add_outgoing_webhook.content_Type": "콘텐츠 형식",
   "add_outgoing_webhook.description": "설명",
   "add_outgoing_webhook.description.help": "Description for your outgoing webhook.",
   "add_outgoing_webhook.displayName": "표시명",
@@ -117,6 +128,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choose when to trigger the outgoing webhook; if the first word of a message matches a Trigger Word exactly, or if it starts with a Trigger Word.",
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "First word matches a trigger word exactly",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "First word starts with a trigger word",
+  "admin.advance.cluster": "High Availability (Beta)",
   "admin.audits.reload": "Reload User Activity Logs",
   "admin.audits.title": "User Activity Logs",
   "admin.authentication.email": "Email Auth",
@@ -124,6 +136,24 @@
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "Note:",
+  "admin.cluster.enableDescription": "활성화 하면 Mattermost가 고 가용성 모드로 동작합니다. 고 가용성 모드 설정에 대한 자세한 내용은 이 <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">문서</a>를 참고하세요.",
+  "admin.cluster.enableTitle": "Enable High Availability Mode:",
+  "admin.cluster.interNodeListenAddressDesc": "The address the server will listen on for communicating with other servers.",
+  "admin.cluster.interNodeListenAddressEx": "예시 \":8075\"",
+  "admin.cluster.interNodeListenAddressTitle": "Inter-Node Listen Address:",
+  "admin.cluster.interNodeUrlsDesc": "The internal/private URLs of all the Mattermost servers separated by commas.",
+  "admin.cluster.interNodeUrlsEx": "Ex \"http://10.10.10.30, http://10.10.10.31\"",
+  "admin.cluster.interNodeUrlsTitle": "Inter-Node URLs:",
+  "admin.cluster.loadedFrom": "This configuration file was loaded from Node ID {clusterId}. Please see the Troubleshooting Guide in our <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> if you are accessing the System Console through a load balancer and experiencing issues.",
+  "admin.cluster.noteDescription": "Changing properties in this section will require a server restart before taking effect. When High Availability mode is enabled, the System Console is set to read-only and can only be changed from the configuration file.",
+  "admin.cluster.should_not_change": "WARNING: These settings may not sync with the other servers in the cluster. High Availability inter-node communication will not start until you modify the config.json to be identical on all servers and restart Mattermost. Please see the <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> on how to add or remove a server from the cluster. If you are accessing the System Console through a load balancer and experiencing issues, please see the Troubleshooting Guide in our <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a>.",
+  "admin.cluster.status_table.config_hash": "Config File MD5",
+  "admin.cluster.status_table.hostname": "Hostname",
+  "admin.cluster.status_table.id": "Node ID",
+  "admin.cluster.status_table.reload": " Reload Cluster Status",
+  "admin.cluster.status_table.status": "상태",
+  "admin.cluster.status_table.url": "Inter-Node URL",
+  "admin.cluster.status_table.version": "버전:",
   "admin.compliance.directoryDescription": "Directory to which compliance reports are written. If blank, will be set to ./data/.",
   "admin.compliance.directoryExample": "예시: \"./data/\"",
   "admin.compliance.directoryTitle": "Compliance Report Directory:",
@@ -252,7 +282,7 @@
   "admin.files.storage": "저장소",
   "admin.general.configuration": "Configuration",
   "admin.general.localization": "Localization",
-  "admin.general.localization.availableLocalesDescription": "Determines which languages are available for users in Account Settings. (Leave it blank to have all supported languages available)",
+  "admin.general.localization.availableLocalesDescription": "Set which languages are available for users in Account Settings (leave this field blank to have all supported languages available).<br /><br />Would like to help with translations? Join the <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> to contribute.",
   "admin.general.localization.availableLocalesTitle": "Available Languages:",
   "admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.",
   "admin.general.localization.clientLocaleTitle": "Default Client Language:",
@@ -290,7 +320,7 @@
   "admin.gitlab.userDescription": "GitLab 연동을 위해 다음 URL https://<your-gitlab-url>/api/v3/user 을 입력하십시오.   서버 설정에 따라 HTTP와 HTTPS 중 올바른 것을 사용하여야 합니다.",
   "admin.gitlab.userExample": "예: \"https://<your-gitlab-url>/api/v3/user\"",
   "admin.gitlab.userTitle": "사용자 API 엔드포인트:",
-  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>Log in</a> to your Google account.</li><li>Go to <a href='https://console.developers.google.com'>https://console.developers.google.com</a>, click <strong>Credentials</strong> in the left hand sidebar and enter <strong>Mattermost - <your-company-name></strong> as the project name.</li><li>Click the <strong>OAuth consent screen</strong> header and enter <strong>Mattermost</strong> as the <strong>Product name to show users</strong>. Click <strong>Save</strong>.</li><li>Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.</li><li>Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong><your-mattermost-url>/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.</li><li>Save the <strong>client ID</strong> and <strong>client secret</strong> to later complete the fields below.</li><li>Finally, go to <a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> and click <strong>Enable</strong>. This might take a few minutes to propagate through Google's systems.</li><li>Complete the <strong>Client ID</strong> and <strong>Client Secret</strong> fields below.</li></ol>",
+  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>Log in</a> to your Google account.</li><li>Go to <a href='https://console.developers.google.com'>https://console.developers.google.com</a>, click <strong>Credentials</strong> in the left hand sidebar and enter \"Mattermost - your-company-name\" as the <strong>Project Name</strong>, then click <strong>Create</strong>.</li><li>Click the <strong>OAuth consent screen</strong> header and enter \"Mattermost\" as the <strong>Product name shown to users</strong>, then click <strong>Save</strong>.</li><li>Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.</li><li>Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong>your-mattermost-url/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.</li><li>Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.</li><li>Finally, go to <a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> and click <strong>Enable</strong>. This might take a few minutes to propagate through Google's systems.</li></ol>",
   "admin.google.authTitle": "Auth Endpoint:",
   "admin.google.clientIdDescription": "The Client ID you received when registering your application with Google.",
   "admin.google.clientIdExample": "Ex \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -345,8 +375,8 @@
   "admin.image.thumbWidthDescription": "Width of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.",
   "admin.image.thumbWidthExample": "Ex \"120\"",
   "admin.image.thumbWidthTitle": "Attachment Thumbnail Width:",
+  "admin.integrations.custom": "Custom Integrations",
   "admin.integrations.external": "External Services",
-  "admin.integrations.webhook": "Webhook과 명령어",
   "admin.ldap.baseDesc": "The Base DN is the Distinguished Name of the location where Mattermost should start its search for users in the LDAP tree.",
   "admin.ldap.baseEx": "Ex \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "BaseDN:",
@@ -380,13 +410,13 @@
   "admin.ldap.noLicense": "<h4 class=\"banner__heading\">Note:</h4><p>Compliance 는 엔터프라이즈 에디션의 기능입니다. 현재 라이센스는 Compliance 기능을 지원하지 않습니다. <a href=\"http://mattermost.com\" target=\"_blank\">이 곳</a>에서 엔터프라이즈 라이센스에 대한 정보를 확인하세요.</p>",
   "admin.ldap.portDesc": "The port Mattermost will use to connect to the LDAP server. Default is 389.",
   "admin.ldap.portEx": "Ex \"389\"",
-  "admin.ldap.portTitle": "LDAP Port:",
+  "admin.ldap.portTitle": "LDAP 포트:",
   "admin.ldap.queryDesc": "The timeout value for queries to the LDAP server. Increase if you are getting timeout errors caused by a slow LDAP server.",
   "admin.ldap.queryEx": "Ex \"60\"",
   "admin.ldap.queryTitle": "Query Timeout (seconds):",
   "admin.ldap.serverDesc": "The domain or IP address of LDAP server.",
   "admin.ldap.serverEx": "Ex \"10.0.0.23\"",
-  "admin.ldap.serverTitle": "LDAP Server:",
+  "admin.ldap.serverTitle": "LDAP 서버:",
   "admin.ldap.skipCertificateVerification": "Skip Certificate Verification",
   "admin.ldap.skipCertificateVerificationDesc": "Skips the certificate verification step for TLS or STARTTLS connections. Not recommended for production environments where TLS is required. For testing only.",
   "admin.ldap.syncFailure": "Sync Failure: {error}",
@@ -448,6 +478,8 @@
   "admin.oauth.google": "Google Apps",
   "admin.oauth.off": "Do not allow sign-in via an OAuth 2.0 provider",
   "admin.oauth.office365": "Office 365",
+  "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications.",
+  "admin.oauth.providerTitle": "Enable OAuth 2.0 Service Provider: ",
   "admin.oauth.select": "Select OAuth 2.0 service provider:",
   "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>Log in</a> to your Microsoft or Office 365 account. Make sure it's the account on the same <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> that you would like users to log in with.</li><li>Go to <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, click <strong>Add an app</strong> and use <strong>Mattermost - <your-company-name></strong> as the application name.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and save it to later complete the field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong><your-mattermost-url>/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and complete the <strong>Application ID</strong> and <strong>Application Secret Password</strong> fields below.</li></ol>",
   "admin.office365.authTitle": "Auth Endpoint:",
@@ -494,7 +526,7 @@
   "admin.recycle.recycleDescription": "Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating \"config.json\" to the new desired configuration and using the <a href=\"../general/configuration\"><b>Configuration > Reload Configuration from Disk</b></a> feature to load the new settings while the server is running. The administrator should then use <b>Recycle Database Connections</b> feature to recycle the database connections based on the new settings.",
   "admin.recycle.reloadFail": "연결을 실패했습니다: {error}",
   "admin.regenerate": "재생성",
-  "admin.reload.button": "Reload Configuration From Disk",
+  "admin.reload.button": "디스크에서 설정 다시 불러오기",
   "admin.reload.loading": " 로딩 중...",
   "admin.reload.reloadDescription": "Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating \"config.json\" to the new desired configuration and using the <b>Reload Configuration from Disk</b> feature to load the new settings while the server is running. The administrator should then use the <a href=\"../advanced/database\"><b>Database > Recycle Database Connections</b></a> feature to recycle the database connections based on the new settings.",
   "admin.reload.reloadFail": "연결을 실패했습니다: {error}",
@@ -608,6 +640,9 @@
   "admin.service.sessionCache": "Session Cache (minutes):",
   "admin.service.sessionCacheDesc": "The number of minutes to cache a session in memory.",
   "admin.service.sessionDaysEx": "Ex \"30\"",
+  "admin.service.siteURL": "Site URL:",
+  "admin.service.siteURLDescription": "The URL, including port number and protocol, from which users will access Mattermost. Leave blank to automatically configure based on incoming traffic.",
+  "admin.service.siteURLExample": "Ex \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "Session length for mobile apps (days):",
   "admin.service.ssoSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.",
   "admin.service.testingDescription": "(개발자 옵션) true로 설정하면, /loadtest 슬래시 명령을 사용할 수 있습니다. 이 명령을 사용하여 테스트를 위한 계정과 데이터를 불러들일 수 있습니다. 이 설정이 적용되려면 서버를 재시작해야 합니다.",
@@ -620,11 +655,13 @@
   "admin.sidebar.advanced": "고급",
   "admin.sidebar.audits": "감사",
   "admin.sidebar.authentication": "인증",
+  "admin.sidebar.cluster": "High Availability (Beta)",
   "admin.sidebar.compliance": "Compliance",
   "admin.sidebar.configuration": "환경설정",
   "admin.sidebar.connections": "연결",
   "admin.sidebar.customBrand": "사용자 정의 브랜딩",
   "admin.sidebar.customEmoji": "사용자 정의 이모티콘",
+  "admin.sidebar.customIntegrations": "Custom Integrations",
   "admin.sidebar.customization": "사용자 정의",
   "admin.sidebar.database": "데이터베이스",
   "admin.sidebar.developer": "개발자 설정",
@@ -666,7 +703,6 @@
   "admin.sidebar.users": "사용자",
   "admin.sidebar.usersAndTeams": "팀과 사용자",
   "admin.sidebar.view_statistics": "사이트 통계",
-  "admin.sidebar.webhooks": "Webhook과 명령어",
   "admin.sidebarHeader.systemConsole": "관리자 도구",
   "admin.sql.dataSource": "Data Source:",
   "admin.sql.driverName": "Driver Name:",
@@ -757,7 +793,7 @@
   "admin.user_item.makeMember": "Make Member",
   "admin.user_item.makeSysAdmin": "Make System Admin",
   "admin.user_item.makeTeamAdmin": "Make Team Admin",
-  "admin.user_item.member": "멤버",
+  "admin.user_item.member": "회원",
   "admin.user_item.mfaNo": ", <strong>MFA</strong>: No",
   "admin.user_item.mfaYes": ", <strong>MFA</strong>: Yes",
   "admin.user_item.resetMfa": "Remove MFA",
@@ -828,17 +864,17 @@
   "audit_table.failedWebhookCreate": "Failed to create a webhook - bad channel permissions",
   "audit_table.failedWebhookDelete": "Failed to delete a webhook - inappropriate conditions",
   "audit_table.headerUpdated": "Updated the {channelName} channel/group header",
-  "audit_table.ip": "IP Address",
+  "audit_table.ip": "IP 주소",
   "audit_table.licenseRemoved": "Successfully removed a license",
   "audit_table.loginAttempt": " (Login attempt)",
   "audit_table.loginFailure": " (Login failure)",
   "audit_table.logout": "Logged out of your account",
-  "audit_table.member": "멤버",
+  "audit_table.member": "회원",
   "audit_table.nameUpdated": "Updated the {channelName} channel/group name",
   "audit_table.oauthTokenFailed": "Failed to get an OAuth access token - {token}",
   "audit_table.revokedAll": "Revoked all current sessions for the team",
   "audit_table.sentEmail": "Sent an email to {email} to reset your password",
-  "audit_table.session": "Session ID",
+  "audit_table.session": "세션 ID",
   "audit_table.sessionRevoked": "The session with id {sessionId} was revoked",
   "audit_table.successfullLicenseAdd": "Successfully added new license",
   "audit_table.successfullLogin": "Successfully logged in",
@@ -861,18 +897,19 @@
   "authorize.allow": "Allow",
   "authorize.app": "The app <strong>{appName}</strong> would like the ability to access and modify your basic information.",
   "authorize.deny": "Deny",
-  "authorize.title": "An application would like to connect to your {teamName} account",
-  "backstage_list.search": "Search",
+  "authorize.title": "<strong>{appName}</strong> would like to connect to your <strong>Mattermost</strong> user account",
+  "backstage_list.search": "검색",
   "backstage_navbar.backToMattermost": "Back to {siteName}",
   "backstage_sidebar.integrations": "Integrations",
   "backstage_sidebar.integrations.commands": "슬래시 명령어",
   "backstage_sidebar.integrations.incoming_webhooks": "Incoming Webhooks",
+  "backstage_sidebar.integrations.oauthApps": "OAuth 2.0 Applications",
   "backstage_sidebar.integrations.outgoing_webhooks": "Outgoing Webhooks",
   "center_panel.recent": "Click here to jump to recent messages. ",
   "chanel_header.addMembers": "Add Members",
   "change_url.close": "닫기",
   "change_url.endWithLetter": "Must end with a letter or number",
-  "change_url.invalidUrl": "Invalid URL",
+  "change_url.invalidUrl": "잘못된 URL",
   "change_url.longer": "Must be longer than two characters",
   "change_url.noUnderscore": "Can not contain two underscores in a row.",
   "change_url.startWithLetter": "Must start with a letter or number",
@@ -889,21 +926,21 @@
   "channel_header.delete": "{term} 삭제...",
   "channel_header.group": "그룹",
   "channel_header.leave": "{term} 떠나기",
-  "channel_header.manageMembers": "멤버 관리",
+  "channel_header.manageMembers": "회원 관리",
   "channel_header.notificationPreferences": "알림 설정",
   "channel_header.recentMentions": "최근 멘션",
   "channel_header.rename": "{term}의 이름을 변경...",
   "channel_header.setHeader": "{term}의 헤더 설정...",
   "channel_header.setPurpose": "{term}의 설명 설정...",
   "channel_header.viewInfo": "정보 보기",
-  "channel_header.viewMembers": "멤버 보기",
+  "channel_header.viewMembers": "회원 보기",
   "channel_info.about": "About",
   "channel_info.close": "닫기",
-  "channel_info.header": "Header:",
+  "channel_info.header": "헤더:",
   "channel_info.id": "ID: ",
   "channel_info.name": "이름:",
-  "channel_info.notFound": "No Channel Found",
-  "channel_info.purpose": "Purpose:",
+  "channel_info.notFound": "채널을 찾을 수 없습니다.",
+  "channel_info.purpose": "설명:",
   "channel_info.url": "URL:",
   "channel_invite.add": " 추가",
   "channel_invite.addNewMembers": "Add New Members to ",
@@ -920,7 +957,7 @@
   "channel_members_modal.addNew": " 새로운 회원 추가",
   "channel_members_modal.close": "닫기",
   "channel_members_modal.remove": "제거하기",
-  "channel_memebers_modal.members": " 멤버",
+  "channel_memebers_modal.members": " 회원",
   "channel_modal.cancel": "취소",
   "channel_modal.channel": "채널",
   "channel_modal.createNew": "새로운 ",
@@ -949,7 +986,7 @@
   "channel_notifications.preferences": "채널 알림 설정: ",
   "channel_notifications.sendDesktop": "데스크탑 알림 받기",
   "channel_notifications.unreadInfo": "읽지 않은 채널은 사이드바에서 굵은 글씨로 표시됩니다. \"멘션만\"을 선택하면 내가 멘션된 채널만 굵게 표시됩니다.",
-  "channel_select.placeholder": "--- Select a channel ---",
+  "channel_select.placeholder": "--- 채널을 선택하세요 ---",
   "channel_switch_modal.dm": "(개인 메시지)",
   "channel_switch_modal.help": "채널 이름을 입력하세요. ↑↓ 방향키와 TAB키를 이용하여 선택하세요, ↵ 엔터키를 누르면 확인, ESC키를 누르면 취소됩니다.",
   "channel_switch_modal.not_found": "No matches found.",
@@ -959,45 +996,45 @@
   "claim.email_to_ldap.enterLdapPwd": "Enter the ID and password for your LDAP account",
   "claim.email_to_ldap.enterPwd": "Enter the password for your {site} email account",
   "claim.email_to_ldap.ldapId": "LDAP ID",
-  "claim.email_to_ldap.ldapIdError": "Please enter your LDAP ID.",
-  "claim.email_to_ldap.ldapPasswordError": "Please enter your LDAP password.",
-  "claim.email_to_ldap.ldapPwd": "LDAP Password",
+  "claim.email_to_ldap.ldapIdError": "LDAP ID를 입력하세요.",
+  "claim.email_to_ldap.ldapPasswordError": "LDAP 비밀번호를 입력하세요.",
+  "claim.email_to_ldap.ldapPwd": "LDAP 비밀번호",
   "claim.email_to_ldap.pwd": "비밀번호",
-  "claim.email_to_ldap.pwdError": "Please enter your password.",
+  "claim.email_to_ldap.pwdError": "비밀번호를 입력하세요.",
   "claim.email_to_ldap.ssoNote": "You must already have a valid LDAP account",
   "claim.email_to_ldap.ssoType": "Upon claiming your account, you will only be able to login with LDAP",
-  "claim.email_to_ldap.switchTo": "Switch account to LDAP",
-  "claim.email_to_ldap.title": "Switch Email/Password Account to LDAP",
+  "claim.email_to_ldap.switchTo": "LDAP 계정으로 변경",
+  "claim.email_to_ldap.title": "이메일/비밀번호 계정을 LDAP 계정으로 변경",
   "claim.email_to_oauth.enterPwd": "Enter the password for your {site} account",
   "claim.email_to_oauth.pwd": "비밀번호",
-  "claim.email_to_oauth.pwdError": "Please enter your password.",
+  "claim.email_to_oauth.pwdError": "비밀번호를 입력하세요.",
   "claim.email_to_oauth.ssoNote": "You must already have a valid {type} account",
   "claim.email_to_oauth.ssoType": "Upon claiming your account, you will only be able to login with {type} SSO",
   "claim.email_to_oauth.switchTo": "Switch account to {uiType}",
-  "claim.email_to_oauth.title": "Switch Email/Password Account to {uiType}",
-  "claim.ldap_to_email.confirm": "Confirm Password",
+  "claim.email_to_oauth.title": "이메일/비밀번호 계정을 {uiType} 계정으로 변경",
+  "claim.ldap_to_email.confirm": "비밀번호 확인",
   "claim.ldap_to_email.email": "You will use the email {email} to login",
   "claim.ldap_to_email.enterLdapPwd": "Enter your {ldapPassword} for your {site} email account",
   "claim.ldap_to_email.enterPwd": "Enter a new password for your email account",
-  "claim.ldap_to_email.ldapPasswordError": "Please enter your LDAP password.",
+  "claim.ldap_to_email.ldapPasswordError": "LDAP 비밀번호를 입력하세요.",
   "claim.ldap_to_email.ldapPwd": "LDAP 비밀번호",
   "claim.ldap_to_email.pwd": "비밀번호",
-  "claim.ldap_to_email.pwdError": "Please enter your password.",
-  "claim.ldap_to_email.pwdNotMatch": "Passwords do not match.",
+  "claim.ldap_to_email.pwdError": "비밀번호를 입력하세요.",
+  "claim.ldap_to_email.pwdNotMatch": "비밀번호가 일치하지 않습니다.",
   "claim.ldap_to_email.ssoType": "Upon claiming your account, you will only be able to login with your email and password",
   "claim.ldap_to_email.switchTo": "Switch account to email/password",
   "claim.ldap_to_email.title": "Switch LDAP Account to Email/Password",
-  "claim.oauth_to_email.confirm": "Confirm Password",
+  "claim.oauth_to_email.confirm": "비밀번호 확인",
   "claim.oauth_to_email.description": "Upon changing your account type, you will only be able to login with your email and password.",
   "claim.oauth_to_email.enterNewPwd": "Enter a new password for your {site} email account",
-  "claim.oauth_to_email.enterPwd": "Please enter a password.",
-  "claim.oauth_to_email.newPwd": "New Password",
-  "claim.oauth_to_email.pwdNotMatch": "Password do not match.",
+  "claim.oauth_to_email.enterPwd": "비밀번호를 입력하세요.",
+  "claim.oauth_to_email.newPwd": "새로운 비밀번호",
+  "claim.oauth_to_email.pwdNotMatch": "비밀번호가 일치하지 않습니다.",
   "claim.oauth_to_email.switchTo": "Switch {type} to email and password",
   "claim.oauth_to_email.title": "Switch {type} Account to Email",
   "confirm_modal.cancel": "취소",
-  "create_comment.addComment": "Add a comment...",
-  "create_comment.comment": "Add Comment",
+  "create_comment.addComment": "답글 달기...",
+  "create_comment.comment": "답글 달기",
   "create_comment.commentLength": "Comment length must be less than {max} characters.",
   "create_comment.commentTitle": "Comment",
   "create_comment.file": "File uploading",
@@ -1007,16 +1044,16 @@
   "create_post.tutorialTip": "<h4>메시지 보내기</h4><p>보내고 싶은 메시지를 작성하고 <strong>Enter</strong>키를 눌러 보내세요.</p><p><strong>첨부</strong> 버튼을 눌러 이미지나 파일을 업로드하세요.</p>",
   "create_post.write": "메시지를 입력하세요...",
   "create_team.agreement": "By proceeding to create your account and use {siteName}, you agree to our <a href='/static/help/terms.html'>Terms of Service</a> and <a href='/static/help/privacy.html'>Privacy Policy</a>. If you do not agree, you cannot use {siteName}.",
-  "create_team.display_name.back": "Back to previous step",
+  "create_team.display_name.back": "이전 단계로 돌아가기",
   "create_team.display_name.charLength": "Name must be 4 or more characters up to a maximum of 15",
   "create_team.display_name.nameHelp": "Name your team in any language. Your team name shows in menus and headings.",
   "create_team.display_name.next": "다음",
   "create_team.display_name.required": "필수 항목입니다.",
   "create_team.display_name.teamName": "팀 이름",
-  "create_team.team_url.back": "Back to previous step",
+  "create_team.team_url.back": "이전 단계로 돌아가기",
   "create_team.team_url.charLength": "Name must be 4 or more characters up to a maximum of 15",
   "create_team.team_url.creatingTeam": "팀 생성 중...",
-  "create_team.team_url.finish": "Finish",
+  "create_team.team_url.finish": "완료",
   "create_team.team_url.hint": "<li>Short and memorable is best</li><li>Use lowercase letters, numbers and dashes</li><li>Must start with a letter and can't end in a dash</li>",
   "create_team.team_url.regex": "Use only lower case letters, numbers and dashes. Must start with a letter and can't end in a dash.",
   "create_team.team_url.required": "필수 항목입니다.",
@@ -1058,18 +1095,18 @@
   "edit_post.edit": "{title} 편집",
   "edit_post.editPost": "글 편집하기...",
   "edit_post.save": "저장",
-  "email_signup.address": "Email Address",
+  "email_signup.address": "이메일 주소",
   "email_signup.createTeam": "팀 만들기",
-  "email_signup.emailError": "Please enter a valid email address",
+  "email_signup.emailError": "유효한 이메일 주소를 입력하세요.",
   "email_signup.find": "Find my teams",
   "email_verify.almost": "{siteName}: You are almost done",
-  "email_verify.failed": " Failed to send verification email.",
+  "email_verify.failed": " 검증메일 발송을 실패했습니다.",
   "email_verify.notVerifiedBody": "Please verify your email address. Check your inbox for an email.",
-  "email_verify.resend": "Resend Email",
+  "email_verify.resend": "다시 보내기",
   "email_verify.sent": " 검증 메일을 보냈습니다.",
   "email_verify.verified": "{siteName} 이메일 검증됨",
-  "email_verify.verifiedBody": "<p>Your email has been verified! Click <a href={url}>here</a> to log in.</p>",
-  "email_verify.verifyFailed": "Failed to verify your email.",
+  "email_verify.verifiedBody": "<p>이메일 검증이 완료되었습니다! <a href={url}>여기</a>를 클릭하여 로그인하세요.</p>",
+  "email_verify.verifyFailed": "이메일 검증을 실패했습니다.",
   "emoji_list.actions": "액션",
   "emoji_list.add": "사용자 정의 이모티콘",
   "emoji_list.creator": "만든 사람",
@@ -1086,9 +1123,9 @@
   "error.not_found.title": "페이지를 찾을 수 없습니다.",
   "error.not_supported.message": "비밀모드는 지원되지 않습니다.",
   "error.not_supported.title": "지원되지 않는 브라우저입니다.",
-  "error_bar.expired": "Enterprise license has expired; you have 15 days from expiry to renew the license, please contact commercial@mattermost.com for details",
-  "error_bar.expiring": "The Enterprise license is expiring on {date}. To renew your license, please contact commercial@mattermost.com",
-  "error_bar.past_grace": "Enterprise license has expired, please contact your System Administrator for details",
+  "error_bar.expired": "엔터프라이즈 라이센스가 만료되었습니다; 15일 안에 라이센스를 갱신해야 합니다, 자세한 내용은 commercial@mattermost.com에 문의하세요.",
+  "error_bar.expiring": "엔터프라이즈 라이센스가 {date}에 만료됩니다. 라이센스를 갱신하려면, commercial@mattermost.com에 문의하세요.",
+  "error_bar.past_grace": "엔터프라이즈 라이센스가 만료되었습니다, 자세한 내용은 시스템 관리자에게 문의하세요.",
   "error_bar.preview_mode": "미리보기 모드: 이메일 알림이 설정되지 않았습니다.",
   "file_attachment.download": "다운로드",
   "file_info_preview.size": "용량 ",
@@ -1100,21 +1137,23 @@
   "filtered_user_list.any_team": "모든 사용자",
   "filtered_user_list.count": "{count}{count, plural, =0 {0명} one {명} other {명}}",
   "filtered_user_list.countTotal": "{total}명 중 {count}{count, plural, =0 {0명} one {명} other {명}}",
-  "filtered_user_list.member": "멤버",
-  "filtered_user_list.search": "멤버 검색",
+  "filtered_user_list.member": "회원",
+  "filtered_user_list.search": "회원 검색",
   "filtered_user_list.show": "필터:",
-  "filtered_user_list.team_only": "팀의 멤버만",
-  "find_team.email": "Email",
+  "filtered_user_list.team_only": "팀의 회원만",
+  "find_team.email": "이메일",
   "find_team.findDescription": "An email was sent with links to any teams to which you are a member.",
   "find_team.findTitle": "팀 찾기",
   "find_team.getLinks": "Get an email with links to any teams to which you are a member.",
   "find_team.placeholder": "you@domain.com",
   "find_team.send": "보내기",
-  "find_team.submitError": "Please enter a valid email address",
-  "general_tab.chooseName": "Please choose a new name for your team",
-  "general_tab.codeDesc": "Click 'Edit' to regenerate Invite Code.",
+  "find_team.submitError": "유효한 이메일 주소를 입력하세요.",
+  "flag_post.flag": "Flag for follow up",
+  "flag_post.unflag": "Unflag",
+  "general_tab.chooseName": "사용자 이름을 선택하세요.",
+  "general_tab.codeDesc": "가입 링크를 변경하려면 '편집'을 클릭하세요.",
   "general_tab.codeLongDesc": "The Invite Code is used as part of the URL in the team invitation link created by <strong>Get Team Invite Link</strong> in the main menu. Regenerating creates a new team invitation link and invalidates the previous link.",
-  "general_tab.codeTitle": "Invite Code",
+  "general_tab.codeTitle": "가입 링크",
   "general_tab.dirDisabled": "Team Directory has been disabled.  Please ask a System Admin to enable the Team Directory in the System Console team settings.",
   "general_tab.dirOff": "Team directory is turned off for this system.",
   "general_tab.includeDirDesc": "Including this team will display the team name from the Team Directory section of the Home Page, and provide a link to the sign-in page.",
@@ -1142,8 +1181,8 @@
   "get_link.copy": "링크 복사",
   "get_post_link_modal.help": "아래 링크를 통해 허용된 사용자가 내 글을 볼 수 있습니다.",
   "get_post_link_modal.title": "바로가기 링크 복사",
-  "get_team_invite_link_modal.help": "Send teammates the link below for them to sign-up to this team site. The Team Invite Link can be shared with multiple teammates as it does not change unless it's regenerated in Team Settings by a Team Admin.",
-  "get_team_invite_link_modal.helpDisabled": "User creation has been disabled for your team. Please ask your team administrator for details.",
+  "get_team_invite_link_modal.help": "아래 링크를 통해 팀에 가입할 수 있습니다. 팀 가입 링크는 여러 사람들에게 공유될 수 있고, 팀 관리자에 의해 변경될 수 있습니다.",
+  "get_team_invite_link_modal.helpDisabled": "팀의 신규 사용자 가입이 비활성화 되어있습니다. 팀 관리자에게 문의하세요.",
   "get_team_invite_link_modal.title": "팀 가입 링크",
   "installed_command.header": "슬래시 명령어",
   "installed_commands.add": "슬래시 명령어 추가",
@@ -1161,14 +1200,35 @@
   "installed_incoming_webhooks.search": "Incoming Webhook 검색하기",
   "installed_incoming_webhooks.unknown_channel": "A Private Webhook",
   "installed_integrations.callback_urls": "Callback URLs: {urls}",
+  "installed_integrations.client_id": "Client ID: <strong>{clientId}</strong>",
+  "installed_integrations.client_secret": "Client Secret: <strong>{clientSecret}</strong>",
   "installed_integrations.content_type": "Content-Type: {contentType}",
   "installed_integrations.creation": "Created by {creator} on {createAt, date, full}",
   "installed_integrations.delete": "삭제",
+  "installed_integrations.hideSecret": "Hide Secret",
   "installed_integrations.regenToken": "토큰 재생성하기",
+  "installed_integrations.showSecret": "Show Secret",
   "installed_integrations.token": "토큰: {token}",
   "installed_integrations.triggerWhen": "Trigger When: {triggerWhen}",
   "installed_integrations.triggerWords": "Trigger Words: {triggerWords}",
+  "installed_integrations.unnamed_oauth_app": "Unnamed OAuth 2.0 Application",
   "installed_integrations.url": "URL: {url}",
+  "installed_oauth_apps.add": "Add OAuth 2.0 Application",
+  "installed_oauth_apps.callbackUrls": "Callback URLs (One Per Line)",
+  "installed_oauth_apps.cancel": "취소",
+  "installed_oauth_apps.description": "설명",
+  "installed_oauth_apps.empty": "No OAuth 2.0 Applications found",
+  "installed_oauth_apps.header": "OAuth 2.0 Applications",
+  "installed_oauth_apps.help": "OAuth 2.0 Applications are available to everyone on your server.",
+  "installed_oauth_apps.homepage": "Homepage",
+  "installed_oauth_apps.iconUrl": "Icon URL",
+  "installed_oauth_apps.is_trusted": "Is Trusted: <strong>{isTrusted}</strong>",
+  "installed_oauth_apps.name": "표시명",
+  "installed_oauth_apps.save": "저장",
+  "installed_oauth_apps.search": "Search OAuth 2.0 Applications",
+  "installed_oauth_apps.trusted": "Is Trusted",
+  "installed_oauth_apps.trusted.no": "아니요",
+  "installed_oauth_apps.trusted.yes": "네",
   "installed_outgoing_webhooks.add": "Outgoing Webhook 추가하기",
   "installed_outgoing_webhooks.empty": "Outgoing webhook이 없습니다.",
   "installed_outgoing_webhooks.header": "Outgoing Webhooks",
@@ -1181,14 +1241,16 @@
   "integrations.header": "통합 기능",
   "integrations.incomingWebhook.description": "Incoming webhook은 외부 시스템에서 메시지를 받는 것을 허용합니다.",
   "integrations.incomingWebhook.title": "Incoming Webhook",
+  "integrations.oauthApps.description": "OAuth 2.0 allows external applications to make authorized requests to the Mattermost API.",
+  "integrations.oauthApps.title": "OAuth 2.0 Applications",
   "integrations.outgoingWebhook.description": "Outgoing webhook은 외부 시스템에 메시지를 요청하고 응답받는 것을 허용합니다.",
   "integrations.outgoingWebhook.title": "Outgoing Webhook",
   "intro_messages.DM": "{teammate}와 개인 메시지 기록의 시작입니다.<br />개인 메시지나 여기서 공유된 파일들은 외부에서 보여지지 않습니다.",
-  "intro_messages.anyMember": " 모든 멤버가 이 채널에 가입하고 글을 읽을 수 있습니다.",
+  "intro_messages.anyMember": " 모든 회원가 이 채널에 가입하고 글을 읽을 수 있습니다.",
   "intro_messages.beginning": "{name}의 시작",
   "intro_messages.channel": "채널",
   "intro_messages.creator": "<strong>{name}</strong> {type}입니다. 만든 사람: <strong>{creator}</strong> 만든 날짜: <strong>{date}</strong>",
-  "intro_messages.default": "<h4 class='channel-intro__title'>{display_name}의 시작</h4><p class='channel-intro__content'><strong>{display_name}에 오신 것을 환영합니다!</strong><br/><br/>이 곳은 팀 멤버가 처음 로그인 할 때 보이는 공간입니다다 - 모두가 알아야할 내용을 공유하는데 사용하세요.</p>",
+  "intro_messages.default": "<h4 class='channel-intro__title'>{display_name}의 시작</h4><p class='channel-intro__content'><strong>{display_name}에 오신 것을 환영합니다!</strong><br/><br/>이 곳은 팀 회원가 처음 로그인 할 때 보이는 공간입니다다 - 모두가 알아야할 내용을 공유하는데 사용하세요.</p>",
   "intro_messages.group": "비공개 그룹",
   "intro_messages.invite": "{type}에 사용자 초대하기",
   "intro_messages.inviteOthers": "팀에 사용자 초대하기",
@@ -1197,21 +1259,21 @@
   "intro_messages.onlyInvited": " 초대받은 회원만 이 비공개 그룹을 볼 수 있습니다.",
   "intro_messages.setHeader": "헤더 설정",
   "intro_messages.teammate": "This is the start of your direct message history with this teammate. Direct messages and files shared here are not shown to people outside this area.",
-  "invite_member.addAnother": "Add another",
-  "invite_member.autoJoin": "People invited automatically join the <strong>{channel}</strong> channel.",
+  "invite_member.addAnother": "더 초대하기",
+  "invite_member.autoJoin": "<strong>{channel}</strong> 채널에 자동으로 초대됩니다.",
   "invite_member.cancel": "취소",
   "invite_member.content": "이메일과 이메일 초대 기능이 비활성화 되어있습니다. 시스템 관리자에게 문의하세요.",
-  "invite_member.disabled": "User creation has been disabled for your team. Please ask your team administrator for details.",
-  "invite_member.emailError": "Please enter a valid email address",
+  "invite_member.disabled": "팀의 신규 사용자 가입이 비활성화 되어있습니다. 팀 관리자에게 문의하세요.",
+  "invite_member.emailError": "유효한 이메일 주소를 입력하세요.",
   "invite_member.firstname": "이름",
   "invite_member.inviteLink": "팀 가입 링크",
   "invite_member.lastname": "성",
   "invite_member.modalButton": "네, 취소합니다.",
   "invite_member.modalMessage": "You have unsent invitations, are you sure you want to discard them?",
   "invite_member.modalTitle": "초대를 취소하시겠습니까?",
-  "invite_member.newMember": "새 멤버 초대하기",
-  "invite_member.send": "초대 보내기",
-  "invite_member.send2": "초대 보내기",
+  "invite_member.newMember": "회원 초대하기",
+  "invite_member.send": "보내기",
+  "invite_member.send2": "보내기",
   "invite_member.sending": " 보내는 중",
   "invite_member.teamInviteLink": "{link}로도 초대할 수 있습니다.",
   "ldap_signup.find": "Find my teams",
@@ -1230,23 +1292,23 @@
   "login.gitlab": "GitLab",
   "login.google": "Google Apps",
   "login.invalidPassword": "비밀번호가 일치하지 않습니다.",
-  "login.ldapUsername": "LDAP Username",
-  "login.ldapUsernameLower": "LDAP username",
+  "login.ldapUsername": "LDAP 사용자명",
+  "login.ldapUsernameLower": "LDAP 사용자명",
   "login.noAccount": "계정이 없으신가요? ",
   "login.noEmail": "이메일을 입력하세요.",
-  "login.noEmailLdapUsername": "Please enter your email or {ldapUsername}",
+  "login.noEmailLdapUsername": "이메일 또는 {ldapUsername}을 입력하세요.",
   "login.noEmailUsername": "이메일 또는 사용자명을 입력하세요.",
-  "login.noEmailUsernameLdapUsername": "Please enter your email, username or {ldapUsername}",
-  "login.noLdapUsername": "Please enter your {ldapUsername}",
+  "login.noEmailUsernameLdapUsername": "이메일, 사용자명 또는 {ldapUsername}을 입력하세요.",
+  "login.noLdapUsername": "{ldapUsername}을 입력하세요.",
   "login.noPassword": "비밀번호를 입력하세요.",
   "login.noUsername": "사용자명을 입력하세요.",
-  "login.noUsernameLdapUsername": "Please enter your username or {ldapUsername}",
+  "login.noUsernameLdapUsername": "사용자명 또는 {ldapUsername}을 입력하세요.",
   "login.office365": "Office 365",
   "login.on": "on {siteName}",
   "login.or": "또는",
   "login.password": "비밀번호",
-  "login.passwordChanged": " Password updated successfully",
-  "login.session_expired": " Your session has expired. Please login again.",
+  "login.passwordChanged": " 비밀번호가 성공적으로 변경되었습니다.",
+  "login.session_expired": " 세션이 만료되었습니다. 다시 로그인 하세요.",
   "login.signIn": "로그인",
   "login.signInWith": "다음으로 로그인하기:",
   "login.userNotFound": "입력된 계정과 일치하는 사용자 정보를 찾을 수 없습니다.",
@@ -1256,11 +1318,11 @@
   "login_mfa.submit": "제출",
   "login_mfa.token": "MFA 토큰",
   "login_mfa.tokenReq": "MFA 토큰을 입력하세요.",
-  "member_item.makeAdmin": "Make Admin",
-  "member_item.member": "멤버",
-  "member_list.noUsersAdd": "No users to add.",
+  "member_item.makeAdmin": "관리자로 설정하기",
+  "member_item.member": "회원",
+  "member_list.noUsersAdd": "추가할 유저가 없습니다.",
   "members_popover.msg": "메시지",
-  "members_popover.title": "멤버",
+  "members_popover.title": "회원",
   "more_channels.close": "닫기",
   "more_channels.create": "새로 만들기",
   "more_channels.createClick": "'새로 만들기'를 클릭하여 새로운 채널을 만드세요",
@@ -1275,9 +1337,9 @@
   "msg_typing.someone": "Someone",
   "navbar.addMembers": "Add Members",
   "navbar.click": "Click here",
-  "navbar.delete": "Delete Channel...",
-  "navbar.leave": "Leave Channel",
-  "navbar.manageMembers": "Manage Members",
+  "navbar.delete": "채널 삭제하기...",
+  "navbar.leave": "채널 떠나기",
+  "navbar.manageMembers": "회원 관리하기",
   "navbar.noHeader": "No channel header yet.{newline}{link} to add one.",
   "navbar.preferences": "알림 설정",
   "navbar.rename": "채널 이름 변경...",
@@ -1293,37 +1355,37 @@
   "navbar_dropdown.emoji": "사용자 정의 이모티콘",
   "navbar_dropdown.help": "도움말",
   "navbar_dropdown.integrations": "통합 기능",
-  "navbar_dropdown.inviteMember": "새로운 멤버 초대하기",
+  "navbar_dropdown.inviteMember": "회원 초대하기",
   "navbar_dropdown.leave": "팀 떠나기",
   "navbar_dropdown.logout": "로그아웃",
-  "navbar_dropdown.manageMembers": "멤버 관리하기",
+  "navbar_dropdown.manageMembers": "회원 관리하기",
   "navbar_dropdown.nativeApps": "네이티브 앱 다운로드",
   "navbar_dropdown.report": "문제 보고",
   "navbar_dropdown.switchTeam": "{team}(으)로 돌아가기",
   "navbar_dropdown.switchTo": "팀 변경: ",
-  "navbar_dropdown.teamLink": "팀 초대 링크",
+  "navbar_dropdown.teamLink": "팀 가입 링크",
   "navbar_dropdown.teamSettings": "팀 설정",
-  "navbar_dropdown.viewMembers": "View Members",
+  "navbar_dropdown.viewMembers": "회원목록 보기",
   "notification.dm": "개인 메시지",
-  "password_form.change": "Change my password",
+  "password_form.change": "비밀번호 변경하기",
   "password_form.click": "Click <a href={url}>here</a> to log in.",
   "password_form.enter": "Enter a new password for your {siteName} account.",
   "password_form.error": "최소 {chars}글자 이상 입력하세요.",
-  "password_form.pwd": "Password",
+  "password_form.pwd": "비밀번호",
   "password_form.title": "Password Reset",
   "password_form.update": "Your password has been updated successfully.",
   "password_send.checkInbox": "Please check your inbox.",
   "password_send.description": "To reset your password, enter the email address you used to sign up",
-  "password_send.email": "Email",
-  "password_send.error": "Please enter a valid email address.",
+  "password_send.email": "이메일",
+  "password_send.error": "유효한 이메일 주소를 입력하세요.",
   "password_send.link": "<p>A password reset link has been sent to <b>{email}</b></p>",
   "password_send.reset": "Reset my password",
   "password_send.title": "Password Reset",
   "pending_post_actions.cancel": "취소",
-  "pending_post_actions.retry": "Retry",
+  "pending_post_actions.retry": "다시 시도",
   "permalink.error.access": "Permalink belongs to a deleted message or to a channel to which you do not have access.",
   "post_attachment.collapse": "Show less...",
-  "post_attachment.more": "Show more...",
+  "post_attachment.more": "더 보기...",
   "post_body.commentedOn": "Commented on {name}{apostrophe} message: ",
   "post_body.deleted": "(삭제된 메시지)",
   "post_body.plusMore": " plus {count} other files",
@@ -1331,32 +1393,15 @@
   "post_delete.notPosted": "Comment could not be posted",
   "post_delete.okay": "확인",
   "post_delete.someone": "Someone deleted the message on which you tried to post a comment.",
-  "post_focus_view.beginning": "채널 보존의 시작",
+  "post_focus_view.beginning": "채널의 시작",
   "post_info.del": "삭제",
   "post_info.edit": "편집",
+  "post_info.mobile.flag": "Flag",
+  "post_info.mobile.unflag": "Unflag",
   "post_info.permalink": "링크",
   "post_info.reply": "답글",
   "posts_view.loadMore": "메시지 더 보기",
   "posts_view.newMsg": "New Messages",
-  "register_app.callback": "Callback URL",
-  "register_app.callbackError": "At least one callback URL must be filled in.",
-  "register_app.cancel": "취소",
-  "register_app.clientId": "Client ID",
-  "register_app.clientSecret": "Client Secret",
-  "register_app.close": "닫기",
-  "register_app.credentialsDescription": "Save these somewhere SAFE and SECURE. Treat your Client ID as your app's username and your Client Secret as the app's password.",
-  "register_app.credentialsSave": "I have saved both my Client Id and Client Secret somewhere safe",
-  "register_app.credentialsTitle": "Your Application Credentials",
-  "register_app.description": "설명",
-  "register_app.dev": "Developer Applications",
-  "register_app.homepage": "Homepage URL",
-  "register_app.homepageError": "Homepage must be filled in.",
-  "register_app.name": "Application Name",
-  "register_app.nameError": "Application name must be filled in.",
-  "register_app.optional": "Optional",
-  "register_app.register": "Register",
-  "register_app.required": "Required",
-  "register_app.title": "Register a New Application",
   "removed_channel.channelName": "the channel",
   "removed_channel.from": "Removed from ",
   "removed_channel.okay": "확인",
@@ -1376,7 +1421,10 @@
   "rhs_comment.comment": "답글",
   "rhs_comment.del": "삭제",
   "rhs_comment.edit": "편집",
+  "rhs_comment.mobile.flag": "Flag",
+  "rhs_comment.mobile.unflag": "Unflag",
   "rhs_comment.permalink": "바로가기",
+  "rhs_header.backToFlaggedTooltip": "Back to Flagged Posts",
   "rhs_header.backToResultsTooltip": "검색결과로 돌아가기",
   "rhs_header.closeSidebarTooltip": "사이드바 닫기",
   "rhs_header.details": "메시지 세부사항",
@@ -1385,12 +1433,15 @@
   "rhs_root.del": "삭제",
   "rhs_root.direct": "개인 메시지",
   "rhs_root.edit": "편집",
+  "rhs_root.mobile.flag": "Flag",
+  "rhs_root.mobile.unflag": "Unflag",
   "rhs_root.permalink": "바로가기",
   "search_bar.cancel": "취소",
   "search_bar.search": "검색",
   "search_bar.usage": "<h4>검색 옵션</h4><ul><li><b>\"따옴표\"</b><span>를 사용하여 문구를 검색할 수 있습니다.</span></li><li><b>from:</b><span> 을 사용하여 특정 작성자를 검색하거나 </span><b>in:</b><span> 을 사용하여 특정 채널에 대해 검색할 수 있습니다.</span></li></ul>",
   "search_header.results": "검색 결과",
   "search_header.title2": "최근 멘션",
+  "search_header.title3": "Flagged Posts",
   "search_item.direct": "개인 메시지",
   "search_item.jump": "바로가기",
   "search_results.because": "<ul><li>문구의 일부분을 검색하려면(예: \"rea\", 를 검색하여 \"reach\" 또는 \"reaction\") 단어 앞 또는 뒤에 와일드카드 문자(*)를 붙여보세요.</li><li>두 글자 검색이나 \"this\", \"a\", \"is\"같이 일반적인 단어는 과도한 결과를 반환하기 때문에 검색결과에 표시되지 않습니다.</li></ul>",
@@ -1407,8 +1458,8 @@
   "setting_upload.noFile": "파일이 선택되지 않았습니다.",
   "setting_upload.select": "파일 선택",
   "sidebar.channels": "채널",
-  "sidebar.createChannel": "Create new channel",
-  "sidebar.createGroup": "Create new group",
+  "sidebar.createChannel": "채널 생성하기",
+  "sidebar.createGroup": "그룹 생성하기",
   "sidebar.direct": "개인 메시지",
   "sidebar.more": "더 보기",
   "sidebar.moreElips": "더 보기...",
@@ -1423,10 +1474,11 @@
   "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.console": "관리자 도구",
+  "sidebar_right_menu.flagged": "Flagged Posts",
   "sidebar_right_menu.help": "도움말",
-  "sidebar_right_menu.inviteNew": "멤버 초대하기",
+  "sidebar_right_menu.inviteNew": "회원 초대하기",
   "sidebar_right_menu.logout": "로그아웃",
-  "sidebar_right_menu.manageMembers": "멤버 관리하기",
+  "sidebar_right_menu.manageMembers": "회원 관리하기",
   "sidebar_right_menu.nativeApps": "네이티브 앱 다운로드",
   "sidebar_right_menu.recentMentions": "최근 멘션",
   "sidebar_right_menu.report": "문제 보고",
@@ -1473,7 +1525,7 @@
   "signup_user_completed.welcome": "Welcome to:",
   "signup_user_completed.whatis": "What's your email address?",
   "signup_user_completed.withLdap": "With your LDAP credentials",
-  "sso_signup.find": "Find my teams",
+  "sso_signup.find": "팀 찾기",
   "sso_signup.gitlab": "GitLab 계정으로 팀 만들기",
   "sso_signup.google": "Google 계정으로 팀 만들기",
   "sso_signup.length_error": "Name must be 3 or more characters up to a maximum of 15",
@@ -1498,20 +1550,20 @@
   "team_import_tab.successful": " 가져오기 성공: ",
   "team_import_tab.summary": "요약",
   "team_member_modal.close": "닫기",
-  "team_member_modal.members": "{team} 멤버",
+  "team_member_modal.members": "{team} 회원",
   "team_members_dropdown.confirmDemoteDescription": "If you demote yourself from the System Admin role and there is not another user with System Admin privileges, you'll need to re-assign a System Admin by accessing the Mattermost server through a terminal and running the following command.",
   "team_members_dropdown.confirmDemoteRoleTitle": "Confirm demotion from System Admin role",
   "team_members_dropdown.confirmDemotion": "Confirm Demotion",
   "team_members_dropdown.confirmDemotionCmd": "platform -assign_role -team_name=\"yourteam\" -email=\"name@yourcompany.com\" -role=\"system_admin\"",
   "team_members_dropdown.inactive": "비활성",
-  "team_members_dropdown.leave_team": "Remove From Team",
+  "team_members_dropdown.leave_team": "팀에서 추방하기",
   "team_members_dropdown.makeActive": "활성화",
-  "team_members_dropdown.makeAdmin": "Make Team Admin",
+  "team_members_dropdown.makeAdmin": "팀 관리자로 설정하기",
   "team_members_dropdown.makeInactive": "비활성화",
-  "team_members_dropdown.makeMember": "Make Member",
-  "team_members_dropdown.member": "멤버",
-  "team_members_dropdown.systemAdmin": "System Admin",
-  "team_members_dropdown.teamAdmin": "Team Admin",
+  "team_members_dropdown.makeMember": "회원으로 설정하기",
+  "team_members_dropdown.member": "회원",
+  "team_members_dropdown.systemAdmin": "시스템 관리자",
+  "team_members_dropdown.teamAdmin": "팀 관리자",
   "team_settings_modal.exportTab": "내보내기",
   "team_settings_modal.generalTab": "일반",
   "team_settings_modal.importTab": "가져오기",
@@ -1541,7 +1593,7 @@
   "tutorial_tip.ok": "확인",
   "tutorial_tip.out": "이 팁 더이상 보지 않기.",
   "tutorial_tip.seen": "이미 알고 계신가요? ",
-  "upload_overlay.info": "Drop a file to upload it.",
+  "upload_overlay.info": "이 곳에 파일을 끌어 업로드하세요.",
   "user.settings.advance.embed_preview": "가능한 경우, 링크 내용 미리보기를 표시",
   "user.settings.advance.embed_toggle": "Show toggle for all embed previews",
   "user.settings.advance.enabledFeatures": "{count, number}개 기능 활성화",
@@ -1581,10 +1633,6 @@
   "user.settings.custom_theme.sidebarTextHoverBg": "Sidebar Text Hover BG",
   "user.settings.custom_theme.sidebarTitle": "사이드바 스타일",
   "user.settings.custom_theme.sidebarUnreadText": "Sidebar Unread Text",
-  "user.settings.developer.applicationsPreview": "Applications (Preview)",
-  "user.settings.developer.register": "Register New Application",
-  "user.settings.developer.thirdParty": "Open to register a new third-party application",
-  "user.settings.developer.title": "개발자 설정",
   "user.settings.display.channelDisplayTitle": "채널 화면 모드",
   "user.settings.display.channeldisplaymode": "채널 영역의 너비를 선택하세요.",
   "user.settings.display.clockDisplay": "시간 표시",
@@ -1668,6 +1716,7 @@
   "user.settings.import_theme.submit": "적용",
   "user.settings.import_theme.submitError": "Invalid format, please try copying and pasting in again.",
   "user.settings.languages.change": "언어 변경",
+  "user.settings.languages.promote": "Select which language Mattermost displays in the user interface.<br /><br />Would like to help with translations? Join the <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> to contribute.",
   "user.settings.mfa.add": "Add MFA to your account",
   "user.settings.mfa.addHelp": "You can require a smartphone-based token, in addition to your password, to sign into Mattermost.<br/><br/>To enable, download Google Authenticator from <a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a> or <a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a> for your phone, then<br/><br/>1. Click the <strong>Add MFA to your account</strong> button above.<br/>2. Use Google Authenticator to scan the QR code that appears.<br/>3. Type in the Token generated by Google Authenticator and click <strong>Save</strong>.<br/><br/>When logging in, you will be asked to enter a token from Google Authenticator in addition to your regular credentials.",
   "user.settings.mfa.addHelpQr": "Please scan the bar code with the Google Authenticator app on your smartphone and fill in the token with one provided by the app.",
@@ -1675,19 +1724,17 @@
   "user.settings.mfa.qrCode": "Bar Code",
   "user.settings.mfa.remove": "Remove MFA from your account",
   "user.settings.mfa.removeHelp": "Removing multi-factor authentication means you will no longer require a phone-based passcode to sign-in to your account.",
+  "user.settings.mfa.title": "Enable Multi-factor Authentication:",
   "user.settings.modal.advanced": "고급",
-  "user.settings.modal.confirmBtns": "Yes, Discard",
+  "user.settings.modal.confirmBtns": "네, 취소합니다.",
   "user.settings.modal.confirmMsg": "You have unsaved changes, are you sure you want to discard them?",
-  "user.settings.modal.confirmTitle": "Discard Changes?",
-  "user.settings.modal.developer": "개발자",
+  "user.settings.modal.confirmTitle": "변경을 취소하시겠습니까?",
   "user.settings.modal.display": "화면",
   "user.settings.modal.general": "일반",
   "user.settings.modal.notifications": "알림",
   "user.settings.modal.security": "보안",
   "user.settings.modal.title": "계정 설정",
-  "user.settings.notification.allActivity": "모든 활동 알림 받기",
-  "user.settings.notification.push": "모바일 푸시 알림",
-  "user.settings.notification.soundConfig": "브라우저 설정에서 알림 소리를 변경하세요",
+  "user.settings.notifications.allActivity": "모든 활동",
   "user.settings.notifications.channelWide": "채널 전체 멘션 \"@channel\", \"@all\"",
   "user.settings.notifications.close": "닫기",
   "user.settings.notifications.comments": "답글 활동 알림",
@@ -1706,9 +1753,11 @@
   "user.settings.notifications.off": "끄기",
   "user.settings.notifications.on": "켜기",
   "user.settings.notifications.onlyMentions": "멘션과 직접 대화에 대한 알림만 받기",
+  "user.settings.notifications.push": "모바일 푸시 알림",
   "user.settings.notifications.sensitiveName": "내 이름 \"{first_name}\" (대소문자 구별 안함)",
   "user.settings.notifications.sensitiveUsername": "내 사용자명 \"{username}\" (대소문자 구별 안함)",
   "user.settings.notifications.sensitiveWords": "다른 알림받을 단어들을 쉼표로 구분하여 입력: (대소문자 구별 안함)",
+  "user.settings.notifications.soundConfig": "브라우저 설정에서 알림 소리를 변경하세요",
   "user.settings.notifications.sounds_info": "Desktop notifications sounds are available on Firefox, Safari, Chrome, Internet Explorer, and Edge.",
   "user.settings.notifications.teamWide": "팀 전체 멘션 \"@all\"",
   "user.settings.notifications.title": "알림 설정",
@@ -1723,7 +1772,7 @@
   "user.settings.security.close": "닫기",
   "user.settings.security.currentPassword": "현재 비밀번호",
   "user.settings.security.currentPasswordError": "현재 비밀번호를 입력해주세요",
-  "user.settings.security.emailPwd": "Email and Password",
+  "user.settings.security.emailPwd": "이메일과 비밀번호",
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "Google",
   "user.settings.security.lastUpdated": "{date} {time} 에 마지막으로 변경됨",
@@ -1775,7 +1824,7 @@
   "web.footer.help": "도움말",
   "web.footer.privacy": "정책",
   "web.footer.terms": "서비스 약관",
-  "web.header.back": "Back",
+  "web.header.back": "돌아가기",
   "web.root.signup_info": "모든 팀 커뮤니케이션을 한 곳에서 확인하고, 검색하고, 접근할 수 있습니다.",
-  "youtube_video.notFound": "Video not found"
+  "youtube_video.notFound": "비밀번호를 찾을 수 없습니다."
 }
diff --git a/webapp/i18n/nl.json b/webapp/i18n/nl.json
index 650042ddd..b66e0f014 100644
--- a/webapp/i18n/nl.json
+++ b/webapp/i18n/nl.json
@@ -30,21 +30,21 @@
   "activity_log_modal.androidNativeApp": "Android eigen applicatie",
   "activity_log_modal.iphoneNativeApp": "iPhone eigen applicatie",
   "add_command.autocomplete": "Automatisch aanvullen",
-  "add_command.autocomplete.help": "(Optional) Show slash command in autocomplete list.",
+  "add_command.autocomplete.help": "(optioneel) Toon slash commando's in de autocomplete lijst.",
   "add_command.autocompleteDescription": "Automatisch aanvullen omgeschrijving",
-  "add_command.autocompleteDescription.help": "Optionele korte omschrijving van de 'slash' opdracht voor in de automatisch aanvullen lijst.",
+  "add_command.autocompleteDescription.help": "(Optionele) korte omschrijving van de 'slash' opdracht voor in de automatisch aanvullen lijst.",
   "add_command.autocompleteDescription.placeholder": "Bevoorbeeld: \"Geeft zoek resultaten op patienten dossiers\"",
   "add_command.autocompleteHint": "Automatisch aanvullen tip",
-  "add_command.autocompleteHint.help": "(Optional) Arguments associated with your slash command, displayed as help in the autocomplete list.",
+  "add_command.autocompleteHint.help": "(Optioneel) Argumenten gerelateerd tot jouw slash commando, worden getoond als help in de autocompleet lijst",
   "add_command.autocompleteHint.placeholder": "Bijvoorbeeld: [Patient naam]",
   "add_command.cancel": "Annuleren",
   "add_command.description": "Omschrijving",
-  "add_command.description.help": "Description for your incoming webhook.",
+  "add_command.description.help": "Omschrijving van jouw inkomende webhook.",
   "add_command.displayName": "Weergavenaam",
-  "add_command.displayName.help": "Display name for your slash command made of up to 64 characters.",
+  "add_command.displayName.help": "Weergavenaam voor jouw slash commando tot 64 karakters.",
   "add_command.header": "Toevoegen",
   "add_command.iconUrl": "Reactie icoon",
-  "add_command.iconUrl.help": "Kies een alternatief figuur om bij de berichten uit slash opdrachten te plaatsen. Kies een URL die naar een .png of .jpg bestand wijst, die minstens 128 bij 128 pixels groot is.",
+  "add_command.iconUrl.help": "Kies een alternatieve profielafbeelding om bij de berichten uit slash opdrachten te plaatsen. Kies een URL die naar een .png of .jpg bestand wijst, die minstens 128 bij 128 pixels groot is.",
   "add_command.iconUrl.placeholder": "https://www.voorbeeld.nl/mijnicoon.png",
   "add_command.method": "Anvraag methode",
   "add_command.method.get": "GET",
@@ -52,10 +52,10 @@
   "add_command.method.post": "POST",
   "add_command.save": "Opslaan",
   "add_command.trigger": "Opdracht Trigger-woord",
-  "add_command.trigger.help": "Trigger word must be unique, and cannot begin with a slash or contain any spaces.",
-  "add_command.trigger.helpExamples": "Examples: client, employee, patient, weather",
-  "add_command.trigger.helpReserved": "Reserved: {link}",
-  "add_command.trigger.helpReservedLinkText": "see list of built-in slash commands",
+  "add_command.trigger.help": "Trigger woord moet uniek zijn, en kan niet beginnen met een slash of spaties bevatten.",
+  "add_command.trigger.helpExamples": "Voorbeelden: klant, werknemer, patient, weer",
+  "add_command.trigger.helpReserved": "Gereserveerd: {link}",
+  "add_command.trigger.helpReservedLinkText": "bekijk een lijst van ingebouwde slash commando's",
   "add_command.trigger.placeholder": "Opdracht activeren, b.v. \"hallo\"",
   "add_command.triggerInvalidLength": "Een activeer-woord moet minimaal {min} en maximaam {max} tekens bevatten",
   "add_command.triggerInvalidSlash": "Een activeer-woord kan niet met een / beginnen",
@@ -66,7 +66,7 @@
   "add_command.url.placeholder": "Moet beginnen met http:// of https://",
   "add_command.urlRequired": "Een aanvraag URL is vereist",
   "add_command.username": "Gebruikersnaam voor de Reactie",
-  "add_command.username.help": "Kies een gebruikersnaam waarmee die slash opdracht kan reageren. Gebruikersnamen kunnen bestaan uit maximaal 22 kleine letters, cijfers en de symbolen \"-\", \"_\", en \".\" .",
+  "add_command.username.help": "(Optioneel) Kies een gebruikersnaam waarmee die slash opdracht kan reageren. Gebruikersnamen kunnen bestaan uit maximaal 22 kleine letters, cijfers en de symbolen \"-\", \"_\", en \".\" .",
   "add_command.username.placeholder": "Gebruikersnaam",
   "add_emoji.cancel": "Annuleren",
   "add_emoji.header": "Toevoegen",
@@ -84,39 +84,51 @@
   "add_emoji.save": "Opslaan",
   "add_incoming_webhook.cancel": "Annuleren",
   "add_incoming_webhook.channel": "Kanaal",
-  "add_incoming_webhook.channel.help": "Public channel or private group that receives the webhook payloads. You must belong to the private group when setting up the webhook.",
+  "add_incoming_webhook.channel.help": "Publiek kanaal of privé groep wat webhook payloads ontvangt. Je moet lid zijn van de privé groep om deze webhook in te stellen.",
   "add_incoming_webhook.channelRequired": "Een geldig kanaal is vereist",
   "add_incoming_webhook.description": "Omschrijving",
-  "add_incoming_webhook.description.help": "Description for your incoming webhook.",
+  "add_incoming_webhook.description.help": "Omschrijving van jouw inkomende webhook.",
   "add_incoming_webhook.displayName": "Weergavenaam",
-  "add_incoming_webhook.displayName.help": "Display name for your incoming webhook made of up to 64 characters.",
+  "add_incoming_webhook.displayName.help": "Weergavenaam voor jouw inkomende webhook van maximaal 64 karakters.",
   "add_incoming_webhook.header": "Toevoegen",
   "add_incoming_webhook.name": "Naam",
   "add_incoming_webhook.save": "Opslaan",
+  "add_oauth_app.callbackUrls.help": "De doorstuur URL's waarnaar de service zal doorsturen nadat gebruikers de autorisatie van de applicatie hebben afgewezen of toegestaan, welke de autorisatie codes of tokens zal afhandelen. Moet een geldige URL zijn en beginnen met http:// of https://.",
+  "add_oauth_app.callbackUrlsRequired": "En of meerdere callback URL's zijn vereist",
+  "add_oauth_app.description.help": "Omschrijving voor jouw OAuth 2.0 applicatie.",
+  "add_oauth_app.descriptionRequired": "Omschrijving voor jouw OAuth 2.0 applicatie is verplicht.",
+  "add_oauth_app.header": "Toevoegen",
+  "add_oauth_app.homepage.help": "De URL van de homepagina van de OAuth 2.0 applicatie. Gebruik HTTP of HTTPS in de URL afhankelijk van de configuratie.",
+  "add_oauth_app.homepageRequired": "Homepagina van de OAuth 2.0 applicatie is verplicht. ",
+  "add_oauth_app.icon.help": "(Optioneel) De URL van de afbeelding die gebruikt word voor jouw OAuth 2.0 applicatie. Gebruik HTTP of HTTPS in jouw URL.",
+  "add_oauth_app.name.help": "Weergavenaam voor jouw OAuth 2.0 applicatie van maximaal 64 karakters.",
+  "add_oauth_app.nameRequired": "Naam van de OAuth 2.0 applicatie is verplicht.",
+  "add_oauth_app.trusted.help": "Wanneer waar, de OAuth 2.0 applicatie is vertrouwd door de Mattermost server en verplicht de gebruiker niet om autorisatie te accepteren. Wanneer niet waar, zal er additioneel venster verschijnen, met de vraag of de gebruiker dit verzoek wil toestaan of afwijzen.",
   "add_outgoing_webhook.callbackUrls": "Aanvraag URL's (Een per regel)",
-  "add_outgoing_webhook.callbackUrls.help": "The URL that messages will be sent to.",
+  "add_outgoing_webhook.callbackUrls.help": "De URL waar berichten naartoe worden gezonden.",
   "add_outgoing_webhook.callbackUrlsRequired": "En of meerdere aanvraag URL's zijn vereist",
   "add_outgoing_webhook.cancel": "Annuleren",
   "add_outgoing_webhook.channel": "Kanaal",
-  "add_outgoing_webhook.channel.help": "Public channel to receive webhook payloads. Optional if at least one Trigger Word is specified.",
-  "add_outgoing_webhook.contentType.help1": "Choose the content type by which the response will be sent.",
-  "add_outgoing_webhook.contentType.help2": "If application/x-www-form-urlencoded is chosen, the server assumes you will be encoding the parameters in a URL format.",
-  "add_outgoing_webhook.contentType.help3": "If application/json is chosen, the server assumes you will posting JSON data.",
+  "add_outgoing_webhook.channel.help": "Publiek kanaal wat webhook payloads ontvangt. Optioneel als er minimaal 1 Trigger Woord is gespecificeerd. ",
+  "add_outgoing_webhook.contentType.help1": "Kies de content type van de te verzenden antwoord.",
+  "add_outgoing_webhook.contentType.help2": "Als application/x-www-form-urlencoded is gekozen, dan zal de server aannemen dat je de parameters in een URL formaat stuurt. ",
+  "add_outgoing_webhook.contentType.help3": "Als application/json is gekozen, neemt de server aan dat je JSON data zult posten.",
   "add_outgoing_webhook.content_Type": "Content Type",
   "add_outgoing_webhook.description": "Omschrijving",
-  "add_outgoing_webhook.description.help": "Description for your outgoing webhook.",
+  "add_outgoing_webhook.description.help": "Omschrijving van jouw uitgaande webhook.",
   "add_outgoing_webhook.displayName": "Weergavenaam",
-  "add_outgoing_webhook.displayName.help": "Display name for your outgoing webhook made of up to 64 characters.",
+  "add_outgoing_webhook.displayName.help": "Weergavenaam voor jouw uitgaande webhook van maximaal 64 karakters.",
   "add_outgoing_webhook.header": "Toevoegen",
   "add_outgoing_webhook.name": "Naam",
   "add_outgoing_webhook.save": "Opslaan",
   "add_outgoing_webhook.triggerWords": "Activeer woorden (één per regel)",
-  "add_outgoing_webhook.triggerWords.help": "Messages that start with one of the specified words will trigger the outgoing webhook. Optional if Channel is selected.",
+  "add_outgoing_webhook.triggerWords.help": "Berichten die starten met 1 van de gespecificeerde woorden zullen de uitgaande webhook triggeren. Optioneel als het Kanaal is geselecteerd.",
   "add_outgoing_webhook.triggerWordsOrChannelRequired": "Een geldig kanaal, of een lijst van activeer-woorden is vereist",
   "add_outgoing_webhook.triggerWordsTriggerWhen": "Activatiewoord",
-  "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choose when to trigger the outgoing webhook; if the first word of a message matches a Trigger Word exactly, or if it starts with a Trigger Word.",
+  "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Kies wanneer de activatie voor uitgaande webhook in werking treed; wanneer het eerste woord van het bericht overeenkomt met een trigger-woord, of wanneer het start met een trigger-woord.",
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "Eerste trigger woord komt exact overeen",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "Eerste woord start met een trigger woord",
+  "admin.advance.cluster": "High Availability (Beta)",
   "admin.audits.reload": "Laad de gebruikeractiviteit logs opnieuw",
   "admin.audits.title": "Gebruiker activiteits logs",
   "admin.authentication.email": "Email authenticatie",
@@ -124,6 +136,24 @@
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "Opmerking:",
+  "admin.cluster.enableDescription": "Mattermost SAML logins toestaan. Lees hier de <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentatie</a> over het configureren van SAML voor Mattermost.",
+  "admin.cluster.enableTitle": "High Availability modus aanzetten:",
+  "admin.cluster.interNodeListenAddressDesc": "Het adres waarop de server zal luisteren voor communicatie met andere servers.",
+  "admin.cluster.interNodeListenAddressEx": "Bv. \":8075\"",
+  "admin.cluster.interNodeListenAddressTitle": "Inter-Node Listen Adres:",
+  "admin.cluster.interNodeUrlsDesc": "De interne/privé URL's van alle Mattermost servers gescheiden door komma's. ",
+  "admin.cluster.interNodeUrlsEx": "Bv \"http://10.10.10.30, http://10.10.10.31\"",
+  "admin.cluster.interNodeUrlsTitle": "Inter-Node URL's:",
+  "admin.cluster.loadedFrom": "Het configuratiebestand was geladen van Node ID {clusterId}. Zie de Troubleshooting Guide in onze <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentatie</a> als je problemen ondervind bij de toegang tot de Systeem Console via een loadbalancer.",
+  "admin.cluster.noteDescription": "Het veranderen van configuratie in deze sectie zal een server herstart vereisen voordat het in werking treed. Wanneer High Availability mode geactiveerd is, zal System Console op alleen-lezen gezet worden en kan alleen gewijzigd worden via het configuratie bestand.",
+  "admin.cluster.should_not_change": "Waarschuwing: Deze instellingen zullen waarschijnlijk niet in sync staat met andere servers in het cluster. High Availability inter-node communicatie zal niet starten tot config.json gelijk is op alle servers en Mattermost is herstart. Bekijk de <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentatie</a> om te zien hoe je een server aan het cluster toevoegt of verwijdert. Wanneer u de Systeem Console via een load balancer benadert en problemen ervaart, lees de Troubleshooting Guide in onze <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentatie</a>.",
+  "admin.cluster.status_table.config_hash": "Configuratie Bestand MD5",
+  "admin.cluster.status_table.hostname": "Hostnaam",
+  "admin.cluster.status_table.id": "Node ID",
+  "admin.cluster.status_table.reload": " Herlaad Cluster Status",
+  "admin.cluster.status_table.status": "Status",
+  "admin.cluster.status_table.url": "Inter-Node URL",
+  "admin.cluster.status_table.version": "Versie",
   "admin.compliance.directoryDescription": "De directory waar de \"compliance\" rapporten worden weggeschreven. Indien leeg, word ./data/ gebruikt.",
   "admin.compliance.directoryExample": "B.v. \"./data/\"",
   "admin.compliance.directoryTitle": "Nalevingsrapport Map:",
@@ -252,7 +282,7 @@
   "admin.files.storage": "Opslag",
   "admin.general.configuration": "Configuratie",
   "admin.general.localization": "Lokalisatie",
-  "admin.general.localization.availableLocalesDescription": "Bepaald welke talen beschikbaar zijn voor gebruikers in account instellingen (laat leeg om alle talen beschikbaar te stellen).",
+  "admin.general.localization.availableLocalesDescription": "Selecteer welke talen er beschikbaar zijn voor gebruikers in de Account Instellingen (laat dit veld leeg om alle talen beschikbaar te stellen).<br /><br />Wil je helpen met vertalen? Word lid van de <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a>.",
   "admin.general.localization.availableLocalesTitle": "Beschikbare talen:",
   "admin.general.localization.clientLocaleDescription": "Standaard taal voor nieuw aangemaakte gebruikers en pagina's bij eerste bezoek.",
   "admin.general.localization.clientLocaleTitle": "Standaard client taal:",
@@ -267,7 +297,7 @@
   "admin.general.policy.restrictPrivateChannelManagementTitle": "Zet prive groep management permissies aan voor:",
   "admin.general.policy.restrictPublicChannelManagementDescription": "Zet een policy aan wie er kan maken, verwijderen, hernoemen en de header instellen bij gebruik van publieke kanalen.",
   "admin.general.policy.restrictPublicChannelManagementTitle": "Zet publieke groep management permissies aan voor:",
-  "admin.general.policy.teamInviteDescription": "Set policy on who can invite others to a team using <b>Invite New Member</b> to invite new users by email, or the <b>Get Team Invite Link</b> options from the Main Menu. If <b>Get Team Invite Link</b> is used to share a link, you can expire the invite code from <b>Team Settings</b> > <b>Invite Code</b> after the desired users join the team.",
+  "admin.general.policy.teamInviteDescription": "Zet een policy op wie er anderen kan uitnodigen om lid te worden van een team met <b>Nodig Nieuw Lid Uit</b> om uit te nodigen per email, of de <b>Krijg Team Uitnodigings Link</b> opties vanuit het Hoofdmenu. Als <b>Krijg Team Uitnodigings Link</b> is gebruikt om een link te delen, kan je de link laten verlopen in de <b>Team Instellingen</b> > <b>Uitnodigings Code</b> nadat de gewenste gebruikers lid zijn geworden van het team.",
   "admin.general.policy.teamInviteTitle": "Versturen van team uitnodigingen toestaan vanaf:",
   "admin.general.privacy": "Privacy",
   "admin.general.usersAndTeams": "Gebruikers en Teams",
@@ -290,7 +320,7 @@
   "admin.gitlab.userDescription": "Geef https://<your-gitlab-url>/api/v3/user. Zorg ervoor dat u HTTP of HTTPS in de URL gebruikt, afhankelijk van de configuratie van uw server.",
   "admin.gitlab.userExample": "Bijv. \"https://<your-gitlab-url>/api/v3/user\"",
   "admin.gitlab.userTitle": "Gebruikers API eindpunt:",
-  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>Log in</a> to your Google account.</li><li>Go to <a href='https://console.developers.google.com'>https://console.developers.google.com</a>, click <strong>Credentials</strong> in the left hand sidebar and enter <strong>Mattermost - <your-company-name></strong> as the project name.</li><li>Click the <strong>OAuth consent screen</strong> header and enter <strong>Mattermost</strong> as the <strong>Product name to show users</strong>. Click <strong>Save</strong>.</li><li>Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.</li><li>Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong><your-mattermost-url>/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.</li><li>Save the <strong>client ID</strong> and <strong>client secret</strong> to later complete the fields below.</li><li>Finally, go to <a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> and click <strong>Enable</strong>. This might take a few minutes to propagate through Google's systems.</li><li>Complete the <strong>Client ID</strong> and <strong>Client Secret</strong> fields below.</li></ol>",
+  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>Inloggen</a> op uw Google account.</li><li>Ga naar <a href='https://console.developers.google.com'>https://console.developers.google.com</a>, klik op <strong>Credentials</strong> in het linker menu en voer \"Mattermost - uw-bedrijfsnaam\" in als <strong>Project Name</strong>, klik daarna op <strong>Create</strong>.</li><li>Klik op <strong>OAuth consent screen</strong> en voer \"Mattermost\" in als <strong>Product name shown to users</strong>, klik daarna op <strong>Save</strong>.</li><li>Onder de kop <strong>Credentials</strong>, klik <strong>Create credentials</strong>, kies <strong>OAuth client ID</strong> en selecteer <strong>Web Application</strong>.</li><li>Onder <strong>Restrictions</strong> en <strong>Authorized redirect URIs</strong> voer in <strong>jouw-mattermost-url/signup/google/complete</strong> (bijv.: http://localhost:8065/signup/google/complete). Klik <strong>Create</strong>.</li><li>Plak de <strong>Client ID</strong> en <strong>Client Secret</strong> in onderstaande velden, klik daarna op <strong>Save</strong>.</li><li>Als laatste stap, ga naar <a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> en klik <strong>Enable</strong>. Het kan een aantal minuten duren voordat het de systemen van Google actief is.</li></ol>",
   "admin.google.authTitle": "Auth Eindpunt:",
   "admin.google.clientIdDescription": "Het Client ID wat je hebt ontvangen bij het registreren van je applicatie bij Google.",
   "admin.google.clientIdExample": "Bv \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -345,8 +375,8 @@
   "admin.image.thumbWidthDescription": "Breedte van de thumbnails gegenereerd op basis van geüploade foto's. Het bijwerken van deze waarde verandert hoe thumbnail afbeeldingen worden afgebeeld in de toekomst, maar verandert niets aan beelden die reeds gemaakt zijn.",
   "admin.image.thumbWidthExample": "B.v. \"120\"",
   "admin.image.thumbWidthTitle": "Bijlage Miniatuur Breedte:",
+  "admin.integrations.custom": "Aangepaste Intergraties",
   "admin.integrations.external": "Externe services",
-  "admin.integrations.webhook": "Webhooks en opdrachten",
   "admin.ldap.baseDesc": "De Base DN is de DN-Naam van de locatie waar Mattermost moet beginnen met het zoeken naar gebruikers in de LDAP-boom.",
   "admin.ldap.baseEx": "Bijv. \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "BaseDN:",
@@ -390,7 +420,7 @@
   "admin.ldap.skipCertificateVerification": "Overslaan van certificaat verificatie",
   "admin.ldap.skipCertificateVerificationDesc": "Slaat de certificaat verificatie stap over voor TLS of STARTTLS verbindingen. Niet aanbevolen voor productie omgevingen waar TLS is vereist. Gebruik dit enkel voor testdoeleinden.",
   "admin.ldap.syncFailure": "Sync Mislukt: {error}",
-  "admin.ldap.syncIntervalHelpText": "LDAP Synchronization updates Mattermost user information to reflect updates on the LDAP server. For example, when a user’s name changes on the LDAP server, the change updates in Mattermost when synchronization is performed. Accounts removed from or disabled in the LDAP server have their Mattermost accounts set to “Inactive” and have their account sessions revoked. Mattermost performs synchronization on the interval entered. For example, if 60 is entered, Mattermost synchronizes every 60 minutes.",
+  "admin.ldap.syncIntervalHelpText": "LDAP Synchronisatie werkt Mattermost gebruikers-informatie bij met updates van de LDAP server. Bijvoorbeeld, in geval van een gebruikersnaam wijziging op de LDAP server, wordt de wijziging in Mattermost doorgevoerd wanneer de sychronisatie plaatsvindt. Accounts die verwijderd of uitgeschakeld zijn op de LDAP server, zullen in Mattermost op \"Inactief\" gezet worden en bijbehorende sessies beeindigd. Mattermost zal de synchronisaties uitvoeren op de ingevulde intervals. Bijvoorbeeld, wanneer 60 is ingevuld, zal Mattermost elke 60 minuten een synchronisatie uitvoeren.",
   "admin.ldap.syncIntervalTitle": "Synchronisatie-Interval (in minuten)",
   "admin.ldap.syncNowHelpText": "Initieer een LDAP synchronisatie meteen.",
   "admin.ldap.sync_button": "Synchroniseer LDAP Nu",
@@ -448,8 +478,10 @@
   "admin.oauth.google": "Google Apps",
   "admin.oauth.off": "Sta niet toe in te loggen via een OAuth 2.0 provider",
   "admin.oauth.office365": "Office 365",
+  "admin.oauth.providerDescription": "Wanneer dit aanstaat kan Mattermost fungeren als een OAuth 2.0 service provider welke Mattermost in staat stelt externe applicaties toe om geautoriseerde verzoeken te sturen naar de Mattermost API.",
+  "admin.oauth.providerTitle": "Aanzetten van OAuth 2.0 Service Provider:",
   "admin.oauth.select": "Selecteer OAuth 2.0 service provider:",
-  "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>Log in</a> to your Microsoft or Office 365 account. Make sure it's the account on the same <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> that you would like users to log in with.</li><li>Go to <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, click <strong>Add an app</strong> and use <strong>Mattermost - <your-company-name></strong> as the application name.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and save it to later complete the field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong><your-mattermost-url>/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and complete the <strong>Application ID</strong> and <strong>Application Secret Password</strong> fields below.</li></ol>",
+  "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>Log in</a> to your Microsoft or Office 365 account. Make sure it's the account on the same <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> that you would like users to log in with.</li><li>Go to <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, click <strong>Go to app list</strong> > <strong>Add an app</strong> and use \"Mattermost - your-company-name\" as the <strong>Application Name</strong>.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and paste it to the <strong>Application Secret Password</strong> field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong>your-mattermost-url/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and then paste the <strong>Application ID</strong> below.</li></ol>",
   "admin.office365.authTitle": "Auth Eindpunt:",
   "admin.office365.clientIdDescription": "Het Spplicatie/Client ID wat je hebt ontvangen bij het registreren van je applicatie bij Microsoft.",
   "admin.office365.clientIdExample": "Bv \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
@@ -594,8 +626,8 @@
   "admin.service.listenExample": "B.v. \":8065\"",
   "admin.service.mfaDesc": "Wanneer dit ingeschakeld is, krijgen de gebruikers de mogelijkheid om multi-factor authenticatie te gebruiken om in te loggen. Ze zullen een smartphone en een authenticator-app zoals Google Authenticator nodig hebben.",
   "admin.service.mfaTitle": "Aanzetten multi-factor authenticatie:",
-  "admin.service.mobileSessionDays": "Sessie duur voor mobiele apps (dagen):",
-  "admin.service.mobileSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
+  "admin.service.mobileSessionDays": "Sessie duur voor mobiel (dagen):",
+  "admin.service.mobileSessionDaysDesc": "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.outWebhooksDesc": "Wanneer dit aanstaat, uitgaande webhooks worden toegestaan. Bekijk de <a href='http://docs.mattermost.com/developer/webhooks-outgoing.html' target='_blank'>documentatie</a> om hier meer over te lezen.",
   "admin.service.outWebhooksTitle": "Inschakelen uitgaande webhooks: ",
   "admin.service.overrideDescription": "Wanneer dit aanstaat, webhooks en slash commando's zijn toegestaan om de gebrukkersnaam waar zij berichten mee plaatsen te veranderen. Let op, in combinatie met icoon overschrijven, kan dit gebruikers vatbaar maken voor phishing aanvallen. ",
@@ -608,23 +640,28 @@
   "admin.service.sessionCache": "Sessie cache in minuten:",
   "admin.service.sessionCacheDesc": "Het aantal minuten dat een sessie in het geheugen wordt gecached.",
   "admin.service.sessionDaysEx": "B.v. \"30\"",
-  "admin.service.ssoSessionDays": "Sessie duur voor mobiele apps (dagen):",
-  "admin.service.ssoSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.",
+  "admin.service.siteURL": "Site URL:",
+  "admin.service.siteURLDescription": "De URL, inclusief poort nummer en protocol, waarvandaan Mattermost gebruikers toegang zullen hebben. Laat dit leeg om automatisch te configureren op basis van inkomend verkeer.",
+  "admin.service.siteURLExample": "Bv \"https://mattermost.example.com:1234\"",
+  "admin.service.ssoSessionDays": "Sessie duur voor SSO (dagen):",
+  "admin.service.ssoSessionDaysDesc": "Het aantal dagen dat de gebruiker voor het laatst zijn credentials heeft ingevoerd voordat gebruikers sessie verloopt. Als de authenticatie SAML of GitLab is, kan de gebruiker automatisch worden terug ingelogd in Mattermost omdat ze al waren ingelogd in SAML of GitLab. Nadat deze instelling is gewijzigd, zal de nieuwe sessie lengte plaatsvinden de volgende keer de gebruiker zijn credentials invult. ",
   "admin.service.testingDescription": "Wanneer dit aanstaat, het /loadtest slash commando is aan om accounts te testen. Veranderen van deze instelling vraagt een herstart van de server voor dit effect heeft.",
   "admin.service.testingTitle": "Aanzetten van test commands:",
-  "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.webSessionDays": "Sessie duur voor 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.",
   "admin.service.webhooksTitle": "Inschakelen inkomende webhooks: ",
   "admin.sidebar.addTeamSidebar": "Voeg een team toe van de navigatiekolom",
   "admin.sidebar.advanced": "Geavanceerd",
   "admin.sidebar.audits": "Compliance en Auditing",
   "admin.sidebar.authentication": "Authenticatie",
+  "admin.sidebar.cluster": "High Availability (Beta)",
   "admin.sidebar.compliance": "Voldoet aan",
   "admin.sidebar.configuration": "Configuratie",
   "admin.sidebar.connections": "Verbindingen",
   "admin.sidebar.customBrand": "Aangepast huisstijl",
   "admin.sidebar.customEmoji": "Aangepaste Emoji",
+  "admin.sidebar.customIntegrations": "Aangepaste Intergraties",
   "admin.sidebar.customization": "Customisatie",
   "admin.sidebar.database": "Database",
   "admin.sidebar.developer": "Ontwikkelaar",
@@ -666,7 +703,6 @@
   "admin.sidebar.users": "Gebruikers",
   "admin.sidebar.usersAndTeams": "Gebruikers en Teams",
   "admin.sidebar.view_statistics": "Site statistieken",
-  "admin.sidebar.webhooks": "Webhooks en opdrachten",
   "admin.sidebarHeader.systemConsole": "Systeem console",
   "admin.sql.dataSource": "Gegevensbron:",
   "admin.sql.driverName": "Stuurprogrammanaam:",
@@ -697,15 +733,15 @@
   "admin.support.privacyTitle": "Privacy beleid link:",
   "admin.support.problemDesc": "Link naar de help documentatie van het team hoofdmenu. Standaard wijst dit naar een peer-to-peer forum, waar gebruikers kunnen zoeken naar technische problemen.",
   "admin.support.problemTitle": "Meld een link met een probleem:",
-  "admin.support.termsDesc": "Link to the terms under which users may use your online service. By default, this includes the \"Mattermost Conditions of Use (End Users)\" explaining the terms under which Mattermost software is provided to end users. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Conditions of Use (End User) for Mattermost software.",
+  "admin.support.termsDesc": "Link naar de algemene voorwaarden voor uw gebruikers. Standaard bevat dit de \"Mattermost Conditions of Use (End Users)\" welke voorwaarden beschrijft waaronder Mattermost software beschikbaar gesteld voor eind gebruikers. Indien u de standaard link vervangt door uw eigen algemene voorwaarden voor de service, neem dan een link op naar de standaard algemene voorwaarden van Mattermost Conditions of Use (End User) voor Mattermost software.",
   "admin.support.termsTitle": "Servicevoorwaarden link:",
   "admin.system_analytics.activeUsers": "Actieve gebruikers met berichten",
   "admin.system_analytics.title": "het systeem",
   "admin.system_analytics.totalPosts": "Totaal aantal berichten",
   "admin.team.brandDesc": "Aanzetten van aangepast logo om een afbeelding naar keuze te tonen, hieronder geüpload, en tekst, hieronder ingevuld, om te tonen op de inlog pagina.",
   "admin.team.brandDescriptionExample": "Alle team communicatie op een plaats, doorzoekbaar en van overal bereikbaar",
-  "admin.team.brandDescriptionHelp": "Naam van de site welke getoond wordt op inlog- en andere schermen.",
-  "admin.team.brandDescriptionTitle": "Site Description",
+  "admin.team.brandDescriptionHelp": "Naam van de service welke getoond wordt op inlog- en UI schermen.",
+  "admin.team.brandDescriptionTitle": "Site Beschrijving",
   "admin.team.brandImageTitle": "Aangepast Logo Afbeelding:",
   "admin.team.brandTextDescription": "De aangepaste merk Markdown-geformateerde tekst die je wilt tonen onder jouw aangepaste merk afbeelding op het inlogscherm. ",
   "admin.team.brandTextTitle": "Aangepaste huisstijl tekst:",
@@ -861,12 +897,13 @@
   "authorize.allow": "Toestaan",
   "authorize.app": "De applicatie <strong>{appName}</strong> wil uw toestemming om uw basis informatie te bekijken en te bewerken.",
   "authorize.deny": "Weigeren",
-  "authorize.title": "Een applicatie wilt verbinding maken met jouw {teamName} account",
+  "authorize.title": "<strong>{appName}</strong> wil verbinding maken met jouw <strong>Mattermost</strong> gebruikers account",
   "backstage_list.search": "Zoeken",
   "backstage_navbar.backToMattermost": "Terug naar {siteName}",
   "backstage_sidebar.integrations": "Integraties",
   "backstage_sidebar.integrations.commands": "Slash opdrachten",
   "backstage_sidebar.integrations.incoming_webhooks": "Inkomende webhooks",
+  "backstage_sidebar.integrations.oauthApps": "OAuth 2.0 Applicaties",
   "backstage_sidebar.integrations.outgoing_webhooks": "Uitgaande webhooks",
   "center_panel.recent": "Klik hier om naar uw recente berichten te gaan. ",
   "chanel_header.addMembers": "Leden toevoegen",
@@ -1111,6 +1148,8 @@
   "find_team.placeholder": "uw.naam@domein.nl",
   "find_team.send": "Verzenden",
   "find_team.submitError": "Vul een geldig e-mail adres in",
+  "flag_post.flag": "Markeren voor vervolgactie",
+  "flag_post.unflag": "Demarkeer",
   "general_tab.chooseName": "Kies een nieuwe naam voor uw team",
   "general_tab.codeDesc": "Klik op 'Bewerken' om de uitnodigings-code opnieuw te genereren.",
   "general_tab.codeLongDesc": "De Uitnodigings Code is onderdeel van de URL in de team uitnodigings link gemaakt door de <strong>Krijg Team Uitnodigings Link\"</strong> in het hoofdmenu. Hergenereren maakt een nieuwe team uitnodiging en zal de vorige link onbruikbaar maken.",
@@ -1128,15 +1167,15 @@
   "general_tab.teamNameInfo": "Zet de teamnaam zoals die zal verschijnen op uw login scherm en bovenaan de navigatiekolom aan de linkerkant.",
   "general_tab.title": "Algemene instellingen",
   "general_tab.yes": "Ja",
-  "get_app.alreadyHaveIt": "Already have it?",
-  "get_app.androidAppName": "Mattermost for Android",
-  "get_app.androidHeader": "Mattermost works best if you switch to our Android app",
-  "get_app.continue": "continue",
-  "get_app.continueWithBrowser": "Or {link}",
-  "get_app.continueWithBrowserLink": "continue with browser",
-  "get_app.iosHeader": "Mattermost works best if you switch to our iPhone app",
+  "get_app.alreadyHaveIt": "Heb je het al?",
+  "get_app.androidAppName": "Mattermost voor Android",
+  "get_app.androidHeader": "Mattermost werkt het beste als je overschakelt naar onze Android app",
+  "get_app.continue": "doorgaan",
+  "get_app.continueWithBrowser": "Of {link}",
+  "get_app.continueWithBrowserLink": "doorgaan met de browser",
+  "get_app.iosHeader": "Mattermost werkt het beste als je overschakelt naar onze iPhone app",
   "get_app.mattermostInc": "Mattermost, Inc",
-  "get_app.openMattermost": "Open Mattermost",
+  "get_app.openMattermost": "Open Matermost",
   "get_link.clipboard": " Link gekopiëerd naar het klembord.",
   "get_link.close": "Afsluiten",
   "get_link.copy": "Kopieer link",
@@ -1161,14 +1200,35 @@
   "installed_incoming_webhooks.search": "Zoek Inkomende Webhooks",
   "installed_incoming_webhooks.unknown_channel": "Een privé webhook",
   "installed_integrations.callback_urls": "Callback URLs: {urls}",
+  "installed_integrations.client_id": "Client ID: <strong>{clientId}</strong>",
+  "installed_integrations.client_secret": "Client Secret: <strong>{clientSecret}</strong>",
   "installed_integrations.content_type": "Content-Type: {contentType}",
   "installed_integrations.creation": "Gemaakt door {creator} op {createAt, date, full}",
   "installed_integrations.delete": "Verwijderen",
+  "installed_integrations.hideSecret": "Verberg Secret",
   "installed_integrations.regenToken": "Token opnieuw genereren",
+  "installed_integrations.showSecret": "Toon Secret",
   "installed_integrations.token": "Token: {token}",
   "installed_integrations.triggerWhen": "Trigger Wanneer: {triggerWhen}",
   "installed_integrations.triggerWords": "Trigger Woorden: {triggerWords}",
+  "installed_integrations.unnamed_oauth_app": "Naamloze OAuth 2.0 Applicatie",
   "installed_integrations.url": "URL: {url}",
+  "installed_oauth_apps.add": "OAuth 2.0 Applicatie Toevoegen",
+  "installed_oauth_apps.callbackUrls": "Callback URL's (Een per regel)",
+  "installed_oauth_apps.cancel": "Annuleren",
+  "installed_oauth_apps.description": "Omschrijving",
+  "installed_oauth_apps.empty": "Geen OAuth 2.0 Applicaties gevonden",
+  "installed_oauth_apps.header": "OAuth 2.0 Applicaties",
+  "installed_oauth_apps.help": "OAuth 2.0 Applicaties zijn beschikbaar voor iedereen op jouw server.",
+  "installed_oauth_apps.homepage": "Homepagina",
+  "installed_oauth_apps.iconUrl": "Pictogram-URL",
+  "installed_oauth_apps.is_trusted": "Is Vertrouwd: <strong>{isTrusted}</strong>",
+  "installed_oauth_apps.name": "Weergavenaam",
+  "installed_oauth_apps.save": "Opslaan",
+  "installed_oauth_apps.search": "Zoek OAuth 2.0 Applicaties",
+  "installed_oauth_apps.trusted": "Is Vertrouwd",
+  "installed_oauth_apps.trusted.no": "Nee",
+  "installed_oauth_apps.trusted.yes": "Ja",
   "installed_outgoing_webhooks.add": "Uitgaande webhook toevoegen",
   "installed_outgoing_webhooks.empty": "Geen uitgaande webhooks gevonden",
   "installed_outgoing_webhooks.header": "Uitgaande webhooks",
@@ -1181,6 +1241,8 @@
   "integrations.header": "Integraties",
   "integrations.incomingWebhook.description": "Inkomende webhooks laten externel integraties toe om berichten te sturen",
   "integrations.incomingWebhook.title": "Inkomende webhook",
+  "integrations.oauthApps.description": "OAuth 2.0 staat externe applicaties toe om geautoriseerde verzoeken te sturen naar de Mattermost API.",
+  "integrations.oauthApps.title": "OAuth 2.0 Applicaties",
   "integrations.outgoingWebhook.description": "Uitgaande webhooks laten externe integraties toe om berichten te ontvangen en hierop te antwoorden",
   "integrations.outgoingWebhook.title": "Uitgaande webhook",
   "intro_messages.DM": "Dit is de start van uw privé berichten historiek met teamlid {teammate}.<br /> Privé berichten en bestanden die hier gedeeld worden zijn niet zichtbaar voor anderen.",
@@ -1334,29 +1396,12 @@
   "post_focus_view.beginning": "Begin van de kanaal archieven",
   "post_info.del": "Verwijderen",
   "post_info.edit": "Bewerken",
+  "post_info.mobile.flag": "Markeer",
+  "post_info.mobile.unflag": "Demarkeer ",
   "post_info.permalink": "Permanente koppeling",
   "post_info.reply": "Antwoord",
   "posts_view.loadMore": "Laad meer berichten",
   "posts_view.newMsg": "Nieuwe berichten",
-  "register_app.callback": "Callback URL",
-  "register_app.callbackError": "Minimaal een callback URL moet worden ingevuld.",
-  "register_app.cancel": "Annuleren",
-  "register_app.clientId": "Client ID",
-  "register_app.clientSecret": "Client Geheim",
-  "register_app.close": "Afsluiten",
-  "register_app.credentialsDescription": "Bewaar deze ergens veilig. Behandel uw Client ID en Client Secret net als uw gebruikersnaam en wachtwoord.",
-  "register_app.credentialsSave": "Ik heb zowel mijn Client Id en Client Secret ergens anders veilig opgeslagen.",
-  "register_app.credentialsTitle": "Jouw Applicatie Credentials",
-  "register_app.description": "Omschrijving",
-  "register_app.dev": "Ontwikkelaars Applicaties",
-  "register_app.homepage": "Thuispagina URL",
-  "register_app.homepageError": "Thuispagina moet ingevuld zijn.",
-  "register_app.name": "Applicatie naam",
-  "register_app.nameError": "Applicatie naam moet ingevuld zijn.",
-  "register_app.optional": "Optioneel",
-  "register_app.register": "Registreren",
-  "register_app.required": "Verplicht",
-  "register_app.title": "Registreer een nieuwe applicatie",
   "removed_channel.channelName": "het kanaal",
   "removed_channel.from": "Verwijderd van ",
   "removed_channel.okay": "OK",
@@ -1376,7 +1421,10 @@
   "rhs_comment.comment": "Commentaar",
   "rhs_comment.del": "Verwijder",
   "rhs_comment.edit": "Bewerken",
+  "rhs_comment.mobile.flag": "Markeer",
+  "rhs_comment.mobile.unflag": "Demarkeer",
   "rhs_comment.permalink": "Permanente koppeling",
+  "rhs_header.backToFlaggedTooltip": "Terug naar Gemarkeerde Berichten",
   "rhs_header.backToResultsTooltip": "Terug naar Zoekresultaten",
   "rhs_header.closeSidebarTooltip": "Zijbalk Sluiten",
   "rhs_header.details": "Bericht details",
@@ -1385,12 +1433,15 @@
   "rhs_root.del": "Verwijderen",
   "rhs_root.direct": "Privé bericht",
   "rhs_root.edit": "Bewerken",
+  "rhs_root.mobile.flag": "Markeer",
+  "rhs_root.mobile.unflag": "Demarkeer",
   "rhs_root.permalink": "Permanente koppeling",
   "search_bar.cancel": "Annuleren",
   "search_bar.search": "Zoeken",
   "search_bar.usage": "<h4>Zoekopties</h4><ul><li><span>Gebruik </span><b>\"aanhalingstekens\"</b><span> om naar zinnen te zoeken</span></li><li><span>Gebruik </span><b>from:</b><span> om berichten van een specifieke gebruiker te vinden en </span><b>in:</b><span> om berichten in een specifiek kanaal te vinden</span></li></ul>",
   "search_header.results": "Zoekresultaten",
   "search_header.title2": "Recente vermeldingen",
+  "search_header.title3": "Gemarkeerde Berichten",
   "search_item.direct": "Privé bericht",
   "search_item.jump": "Spring",
   "search_results.because": "<ul><li>Wanneer u op zoek bent naar een gedeeltelijk woord (b.v. zoek naar \"tele\", op zoek naar \"telefooon\" of \"televisie\"), moet u een * aan de zoekterm toevoegen</li><li>Zoekopdrachten van 2 letters en algemene woorden zoals \"dit\", \"een\", \"het\" verschijnen niet in de zoekresultaten</li></ul>",
@@ -1423,6 +1474,7 @@
   "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.console": "Systeem console",
+  "sidebar_right_menu.flagged": "Gemarkeerde Berichten",
   "sidebar_right_menu.help": "Help",
   "sidebar_right_menu.inviteNew": "Nodig een nieuw lid uit...",
   "sidebar_right_menu.logout": "Afmelden",
@@ -1581,10 +1633,6 @@
   "user.settings.custom_theme.sidebarTextHoverBg": "Navigatiekolom tekst 'hover' achtergrond",
   "user.settings.custom_theme.sidebarTitle": "Zijbalk Stijlen",
   "user.settings.custom_theme.sidebarUnreadText": "Navigatiekolom ongelezen tekst",
-  "user.settings.developer.applicationsPreview": "Applicaties (preview)",
-  "user.settings.developer.register": "Registreer een nieuwe applicatie",
-  "user.settings.developer.thirdParty": "Open voor het registreren van een nieuwe third-party applicatie",
-  "user.settings.developer.title": "Ontwikkelaar instellingen",
   "user.settings.display.channelDisplayTitle": "Kanaal Schermmodus",
   "user.settings.display.channeldisplaymode": "Kies de breedte van het center kanaal.",
   "user.settings.display.clockDisplay": "Klok weergave",
@@ -1668,6 +1716,7 @@
   "user.settings.import_theme.submit": "Verstuur",
   "user.settings.import_theme.submitError": "Ongeldig formaat, probeer het kopiëren en plakken opnieuw.",
   "user.settings.languages.change": "Taal van de interface wijzigen",
+  "user.settings.languages.promote": "Selecteer welke taal Mattermost moet weergeven in de gebruikersinterface.<br /><br />Wil je helpen met vertalen? Word lid van de <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a>.",
   "user.settings.mfa.add": "Toevoegen van MFA aan jouw account",
   "user.settings.mfa.addHelp": "Je kan een smartphone gebaseerde token verplichten, naast jouw wachtwoord, om in te loggen op Mattermost.<br/><br/>Om dit aan te zetten, download Google Authenticator van <a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a> of <a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a>voor jouw telefoon, dan <br/><br/>1. Klik op de <strong>Voeg MFA aan jouw account</strong> knop erboven.<br/>2. Gebruik Google Authenticator om de QR code te scannen die verschijnt.<br/>3. Type het Token wat gegenereerd is door Google Authenticator en druk <strong>Opslaan</strong><br/><br/>Wanneer je inlogt, zal wirden gevraagd naar een token van Google Authenticator naast jouw reguliere inlog gegevens. ",
   "user.settings.mfa.addHelpQr": "Scan de barcode met de Google Authenticator app op jouw smartphone en vul het token in wat je van de app gekregen hebt.",
@@ -1675,19 +1724,17 @@
   "user.settings.mfa.qrCode": "Streepjescode",
   "user.settings.mfa.remove": "Verwijderen van MFA van jouw account",
   "user.settings.mfa.removeHelp": "Verwijderen van multi-factor autenticatie betekent dat je niet langer verplicht een telefoon gebaseerde toegangscode nodig hebt om in te loggen op jouw account. ",
+  "user.settings.mfa.title": "Multi-factor Authenticatie:",
   "user.settings.modal.advanced": "Geavanceerd",
   "user.settings.modal.confirmBtns": "Ja, verwijderen",
   "user.settings.modal.confirmMsg": "U niet-opgeslagen wijzigingen, weet u zeker dat u deze wilt verwijderen?",
   "user.settings.modal.confirmTitle": "Wijzigingen verwijderen?",
-  "user.settings.modal.developer": "Ontwikkelaar",
   "user.settings.modal.display": "Weergave",
   "user.settings.modal.general": "Algemeen",
   "user.settings.modal.notifications": "Meldingen",
   "user.settings.modal.security": "Beveiliging",
   "user.settings.modal.title": "Account-instellingen",
-  "user.settings.notification.allActivity": "Voor alle activiteiten",
-  "user.settings.notification.push": "Mobiele push meldingen",
-  "user.settings.notification.soundConfig": "Configureer de meldings-geluiden in de instellingen van uw browser",
+  "user.settings.notifications.allActivity": "Voor alle activiteiten",
   "user.settings.notifications.channelWide": "Kanaal-brede vermeldingen \"@\"kanaal\", \"@all\"",
   "user.settings.notifications.close": "Afsluiten",
   "user.settings.notifications.comments": "Reactie draden notificaties",
@@ -1706,9 +1753,11 @@
   "user.settings.notifications.off": "Uit",
   "user.settings.notifications.on": "Aan",
   "user.settings.notifications.onlyMentions": "Enkele voor vermeldingen en privé berichten",
+  "user.settings.notifications.push": "Mobiele push meldingen",
   "user.settings.notifications.sensitiveName": "Uw hoofdlettergevoelige eerste naam \"{first_name}\"",
   "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": "Bureaubladmeldings-geluiden zijn beschikbaar op Firefox, Safari, Chrome, Internet Explorer, en Edge.",
   "user.settings.notifications.teamWide": "Team-vermeldingen \"@all\"",
   "user.settings.notifications.title": "Meldings-instellingen",
diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json
index fc8f49260..4c720a02d 100644
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -30,21 +30,21 @@
   "activity_log_modal.androidNativeApp": "App Nativo para Android",
   "activity_log_modal.iphoneNativeApp": "App Nativo para iPhone",
   "add_command.autocomplete": "Autocompletar",
-  "add_command.autocomplete.help": "(Optional) Show slash command in autocomplete list.",
+  "add_command.autocomplete.help": "(Opcional) Exibir comandos slash na lista de auto preenchimento.",
   "add_command.autocompleteDescription": "Autocompletar Descrição: ",
-  "add_command.autocompleteDescription.help": "Breve descrição opcional do comando slash para a lista de preenchimento automático.",
+  "add_command.autocompleteDescription.help": "(Opcional) Breve descrição opcional do comando slash para a lista de preenchimento automático.",
   "add_command.autocompleteDescription.placeholder": "Exemplo: \"Retorna os resultados da pesquisa, prontuário\"",
   "add_command.autocompleteHint": "Autocompletar Sugestão",
-  "add_command.autocompleteHint.help": "(Optional) Arguments associated with your slash command, displayed as help in the autocomplete list.",
+  "add_command.autocompleteHint.help": "(Opcional) Argumentos associados com seu comando slash, exibido como ajuda na lista de preenchimento automático.",
   "add_command.autocompleteHint.placeholder": "Exemplo: [Nome Do Paciente]",
   "add_command.cancel": "Cancelar",
   "add_command.description": "Descrição",
-  "add_command.description.help": "Description for your incoming webhook.",
+  "add_command.description.help": "Descrição do seu webhook de entrada.",
   "add_command.displayName": "Nome de Exibição",
-  "add_command.displayName.help": "Display name for your slash command made of up to 64 characters.",
+  "add_command.displayName.help": "Nome de exibição para seu comando slash contendo até 64 caracteres.",
   "add_command.header": "Adicionar",
   "add_command.iconUrl": "Ícone de Resposta",
-  "add_command.iconUrl.help": "Escolha uma imagem do perfil para substituir as respostas dos posts deste comando slash. Digite a URL de um arquivo .png ou .jpg com pelo menos 128 pixels por 128 pixels.",
+  "add_command.iconUrl.help": "(Opcional) Escolha uma imagem do perfil para substituir as respostas dos posts deste comando slash. Digite a URL de um arquivo .png ou .jpg com pelo menos 128 pixels por 128 pixels.",
   "add_command.iconUrl.placeholder": "https://www.example.com/myicon.png",
   "add_command.method": "Método da Requisição",
   "add_command.method.get": "GET",
@@ -52,10 +52,10 @@
   "add_command.method.post": "POST",
   "add_command.save": "Salvar",
   "add_command.trigger": "Comando Palavra Gatilho",
-  "add_command.trigger.help": "Trigger word must be unique, and cannot begin with a slash or contain any spaces.",
-  "add_command.trigger.helpExamples": "Examples: client, employee, patient, weather",
-  "add_command.trigger.helpReserved": "Reserved: {link}",
-  "add_command.trigger.helpReservedLinkText": "see list of built-in slash commands",
+  "add_command.trigger.help": "Palavra gatilho precisa ser única, e não pode começar com uma barra ou conter espaços.",
+  "add_command.trigger.helpExamples": "Exemplos: cliente, funcionario, paciente, tempo",
+  "add_command.trigger.helpReserved": "Reservado: {link}",
+  "add_command.trigger.helpReservedLinkText": "veja a lista de comandos slash nativos",
   "add_command.trigger.placeholder": "Comando gatilho ex. \"ola\"",
   "add_command.triggerInvalidLength": "Uma palavra gatilho precisa conter entre {min} e {max} caracteres",
   "add_command.triggerInvalidSlash": "Uma palavra gatilho não pode começar com /",
@@ -66,7 +66,7 @@
   "add_command.url.placeholder": "Deve começar com http:// ou https://",
   "add_command.urlRequired": "Uma URL de requisição é necessária",
   "add_command.username": "Usuário de Resposta",
-  "add_command.username.help": "Escolha um nome de usuário para substituir as respostas deste comando slash. O nome de usuário deve ter até 22 caracteres contendo letras minúsculas, números e os símbolos \"-\", \"_\", e \".\" .",
+  "add_command.username.help": "(Opcional) Escolha um nome de usuário para substituir as respostas deste comando slash. O nome de usuário deve ter até 22 caracteres contendo letras minúsculas, números e os símbolos \"-\", \"_\", e \".\" .",
   "add_command.username.placeholder": "Usuário",
   "add_emoji.cancel": "Cancelar",
   "add_emoji.header": "Adicionar",
@@ -84,39 +84,51 @@
   "add_emoji.save": "Salvar",
   "add_incoming_webhook.cancel": "Cancelar",
   "add_incoming_webhook.channel": "Canal",
-  "add_incoming_webhook.channel.help": "Public channel or private group that receives the webhook payloads. You must belong to the private group when setting up the webhook.",
+  "add_incoming_webhook.channel.help": "Canal público ou grupo privado que recebe as cargas webhook. Você deve pertencer ao grupo privado quando configurar o webhook.",
   "add_incoming_webhook.channelRequired": "Um canal válido é necessário",
   "add_incoming_webhook.description": "Descrição",
-  "add_incoming_webhook.description.help": "Description for your incoming webhook.",
+  "add_incoming_webhook.description.help": "Descrição do seu webhook de entrada.",
   "add_incoming_webhook.displayName": "Nome de Exibição",
-  "add_incoming_webhook.displayName.help": "Display name for your incoming webhook made of up to 64 characters.",
+  "add_incoming_webhook.displayName.help": "Nome de exibição para seu webhook de entrada contendo até 64 caracteres.",
   "add_incoming_webhook.header": "Adicionar",
   "add_incoming_webhook.name": "Nome",
   "add_incoming_webhook.save": "Salvar",
+  "add_oauth_app.callbackUrls.help": "Os URIs de redirecionamento para o qual o serviço irá redirecionar os usuários depois de aceitar ou negar a autorização de sua aplicação, e que irá lidar com códigos de autorização ou tokens de acesso. Deve ser uma URL válida e começar com http:// ou https://.",
+  "add_oauth_app.callbackUrlsRequired": "Uma ou mais URLs callback são necessárias",
+  "add_oauth_app.description.help": "Descrição para sua aplicação OAuth 2.0.",
+  "add_oauth_app.descriptionRequired": "Descrição para a aplicação OAuth 2.0 é obrigatória.",
+  "add_oauth_app.header": "Adicionar",
+  "add_oauth_app.homepage.help": "A URL para a página inicial da aplicação OAuth 2.0. Certifique-se de usar HTTP ou HTTPS em sua URL dependendo da sua configuração do servidor.",
+  "add_oauth_app.homepageRequired": "Página Inicial para a aplicação OAuth 2.0 é obrigatória.",
+  "add_oauth_app.icon.help": "(Opcional) A URL da imagem usada para a sua aplicação OAuth 2.0. Certifique-se de usar HTTP ou HTTPS em sua URL.",
+  "add_oauth_app.name.help": "Nome de exibição para sua aplicação OAuth 2.0 contendo até 64 caracteres.",
+  "add_oauth_app.nameRequired": "Nome para a aplicação OAuth 2.0 é obrigatória.",
+  "add_oauth_app.trusted.help": "Quando verdadeiro, a aplicação OAuth 2.0 é considerado confiável pelo servidor Mattermost e não requer que o usuário aceite a autorização. Quando falso, uma janela adicional será exibida, solicitando ao usuário para aceitar ou negar a autorização.",
   "add_outgoing_webhook.callbackUrls": "URLs Callback (Uma Por Linha)",
-  "add_outgoing_webhook.callbackUrls.help": "The URL that messages will be sent to.",
+  "add_outgoing_webhook.callbackUrls.help": "A URL que as mensagens serão enviadas.",
   "add_outgoing_webhook.callbackUrlsRequired": "Uma ou mais URLs callback são necessárias",
   "add_outgoing_webhook.cancel": "Cancelar",
   "add_outgoing_webhook.channel": "Canal",
-  "add_outgoing_webhook.channel.help": "Public channel to receive webhook payloads. Optional if at least one Trigger Word is specified.",
-  "add_outgoing_webhook.contentType.help1": "Choose the content type by which the response will be sent.",
-  "add_outgoing_webhook.contentType.help2": "If application/x-www-form-urlencoded is chosen, the server assumes you will be encoding the parameters in a URL format.",
-  "add_outgoing_webhook.contentType.help3": "If application/json is chosen, the server assumes you will posting JSON data.",
+  "add_outgoing_webhook.channel.help": "Canal público para receber cargas webhook. Opcional se pelo menos uma Palavra Gatilho for especificado.",
+  "add_outgoing_webhook.contentType.help1": "Escolha o tipo de conteúdo pelo qual a resposta será enviada.",
+  "add_outgoing_webhook.contentType.help2": "Se application/x-www-form-urlencoded for escolhida, o servidor assume que você vai codificar os parâmetros em um formato de URL.",
+  "add_outgoing_webhook.contentType.help3": "Se application/json for escolhida, o servidor assume que você irá postar os dados em JSON.",
   "add_outgoing_webhook.content_Type": "Tipo de Conteúdo",
   "add_outgoing_webhook.description": "Descrição",
-  "add_outgoing_webhook.description.help": "Description for your outgoing webhook.",
+  "add_outgoing_webhook.description.help": "Descrição do seu webhook de saída.",
   "add_outgoing_webhook.displayName": "Nome de Exibição",
-  "add_outgoing_webhook.displayName.help": "Display name for your outgoing webhook made of up to 64 characters.",
+  "add_outgoing_webhook.displayName.help": "Nome de exibição para seu webhook de saída contendo até 64 caracteres.",
   "add_outgoing_webhook.header": "Adicionar",
   "add_outgoing_webhook.name": "Nome",
   "add_outgoing_webhook.save": "Salvar",
   "add_outgoing_webhook.triggerWords": "Palavras Gatilho (Uma Por Linha)",
-  "add_outgoing_webhook.triggerWords.help": "Messages that start with one of the specified words will trigger the outgoing webhook. Optional if Channel is selected.",
+  "add_outgoing_webhook.triggerWords.help": "Mensagens que começam com uma das palavras especificadas irá disparar o webhook de saída. Opcional se o canal for selecionado.",
   "add_outgoing_webhook.triggerWordsOrChannelRequired": "Um canal válido ou uma lista de palavras gatilho é necessário",
   "add_outgoing_webhook.triggerWordsTriggerWhen": "Gatilho Quando",
-  "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choose when to trigger the outgoing webhook; if the first word of a message matches a Trigger Word exactly, or if it starts with a Trigger Word.",
+  "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Escolher quando disparar o webhook de saída; se a primeira palavra de uma mensagem corresponde exatamente a uma Palavra Gatilho, ou se ele começa com uma Palavra Gatilho.",
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "Primeira palavra corresponde exatamente a uma palavra gatilho",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "Primeira palavra começa com uma palavra gatilho",
+  "admin.advance.cluster": "Alta Disponibilidade (Beta)",
   "admin.audits.reload": "Recarregar",
   "admin.audits.title": "Atividade de Usuário",
   "admin.authentication.email": "Autenticação Email",
@@ -124,12 +136,30 @@
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "Nota:",
+  "admin.cluster.enableDescription": "Quando verdadeiro, Mattermost irá executar no modo de Alta Disponibilidade. Por favor veja a <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentação</a> para aprender mais sobre configurar Alta Disponibilidade para o Mattermost.",
+  "admin.cluster.enableTitle": "Ativar modo Alta Disponibilidade:",
+  "admin.cluster.interNodeListenAddressDesc": "O endereço que o servidor irá escutar para a comunicação com os outros servidores.",
+  "admin.cluster.interNodeListenAddressEx": "Ex \":8065\"",
+  "admin.cluster.interNodeListenAddressTitle": "Inter-Node Escutar Endereço:",
+  "admin.cluster.interNodeUrlsDesc": "As URLs internas/privadas de todos os servidores Mattermost separados por virgulas.",
+  "admin.cluster.interNodeUrlsEx": "Ex \"http://10.10.10.30, http://10.10.10.31\"",
+  "admin.cluster.interNodeUrlsTitle": "Inter-Node URLs:",
+  "admin.cluster.loadedFrom": "Este arquivo de configuração foi carregado do Node ID {clusterId}. Por favor consulte o Guia de Resolução de Problemas na nossa <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentação</a> se você está acessando o Console do Sistema através de um balanceador de carga e enfrentando problemas.",
+  "admin.cluster.noteDescription": "Alterando propriedades nesta seção irá exigir a reinicialização do servidor antes de ter efeito. Quando o modo de Alta Disponibilidade é ativado, o Console do Sistema é definido para somente leitura e só pode ser alterado a partir do arquivo de configuração.",
+  "admin.cluster.should_not_change": "ATENÇÃO: Essas configurações podem não sincronizar com outros servidores no cluster. Comunicação de Alta Disponibilidade inter-node não será iniciado até que você modifique o config.json para ser idênticos em todos os servidores e reiniciar Mattermost. Por favor veja a <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentação</a> como adicionar ou remover um servidor do cluster. Se você estiver acessando o Console do Sistema através de um balanceador e enfrentando problemas, por favor veja o Guia de Resolução de Problemas na nossa <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentação</a>.",
+  "admin.cluster.status_table.config_hash": "MD5 Arquivo de Configuração",
+  "admin.cluster.status_table.hostname": "Nome da máquina",
+  "admin.cluster.status_table.id": "Node ID",
+  "admin.cluster.status_table.reload": " Recarregar Cluster Status",
+  "admin.cluster.status_table.status": "Status",
+  "admin.cluster.status_table.url": "Inter-Node URL",
+  "admin.cluster.status_table.version": "Versão",
   "admin.compliance.directoryDescription": "Diretório o qual os relatórios compliance são gravados. Se estiver em branco, será usado ./data/.",
   "admin.compliance.directoryExample": "Ex \"./data/\"",
   "admin.compliance.directoryTitle": "Diretório de Relatórios de conformidade:",
   "admin.compliance.enableDailyDesc": "Quando verdadeiro, Mattermost irá gerar um relatório diário de compliance.",
   "admin.compliance.enableDailyTitle": "Ativar Relatório Diário:",
-  "admin.compliance.enableDesc": "When true, Mattermost allows compliance reporting from the <strong>Compliance and Auditing</strong> tab. See <a href=\"https://docs.mattermost.com/administration/compliance.html\" target=\"_blank\">documentation</a> to learn more.",
+  "admin.compliance.enableDesc": "Quando verdadeiro, Mattermost permite relatórios de compliance para a aba <strong>Compliance e Auditoria</strong>. Veja a <a href=\"https://docs.mattermost.com/administration/compliance.html\" target=\"_blank\">documentação</a> para saber mais.",
   "admin.compliance.enableTitle": "Habilitar Relatórios de Conformidade:",
   "admin.compliance.false": "falso",
   "admin.compliance.noLicense": "<h4 class=\"banner__heading\">Nota:</h4><p>Compliance é um recurso enterprise. Sua licença atual não suporta Compliance. Clique <a href=\"http://mattermost.com\" target=\"_blank\">aqui</a> para informações e preços da licença enterprise.</p>",
@@ -252,7 +282,7 @@
   "admin.files.storage": "Armazenamento",
   "admin.general.configuration": "Configuração",
   "admin.general.localization": "Regionalização",
-  "admin.general.localization.availableLocalesDescription": "Determina quais idiomas estão disponíveis para usuários na Configurações de Conta. (Deixe em branco para ter todas as línguas disponíveis)",
+  "admin.general.localization.availableLocalesDescription": "Defina qual idioma está disponível para os usuários na Configurações de Conta (deixe este campo em branco para ter todos os idiomas suportados disponível).<br /><br />Gostaria de ajudar com as traduções? Junte-se ao <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> para contribuir.",
   "admin.general.localization.availableLocalesTitle": "Idiomas Disponíveis:",
   "admin.general.localization.clientLocaleDescription": "Linguagem padrão para os novos usuários criados e páginas onde o usuário não esteja logado.",
   "admin.general.localization.clientLocaleTitle": "Idioma Padrão do Cliente:",
@@ -263,16 +293,16 @@
   "admin.general.policy.permissionsAdmin": "Administradores de Time e Sistema",
   "admin.general.policy.permissionsAll": "Todos os membros da equipe",
   "admin.general.policy.permissionsSystemAdmin": "Administrador de Sistema",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "Set policy on who can create, delete, rename, and set the header or purpose for private groups.",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Definir a política de quem pode criar, apagar, renomear e definir o cabeçalho ou propósito para grupos privados.",
   "admin.general.policy.restrictPrivateChannelManagementTitle": "Habilitar permissões de administração do canal privado para:",
-  "admin.general.policy.restrictPublicChannelManagementDescription": "Set policy on who can create, delete, rename, and set the header or purpose for public channels.",
+  "admin.general.policy.restrictPublicChannelManagementDescription": "Definir a política de quem pode criar, apagar, renomear e definir o cabeçalho ou propósito para canais públicos.",
   "admin.general.policy.restrictPublicChannelManagementTitle": "Habilitar permissões de administração do canal público para:",
-  "admin.general.policy.teamInviteDescription": "Set policy on who can invite others to a team using <b>Invite New Member</b> to invite new users by email, or the <b>Get Team Invite Link</b> options from the Main Menu. If <b>Get Team Invite Link</b> is used to share a link, you can expire the invite code from <b>Team Settings</b> > <b>Invite Code</b> after the desired users join the team.",
+  "admin.general.policy.teamInviteDescription": "Definir a política de quem pode convidar outros para a equipe usando <b>Convide um Novo Membro</b> para convidar um novo usuário por email, ou a opção <b>Obter Link Convite para Equipe</b> no Menu Principal. Se <b>Obter Link Convite para Equipe</b> for usado para compartilhar um link, você pode expirar o código convite em <b>Configurações de Equipe</b> > <b>Código Convite</b> depois que os usuários desejados já se juntaram a equipe.",
   "admin.general.policy.teamInviteTitle": "Permitir o envio de convites de equipe para:",
   "admin.general.privacy": "Privacidade",
   "admin.general.usersAndTeams": "Usuários e Equipes",
   "admin.gitab.clientSecretDescription": "Obter este valor de acordo com as instruções acima para logar no GitLab.",
-  "admin.gitlab.EnableHtmlDesc": "<ol><li>Faça login na sua conta do GitLab e vá para Configurações do Perfil -> Aplicativos.</li><li>Digite redirecionamento URIs \"<your-mattermost-url>/login/gitlab/complete\" (exemplo: http://localhost:8065/login/gitlab/complete) e \"<your-mattermost-url>/signup/gitlab/complete\". </li><li>Em seguida use os campos \"Application Secret Key\" e \"Aplication ID\" do Gitlab para completar as opções abaixo.</li><li>Complete o Endpoint com as URLs abaixo. </li></ol>",
+  "admin.gitlab.EnableHtmlDesc": "<ol><li>Faça login na sua conta do GitLab e vá para Configurações do Perfil -> Aplicativos.</li><li>Digite redirecionamento URIs \"<your-mattermost-url>/login/gitlab/complete\" (exemplo: http://localhost:8065/login/gitlab/complete) e \"<your-mattermost-url>/signup/gitlab/complete\". </li><li>Em seguida use os campos \"Chave Secreta do Aplicativo\" e \"ID Aplicativo\" do Gitlab para completar as opções abaixo.</li><li>Complete o Endpoint com as URLs abaixo. </li></ol>",
   "admin.gitlab.authDescription": "Entre https://<your-gitlab-url>/oauth/authorize (exemplo https://example.com:3000/oauth/authorize).   Tenha certeza de usar HTTP ou HTTPS na sua URL dependendo da configuração do seu servidor.",
   "admin.gitlab.authExample": "Ex \"https://<your-gitlab-url>/oauth/authorize\"",
   "admin.gitlab.authTitle": "Autenticação Endpoint:",
@@ -280,7 +310,7 @@
   "admin.gitlab.clientIdExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.gitlab.clientIdTitle": "ID do aplicativo:",
   "admin.gitlab.clientSecretExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.gitlab.clientSecretTitle": "Chave secreta do aplicativo:",
+  "admin.gitlab.clientSecretTitle": "Chave Secreta do Aplicativo:",
   "admin.gitlab.enableDescription": "Quando verdadeiro, Mattermost permite a criação de equipes e inscrições de conta usando GitLab OAuth.",
   "admin.gitlab.enableTitle": "Habilitar autenticação com o GitLab: ",
   "admin.gitlab.settingsTitle": "Configurações GitLab",
@@ -290,14 +320,14 @@
   "admin.gitlab.userDescription": "Digite https://<your-gitlab-url>/api/v3/user.   Certifique-se de usar HTTP ou HTTPS na sua URL dependendo da configuração de seu servidor.",
   "admin.gitlab.userExample": "Ex \"https://<your-gitlab-url>/api/v3/user\"",
   "admin.gitlab.userTitle": "API Usuário Endpoint:",
-  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>Log in</a> to your Google account.</li><li>Go to <a href='https://console.developers.google.com'>https://console.developers.google.com</a>, click <strong>Credentials</strong> in the left hand sidebar and enter <strong>Mattermost - <your-company-name></strong> as the project name.</li><li>Click the <strong>OAuth consent screen</strong> header and enter <strong>Mattermost</strong> as the <strong>Product name to show users</strong>. Click <strong>Save</strong>.</li><li>Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.</li><li>Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong><your-mattermost-url>/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.</li><li>Save the <strong>client ID</strong> and <strong>client secret</strong> to later complete the fields below.</li><li>Finally, go to <a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> and click <strong>Enable</strong>. This might take a few minutes to propagate through Google's systems.</li><li>Complete the <strong>Client ID</strong> and <strong>Client Secret</strong> fields below.</li></ol>",
+  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>Log in</a> to sua conta Google.</li><li>Ir para <a href='https://console.developers.google.com'>https://console.developers.google.com</a>, clique <strong>Credenciais</strong> na barra lateral esquerda e digite \"Mattermost - nome-da-sua-empresa\" como o <strong>Nome do Projeto</strong>, então clique <strong>Criar</strong>.</li><li>Clique no título <strong>tela de consentimento OAuth</strong> e digite \"Mattermost\" como o <strong>nome do Produto exibido para os usuários</strong>, então clique <strong>Salvar</strong>.</li><li>Dentro do título <strong>Credenciais</strong>, clique <strong>Criar credenciais</strong>, escolha <strong>ID do cliente OAuth</strong> e selecione <strong>Aplicação da Web</strong>.</li><li>Dentro de <strong>Restrições</strong> e <strong>URIs de redirecionamento autorizados</strong> digite <strong>sua-url-mattermost/signup/google/complete</strong> (exemplo: http://localhost:8065/signup/google/complete). Clique <strong>Criar</strong>.</li><li>Cole <strong>ID do Cliente</strong> e <strong>Chave Secreta do Cliente</strong> nos campos abaixo, então clique <strong>Salvar</strong>.</li><li>Finalmente, vá para <a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> e clique <strong>Ativar</strong>. Isto pode levar alguns minutos para propagar através do si sistema do Google.</li></ol>",
   "admin.google.authTitle": "Autenticação Endpoint:",
-  "admin.google.clientIdDescription": "The Client ID you received when registering your application with Google.",
+  "admin.google.clientIdDescription": "A ID do Cliente que você recebeu quando registrou sua aplicação com o Google.",
   "admin.google.clientIdExample": "Ex \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
   "admin.google.clientIdTitle": "ID do Cliente",
-  "admin.google.clientSecretDescription": "The Client Secret you received when registering your application with Google.",
+  "admin.google.clientSecretDescription": "A Chave Secreta do Cliente que você recebeu quando registrou sua aplicação com o Google.",
   "admin.google.clientSecretExample": "Ex \"H8sz0Az-dDs2p15-7QzD231\"",
-  "admin.google.clientSecretTitle": "Segredo Cliente",
+  "admin.google.clientSecretTitle": "Chave Secreta do Cliente:",
   "admin.google.tokenTitle": "Token Endpoint:",
   "admin.google.userTitle": "API Usuário Endpoint:",
   "admin.image.amazonS3BucketDescription": "Nome selecionado para o seu S3 bucket in AWS.",
@@ -345,8 +375,8 @@
   "admin.image.thumbWidthDescription": "Largura dos thumbnails gerados das imagens enviadas. Atualizando este valor muda como o thumbnail das imagens serão geradas no futuro, mas não muda as imagens já criadas no passado.",
   "admin.image.thumbWidthExample": "Ex \"120\"",
   "admin.image.thumbWidthTitle": "Anexo Thumbnail Largura:",
+  "admin.integrations.custom": "Integrações Personalizadas",
   "admin.integrations.external": "Serviços Externos",
-  "admin.integrations.webhook": "Webhooks e Comandos",
   "admin.ldap.baseDesc": "Base DN é o nome distinto do local onde Mattermost deve começar sua busca para os usuários na árvore LDAP.",
   "admin.ldap.baseEx": "Ex \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "BaseDN:",
@@ -390,7 +420,7 @@
   "admin.ldap.skipCertificateVerification": "Pular a Verificação do Certificado",
   "admin.ldap.skipCertificateVerificationDesc": "Pula a etapa de verificação do certificado para conexões TLS ou STARTTLS. Não recomentado para ambientes de produção onde TLS é necessário. Apenas para teste.",
   "admin.ldap.syncFailure": "Falha de Sincronização: {error}",
-  "admin.ldap.syncIntervalHelpText": "LDAP Synchronization updates Mattermost user information to reflect updates on the LDAP server. For example, when a user’s name changes on the LDAP server, the change updates in Mattermost when synchronization is performed. Accounts removed from or disabled in the LDAP server have their Mattermost accounts set to “Inactive” and have their account sessions revoked. Mattermost performs synchronization on the interval entered. For example, if 60 is entered, Mattermost synchronizes every 60 minutes.",
+  "admin.ldap.syncIntervalHelpText": "Sincronização LDAP atualiza as informações do usuário Mattermost para refletir atualizações no servidor LDAP. Por exemplo, quando o nome de um usuário muda no servidor LDAP, a mudança atualiza o Mattermost quando a sincronização é executada. Contas removidas ou desativas no servidor LDAP tem suas contas definidas como “Inativa” e suas sessões revogadas. Mattermos executa a sincronização no intervalo digitado. Por exemplo, se 60 for digitado, Mattermost irá sincronizar a cada 60 minutos.",
   "admin.ldap.syncIntervalTitle": "Intervalo de sincronização (minutos)",
   "admin.ldap.syncNowHelpText": "Iniciar uma sincronização LDAP imediatamente.",
   "admin.ldap.sync_button": "Sincronizar LDAP Agora",
@@ -446,17 +476,19 @@
   "admin.notifications.title": "Configurações de Notificação",
   "admin.oauth.gitlab": "GitLab",
   "admin.oauth.google": "Google Apps",
-  "admin.oauth.off": "Do not allow sign-in via an OAuth 2.0 provider",
+  "admin.oauth.off": "Não é permitido login via um provedor OAuth 2.0",
   "admin.oauth.office365": "Office 365",
-  "admin.oauth.select": "Select OAuth 2.0 service provider:",
-  "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>Log in</a> to your Microsoft or Office 365 account. Make sure it's the account on the same <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> that you would like users to log in with.</li><li>Go to <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, click <strong>Add an app</strong> and use <strong>Mattermost - <your-company-name></strong> as the application name.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and save it to later complete the field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong><your-mattermost-url>/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and complete the <strong>Application ID</strong> and <strong>Application Secret Password</strong> fields below.</li></ol>",
+  "admin.oauth.providerDescription": "Quando verdadeiro, Mattermost pode atuar como um provedor de serviços OAuth 2.0 pra permitir solicitações de API de aplicações externas.",
+  "admin.oauth.providerTitle": "Ativar Provedor de Serviço OAuth 2.0: ",
+  "admin.oauth.select": "Selecione provedor de serviço OAuth 2.0:",
+  "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>Log in</a> na sua conta Microsoft ou Office 365. Certifique-se que esta conta é do mesmo <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> que você gostaria que os usuários entrassem.</li><li>Vá para <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, clique <strong>Ir para lista de aplicativo</strong> > <strong>Adicionar um aplicativo</strong> e use \"Mattermost - nome-da-sua-empresa\" como <strong>Nome da Aplicação</strong>.</li><li>Dentro de <strong>Segredos do Aplicativo</strong>, clique <strong>Gerar Nova Senha</strong> copie e cole no campo abaixo <strong>Aplicativo Senha Secreta</strong>.</li><li>Dentro de <strong>Plataformas</strong>, clique <strong>Adicionar Plataforma</strong>, escolha <strong>Web</strong> e digite <strong>url-da-sua-empresa/signup/office365/complete</strong> (exemplo: http://localhost:8065/signup/office365/complete) dentro de <strong>Redirecionar URIs</strong>. Também desmarque <strong>Permitir Fluxo Implícito</strong>.</li><li>Finalmente, clique <strong>Salvar</strong> e então copie e cole no campo abaixo <strong>ID da Aplicação</strong>.</li></ol>",
   "admin.office365.authTitle": "Autenticação Endpoint:",
-  "admin.office365.clientIdDescription": "The Application/Client ID you received when registering your application with Microsoft.",
+  "admin.office365.clientIdDescription": "O Aplicativo/ID do Cliente que você recebeu quando registrou seu aplicativo com a Microsoft.",
   "admin.office365.clientIdExample": "Ex \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
-  "admin.office365.clientIdTitle": "ID do aplicativo:",
-  "admin.office365.clientSecretDescription": "The Application Secret Password you generated when registering your application with Microsoft.",
+  "admin.office365.clientIdTitle": "ID do Aplicativo:",
+  "admin.office365.clientSecretDescription": "O Aplicativo Senha Secreta que você gerou quando registrou seu aplicativo com a Microsoft.",
   "admin.office365.clientSecretExample": "Ex \"shAieM47sNBfgl20f8ci294\"",
-  "admin.office365.clientSecretTitle": "Application Secret Password:",
+  "admin.office365.clientSecretTitle": "Aplicativo Senha Secreta:",
   "admin.office365.tokenTitle": "Token Endpoint:",
   "admin.office365.userTitle": "API Usuário Endpoint:",
   "admin.password.lowercase": "Pelo menos uma letra minúscula",
@@ -595,7 +627,7 @@
   "admin.service.mfaDesc": "Quando verdadeiro, vai ser dada a opção do usuário adicionar autenticação multi-fator em sua conta. Eles irão precisar de um smartphone e um app autenticador como o Google Authenticator.",
   "admin.service.mfaTitle": "Ativar Autenticação Multi-Fator:",
   "admin.service.mobileSessionDays": "Tamanho da sessão para app móvel (dias):",
-  "admin.service.mobileSessionDaysDesc": "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.mobileSessionDaysDesc": "O número de dias desde a última vez que um usuário entrou suas credenciais para expirar a sessão do usuário. Depois de alterar essa configuração, a nova duração da sessão terá efeito após a próxima vez que o usuário digitar suas credenciais.",
   "admin.service.outWebhooksDesc": "Quando verdadeiro, webhooks de saída serão permitidos. Veja a <a href='http://docs.mattermost.com/developer/webhooks-outgoing.html' target='_blank'>documentação</a> para saber mais.",
   "admin.service.outWebhooksTitle": "Ativar Webhooks Saída: ",
   "admin.service.overrideDescription": "Quando verdadeiro, será permitido webhooks e comandos slash mudar o icone com que eles postam. Note, combinado com permitir substituição de usuário, isto pode permitir que o usuário faça ataque phishing.",
@@ -608,23 +640,28 @@
   "admin.service.sessionCache": "Cache da Sessão (minutos):",
   "admin.service.sessionCacheDesc": "O número de minutos para o cache de uma sessão na memória.",
   "admin.service.sessionDaysEx": "Ex \"30\"",
-  "admin.service.ssoSessionDays": "Tamanho da sessão para app móvel (dias):",
-  "admin.service.ssoSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.",
+  "admin.service.siteURL": "Site URL:",
+  "admin.service.siteURLDescription": "A URL, incluindo o número da porta e o protocolo, a partir do qual os usuários irão acessar Mattermost. Deixe em branco para configurar automaticamente com base no tráfego de entrada.",
+  "admin.service.siteURLExample": "Ex \"https://mattermost.example.com:1234\"",
+  "admin.service.ssoSessionDays": "Tamanho da sessão SSO (dias):",
+  "admin.service.ssoSessionDaysDesc": "O número de dias desde a última vez que um usuário entrou suas credenciais para expirar a sessão do usuário. Se o método de autenticação é SAML ou GitLab, o usuário pode automaticamente ser registrado novamente no Mattermost se já estiver conectado ao SAML ou GitLab. Depois de alterar essa configuração, a configuração terá efeito após a próxima vez que o usuário digitar suas credenciais.",
   "admin.service.testingDescription": "Quando verdadeiro, comando slash /loadtest está habilitado para carregar contas e teste, dados e formatação de texto. Mudar isso exigirá um reinício do servidor antes que tenha efeito.",
   "admin.service.testingTitle": "Ativar Comandos Teste: ",
-  "admin.service.webSessionDays": "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.webSessionDays": "Tamanho da sessão LDAP e email (dias):",
+  "admin.service.webSessionDaysDesc": "O número de dias desde a última vez que um usuário entrou suas credenciais para expirar a sessão do usuário. Depois de alterar essa configuração, a nova duração da sessão terá efeito após a próxima vez que o usuário digitar suas credenciais.",
   "admin.service.webhooksDescription": "Quando verdadeiro, webhooks de entrada serão permitidos. Para ajudar combater ataques de phishing, todas as postagens por webhook serão marcadas com uma etiqueta BOT. Veja a <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>documentação</a> para saber mais.",
   "admin.service.webhooksTitle": "Ativar Webhooks Entrada: ",
   "admin.sidebar.addTeamSidebar": "Adicionar equipe do menu lateral",
   "admin.sidebar.advanced": "Avançado",
   "admin.sidebar.audits": "Conformidade e Auditoria",
   "admin.sidebar.authentication": "Autenticação",
+  "admin.sidebar.cluster": "Alta Disponibilidade (Beta)",
   "admin.sidebar.compliance": "Compliance",
   "admin.sidebar.configuration": "Configuração",
   "admin.sidebar.connections": "Conexões",
   "admin.sidebar.customBrand": "Marca Personalizada",
   "admin.sidebar.customEmoji": "Emoji Personalizado",
+  "admin.sidebar.customIntegrations": "Integrações Personalizadas",
   "admin.sidebar.customization": "Customização",
   "admin.sidebar.database": "Banco de dados",
   "admin.sidebar.developer": "Desenvolvedor",
@@ -666,7 +703,6 @@
   "admin.sidebar.users": "Usuários",
   "admin.sidebar.usersAndTeams": "Usuários e Equipes",
   "admin.sidebar.view_statistics": "Estatísticas do Site",
-  "admin.sidebar.webhooks": "Webhooks e Comandos",
   "admin.sidebarHeader.systemConsole": "Console do Sistema",
   "admin.sql.dataSource": "Fonte de Dados:",
   "admin.sql.driverName": "Nome do Driver:",
@@ -697,7 +733,7 @@
   "admin.support.privacyTitle": "Link da Política de Privacidade:",
   "admin.support.problemDesc": "Link para a documentação de ajuda do site no menu principal. Por padrão este aponta para um fórum peer-to-peer de solução de problemas onde os usuários podem pesquisar, encontrar e pedir ajuda com problemas técnicos.",
   "admin.support.problemTitle": "Link para Reportar um Problema:",
-  "admin.support.termsDesc": "Link to the terms under which users may use your online service. By default, this includes the \"Mattermost Conditions of Use (End Users)\" explaining the terms under which Mattermost software is provided to end users. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Conditions of Use (End User) for Mattermost software.",
+  "admin.support.termsDesc": "Link para os termos em que os usuários podem usar o serviço on-line. Por padrão, isso inclui \"Condições de Uso Mattermost (Usuários Finais)\", explicando os termos sob os quais software Mattermost é fornecido aos usuários finais. Se você alterar o link padrão para adicionar seus próprios termos para usar o serviço que você oferece, seus novos termos devem incluir um link para os termos padrão para que os usuários finais estejam cientes das Condições de Uso Mattermost (Usuário Final) para o software Mattermost.",
   "admin.support.termsTitle": "Link Termos do Serviço:",
   "admin.system_analytics.activeUsers": "Usuários Ativos com Postagens",
   "admin.system_analytics.title": "o Sistema",
@@ -705,7 +741,7 @@
   "admin.team.brandDesc": "Ativar marca personalizada para mostrar uma imagem de sua escolha, carregado abaixo e algum texto de ajuda, escrito abaixo na página de login.",
   "admin.team.brandDescriptionExample": "Toda comunicação em um só lugar, pesquisável e acessível em qualquer lugar",
   "admin.team.brandDescriptionHelp": "Nome do serviço mostrado na tela de início da sessão e na UI.",
-  "admin.team.brandDescriptionTitle": "Site Description",
+  "admin.team.brandDescriptionTitle": "Descrição Site",
   "admin.team.brandImageTitle": "Imagem Personalizada da Marca:",
   "admin.team.brandTextDescription": "O texto personalizado da marca formatado em Markdown que você gostaria que aparece-se abaixo da sua imagem de marca personalizada na tela de login.",
   "admin.team.brandTextTitle": "Texto Personalizado da Marca:",
@@ -861,12 +897,13 @@
   "authorize.allow": "Permitir",
   "authorize.app": "O app <strong>{appName}</strong> gostaria de ter a capacidade de acessar e modificar suas informações básicas.",
   "authorize.deny": "Negar",
-  "authorize.title": "Um aplicativo gostaria de conectar na sua conta {teamName}",
+  "authorize.title": "<strong>{appName}</strong> gostaria de conectar a sua conta de usuário <strong>Mattermost</strong>",
   "backstage_list.search": "Pesquisar",
   "backstage_navbar.backToMattermost": "Voltar para {siteName}",
   "backstage_sidebar.integrations": "Integrações",
   "backstage_sidebar.integrations.commands": "Comandos Slash",
   "backstage_sidebar.integrations.incoming_webhooks": "Webhooks Entrada",
+  "backstage_sidebar.integrations.oauthApps": "Aplicativos OAuth 2.0",
   "backstage_sidebar.integrations.outgoing_webhooks": "Webhooks Saída",
   "center_panel.recent": "Clique aqui para pular para mensagens recentes. ",
   "chanel_header.addMembers": "Adicionar Membros",
@@ -1111,6 +1148,8 @@
   "find_team.placeholder": "voce@dominio.com",
   "find_team.send": "Enviar",
   "find_team.submitError": "Por favor entre um endereço de e-mail válido",
+  "flag_post.flag": "Marcar para seguir",
+  "flag_post.unflag": "Desmarcar",
   "general_tab.chooseName": "Por favor escolha um novo nome para sua equipe",
   "general_tab.codeDesc": "Clique 'Edit' para re-gerar o Código de Convite.",
   "general_tab.codeLongDesc": "O Código de convite é usado como parte da URL no link de convite da equipe criado por <strong>Obter Link de Convite de Equipe</strong> no menu principal. Re-gerar cria um novo link de convite de equipe e invalida os link anteriores.",
@@ -1128,15 +1167,15 @@
   "general_tab.teamNameInfo": "Defina o nome da equipe como aparece na sua tela de login e no topo na lateral esquerda.",
   "general_tab.title": "Definições Gerais",
   "general_tab.yes": "Sim",
-  "get_app.alreadyHaveIt": "Already have it?",
-  "get_app.androidAppName": "Mattermost for Android",
-  "get_app.androidHeader": "Mattermost works best if you switch to our Android app",
-  "get_app.continue": "continue",
-  "get_app.continueWithBrowser": "Or {link}",
-  "get_app.continueWithBrowserLink": "continue with browser",
-  "get_app.iosHeader": "Mattermost works best if you switch to our iPhone app",
+  "get_app.alreadyHaveIt": "Já tem isso?",
+  "get_app.androidAppName": "Mattermost para Android",
+  "get_app.androidHeader": "Mattermost funciona melhor se você mudar para o nosso aplicativo Android",
+  "get_app.continue": "continuar",
+  "get_app.continueWithBrowser": "Ou {link}",
+  "get_app.continueWithBrowserLink": "continuar no navegador",
+  "get_app.iosHeader": "Mattermost funciona melhor se você mudar para o nosso aplicativo iPhone",
   "get_app.mattermostInc": "Mattermost, Inc",
-  "get_app.openMattermost": "Open Mattermost",
+  "get_app.openMattermost": "Abrir Mattermost",
   "get_link.clipboard": " Link copiado para a área de transferência.",
   "get_link.close": "Fechar",
   "get_link.copy": "Copiar Link",
@@ -1161,14 +1200,35 @@
   "installed_incoming_webhooks.search": "Pesquisar Webhooks de Entrada",
   "installed_incoming_webhooks.unknown_channel": "Webhook Privado",
   "installed_integrations.callback_urls": "Callback URLs: {urls}",
+  "installed_integrations.client_id": "ID do Client: <strong>{clientId}</strong>",
+  "installed_integrations.client_secret": "Chave Secreta do Cliente: <strong>{clientSecret}</strong>",
   "installed_integrations.content_type": "Content-Type: {contentType}",
   "installed_integrations.creation": "Criado por {creator} em {createAt, date, full}",
   "installed_integrations.delete": "Deletar",
+  "installed_integrations.hideSecret": "Ocultar Segredo",
   "installed_integrations.regenToken": "Re-gerar Token",
+  "installed_integrations.showSecret": "Mostrar Segredo",
   "installed_integrations.token": "Token: {token}",
-  "installed_integrations.triggerWhen": "Trigger When: {triggerWhen}",
+  "installed_integrations.triggerWhen": "Gatilho Quando: {triggerWhen}",
   "installed_integrations.triggerWords": "Palavras Gatilho: {triggerWords}",
+  "installed_integrations.unnamed_oauth_app": "Aplicativo OAuth 2.0 sem nome",
   "installed_integrations.url": "URL: {url}",
+  "installed_oauth_apps.add": "Adicionar Aplicativo OAuth 2.0",
+  "installed_oauth_apps.callbackUrls": "URLs Callback (Uma Por Linha)",
+  "installed_oauth_apps.cancel": "Cancelar",
+  "installed_oauth_apps.description": "Descrição",
+  "installed_oauth_apps.empty": "Nenhum Aplicativo OAuth 2.0 encontrado",
+  "installed_oauth_apps.header": "Aplicativos OAuth 2.0",
+  "installed_oauth_apps.help": "Aplicativos OAuth 2.0 estão disponíveis para todo mundo no seu servidor.",
+  "installed_oauth_apps.homepage": "Página inicial",
+  "installed_oauth_apps.iconUrl": "URL do Ícone",
+  "installed_oauth_apps.is_trusted": "É Confiável: <strong>{isTrusted}</strong>",
+  "installed_oauth_apps.name": "Nome de Exibição",
+  "installed_oauth_apps.save": "Salvar",
+  "installed_oauth_apps.search": "Pesquisar Aplicativos OAuth 2.0",
+  "installed_oauth_apps.trusted": "É Confiável",
+  "installed_oauth_apps.trusted.no": "Não",
+  "installed_oauth_apps.trusted.yes": "Sim",
   "installed_outgoing_webhooks.add": "Adicionar Webhooks Saída",
   "installed_outgoing_webhooks.empty": "Nenhum webhook de saída encontrado",
   "installed_outgoing_webhooks.header": "Webhooks Saída",
@@ -1181,6 +1241,8 @@
   "integrations.header": "Integrações",
   "integrations.incomingWebhook.description": "Webhooks de entrada permite que integrações externas envie mensagens",
   "integrations.incomingWebhook.title": "Webhooks Entrada",
+  "integrations.oauthApps.description": "OAuth 2.0 permite que aplicativos externos façam solicitações autorizada para a API Mattermost.",
+  "integrations.oauthApps.title": "Aplicativos OAuth 2.0",
   "integrations.outgoingWebhook.description": "Webhooks de saída permite que integrações externas recebam e respondam a mensagens",
   "integrations.outgoingWebhook.title": "Webhooks Saída",
   "intro_messages.DM": "Este é o início do seu histórico de mensagens diretas com {teammate}.<br />Mensagens diretas e arquivos compartilhados aqui não são mostrados para pessoas de fora desta área.",
@@ -1334,29 +1396,12 @@
   "post_focus_view.beginning": "Início do Canal de Arquivos",
   "post_info.del": "Deletar",
   "post_info.edit": "Editar",
+  "post_info.mobile.flag": "Marcar",
+  "post_info.mobile.unflag": "Desmarcar",
   "post_info.permalink": "Permalink",
   "post_info.reply": "Responder",
   "posts_view.loadMore": "Carregar mais mensagens",
   "posts_view.newMsg": "Novas Mensagens",
-  "register_app.callback": "Callback URL",
-  "register_app.callbackError": "Pelo menos uma URL de retorno de chamada deve ser preenchida.",
-  "register_app.cancel": "Cancelar",
-  "register_app.clientId": "ID do Cliente",
-  "register_app.clientSecret": "Segredo Cliente",
-  "register_app.close": "Fechar",
-  "register_app.credentialsDescription": "Guardá-las em algum lugar SEGURO. Trate o seu ID de cliente, como nome de usuário da sua aplicação e o seu Senha de Cliente como uma senha de app.",
-  "register_app.credentialsSave": "Eu salvei ambos meu Id de Cliente e o Segredo Cliente em um local seguro",
-  "register_app.credentialsTitle": "Suas Credenciais de Aplicação",
-  "register_app.description": "Descrição",
-  "register_app.dev": "Aplicativos Desenvolvedor",
-  "register_app.homepage": "URL da página principal",
-  "register_app.homepageError": "Página principal precisa ser preenchida.",
-  "register_app.name": "Nome do Aplicativo",
-  "register_app.nameError": "Nome da aplicação precisa ser preenchida.",
-  "register_app.optional": "Opcional",
-  "register_app.register": "Registrar",
-  "register_app.required": "Necessário",
-  "register_app.title": "Registar um Novo Aplicativo",
   "removed_channel.channelName": "o canal",
   "removed_channel.from": "Removido de ",
   "removed_channel.okay": "Ok",
@@ -1376,7 +1421,10 @@
   "rhs_comment.comment": "Comentário",
   "rhs_comment.del": "Deletar",
   "rhs_comment.edit": "Editar",
+  "rhs_comment.mobile.flag": "Marcar",
+  "rhs_comment.mobile.unflag": "Desmarcar",
   "rhs_comment.permalink": "Permalink",
+  "rhs_header.backToFlaggedTooltip": "Voltar para Posts Marcados",
   "rhs_header.backToResultsTooltip": "Voltar para os Resultados da Pesquisa",
   "rhs_header.closeSidebarTooltip": "Fechar a Barra Lateral",
   "rhs_header.details": "Detalhes da Mensagem",
@@ -1385,12 +1433,15 @@
   "rhs_root.del": "Deletar",
   "rhs_root.direct": "Mensagem Direta",
   "rhs_root.edit": "Editar",
+  "rhs_root.mobile.flag": "Marcar",
+  "rhs_root.mobile.unflag": "Desmarcar",
   "rhs_root.permalink": "Permalink",
   "search_bar.cancel": "Cancelar",
   "search_bar.search": "Procurar",
   "search_bar.usage": "<h4>Opções de Pesquisa</h4><ul><li><span>Utilize </span><b>\"aspas\"</b><span> para pesquisar frases</span></li><li><span>Use </span><b>from:</b><span> para encontrar mensagens de usuários específicos e </span><b>in:</b><span> para encontrar postagens em canais específicos</span></li></ul>",
   "search_header.results": "Resultados da Pesquisa",
   "search_header.title2": "Menções Recentes",
+  "search_header.title3": "Posts Marcados",
   "search_item.direct": "Mensagem Direta",
   "search_item.jump": "Pular",
   "search_results.because": "<ul><li>Se você está pesquisando uma parte da frase (ex. pesquisando \"rea\", procurando por \"reagir\" ou \"reação\"), acrescente um * ao seu termo de pesquisa</li><li>Devido ao grande volume de resultados, pesquisas com duas letras e palavras comuns como \"este\", \"um\" e \"é\" não aparecerão nos resultados de pesquisa</li></ul>",
@@ -1423,6 +1474,7 @@
   "sidebar_header.tutorial": "<h4>Menu Principal</h4><p>O <strong>Menu Principal</strong> é onde você pode <strong>Convidar novos membros</strong>, acessar sua <strong>Definição de Conta</strong> e ajustar o seu <strong>Tema de Cores</strong>.</p><p>Administradores de equipe podem também acessar suas <strong>Configurações de Equipe</strong> a partir deste menu.</p><p>Administradores de Sistema vão encontrar em <strong>Console do Sistema</strong> opções para administrar todo o sistema.</p>",
   "sidebar_right_menu.accountSettings": "Definições de Conta",
   "sidebar_right_menu.console": "Console do Sistema",
+  "sidebar_right_menu.flagged": "Posts Marcados",
   "sidebar_right_menu.help": "Ajuda",
   "sidebar_right_menu.inviteNew": "Convidar Membros para Equipe",
   "sidebar_right_menu.logout": "Logout",
@@ -1460,7 +1512,7 @@
   "signup_user_completed.lets": "Vamos criar a sua conta",
   "signup_user_completed.no_open_server": "Este servidor não permite inscrições abertas.  Por favor fale com seu Administrador para receber um convite.",
   "signup_user_completed.none": "Nenhum método de criação de equipe foi habilitado.  Por favor, entre em contato com um administrador para o acesso.",
-  "signup_user_completed.office365": "with Office 365",
+  "signup_user_completed.office365": "com Office 365",
   "signup_user_completed.onSite": "no {siteName}",
   "signup_user_completed.or": "ou",
   "signup_user_completed.passwordLength": "Por favor entre no mínimo {min} caracteres",
@@ -1581,10 +1633,6 @@
   "user.settings.custom_theme.sidebarTextHoverBg": "Fundo Barra lateral Sobre Texto",
   "user.settings.custom_theme.sidebarTitle": "Estilos da Barra Lateral",
   "user.settings.custom_theme.sidebarUnreadText": "Barra Lateral Texto Não Lido",
-  "user.settings.developer.applicationsPreview": "Aplicativos (Pré-visualização)",
-  "user.settings.developer.register": "Registar Novo Aplicativo",
-  "user.settings.developer.thirdParty": "Abrir para registrar um novo aplicativo de terceiros",
-  "user.settings.developer.title": "Configurações de Desenvolvedor",
   "user.settings.display.channelDisplayTitle": "Modo de Exibição do Canal",
   "user.settings.display.channeldisplaymode": "Selecione a largura do centro do canal.",
   "user.settings.display.clockDisplay": "Exibição do Relógio",
@@ -1624,14 +1672,14 @@
   "user.settings.general.confirmEmail": "Confirmar o email",
   "user.settings.general.email": "E-mail",
   "user.settings.general.emailGitlabCantUpdate": "Login ocorre através do GitLab. Email não pode ser atualizado. Endereço de email utilizado para notificações é {email}.",
-  "user.settings.general.emailGoogleCantUpdate": "Login ocorre através do GitLab. Email não pode ser atualizado. Endereço de email utilizado para notificações é {email}.",
+  "user.settings.general.emailGoogleCantUpdate": "Login ocorre através do Google. Email não pode ser atualizado. Endereço de email utilizado para notificações é {email}.",
   "user.settings.general.emailHelp1": "Email é usado para login, notificações, e redefinição de senha. Requer verificação de email se alterado.",
   "user.settings.general.emailHelp2": "Email foi desativado pelo seu administrador de sistema. Nenhuma notificação por email será enviada até isto ser habilitado.",
   "user.settings.general.emailHelp3": "Email é usado para login, notificações e redefinição de senha.",
   "user.settings.general.emailHelp4": "Uma verificação por email foi enviada para {email}.",
   "user.settings.general.emailLdapCantUpdate": "Login ocorre através de LDAP. Email não pode ser atualizado. Endereço de email utilizado para notificações é {email}.",
   "user.settings.general.emailMatch": "Os novos emails que você inseriu não correspondem.",
-  "user.settings.general.emailOffice365CantUpdate": "Login ocorre através do GitLab. Email não pode ser atualizado. Endereço de email utilizado para notificações é {email}.",
+  "user.settings.general.emailOffice365CantUpdate": "Login ocorre através do Office 365. Email não pode ser atualizado. Endereço de email utilizado para notificações é {email}.",
   "user.settings.general.emailSamlCantUpdate": "Login ocorre através SAML. Email não pode ser atualizado. Endereço de email utilizado para notificações é {email}.",
   "user.settings.general.emailUnchanged": "Seu novo endereço de email é o mesmo do seu endereço de email antigo.",
   "user.settings.general.emptyName": "Clique 'Editar' para adicionar seu nome completo",
@@ -1643,9 +1691,9 @@
   "user.settings.general.imageUpdated": "Imagem última atualização {date}",
   "user.settings.general.lastName": "Último Nome",
   "user.settings.general.loginGitlab": "Login feito através do GitLab ({email})",
-  "user.settings.general.loginGoogle": "Login feito através do GitLab ({email})",
+  "user.settings.general.loginGoogle": "Login feito através do Google ({email})",
   "user.settings.general.loginLdap": "Login feito através de LDAP ({email})",
-  "user.settings.general.loginOffice365": "Login feito através do GitLab ({email})",
+  "user.settings.general.loginOffice365": "Login feito através do Office 365 ({email})",
   "user.settings.general.loginSaml": "Login feito através de SAML ({email})",
   "user.settings.general.newAddress": "Novo Endereço: {email}<br />Verifique seu email para checar o endereço acima.",
   "user.settings.general.nickname": "Apelido",
@@ -1668,6 +1716,7 @@
   "user.settings.import_theme.submit": "Enviar",
   "user.settings.import_theme.submitError": "Formato inválido, por favor tente copiar e colar novamente.",
   "user.settings.languages.change": "Alterar o idioma da interface",
+  "user.settings.languages.promote": "Escolha qual idioma Mattermost exibirá a interface do usuário.<br /><br />Gostaria de ajudar com as traduções? Junte-se ao <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> para contribuir.",
   "user.settings.mfa.add": "Adicionar MFA para sua conta",
   "user.settings.mfa.addHelp": "Você pode exigir um token gerado por um smartphone, além da sua senha, para entrar no Mattermost.<br/><br/>Para ativar, faça download no seu telefone do Google Authenticator no <a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a> ou <a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a>, em seguida,<br/><br/>1. Clique no botão acima<strong>Adicionar MFA para sua conta</strong>.<br/>2. Use o Google Authenticator para scanear o QR code que aparece.<br/>3. Digite o Token gerado pelo Google Authenticator e clique em <strong>Salvar</strong>.<br/><br/>Quando o logar, você será solicitado a digitar um token do Google Authenticator, além de suas credenciais regulares.",
   "user.settings.mfa.addHelpQr": "Por favor escanei o QR code com o app Google Authenticator no seu smartphone e preencha com o token fornecido pelo app.",
@@ -1675,19 +1724,17 @@
   "user.settings.mfa.qrCode": "Código de Barra",
   "user.settings.mfa.remove": "Remover MFA da sua conta",
   "user.settings.mfa.removeHelp": "Remoção da autenticação multi-fator significa que você não vai mais exigir um código de acesso baseado no telefone para fazer login na sua conta.",
+  "user.settings.mfa.title": "Autenticação Multi-Fator",
   "user.settings.modal.advanced": "Avançado",
   "user.settings.modal.confirmBtns": "Sim, Descartar",
   "user.settings.modal.confirmMsg": "Você tem alterações não salvas, você tem certeza que quer descartar elas?",
   "user.settings.modal.confirmTitle": "Descartar alterações?",
-  "user.settings.modal.developer": "Desenvolvedor",
   "user.settings.modal.display": "Exibir",
   "user.settings.modal.general": "Geral",
   "user.settings.modal.notifications": "Notificações",
   "user.settings.modal.security": "Segurança",
   "user.settings.modal.title": "Definições de Conta",
-  "user.settings.notification.allActivity": "Para todas atividades",
-  "user.settings.notification.push": "Notificações push móvel",
-  "user.settings.notification.soundConfig": "Por favor configurar sons de notificações nas configurações do seu navegador",
+  "user.settings.notifications.allActivity": "Para todas as atividades",
   "user.settings.notifications.channelWide": "Menções para todo canal \"@channel\", \"@all\"",
   "user.settings.notifications.close": "Fechar",
   "user.settings.notifications.comments": "Notificações comentário a tópicos",
@@ -1706,9 +1753,11 @@
   "user.settings.notifications.off": "Desligado",
   "user.settings.notifications.on": "Ligado",
   "user.settings.notifications.onlyMentions": "Somente para menções e mensagens diretas",
+  "user.settings.notifications.push": "Notificações push móvel",
   "user.settings.notifications.sensitiveName": "Seu primeiro nome sensível a maiúsculas e minúsculas \"{first_name}\"",
   "user.settings.notifications.sensitiveUsername": "Seu usuário não sensível a maiúsculas \"{username}\"",
   "user.settings.notifications.sensitiveWords": "Outras palavras não sensível a maiúscula, separadas por virgulas:",
+  "user.settings.notifications.soundConfig": "Por favor configurar sons de notificações nas configurações do seu navegador",
   "user.settings.notifications.sounds_info": "Notificações na área de trabalho estão disponíveis no Firefox, Safari, Chrome, Internet Explorer, e Edge.",
   "user.settings.notifications.teamWide": "Mencionar toda a equipe \"@all\"",
   "user.settings.notifications.title": "Configurações de Notificação",
@@ -1762,7 +1811,7 @@
   "user.settings.security.switchGitlab": "Trocar para usar GitLab SSO",
   "user.settings.security.switchGoogle": "Trocar para usar Google SSO",
   "user.settings.security.switchLdap": "Trocar para usar LDAP",
-  "user.settings.security.switchOffice365": "Switch to using Office 365 SSO",
+  "user.settings.security.switchOffice365": "Mudar para usar Office 365 SSO",
   "user.settings.security.switchSaml": "Trocar para usar SAML SSO",
   "user.settings.security.title": "Configurações de Segurança",
   "user.settings.security.viewHistory": "Ver Histórico de Acesso",
diff --git a/webapp/i18n/zh_CN.json b/webapp/i18n/zh_CN.json
index 384b8a764..6b0938583 100644
--- a/webapp/i18n/zh_CN.json
+++ b/webapp/i18n/zh_CN.json
@@ -30,21 +30,21 @@
   "activity_log_modal.androidNativeApp": "Android本地App",
   "activity_log_modal.iphoneNativeApp": "iPhone本地App",
   "add_command.autocomplete": "自动完成：",
-  "add_command.autocomplete.help": "(Optional) Show slash command in autocomplete list.",
+  "add_command.autocomplete.help": "(可选) 在自动完成列表显示斜杠命令。",
   "add_command.autocompleteDescription": "自动补全描述",
-  "add_command.autocompleteDescription.help": "对自动补全列表中，斜杠命令的可选简述。",
+  "add_command.autocompleteDescription.help": "(可选) 在自动补全列表中显示斜杠命令的简述。",
   "add_command.autocompleteDescription.placeholder": "例如: 返回关于病人记录的搜索结果",
   "add_command.autocompleteHint": "自动完成提示",
-  "add_command.autocompleteHint.help": "(Optional) Arguments associated with your slash command, displayed as help in the autocomplete list.",
+  "add_command.autocompleteHint.help": "(可选) 你的斜杠命令在自动完成列表中显示的参数。",
   "add_command.autocompleteHint.placeholder": "例如: [患者姓名]",
   "add_command.cancel": "取消",
   "add_command.description": "描述",
-  "add_command.description.help": "Description for your incoming webhook.",
+  "add_command.description.help": "传入webhook的简述。",
   "add_command.displayName": "显示名称",
-  "add_command.displayName.help": "Display name for your slash command made of up to 64 characters.",
+  "add_command.displayName.help": "您的斜杠命令显示名，最多64字。",
   "add_command.header": "添加",
   "add_command.iconUrl": "回复图标",
-  "add_command.iconUrl.help": "选择一个件图片覆盖回复这个斜杠命令。输入的URL.png或.jpg文件至少128像素x128像素。",
+  "add_command.iconUrl.help": "(可选) 选择一个头像覆盖此斜杠命令产生的信息。输入的.png或.jpg文件URL至少128像素x128像素。",
   "add_command.iconUrl.placeholder": "https://www.example.com/myicon.png",
   "add_command.method": "请求方式",
   "add_command.method.get": "GET",
@@ -52,10 +52,10 @@
   "add_command.method.post": "POST",
   "add_command.save": "保存",
   "add_command.trigger": "命令触发词",
-  "add_command.trigger.help": "Trigger word must be unique, and cannot begin with a slash or contain any spaces.",
-  "add_command.trigger.helpExamples": "Examples: client, employee, patient, weather",
-  "add_command.trigger.helpReserved": "Reserved: {link}",
-  "add_command.trigger.helpReservedLinkText": "see list of built-in slash commands",
+  "add_command.trigger.help": "触发关键字必须唯一，且不能以斜杠开头或含空格。",
+  "add_command.trigger.helpExamples": "例：client, employee, patient, weather",
+  "add_command.trigger.helpReserved": "预留：{link}",
+  "add_command.trigger.helpReservedLinkText": "查看内置斜杠指令列表",
   "add_command.trigger.placeholder": "命令触发器。譬如\"hello\"",
   "add_command.triggerInvalidLength": "触发器单词必须包含 {min} 至 {max} 个字符",
   "add_command.triggerInvalidSlash": "触发器单词第一个单词不能为/",
@@ -66,7 +66,7 @@
   "add_command.url.placeholder": "必须以http://或https://开始",
   "add_command.urlRequired": "需要一个请求的URL",
   "add_command.username": "回复用户名",
-  "add_command.username.help": "选择一个用户名用于覆盖这个响应命令。用户名可以包含多达22个小写字母，数字以及符号 \"-\"，\"_\" 和 \".\" 字符。",
+  "add_command.username.help": "(可选) 选择一个用户名用于覆盖这个命令回应。用户名可以包含多达22个小写字母，数字以及符号 \"-\"，\"_\" 和 \".\" 字符。",
   "add_command.username.placeholder": "用户名",
   "add_emoji.cancel": "取消",
   "add_emoji.header": "添加",
@@ -84,39 +84,51 @@
   "add_emoji.save": "保存",
   "add_incoming_webhook.cancel": "取消",
   "add_incoming_webhook.channel": "频道",
-  "add_incoming_webhook.channel.help": "Public channel or private group that receives the webhook payloads. You must belong to the private group when setting up the webhook.",
+  "add_incoming_webhook.channel.help": "接收webhook的公开频道或私有组。您必须属于该私有组才能设定webhook。",
   "add_incoming_webhook.channelRequired": "需要一个合法的频道",
   "add_incoming_webhook.description": "描述",
-  "add_incoming_webhook.description.help": "Description for your incoming webhook.",
+  "add_incoming_webhook.description.help": "传入webhook的简述。",
   "add_incoming_webhook.displayName": "显示名称",
-  "add_incoming_webhook.displayName.help": "Display name for your incoming webhook made of up to 64 characters.",
+  "add_incoming_webhook.displayName.help": "传入webhook的显示名，最多64字。",
   "add_incoming_webhook.header": "添加",
   "add_incoming_webhook.name": "名称",
   "add_incoming_webhook.save": "保存",
+  "add_oauth_app.callbackUrls.help": "用户在接收或拒绝授权您的应用后重转向的网址，同时用来处理授权码或访问令牌。比为以 http:// 或 https:// 开头的有效网址。",
+  "add_oauth_app.callbackUrlsRequired": "需要一个或多个回调URL",
+  "add_oauth_app.description.help": "您的 OAuth 2.0 应用描述。",
+  "add_oauth_app.descriptionRequired": "OAuth 2.0 应用描述为必填。",
+  "add_oauth_app.header": "添加",
+  "add_oauth_app.homepage.help": "OAuth 2.0 应用首页网址。请您确认有根据服务器设置使用 HTTP 或 HTTPS 网址。",
+  "add_oauth_app.homepageRequired": "OAuth 2.0 应用首页网址为必填。",
+  "add_oauth_app.icon.help": "(可选) 指向您的 OAuth 2.0 应用的图片网址。请您确认您的网址使用 HTTP 或 HTTPS。",
+  "add_oauth_app.name.help": "您的 OAuth 2.0 应用显示名，最多64字。",
+  "add_oauth_app.nameRequired": "OAuth 2.0 应用名为必填。",
+  "add_oauth_app.trusted.help": "当设为是时，OAuth 2.0 应用将被 Mattermost 服务器信任且不需用户同意授权。当设为否时，将会弹出新窗口询问用户同意或拒绝授权。",
   "add_outgoing_webhook.callbackUrls": "回调URL（每行一个）",
-  "add_outgoing_webhook.callbackUrls.help": "The URL that messages will be sent to.",
+  "add_outgoing_webhook.callbackUrls.help": "信息传输到的网址。",
   "add_outgoing_webhook.callbackUrlsRequired": "需要一个或多个回调URL",
   "add_outgoing_webhook.cancel": "取消",
   "add_outgoing_webhook.channel": "频道",
-  "add_outgoing_webhook.channel.help": "Public channel to receive webhook payloads. Optional if at least one Trigger Word is specified.",
-  "add_outgoing_webhook.contentType.help1": "Choose the content type by which the response will be sent.",
-  "add_outgoing_webhook.contentType.help2": "If application/x-www-form-urlencoded is chosen, the server assumes you will be encoding the parameters in a URL format.",
-  "add_outgoing_webhook.contentType.help3": "If application/json is chosen, the server assumes you will posting JSON data.",
+  "add_outgoing_webhook.channel.help": "接收webhook的公开频道。如果至少有一个触发关键字设定时此项为可选。",
+  "add_outgoing_webhook.contentType.help1": "选择发送的回复时的内容类型。",
+  "add_outgoing_webhook.contentType.help2": "如果选择了 application/x-www-form-urlencoded，服务器将认为您会将参数以URL格式编码。",
+  "add_outgoing_webhook.contentType.help3": "如果选择了 application/json，服务器将认为您会传送 JSON 数据。",
   "add_outgoing_webhook.content_Type": "内容类型",
   "add_outgoing_webhook.description": "描述",
-  "add_outgoing_webhook.description.help": "Description for your outgoing webhook.",
+  "add_outgoing_webhook.description.help": "您的传出webhook简述。",
   "add_outgoing_webhook.displayName": "显示名称",
-  "add_outgoing_webhook.displayName.help": "Display name for your outgoing webhook made of up to 64 characters.",
+  "add_outgoing_webhook.displayName.help": "传出webhook的显示名，最多64字。",
   "add_outgoing_webhook.header": "添加",
   "add_outgoing_webhook.name": "名称",
   "add_outgoing_webhook.save": "保存",
   "add_outgoing_webhook.triggerWords": "触发词（一行一个）",
-  "add_outgoing_webhook.triggerWords.help": "Messages that start with one of the specified words will trigger the outgoing webhook. Optional if Channel is selected.",
+  "add_outgoing_webhook.triggerWords.help": "以特定关键字的信息将触发传出webhook。如果有选择频道此项则为可选。",
   "add_outgoing_webhook.triggerWordsOrChannelRequired": "需要一个有效的频道或一个触发字列表",
   "add_outgoing_webhook.triggerWordsTriggerWhen": "触发时机",
-  "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choose when to trigger the outgoing webhook; if the first word of a message matches a Trigger Word exactly, or if it starts with a Trigger Word.",
+  "add_outgoing_webhook.triggerWordsTriggerWhen.help": "选择何时触发传出webhook：信息第一个词符合触发关键字或时以触发关键字开头。",
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "第一个完全符合触发关键字",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "第一字以触发关键字为开头",
+  "admin.advance.cluster": "高可用性 (Beta)",
   "admin.audits.reload": "重新载入用户活动日志",
   "admin.audits.title": "用户活动日志",
   "admin.authentication.email": "邮件验证",
@@ -124,6 +136,24 @@
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "注释：",
+  "admin.cluster.enableDescription": "当设为是时，Mattermost将以高可用性模式运行。请参考<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">文档</a>了解Mattermost的高可用性。",
+  "admin.cluster.enableTitle": "开启高可用性模式：",
+  "admin.cluster.interNodeListenAddressDesc": "服务器与其他服务器通讯的监听地址。",
+  "admin.cluster.interNodeListenAddressEx": "例如 \":8065\"",
+  "admin.cluster.interNodeListenAddressTitle": "互连节点监听地址：",
+  "admin.cluster.interNodeUrlsDesc": "所有Mattermost服务器的内部/私有网址用逗号分开",
+  "admin.cluster.interNodeUrlsEx": "例如 \"http://10.10.10.30, http://10.10.10.31\"",
+  "admin.cluster.interNodeUrlsTitle": "互连节点网址：",
+  "admin.cluster.loadedFrom": "此配置文件是从节点ID  {clusterId} 加载的。请见我们的<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">文档</a>中的排错手册如果您在通过负载均衡服务器访问系统控制且遇到问题。",
+  "admin.cluster.noteDescription": "修改此分类中的属性需要重启服务器才能生效。当高可用性模式开启时，系统控制台将设为只读且只能通过修改配置文件进行改动。",
+  "admin.cluster.should_not_change": "警告：这些设定可能不会与其他机群服务器同步。高可用性互连节点通讯只会在您确保所有服务器中的config.json一致并重启Mattermost后开启。请见<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">文档</a>了解如何从机群里添加或删除服务器。如果您在通过负载均衡服务器访问系统控制且遇到问题，请见我们的<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">文档</a>中的排错手册。",
+  "admin.cluster.status_table.config_hash": "配置文件MD5",
+  "admin.cluster.status_table.hostname": "主机名",
+  "admin.cluster.status_table.id": "节点 ID",
+  "admin.cluster.status_table.reload": "重加载机群状态",
+  "admin.cluster.status_table.status": "状态",
+  "admin.cluster.status_table.url": "互连节点网址",
+  "admin.cluster.status_table.version": "版本：",
   "admin.compliance.directoryDescription": "用户保存守规报告。如果为空，将被设置为 ./data/。",
   "admin.compliance.directoryExample": "例如 \"./data/\"",
   "admin.compliance.directoryTitle": "守规报告目录：",
@@ -198,9 +228,9 @@
   "admin.email.emailSuccess": "发送电子邮件时没有错误的报告.  请务必检查您的收件箱.",
   "admin.email.fullPushNotification": "发送完整的消息片段",
   "admin.email.genericPushNotification": "发送包含用户名称和频道名称的一般描述",
-  "admin.email.inviteSaltDescription": "电子邮件邀请加入32字符的盐值加密.安装时随机生成. 点击 \"重新生成\" 生成新的加密.",
+  "admin.email.inviteSaltDescription": "32字符的盐值用于签署电子邮件邀请。安装时随机生成。点击 \"重新生成\" 生成新的盐值。",
   "admin.email.inviteSaltExample": "Ex \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
-  "admin.email.inviteSaltTitle": "电子邮件邀请 Salt：",
+  "admin.email.inviteSaltTitle": "电子邮件邀盐值：",
   "admin.email.mhpns": "使用加密的，产品及质量的HPNS连接到iOS和Android应用程序",
   "admin.email.mhpnsHelp": "从 iTunes下载 <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target=\"_blank\">Mattermost iOS app</a>。从 Google Play 下载 <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" 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.mtpns": "在iTunes和TPNS的谷歌Play使用iOS和Android应用程序",
@@ -216,9 +246,9 @@
   "admin.email.notificationOrganizationDescription": "从mattermost电子邮件通知显示组织机构名称和地址，如“©ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\"。如果字段为空，则将不显示该组织的名称和地址。",
   "admin.email.notificationsDescription": "通常在产品中设置为是,Mattermost尝试方式邮件通知. 开发人员可以将此字段设置为假以跳过电子邮件安装程序以加快开发速度.<br />置此为是的删除预览模式横幅 (设置后需要注销和重新登录).",
   "admin.email.notificationsTitle": "启用发送邮件通知：",
-  "admin.email.passwordSaltDescription": "32字盐用来签署重置密码邮件。由安装时随机生成。点击 \"重新生成\" 生成新的盐。",
+  "admin.email.passwordSaltDescription": "32字盐值用来签署重置密码邮件。由安装时随机生成。点击 \"重新生成\" 生成新的盐。",
   "admin.email.passwordSaltExample": "Ex \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
-  "admin.email.passwordSaltTitle": "密码重设盐：",
+  "admin.email.passwordSaltTitle": "密码重设盐值：",
   "admin.email.pushContentDesc": "选择“发送用户名称和频道名称的通用描述”提供通用信息的推送通知，包括用户名称和频道名称但没有来自信息文本的具体细节。<br /><br />选择“发送完整的信息片段”，发送来自消息触发通知的详细摘录，可能包括发送信息中的保密信息。如果您的推送通知服务在您的防火墙之外，强烈建议此选项仅用于“https”协议加密连接。",
   "admin.email.pushContentTitle": "推送通知内容：",
   "admin.email.pushDesc": "通常在正式环境中设置为是。当设为是时，Mattermost尝试给iOS和安卓从推送通知服务器发送通知。",
@@ -252,7 +282,7 @@
   "admin.files.storage": "储存",
   "admin.general.configuration": "配置",
   "admin.general.localization": "本地化",
-  "admin.general.localization.availableLocalesDescription": "设定帐号设定里用户可选的语言。（留空将开启所有支持的语言）",
+  "admin.general.localization.availableLocalesDescription": "设置用户在帐号设定里可用的语言 (留空将所有可用的语言为可用)。<br /><br />想要帮助翻译吗？加入<a href='http://translate.mattermost.com/' target='_blank'>Mattermost 翻译服务器</a>。",
   "admin.general.localization.availableLocalesTitle": "可用的语言：",
   "admin.general.localization.clientLocaleDescription": "新创建的用户以及未登入的用户的默认语言。",
   "admin.general.localization.clientLocaleTitle": "默认客户端语言：",
@@ -263,9 +293,9 @@
   "admin.general.policy.permissionsAdmin": "团队和系统管理员",
   "admin.general.policy.permissionsAll": "所有团队成员",
   "admin.general.policy.permissionsSystemAdmin": "系统管理员",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "设置谁可以创建，删除，重命名，以及设置标题或私有组作用的策略。",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "设置谁可以创建，删除，重命名，以及设置标语或私有组作用的策略。",
   "admin.general.policy.restrictPrivateChannelManagementTitle": "启用私人群组管理的权限：",
-  "admin.general.policy.restrictPublicChannelManagementDescription": "设置谁可以创建，删除，重命名，以及设置标题或公共频道作用的策略。",
+  "admin.general.policy.restrictPublicChannelManagementDescription": "设置谁可以创建，删除，重命名，以及设置标语或公共频道作用的策略。",
   "admin.general.policy.restrictPublicChannelManagementTitle": "启用公共频道的管理权限：",
   "admin.general.policy.teamInviteDescription": "设置谁可以用<b>邀请新成员</b>发送邮件邀请他人到团队，或用主菜单的<b>获取团队邀请链接</b>的策略。如果使用了<b>获取团队邀请链接</b>，您可以在用户加入到团队后到<b>团队设定</b> > <b>邀请码</b>废除邀请码。",
   "admin.general.policy.teamInviteTitle": "启用发送团队邀请的使用者：",
@@ -290,7 +320,7 @@
   "admin.gitlab.userDescription": "输入 https://<your-gitlab-url>/api/v3/user。根据于您的服务器设定而决定网址中使用HTTP或HTTPS。",
   "admin.gitlab.userExample": "如：\"https://<your-gitlab-url>/api/v3/user\"",
   "admin.gitlab.userTitle": "用户API 端点：",
-  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>登入</a>到您的谷歌帐号。</li><li>到<a href='https://console.developers.google.com'>https://console.developers.google.com</a>，在左边导航点击<strong>凭证</strong>后输入<strong>Mattermost - <your-company-name></strong>为项目名。</li><li>点击<strong>OAuth 同意页面</strong>标题并输入<strong>Mattermost</strong>做为<strong>显示给用户的产品名</strong>。点击<strong>保存</strong>。</li><li>在<strong>凭证</strong>标题下，点击<strong>创建凭证</strong>，选择<strong>OAuth客户端ID</strong>并选择<strong>网页应用</strong>。</li><li>在<strong>限制</strong>和<strong>经认可的重指向网址</strong>下输入<strong><your-mattermost-url>/signup/google/complete</strong> (例: http://localhost:8065/signup/google/complete)。点击<strong>创建</strong>。</li><li>保存<strong>客户端ID</strong>和<strong>客户端秘密</strong>以便完整填写以下栏。</li><li>最后，到<a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a>并点击<strong>启用</strong>。这可能需要几分钟时间让谷歌服务器同步数据。</li><li>完成以下<strong>客户端ID</strong>和<strong>客户端秘密</strong>。</li></ol>",
+  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>登入</a>到您的谷歌帐号。</li><li>到<a href='https://console.developers.google.com'>https://console.developers.google.com</a>，在左边导航点击<strong>凭证</strong>后输入\"Mattermost - your-company-name\"为<strong>项目名</strong>，然后点击<strong>创建</strong>。</li><li>点击<strong>OAuth 同意页面</strong>标题并输入\"Mattermost\" 做为<strong>显示给用户的产品名</strong>，然后点击<strong>保存</strong>。</li><li>在<strong>凭证</strong>标题下，点击<strong>创建凭证</strong>，选择<strong>OAuth客户端ID</strong>并选择<strong>网页应用</strong>。</li><li>在<strong>限制</strong>和<strong>经认可的重指向网址</strong>下输入<strong>your-mattermost-url/signup/google/complete</strong> (例: http://localhost:8065/signup/google/complete)。点击<strong>创建</strong>。</li><li>粘贴<strong>客户端ID</strong>和<strong>客户端秘密</strong>到以下栏，然后点击<strong>保存</strong>。</li><li>最后，到<a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a>并点击<strong>启用</strong>。这可能需要几分钟时间让谷歌服务器同步数据。</li></ol>",
   "admin.google.authTitle": "认证端点：",
   "admin.google.clientIdDescription": "您在谷歌注册您的应用时收到的客户端ID。",
   "admin.google.clientIdExample": "例如 \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -330,9 +360,9 @@
   "admin.image.profileWidthDescription": "个人头像宽度。",
   "admin.image.profileWidthExample": "例如 \"1024\"",
   "admin.image.profileWidthTitle": "个人头像宽度：",
-  "admin.image.publicLinkDescription": "32字盐用来签署公开的图片链接。由安装时随机生成。点击 \"重新生成\" 生成新的盐。",
+  "admin.image.publicLinkDescription": "32字盐值用来签署公开的图片链接。由安装时随机生成。点击 \"重新生成\" 生成新的盐。",
   "admin.image.publicLinkExample": "例如 \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
-  "admin.image.publicLinkTitle": "公共链接加密: ",
+  "admin.image.publicLinkTitle": "公共链接盐值：",
   "admin.image.shareDescription": "允许用户分享文件和图片的公共链接。",
   "admin.image.shareTitle": "分享公共文件链接：",
   "admin.image.storeAmazonS3": "Amazon S3",
@@ -345,8 +375,8 @@
   "admin.image.thumbWidthDescription": "上传图片时生成缩略图宽度。更新这个值改变之后的缩略图显示，但不改变在过去创建的图片。",
   "admin.image.thumbWidthExample": "例如 \"120\"",
   "admin.image.thumbWidthTitle": "附件缩略图宽度：",
+  "admin.integrations.custom": "自定义集成",
   "admin.integrations.external": "外部服务",
-  "admin.integrations.webhook": "Webhooks和命令",
   "admin.ldap.baseDesc": "BaseDN可以使Mattermost在LADP树中搜索用户时可以按位置区分名称.",
   "admin.ldap.baseEx": "例如：\"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "BaseDN：",
@@ -446,10 +476,12 @@
   "admin.notifications.title": "通知设置",
   "admin.oauth.gitlab": "GitLab",
   "admin.oauth.google": "Google Apps",
-  "admin.oauth.off": "不允许通过OAuth 2.0提供者登入",
+  "admin.oauth.off": "不允许通过 OAuth 2.0 提供商登入",
   "admin.oauth.office365": "Office 365",
-  "admin.oauth.select": "选择OAuth 2.0服务提供者：",
-  "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>登入</a>到您的微软或Office 365帐号。确定是和您想让用户登入的同一个<a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>租户</a>。</li><li>到<a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>，点击<strong>添加应用</strong>然后用<strong>Mattermost - <your-company-name></strong>做为应用名。</li><li>在<strong>应用秘密</strong>下，点击<strong>生成新密码</strong>后保存以便完整填写以下栏。</li><li>在<strong>平台</strong>下，点击<strong>添加平台</strong>，选择<strong>网页</strong>并在<strong>重指向网址</strong>下输入<strong><your-mattermost-url>/signup/office365/complete</strong> (例: http://localhost:8065/signup/office365/complete)。同时反选择<strong>允许隐含流程</strong>。</li><li>最后，点击<strong>保存</strong>并完成以下栏的<strong>应用ID</strong>以及<strong>应用密码</strong>。</li></ol>",
+  "admin.oauth.providerDescription": "当设为是时，Mattermost 可做为 OAuth 2.0 服务提供商以给予外部应用的API请求授权。",
+  "admin.oauth.providerTitle": "启动 OAuth 2.0 服务提供商：",
+  "admin.oauth.select": "选择 OAuth 2.0 服务提供商：",
+  "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>登入</a>到您的微软或Office 365帐号。确定是和您想让用户登入的同一个<a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>租户</a>。</li><li>到<a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>，点击<strong>转到应用列表</strong> > <strong>添加应用</strong>然后用\"Mattermost - your-company-name\"做为<strong>应用名</strong>。</li><li>在<strong>应用秘密</strong>下，点击<strong>生成新密码</strong>后粘贴到以下<strong>应用密码</strong>栏。</li><li>在<strong>平台</strong>下，点击<strong>添加平台</strong>，选择<strong>网页</strong>并在<strong>重指向网址</strong>下输入<strong>your-mattermost-url/signup/office365/complete</strong> (例: http://localhost:8065/signup/office365/complete)。同时反选择<strong>允许隐含流程</strong>。</li><li>最后，点击<strong>保存</strong>并粘贴<strong>应用ID</strong>到下方。</li></ol>",
   "admin.office365.authTitle": "认证端点：",
   "admin.office365.clientIdDescription": "您在微软注册您的应用时收到的应用/客户端ID。",
   "admin.office365.clientIdExample": "例如 \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
@@ -471,7 +503,7 @@
   "admin.password.uppercase": "至少有一个大写字母",
   "admin.privacy.showEmailDescription": "当设置为否,在其他用户的用户界面隐藏自己的电子邮件地址, 包括团队拥有者和团队管理员.通常用于当系统为管理团队的一些用户选择保持他们的私人联系信息.",
   "admin.privacy.showEmailTitle": "显示电子邮箱地址：",
-  "admin.privacy.showFullNameDescription": "当设置为否,从其他用户隐藏,包括团队拥有者和团队管理员.用户名是姓名显示显示的是全名.",
+  "admin.privacy.showFullNameDescription": "当设置为否时，用户看不到他人的全名，包括团队拥有者和团队管理员。全名显示的地方将被用户名替代。",
   "admin.privacy.showFullNameTitle": "显示全名：",
   "admin.rate.enableLimiterDescription": "当设置为是时，API使用率被限制到以下值。",
   "admin.rate.enableLimiterTitle": "启用频率限制：",
@@ -506,23 +538,23 @@
   "admin.reset_password.titleSwitch": "切换到电子邮件/密码的账户",
   "admin.saml.assertionConsumerServiceURLDesc": "输入 https://<your-mattermost-url>/login/sso/saml。确保您使用服务器设定的HTTP或HTTPS网址。此栏又名断言消耗服务网址。",
   "admin.saml.assertionConsumerServiceURLEx": "如 \"https://<your-mattermost-url>/login/sso/saml\"",
-  "admin.saml.assertionConsumerServiceURLTitle": "服务提供者登入URL：",
+  "admin.saml.assertionConsumerServiceURLTitle": "服务提供商登入URL：",
   "admin.saml.emailAttrDesc": "使用SAML断言中的属性做为Mattermost中用户的电子邮箱地址。",
   "admin.saml.emailAttrEx": "如 \"Email\" 或 \"PrimaryEmail\"",
   "admin.saml.emailAttrTitle": "邮箱属性：",
   "admin.saml.enableDescription": "当设为是时，Mattermost允许通过SAML登陆。请参考<a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>文档</a>了解Mattermost配置SAML。",
   "admin.saml.enableTitle": "开启SAML登入：",
-  "admin.saml.encryptDescription": "当设置为是时，Mattermost 将会使用您的服务提供者证书来解密SAML断言。",
+  "admin.saml.encryptDescription": "当设置为是时，Mattermost 将会使用您的服务提供商证书来解密SAML断言。",
   "admin.saml.encryptTitle": "开启加密：",
   "admin.saml.firstnameAttrDesc": "使用SAML断言中的属性做为Mattermost中用户的名字。",
   "admin.saml.firstnameAttrEx": "如 \"FirstName\"",
   "admin.saml.firstnameAttrTitle": "名字属性：",
   "admin.saml.idpCertificateFileDesc": "由可信任的身份认证系统提供商所提供的证书公钥",
-  "admin.saml.idpCertificateFileRemoveDesc": "从身份提供者中移除公钥认证信息。",
-  "admin.saml.idpCertificateFileTitle": "身份认证公钥证书",
-  "admin.saml.idpDescriptorUrlDesc": "在使用SAML请求时所访问的身份认证系统的地址",
+  "admin.saml.idpCertificateFileRemoveDesc": "从身份提供商中移除公钥认证信息。",
+  "admin.saml.idpCertificateFileTitle": "身份认证商公钥证书",
+  "admin.saml.idpDescriptorUrlDesc": "在使用SAML请求时所访问的身份提供商的核发者网址。",
   "admin.saml.idpDescriptorUrlEx": "如 \"https://idp.example.org/SAML2/issuer\"",
-  "admin.saml.idpDescriptorUrlTitle": "身份提供者核发地址：",
+  "admin.saml.idpDescriptorUrlTitle": "身份提供商核发地址：",
   "admin.saml.idpUrlDesc": "Mattermost发送SAML登入启动初始网址。",
   "admin.saml.idpUrlEx": "如 \"https://idp.example.org/SAML2/SSO/Login\"",
   "admin.saml.idpUrlTitle": "SAML SSO 网址：",
@@ -538,15 +570,15 @@
   "admin.saml.nicknameAttrDesc": "(可选)使用SAML断言中的属性做为Mattermost中用户的昵称。",
   "admin.saml.nicknameAttrEx": "例如：\"昵称\"",
   "admin.saml.nicknameAttrTitle": "昵称属性：",
-  "admin.saml.privateKeyFileFileDesc": "用于解析从身份认证系统中返回的SAML数据的私钥",
-  "admin.saml.privateKeyFileFileRemoveDesc": "移除用于解析从身份认证系统中返回的SAML数据的私钥.",
-  "admin.saml.privateKeyFileTitle": "服务提供者密钥：",
-  "admin.saml.publicCertificateFileDesc": "当Mattermost是服务提供者时，用来生成从服务提供者到身份提供者产生的SAML请求使用的证书。",
-  "admin.saml.publicCertificateFileRemoveDesc": "当Mattermost是服务提供者时，删除用来生成从服务提供者到身份提供者产生的SAML请求使用的证书。",
-  "admin.saml.publicCertificateFileTitle": "服务提供者公开证书：",
-  "admin.saml.remove.idp_certificate": "删除身份提供者证书",
-  "admin.saml.remove.privKey": "移除服务提供者密钥",
-  "admin.saml.remove.sp_certificate": "删除服务提供者证书",
+  "admin.saml.privateKeyFileFileDesc": "用于解析从身份认证商中返回的SAML数据的私钥",
+  "admin.saml.privateKeyFileFileRemoveDesc": "移除用于解析从身份认证商中返回的SAML数据的私钥.",
+  "admin.saml.privateKeyFileTitle": "服务提供商密钥：",
+  "admin.saml.publicCertificateFileDesc": "当Mattermost是服务提供商时，用来生成从服务提供者到身份提供者产生的SAML请求使用的证书。",
+  "admin.saml.publicCertificateFileRemoveDesc": "当Mattermost是服务提供商时，删除用来生成从服务提供者到身份提供者产生的SAML请求使用的证书。",
+  "admin.saml.publicCertificateFileTitle": "服务提供商公开证书：",
+  "admin.saml.remove.idp_certificate": "删除身份提供商证书",
+  "admin.saml.remove.privKey": "移除服务提供商密钥",
+  "admin.saml.remove.sp_certificate": "删除服务提供商证书",
   "admin.saml.removing.certificate": "删除证书中...",
   "admin.saml.removing.privKey": "删除密钥中...",
   "admin.saml.uploading.certificate": "上传证书中...",
@@ -554,15 +586,15 @@
   "admin.saml.usernameAttrDesc": "使用SAML断言中的属性做为Mattermost中用户的用户名。",
   "admin.saml.usernameAttrEx": "如 \"Username\"",
   "admin.saml.usernameAttrTitle": "用户名：",
-  "admin.saml.verifyDescription": "设为是时，Mattermost会核实SAML回复签字与服务提供者登入网址一致",
+  "admin.saml.verifyDescription": "设为是时，Mattermost会核实SAML回复签字与服务提供商登入网址一致",
   "admin.saml.verifyTitle": "校验签名：",
   "admin.save": "保存",
   "admin.saving": "保存配置中...",
   "admin.security.connection": "连接",
-  "admin.security.inviteSalt.disabled": "邀请盐无法在邮件寄送关闭下修改。",
+  "admin.security.inviteSalt.disabled": "邀请盐值无法在邮件寄送关闭下修改。",
   "admin.security.login": "登录",
   "admin.security.password": "密码",
-  "admin.security.passwordResetSalt.disabled": "重置密码盐无法在邮件寄送关闭下修改。",
+  "admin.security.passwordResetSalt.disabled": "重置密码盐值无法在邮件寄送关闭下修改。",
   "admin.security.public_links": "公开链接",
   "admin.security.requireEmailVerification.disabled": "邮件验证无法在邮件寄送关闭下修改。",
   "admin.security.session": "会话",
@@ -590,12 +622,12 @@
   "admin.service.integrationAdmin": "限制仅团队和系统管理员可以建整合：",
   "admin.service.integrationAdminDesc": "当设为是时，用户创建的集成只能由管理员创建。",
   "admin.service.listenAddress": "监听地址：",
-  "admin.service.listenDescription": "监听和绑定地址.输入\": 8065\"将绑定所有接口或者\"127.0.0.1: 8065\".修改这个设置需要重启服务器才能生效.",
+  "admin.service.listenDescription": "绑定和监听地址。输入 \": 8065\" 将绑定所有接口或者您可以选择 \"127.0.0.1: 8065\" 只监听本地。修改这个设置需要重启服务器才能生效。",
   "admin.service.listenExample": "例如\": 8065\"",
   "admin.service.mfaDesc": "如果正确，用户将被提供对其账户添加多重因素身份验证的选项。他们需要一部智能手机和一个像Google Authenticator一样的身份验证器应用程序。",
   "admin.service.mfaTitle": "启用多因素身份验证：",
-  "admin.service.mobileSessionDays": "移动应用会话市场（天）：",
-  "admin.service.mobileSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
+  "admin.service.mobileSessionDays": "移动应用会话时长 (天)：",
+  "admin.service.mobileSessionDaysDesc": "从用户上一次输入他们的认证到会话过期的天数。修改此设定后，新的会话时常将在用户下一次输入认证后生效。",
   "admin.service.outWebhooksDesc": "当设为是时，允许传出webhooks。详情参见<a href='http://docs.mattermost.com/developer/webhooks-outgoing.html' target='_blank'>文档</a>。",
   "admin.service.outWebhooksTitle": "启用对外Webhooks: ",
   "admin.service.overrideDescription": "当设置为是时，webhooks和斜杠命令将允许改变贴文的用户名。注意：结合允许图标覆盖将可能导致用户受到络钓鱼攻击。",
@@ -608,23 +640,28 @@
   "admin.service.sessionCache": "会话缓存（分钟）：",
   "admin.service.sessionCacheDesc": "会话在内存缓存的分钟数。",
   "admin.service.sessionDaysEx": "Ex\"30\"",
-  "admin.service.ssoSessionDays": "移动应用会话市场（天）：",
-  "admin.service.ssoSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.",
+  "admin.service.siteURL": "站点网址：",
+  "admin.service.siteURLDescription": "用户访问Mattermost的包含端口和协议的网址。留空将自动根据访问请求设定。",
+  "admin.service.siteURLExample": "如 \"https://mattermost.example.com:1234\"",
+  "admin.service.ssoSessionDays": "SSO会话时长 (天)：",
+  "admin.service.ssoSessionDaysDesc": "从用户上一次输入他们的认证到会话过期的天数。如果验证方式时SAML或GitLab，用户将会自动登入到Mattermost如果他们已经登入到SAML或GitLab。修改此设定后，新的会话时常将在用户下一次输入认证后生效。",
   "admin.service.testingDescription": "当设为是时，/loadtest 斜杠命令能载入测试账号，数据和文字格式。修改这个设置需要重启服务器才能生效。",
   "admin.service.testingTitle": "启动测试指令：",
-  "admin.service.webSessionDays": "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.webSessionDays": "LDAP和电子邮件的会话时长 (天)：",
+  "admin.service.webSessionDaysDesc": "从用户上一次输入他们的认证到会话过期的天数。修改此设定后，新的会话时常将在用户下一次输入认证后生效。",
   "admin.service.webhooksDescription": "设为是时，允许传入webhooks。为了避免钓鱼攻击，所有webhooks的帖文会标上BOT标签。参见 <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>文档</a> 了解详情。",
   "admin.service.webhooksTitle": "启用外部Webhooks: ",
   "admin.sidebar.addTeamSidebar": "从侧边栏菜单添加团队",
   "admin.sidebar.advanced": "高级",
   "admin.sidebar.audits": "合规性与审计",
   "admin.sidebar.authentication": "验证",
+  "admin.sidebar.cluster": "高可用性 (Beta)",
   "admin.sidebar.compliance": "合规",
   "admin.sidebar.configuration": "配置",
   "admin.sidebar.connections": "连接",
   "admin.sidebar.customBrand": "自定义品牌",
   "admin.sidebar.customEmoji": "自定义表情符",
+  "admin.sidebar.customIntegrations": "自定义集成",
   "admin.sidebar.customization": "自定义",
   "admin.sidebar.database": "数据库",
   "admin.sidebar.developer": "开发人员",
@@ -666,11 +703,10 @@
   "admin.sidebar.users": "用户",
   "admin.sidebar.usersAndTeams": "成员和团队",
   "admin.sidebar.view_statistics": "站点统计",
-  "admin.sidebar.webhooks": "Webhooks和命令",
   "admin.sidebarHeader.systemConsole": "系统控制台",
   "admin.sql.dataSource": "数据源：",
   "admin.sql.driverName": "驱动名：",
-  "admin.sql.keyDescription": "32位加密字符可用于加密和解密敏感字段在数据库.",
+  "admin.sql.keyDescription": "32位盐值字符用于加密和解密数据库敏感字段。",
   "admin.sql.keyExample": "例如\"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.sql.keyTitle": "静止加密Key: ",
   "admin.sql.maxConnectionsDescription": "最大数量的空闲连接开放数据库.",
@@ -684,7 +720,7 @@
   "admin.sql.replicas": "数据源副本: ",
   "admin.sql.traceDescription": "(开发模式)当设置为是、,SQL语句执行过程会被写入到日志.",
   "admin.sql.traceTitle": "追踪：",
-  "admin.sql.warning": "警告：重新生成盐可能导致一些列在数据库中返回空。",
+  "admin.sql.warning": "警告：重新生成盐值可能导致一些列在数据库中返回空。",
   "admin.support.aboutDesc": "该链接有关于Mattermost部署的很多内容,例如你的组织的内容和受众群体.默认是Mattermost信息页面.",
   "admin.support.aboutTitle": "关于链接：",
   "admin.support.emailHelp": "显示在邮件通知和教学上让最终用户提问支持的电子邮件地址。",
@@ -697,15 +733,15 @@
   "admin.support.privacyTitle": "隐私策略链接：",
   "admin.support.problemDesc": "该链接是团队网站主菜单帮助文档.默认情况下，这个链接到对等的疑难解答论坛，用户可以搜索,求助技术难题.",
   "admin.support.problemTitle": "报告问题链接：",
-  "admin.support.termsDesc": "Link to the terms under which users may use your online service. By default, this includes the \"Mattermost Conditions of Use (End Users)\" explaining the terms under which Mattermost software is provided to end users. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Conditions of Use (End User) for Mattermost software.",
+  "admin.support.termsDesc": "用户使用您的在线服务的条款链接。默认情况下，此链接指向 \"Mattermost 使用条款 (最终用户)\" 解释Mattermost软件提供给最终用户的条款。如果您修改默认链接来添加您自己的服务条款，您的新条款必须包含链接到默认条款让用户知道Mattermost软件的最终用户条款。",
   "admin.support.termsTitle": "服务条款链接：",
   "admin.system_analytics.activeUsers": "有发问的正常用户",
   "admin.system_analytics.title": "系统",
   "admin.system_analytics.totalPosts": "帖子总数",
   "admin.team.brandDesc": "启用自定义形象，以在登录页上显示一张自选图片，以及一些已经设定好的文本。",
-  "admin.team.brandDescriptionExample": "所有团队的通讯一站式解决，随时随地可搜索和访问",
-  "admin.team.brandDescriptionHelp": "登录屏幕和UI所示服务名称.",
-  "admin.team.brandDescriptionTitle": "Site Description",
+  "admin.team.brandDescriptionExample": "所有团队的通讯一站式解决，随时随地可访问和搜索",
+  "admin.team.brandDescriptionHelp": "登录页面和界面所示服务描述。",
+  "admin.team.brandDescriptionTitle": "站点描述",
   "admin.team.brandImageTitle": "自定义形象图片：",
   "admin.team.brandTextDescription": "您希望出现的自定义形象Markdown-formatted文档在您的登录界面自定义形象图片下方。",
   "admin.team.brandTextTitle": "自定义形象文本：",
@@ -728,7 +764,7 @@
   "admin.team.restrictTitle": "只允许特定电子邮件域名创建帐号：",
   "admin.team.restrict_direct_message_any": "在Mattermost服务器上的任何用户",
   "admin.team.restrict_direct_message_team": "任何团队成员",
-  "admin.team.siteNameDescription": "登录屏幕和UI所示服务名称.",
+  "admin.team.siteNameDescription": "登录画面和界面所显示的服务名称。",
   "admin.team.siteNameExample": "例如\"Mattermost\"",
   "admin.team.siteNameTitle": "网站名称：",
   "admin.team.teamCreationDescription": "当设为否，只有系统管理能创建团队。",
@@ -827,7 +863,7 @@
   "audit_table.failedPassword": "修改密码失败-试图通过oauth登录更新用户密码",
   "audit_table.failedWebhookCreate": "创建一个webhook失败-没有频道权限",
   "audit_table.failedWebhookDelete": "删除webhook失败-不合适的条件",
-  "audit_table.headerUpdated": "更新{channelName}频道/组头",
+  "audit_table.headerUpdated": "更新{channelName}频道/组标语",
   "audit_table.ip": "IP地址",
   "audit_table.licenseRemoved": "成功删除许可证",
   "audit_table.loginAttempt": "(登录尝试)",
@@ -861,14 +897,15 @@
   "authorize.allow": "允许",
   "authorize.app": "应用<strong>{appName}</strong>想要能访问和修改您的基本资料。",
   "authorize.deny": "否认",
-  "authorize.title": "一个应用将连接到你的{teamName}账户",
+  "authorize.title": "<strong>{appName}</strong> 想要链接到您的 <strong>Mattermost</strong> 用户帐号",
   "backstage_list.search": "搜索",
   "backstage_navbar.backToMattermost": "返回{siteName}",
   "backstage_sidebar.integrations": "集成",
   "backstage_sidebar.integrations.commands": "斜线命令",
   "backstage_sidebar.integrations.incoming_webhooks": "引入Webhooks",
+  "backstage_sidebar.integrations.oauthApps": "OAuth 2.0 应用",
   "backstage_sidebar.integrations.outgoing_webhooks": "对外Webhooks",
-  "center_panel.recent": "点击这里跳转到最近的消息.",
+  "center_panel.recent": "点击这里跳转到最近的消息。",
   "chanel_header.addMembers": "添加成员",
   "change_url.close": "关闭",
   "change_url.endWithLetter": "必须以字母或数字结束",
@@ -885,7 +922,7 @@
   "channel_flow.invalidName": "无效的频道名称",
   "channel_flow.set_url_title": "设置{term}URL",
   "channel_header.channel": "频道",
-  "channel_header.channelHeader": "设置频道头...",
+  "channel_header.channelHeader": "设置频道标语...",
   "channel_header.delete": "删除{term}...",
   "channel_header.group": "组",
   "channel_header.leave": "离开{term}",
@@ -893,13 +930,13 @@
   "channel_header.notificationPreferences": "消息通知设置",
   "channel_header.recentMentions": "最近提到",
   "channel_header.rename": "重命名{term}...",
-  "channel_header.setHeader": "设置{term}头...",
+  "channel_header.setHeader": "设置{term}标语中...",
   "channel_header.setPurpose": "设置{term}目的...",
   "channel_header.viewInfo": "查看信息",
   "channel_header.viewMembers": "查看成员",
   "channel_info.about": "关于",
   "channel_info.close": "关闭",
-  "channel_info.header": "页眉：",
+  "channel_info.header": "标语：",
   "channel_info.id": "ID：",
   "channel_info.name": "名称",
   "channel_info.notFound": "没有发现频道",
@@ -928,8 +965,8 @@
   "channel_modal.displayNameError": "此栏必须填写",
   "channel_modal.edit": "编辑",
   "channel_modal.group": "组",
-  "channel_modal.header": "头",
-  "channel_modal.headerHelp": "设定在 {term} 标题里在 {term} 旁边的文字。举例，输入常见链接 [链接标题](http://example.com)。",
+  "channel_modal.header": "标语",
+  "channel_modal.headerHelp": "设定在 {term} 标语里在 {term} 旁边的文字。举例，输入常见链接 [链接标题](http://example.com)。",
   "channel_modal.modalTitle": "新",
   "channel_modal.name": "名",
   "channel_modal.nameEx": "如: \"错误\"，\"营销\"，\"客户支持\"",
@@ -1041,11 +1078,11 @@
   "delete_post.question": "您确认要删除{term}？",
   "delete_post.warning": "这个帖子有{count}评论。",
   "edit_channel_header_modal.cancel": "取消",
-  "edit_channel_header_modal.description": "编辑频道头频道名称旁显示的文本。",
-  "edit_channel_header_modal.error": "T这频道标题太长,请输入一个短点儿的",
+  "edit_channel_header_modal.description": "编辑在频道标语里显示在频道名称旁的文本。",
+  "edit_channel_header_modal.error": "这频道标语太长，请输入一个简短的",
   "edit_channel_header_modal.save": "保存",
-  "edit_channel_header_modal.title": "编辑{channel}头",
-  "edit_channel_header_modal.title_dm": "编辑页眉",
+  "edit_channel_header_modal.title": "编辑{channel}的标语",
+  "edit_channel_header_modal.title_dm": "编辑标语",
   "edit_channel_purpose_modal.body": "描述如何使用这个{type}。此文本出现在“更多”菜单频道列表中，帮助他人决定是否加入。",
   "edit_channel_purpose_modal.cancel": "取消",
   "edit_channel_purpose_modal.channel": "频道",
@@ -1111,8 +1148,10 @@
   "find_team.placeholder": "you@domain.com",
   "find_team.send": "发送",
   "find_team.submitError": "请输入一个有效的电子邮件地址",
+  "flag_post.flag": "标志复查",
+  "flag_post.unflag": "取消标志",
   "general_tab.chooseName": "请选择一个新的名称为你的团队",
-  "general_tab.codeDesc": "点击“编辑”重新生成邀请码.",
+  "general_tab.codeDesc": "点击 \"编辑\" 重新生成邀请码。",
   "general_tab.codeLongDesc": "邀请码用来在主菜单里使用<strong>获取团队邀请链接</strong>所产生的团队邀请链接中的一部分。重新生成一个新的团队邀请链接将使之前的链接无效。",
   "general_tab.codeTitle": "邀请码",
   "general_tab.dirDisabled": "团队目录已被禁用.请联系系统管理员,在系统控制台中国的团队设置中启用团队目录.",
@@ -1128,22 +1167,22 @@
   "general_tab.teamNameInfo": "设置出现在您登录界面左侧边栏顶部的团队名称。",
   "general_tab.title": "基本设置",
   "general_tab.yes": "是的",
-  "get_app.alreadyHaveIt": "Already have it?",
-  "get_app.androidAppName": "Mattermost for Android",
-  "get_app.androidHeader": "Mattermost works best if you switch to our Android app",
-  "get_app.continue": "continue",
-  "get_app.continueWithBrowser": "Or {link}",
-  "get_app.continueWithBrowserLink": "continue with browser",
-  "get_app.iosHeader": "Mattermost works best if you switch to our iPhone app",
+  "get_app.alreadyHaveIt": "已经拥有？",
+  "get_app.androidAppName": "安卓版Mattermost",
+  "get_app.androidHeader": "使用安卓应用获得Mattermost最好的表现",
+  "get_app.continue": "继续",
+  "get_app.continueWithBrowser": "或 {link}",
+  "get_app.continueWithBrowserLink": "继续使用浏览器",
+  "get_app.iosHeader": "使用iPhone应用获得Mattermost最好的表现",
   "get_app.mattermostInc": "Mattermost, Inc",
-  "get_app.openMattermost": "Open Mattermost",
+  "get_app.openMattermost": "打开 Mattermost",
   "get_link.clipboard": " 链接复制到剪贴板。",
   "get_link.close": "关闭",
   "get_link.copy": "复制链接",
   "get_post_link_modal.help": "下方的链接允许授权用户查看您的帖子。",
   "get_post_link_modal.title": "复制超链接",
   "get_team_invite_link_modal.help": "向队友发送下方的链接以便其在此团队站点注册。团队邀请链接可以与多个队友分享，因为它不会改变，除非团队管理员在团队设置中重新生成。",
-  "get_team_invite_link_modal.helpDisabled": "创建用户已禁用.详情请您的团队管理员.",
+  "get_team_invite_link_modal.helpDisabled": "创建用户已禁用。详情请联系您的团队管理员。",
   "get_team_invite_link_modal.title": "团队邀请链接",
   "installed_command.header": "斜杠命令",
   "installed_commands.add": "添加斜杠命令",
@@ -1161,14 +1200,35 @@
   "installed_incoming_webhooks.search": "搜索传入Webhooks",
   "installed_incoming_webhooks.unknown_channel": "私有Webhook",
   "installed_integrations.callback_urls": "回调地址：{urls}",
+  "installed_integrations.client_id": "客户端ID：<strong>{clientId}</strong>",
+  "installed_integrations.client_secret": "客户端密码：<strong>{clientSecret}</strong>",
   "installed_integrations.content_type": "Content-Type: {contentType}",
   "installed_integrations.creation": "{creator}在{createAt, date, full}中创建",
   "installed_integrations.delete": "删除",
+  "installed_integrations.hideSecret": "隐藏密码",
   "installed_integrations.regenToken": "重新生成Token",
+  "installed_integrations.showSecret": "显示密码",
   "installed_integrations.token": "令牌：{token}",
   "installed_integrations.triggerWhen": "触发于：{triggerWhen}",
   "installed_integrations.triggerWords": "触发关键词：{triggerWords}",
+  "installed_integrations.unnamed_oauth_app": "未命名 OAuth 2.0 应用",
   "installed_integrations.url": "网址：{url}",
+  "installed_oauth_apps.add": "添加 OAuth 2.0 应用",
+  "installed_oauth_apps.callbackUrls": "回调网址 (每行一个)",
+  "installed_oauth_apps.cancel": "取消",
+  "installed_oauth_apps.description": "描述",
+  "installed_oauth_apps.empty": "没有找到 OAuth 2.0 应用",
+  "installed_oauth_apps.header": "OAuth 2.0 应用",
+  "installed_oauth_apps.help": "OAuth 2.0 应用对您服务器上所有用户开放。",
+  "installed_oauth_apps.homepage": "首頁",
+  "installed_oauth_apps.iconUrl": "图标网址",
+  "installed_oauth_apps.is_trusted": "是受信任的：<strong>{isTrusted}</strong>",
+  "installed_oauth_apps.name": "显示名称",
+  "installed_oauth_apps.save": "保存",
+  "installed_oauth_apps.search": "搜索 OAuth 2.0 应用",
+  "installed_oauth_apps.trusted": "是受信任",
+  "installed_oauth_apps.trusted.no": "不",
+  "installed_oauth_apps.trusted.yes": "是",
   "installed_outgoing_webhooks.add": "添加对外Webhooks",
   "installed_outgoing_webhooks.empty": "没找到传出webhooks",
   "installed_outgoing_webhooks.header": "对外Webhooks",
@@ -1181,21 +1241,23 @@
   "integrations.header": "集成",
   "integrations.incomingWebhook.description": "传入的webhooks允许外部集成发送信息",
   "integrations.incomingWebhook.title": "引入Webhook",
+  "integrations.oauthApps.description": "OAuth 2.0 允许外部引用向 Mattermost API 发出已授权的请求。",
+  "integrations.oauthApps.title": "OAuth 2.0 应用",
   "integrations.outgoingWebhook.description": "传出的网络挂接允许外部集成接收和响应信息",
   "integrations.outgoingWebhook.title": "引出Webhook",
   "intro_messages.DM": "这是您和{teammate}私信记录的开始。<br/>此区域外的人不能看到这里共享的私信和文件。",
   "intro_messages.anyMember": " 任何成员可以加入和查看这个频道。",
   "intro_messages.beginning": "{name}开始",
   "intro_messages.channel": "频道",
-  "intro_messages.creator": "这是<strong>{name}</strong>{type}的开始, <strong>{creator}</strong>在<strong>{date}</strong>创建",
+  "intro_messages.creator": "这是<strong>{name}</strong>{type}的开始，由<strong>{creator}</strong>在<strong>{date}</strong>建立",
   "intro_messages.default": "<h4 class='channel-intro__title'>{display_name}的开始</h4><p class='channel-intro__content'><strong>欢迎进入{display_name}!</strong><br/><br/>这是团队成员登录后看到的第一个频道—使用它来发布每个人需要知道的更新信息。</p>",
   "intro_messages.group": "私密小组",
   "intro_messages.invite": "邀请其他人到{type}",
   "intro_messages.inviteOthers": "邀请其他人入组",
-  "intro_messages.noCreator": "这是{name}{type}的开始,在{date}创建.",
+  "intro_messages.noCreator": "这是{name}{type}的开始，于{date}建立。",
   "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">{display_name}的开始</h4><p class=\"channel-intro__content\">这是{display_name}的开始,一个用于非工作的频道.<br/></p>",
   "intro_messages.onlyInvited": "只有受邀的人才能看到这个私密小组.",
-  "intro_messages.setHeader": "设置标题头",
+  "intro_messages.setHeader": "设置标语",
   "intro_messages.teammate": "这是你与组员私信记录的开始.此区外的人是看不到这里展示的私信和文件.",
   "invite_member.addAnother": "添加另一个",
   "invite_member.autoJoin": "被邀请人将自动加入频道<strong>{channel}</strong>.",
@@ -1208,7 +1270,7 @@
   "invite_member.lastname": "名字",
   "invite_member.modalButton": "是的,抛弃",
   "invite_member.modalMessage": "你有未寄出的邀请函,你确定你想要抛弃他们吗?",
-  "invite_member.modalTitle": "丢弃的邀请?",
+  "invite_member.modalTitle": "丢弃邀请？",
   "invite_member.newMember": "邀请新成员",
   "invite_member.send": "发送邀请",
   "invite_member.send2": "邀请函",
@@ -1232,7 +1294,7 @@
   "login.invalidPassword": "您的密码是错误的。",
   "login.ldapUsername": "LDAP用户名",
   "login.ldapUsernameLower": "LDAP用户名",
-  "login.noAccount": "没有一个帐户吗?",
+  "login.noAccount": "没有帐户吗？",
   "login.noEmail": "请输入您的电子邮件",
   "login.noEmailLdapUsername": "请输入您的电子邮件或 {ldapUsername}",
   "login.noEmailUsername": "请输入您的电子邮件或用户名",
@@ -1258,7 +1320,7 @@
   "login_mfa.tokenReq": "请输入多重验证令牌",
   "member_item.makeAdmin": "Admin",
   "member_item.member": "成员",
-  "member_list.noUsersAdd": "没有用户添加",
+  "member_list.noUsersAdd": "没有用户可添加。",
   "members_popover.msg": "消息",
   "members_popover.title": "成员",
   "more_channels.close": "关闭",
@@ -1278,10 +1340,10 @@
   "navbar.delete": "删除频道...",
   "navbar.leave": "离开频道",
   "navbar.manageMembers": "成员管理",
-  "navbar.noHeader": "没有频道头.{newline}{link}去添加一个.",
+  "navbar.noHeader": "没有频道标语。{newline}{link}去添加。",
   "navbar.preferences": "通知偏好",
   "navbar.rename": "重命名频道...",
-  "navbar.setHeader": "设置频道头...",
+  "navbar.setHeader": "设置频道标语...",
   "navbar.setPurpose": "设置频道的目的...",
   "navbar.toggle1": "切换侧边栏",
   "navbar.toggle2": "切换侧边栏",
@@ -1334,29 +1396,12 @@
   "post_focus_view.beginning": "开始频道归档",
   "post_info.del": "删除",
   "post_info.edit": "编辑",
+  "post_info.mobile.flag": "标志",
+  "post_info.mobile.unflag": "取消标志",
   "post_info.permalink": "超链接",
   "post_info.reply": "回复",
   "posts_view.loadMore": "载入更多的消息",
   "posts_view.newMsg": "新消息",
-  "register_app.callback": "回调URL",
-  "register_app.callbackError": "至少有一个回调URL必须填写。",
-  "register_app.cancel": "取消",
-  "register_app.clientId": "客户端ID",
-  "register_app.clientSecret": "客户端秘密",
-  "register_app.close": "关闭",
-  "register_app.credentialsDescription": "保存这些安全的地方.防止你的客户端ID作为你的应用程序的用户名和你的客户秘密为应用程序的密码.",
-  "register_app.credentialsSave": "我保存了我的客户Id和安全的客户端秘密",
-  "register_app.credentialsTitle": "你的应用程序证书",
-  "register_app.description": "描述",
-  "register_app.dev": "开发者应用程序",
-  "register_app.homepage": "主页URL",
-  "register_app.homepageError": "主页必须填写。",
-  "register_app.name": "应用程序名",
-  "register_app.nameError": "应用程序名称必须填写。",
-  "register_app.optional": "可选的",
-  "register_app.register": "注册",
-  "register_app.required": "必需的",
-  "register_app.title": "注册一个新的应用程序",
   "removed_channel.channelName": "频道",
   "removed_channel.from": "删除从",
   "removed_channel.okay": "Okay",
@@ -1376,7 +1421,10 @@
   "rhs_comment.comment": "评论",
   "rhs_comment.del": "删除",
   "rhs_comment.edit": "编辑",
+  "rhs_comment.mobile.flag": "标志",
+  "rhs_comment.mobile.unflag": "取消标志",
   "rhs_comment.permalink": "永久链接",
+  "rhs_header.backToFlaggedTooltip": "回到已标志的贴",
   "rhs_header.backToResultsTooltip": "回到搜索结果",
   "rhs_header.closeSidebarTooltip": "关闭侧栏",
   "rhs_header.details": "消息详情",
@@ -1385,12 +1433,15 @@
   "rhs_root.del": "删除",
   "rhs_root.direct": "私信",
   "rhs_root.edit": "编辑",
+  "rhs_root.mobile.flag": "标志",
+  "rhs_root.mobile.unflag": "取消标志",
   "rhs_root.permalink": "永久链接",
   "search_bar.cancel": "取消",
   "search_bar.search": "搜索",
   "search_bar.usage": "<h4>搜索选项</h4><ul><li><span>使用</span><b>“引号”</b><span>搜索词组</span></li><li><span>使用</span><b>来自</b>的<span>查找来自特定用户和</span><b>的帖子，</b><span>中的查找特定频道的帖子</span></li></ul>",
   "search_header.results": "搜索结果",
   "search_header.title2": "最近提到",
+  "search_header.title3": "已标志的贴",
   "search_item.direct": "私信",
   "search_item.jump": "跳",
   "search_results.because": "<ul><li>如果您需搜索一个部分词组（例如搜索“rea”，查找“reach”或“reaction”），请在结尾附上 *。</li><li>由于搜索结果的数量限制，双字母和“this”，“a”和“is”等常用词不会出现在搜索结果中。</li></ul>",
@@ -1423,6 +1474,7 @@
   "sidebar_header.tutorial": "<h4>主菜单</h4><p><strong>在主菜单中</strong>您可以<strong>邀请新成员</strong>，访问您的<strong>账户设置</strong>和设置您的<strong>主题颜色</strong>。</p><p>团队管理员也能通过此菜单访问他们的<strong>团队设置</strong>。</p><p>系统管理员将找到一个<strong>系统控制台</strong>选项管理整个系统。</p>",
   "sidebar_right_menu.accountSettings": "账户设置",
   "sidebar_right_menu.console": "系统控制台",
+  "sidebar_right_menu.flagged": "已标志的贴",
   "sidebar_right_menu.help": "帮助",
   "sidebar_right_menu.inviteNew": "邀请新成员",
   "sidebar_right_menu.logout": "注销",
@@ -1573,18 +1625,14 @@
   "user.settings.custom_theme.newMessageSeparator": "新消息分隔符",
   "user.settings.custom_theme.onlineIndicator": "在线显示",
   "user.settings.custom_theme.sidebarBg": "侧边栏BG",
-  "user.settings.custom_theme.sidebarHeaderBg": "侧边栏头BG",
-  "user.settings.custom_theme.sidebarHeaderTextColor": "侧边栏头文本",
+  "user.settings.custom_theme.sidebarHeaderBg": "侧边栏头背景",
+  "user.settings.custom_theme.sidebarHeaderTextColor": "侧边栏头文字",
   "user.settings.custom_theme.sidebarText": "侧边栏文本",
   "user.settings.custom_theme.sidebarTextActiveBorder": "侧边栏文本活动边框",
   "user.settings.custom_theme.sidebarTextActiveColor": "侧边栏文本活跃的颜色”",
   "user.settings.custom_theme.sidebarTextHoverBg": "侧边栏文本HoverBG",
   "user.settings.custom_theme.sidebarTitle": "侧栏风格",
   "user.settings.custom_theme.sidebarUnreadText": "侧边栏未读文本",
-  "user.settings.developer.applicationsPreview": "应用程序(预览)",
-  "user.settings.developer.register": "注册新应用程序",
-  "user.settings.developer.thirdParty": "开放注册一个新的第三方应用程序",
-  "user.settings.developer.title": "开发人员设置",
   "user.settings.display.channelDisplayTitle": "频道显示模式",
   "user.settings.display.channeldisplaymode": "选择中央间频道的宽度。",
   "user.settings.display.clockDisplay": "时钟显示",
@@ -1636,7 +1684,7 @@
   "user.settings.general.emailUnchanged": "您的新电子邮件地址和旧的电子邮件地址一致。",
   "user.settings.general.emptyName": "点击 '编辑' 添加您的全名",
   "user.settings.general.emptyNickname": "点击 '编辑' 添加一个昵称",
-  "user.settings.general.field_handled_externally": "此栏由您的登入提供者决定。如果您想更改，您需要到您的登入提供者改动。",
+  "user.settings.general.field_handled_externally": "此栏由您的登入提供商决定。如果您想更改，您需要到您的登入提供者改动。",
   "user.settings.general.firstName": "姓",
   "user.settings.general.fullName": "全名",
   "user.settings.general.imageTooLarge": "无法上传头像。文件太大。",
@@ -1668,6 +1716,7 @@
   "user.settings.import_theme.submit": "发送",
   "user.settings.import_theme.submitError": "无效格式，请尝试再次复制粘贴。",
   "user.settings.languages.change": "更改界面语言",
+  "user.settings.languages.promote": "选择 Mattermost 界面显示的语言。<br /><br />想要帮助翻译吗？加入<a href='http://translate.mattermost.com/' target='_blank'>Mattermost 翻译服务器</a>。",
   "user.settings.mfa.add": "向您的账户添加多重验证",
   "user.settings.mfa.addHelp": "您需要密码之外用基于智能手机的令牌来登入 Mattermost。<br/><br/>请从 <a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a> 或 <a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a> 下载Google Authenticator 到您的手机，然后<br/><br/>1. 点击上方<strong>添加多重验证到您的帐号</strong>按钮。<br/>2. 使用Google Authenticator扫描显示的QR码。<br/>3. 输入Google Authenticator生成的令牌并点击<strong>保存</strong>。<br/><br/>登入时，您会被要求额外输入Google Authenticator令牌。",
   "user.settings.mfa.addHelpQr": "请使用您智能手机的Google Authenticator应用扫描二维码并填写一个由应用程序提供的令牌。",
@@ -1675,19 +1724,17 @@
   "user.settings.mfa.qrCode": "条形码",
   "user.settings.mfa.remove": "从您的账户中删除多重验证",
   "user.settings.mfa.removeHelp": "删除多重验证意味着您不再需要基于手机的密码来登入您的帐号。",
+  "user.settings.mfa.title": "启用多重验证：",
   "user.settings.modal.advanced": "高级",
   "user.settings.modal.confirmBtns": "是的,放弃",
   "user.settings.modal.confirmMsg": "您有未保存的更改，您确定你想要放弃他们吗？",
   "user.settings.modal.confirmTitle": "放弃修改？",
-  "user.settings.modal.developer": "开发人员",
   "user.settings.modal.display": "显示",
   "user.settings.modal.general": "基本",
   "user.settings.modal.notifications": "通知",
   "user.settings.modal.security": "安全",
   "user.settings.modal.title": "账户设置",
-  "user.settings.notification.allActivity": "所有活动",
-  "user.settings.notification.push": "手机推送信息提示",
-  "user.settings.notification.soundConfig": "请在您的浏览器中配置消息通知声音设置",
+  "user.settings.notifications.allActivity": "所有活动",
   "user.settings.notifications.channelWide": "频道范围提及 \"@channel\", \"@all\"",
   "user.settings.notifications.close": "关闭",
   "user.settings.notifications.comments": "评论串通知",
@@ -1706,9 +1753,11 @@
   "user.settings.notifications.off": "关",
   "user.settings.notifications.on": "开",
   "user.settings.notifications.onlyMentions": "只在提及和私信中",
+  "user.settings.notifications.push": "手机推送",
   "user.settings.notifications.sensitiveName": "您的敏感姓\"{first_name}\"",
   "user.settings.notifications.sensitiveUsername": "不区分大小写的用户名\"{username}\"",
   "user.settings.notifications.sensitiveWords": "其他不区分大小写的词汇，以逗号分隔：",
+  "user.settings.notifications.soundConfig": "请在您的浏览器中配置消息通知声音设置",
   "user.settings.notifications.sounds_info": "桌面通知声音在Firefox、Safari、Chrome、InternetExplorer和Edge中有效。",
   "user.settings.notifications.teamWide": "团队范围的提及\"@all\"",
   "user.settings.notifications.title": "通知设置",
@@ -1776,6 +1825,6 @@
   "web.footer.privacy": "隐私",
   "web.footer.terms": "条款",
   "web.header.back": "返回",
-  "web.root.signup_info": "所有团队的通讯一站式解决，随时随地可搜索和访问",
+  "web.root.signup_info": "所有团队的通讯一站式解决，随时随地可访问和搜索",
   "youtube_video.notFound": "视频未找到"
 }
diff --git a/webapp/i18n/zh_TW.json b/webapp/i18n/zh_TW.json
index b39635dca..54bd426f8 100644
--- a/webapp/i18n/zh_TW.json
+++ b/webapp/i18n/zh_TW.json
@@ -3,17 +3,17 @@
   "about.copyright": "版權所有 2016 Mattermost, Inc. 保留所有權利",
   "about.database": "資料庫：",
   "about.date": "編譯日期：",
-  "about.enterpriseEditionLearn": "學習更多關於企業版本：",
+  "about.enterpriseEditionLearn": "學習更多關於企業版：",
   "about.enterpriseEditionSt": "防火牆內側也可運行的溝通模式。",
-  "about.enterpriseEditione1": "企業版本",
+  "about.enterpriseEditione1": "企業版",
   "about.hash": "編譯 Hash：",
-  "about.hashee": "企業版本編譯 Hash：",
+  "about.hashee": "企業版編譯 Hash：",
   "about.licensed": "授權來自：",
   "about.number": "編譯序號：",
   "about.teamEditionLearn": "加入 Mattermost 社群：",
   "about.teamEditionSt": "您的團隊溝通皆在同處，隨時隨地皆可搜尋與存取。",
-  "about.teamEditiont0": "團隊版本",
-  "about.teamEditiont1": "企業版本",
+  "about.teamEditiont0": "團隊版",
+  "about.teamEditiont1": "企業版",
   "about.title": "關於 Mattermost",
   "about.version": "版本：",
   "access_history.title": "存取紀錄",
@@ -93,6 +93,17 @@
   "add_incoming_webhook.header": "新增",
   "add_incoming_webhook.name": "名字",
   "add_incoming_webhook.save": "儲存",
+  "add_oauth_app.callbackUrls.help": "在使用者同意或是拒絕授權給您的應用程式之後使用者將會被重導向至此重導向網址，同時該網址將會處理授權碼或是存取 Token。必須是以 http:// 或 https:// 開頭的有效網址。",
+  "add_oauth_app.callbackUrlsRequired": "請填入一或多個回呼網址",
+  "add_oauth_app.description.help": "您的 OAuth 2.0 應用程式的敘述。",
+  "add_oauth_app.descriptionRequired": "請填入 OAuth 2.0 應用程式的敘述。",
+  "add_oauth_app.header": "新增",
+  "add_oauth_app.homepage.help": "OAuth 2.0 應用程式的首頁網址。請確定您有根據伺服器設定使用正確的 HTTP 或 HTTPS 網址。",
+  "add_oauth_app.homepageRequired": "請填入 OAuth 2.0 應用程式的首頁網址。",
+  "add_oauth_app.icon.help": "(非必須) 指向您的 OAuth 2.0 應用程式的圖片的網址。請確保在網址中使用了 HTTP 或 HTTPS。",
+  "add_oauth_app.name.help": "您的 OAuth 2.0 應用程式的顯示名稱，最多64個字元。",
+  "add_oauth_app.nameRequired": "請填入 OAuth 2.0 應用程式的名字。",
+  "add_oauth_app.trusted.help": "信任時，此 OAuth 2.0 應用程式將被 Mattermost 伺服器信任且不需要使用者同意授權。不信任時，將會出現新的視窗詢問使用者同意或是拒絕授權。",
   "add_outgoing_webhook.callbackUrls": "回呼網址(一行一個)",
   "add_outgoing_webhook.callbackUrls.help": "訊息被送達的網址。",
   "add_outgoing_webhook.callbackUrlsRequired": "請填入一或多個回呼網址",
@@ -117,6 +128,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhen.help": "選擇何時觸發傳出的 Webook：訊息的第一個字完全符合觸發關鍵字，或是訊息以觸發關鍵字開頭。",
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "第一個字完全符合觸發關鍵字",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "第一個字以觸發關鍵字為開頭",
+  "admin.advance.cluster": "高可用性 (Beta)",
   "admin.audits.reload": "重新載入使用者活動記錄",
   "admin.audits.title": "使用者活動記錄",
   "admin.authentication.email": "電子郵件認證",
@@ -124,7 +136,25 @@
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "註：",
-  "admin.compliance.directoryDescription": "合規報告的寫入目錄，若空白，則設定為 ./data/。",
+  "admin.cluster.enableDescription": "啟用時，Mattermost 將會運行於高可用性模式。請看<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">文件</a>以了解如何設定 Mattermost 的高可用性。",
+  "admin.cluster.enableTitle": "啟用高可用性模式：",
+  "admin.cluster.interNodeListenAddressDesc": "伺服器將會監聽此位址來跟其他伺服器通訊。",
+  "admin.cluster.interNodeListenAddressEx": "例如：\":8065\"",
+  "admin.cluster.interNodeListenAddressTitle": "節點間通訊監聽位址：",
+  "admin.cluster.interNodeUrlsDesc": "所有 Mattermost 伺服器的內部/私人網址，以逗號分離。",
+  "admin.cluster.interNodeUrlsEx": "如 \"http://10.10.10.30, http://10.10.10.31\"",
+  "admin.cluster.interNodeUrlsTitle": "節點間網址：",
+  "admin.cluster.loadedFrom": "此設定檔是從節點 ID {clusterId} 讀取。如果您是經由負載平衡器存取系統控制台且遇到了問題，請參閱<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">文件</a>中的疑難排解指引。",
+  "admin.cluster.noteDescription": "修改此節的屬性需要重啟伺服器以生效。啟用高可用性模式時，系統控制台會被設成唯讀，只能經由設定檔來修改。",
+  "admin.cluster.should_not_change": "警告：這些設定可能不會跟此叢集內其他的伺服器同步。高可用性節點間通訊在您將所有伺服器的 config.json 修改成一樣並重新啟動 Mattermost 之前不會開始。如何從叢集中增加或移除伺服器請看<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">文件</a>。如果您是經由負載平衡器存取系統控制台且遇到了問題，請參閱<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">文件</a>中的疑難排解指引。",
+  "admin.cluster.status_table.config_hash": "設定檔 MD5",
+  "admin.cluster.status_table.hostname": "主機名稱",
+  "admin.cluster.status_table.id": "節點 ID",
+  "admin.cluster.status_table.reload": " 重新讀取叢集狀態",
+  "admin.cluster.status_table.status": "狀態",
+  "admin.cluster.status_table.url": "節點間網址",
+  "admin.cluster.status_table.version": "版本",
+  "admin.compliance.directoryDescription": "規範報告的寫入目錄，若空白，則設定為 ./data/。",
   "admin.compliance.directoryExample": "例如 \"./data/\"",
   "admin.compliance.directoryTitle": "規範報告目錄：",
   "admin.compliance.enableDailyDesc": "若啟用，Mattermost 會每日產生規範報告。",
@@ -252,7 +282,7 @@
   "admin.files.storage": "儲存區",
   "admin.general.configuration": "設定",
   "admin.general.localization": "語言",
-  "admin.general.localization.availableLocalesDescription": "指定哪些語言可以讓使用者於帳號設定中使用。(留空表示全部的語言都可用)",
+  "admin.general.localization.availableLocalesDescription": "設定使用者在帳號設定中可以選用哪些語言(此欄留空則將會開放所有支援的語言)。<br /><br />想要幫忙翻譯嘛？加入 <a href='http://translate.mattermost.com/' target='_blank'>Mattermost 翻譯伺服器</a> 來幫忙。",
   "admin.general.localization.availableLocalesTitle": "可用語言：",
   "admin.general.localization.clientLocaleDescription": "新建使用者及未登入頁面的預設語言。",
   "admin.general.localization.clientLocaleTitle": "預設的用戶端語言：",
@@ -290,7 +320,7 @@
   "admin.gitlab.userDescription": "輸入 https://<your-gitlab-url>/api/v3/user。根據伺服器的設定，網址您可能需要改用 HTTP 或 HTTPS。",
   "admin.gitlab.userExample": "如：\"https://<your-gitlab-url>/api/v3/user\"",
   "admin.gitlab.userTitle": "使用者 API 端點：",
-  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>登入</a>您的 Google帳號。</li><li>前往 <a href='https://console.developers.google.com'>https://console.developers.google.com</a>，按左側邊列的<strong>憑證</strong>並輸入<strong>Mattermost - <您的公司名稱></strong>作為專案名。</li><li>按 <strong>OAuth 同意畫面</strong> 標題並輸入 <strong>Mattermost</strong> 作為 <strong>向使用者顯示的產品名稱</strong>。 按 <strong>儲存</strong> 。</li><li>在 <strong>憑證</strong> 標題下，按 <strong>建立憑證</strong>，選擇 <strong>OAuth 用戶端 ID</strong> 並選擇 <strong>網路應用程式</strong>。</li><li>在 <strong>限制</strong> 的 <strong>已授權的重新導向 URI</strong> 中輸入 <strong><您的 mattermost url>/signup/google/complete</strong> (如： http://localhost:8065/signup/google/complete)。 按 <strong>建立</strong>。</li><li>記下 <strong>用戶端 ID</strong> 跟 <strong>用戶端密鑰</strong> 晚點用來完成下面的欄位。</li><li>最後，前往 <a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> 並按 <strong>啟用</strong>。這可能需要花上幾分鐘以在 Google 的系統完成散佈。</li><li>輸入下面的 <strong>用戶端 ID</strong> 跟 <strong>用戶端密碼</strong>欄位 。</li></ol>",
+  "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>登入</a>您的 Google帳號。</li><li>前往 <a href='https://console.developers.google.com'>https://console.developers.google.com</a>，按左側邊列的<strong>憑證</strong>並輸入\"Mattermost - 您的公司名稱\"作為<strong>專案名稱</strong>，按<strong>建立</strong>。</li><li>按 <strong>OAuth 同意畫面</strong> 標題並輸入 \"Mattermost\" 作為 <strong>向使用者顯示的產品名稱</strong>。 按 <strong>儲存</strong> 。</li><li>在 <strong>憑證</strong> 標題下，按 <strong>建立憑證</strong>，選擇 <strong>OAuth 用戶端 ID</strong> 並選擇 <strong>網路應用程式</strong>。</li><li>在 <strong>限制</strong> 的 <strong>已授權的重新導向 URI</strong> 中輸入 <strong>您的 Mattermost 網址/signup/google/complete</strong> (如： http://localhost:8065/signup/google/complete)。 按 <strong>建立</strong>。</li><li>將 <strong>用戶端 ID</strong> 跟 <strong>用戶端密鑰</strong> 貼至下面的欄位，按下<strong>儲存</strong>。</li><li>最後，前往 <a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> 並按 <strong>啟用</strong>。這可能需要花上幾分鐘以在 Google 的系統完成散佈。</li></ol>",
   "admin.google.authTitle": "認證端點：",
   "admin.google.clientIdDescription": "當您在 Google 註冊您的應用程式時收到的用戶端 ID。",
   "admin.google.clientIdExample": "Ex \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
@@ -345,8 +375,8 @@
   "admin.image.thumbWidthDescription": "上傳圖片的縮圖寬度。改變這個值只會改變之後的縮圖如何顯示，但不會改變以前的縮圖。",
   "admin.image.thumbWidthExample": "例如：\"120\"",
   "admin.image.thumbWidthTitle": "附加檔案縮圖寬：",
+  "admin.integrations.custom": "自訂整合",
   "admin.integrations.external": "外部服務",
-  "admin.integrations.webhook": "Webhook 與命令",
   "admin.ldap.baseDesc": "BaseDN 是 Mattermost 在 LDAP 樹搜尋使用者的起始點的識別名。",
   "admin.ldap.baseEx": "例如：\"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "BaseDN：",
@@ -448,8 +478,10 @@
   "admin.oauth.google": "Google Apps",
   "admin.oauth.off": "不允許經由 OAuth 2.0 提供者登入",
   "admin.oauth.office365": "Office 365",
+  "admin.oauth.providerDescription": "啟用時，Mattermost 將可以作為一個 OAuth 2.0 服務提供者以授權外部應用程式的 API 要求。",
+  "admin.oauth.providerTitle": "啟用 OAuth 2.0 服務提供者：",
   "admin.oauth.select": "選擇 OAuth 2.0 服務提供者：",
-  "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>登入</a>您的 Microsoft 或 Office 365 帳號。請確定該帳號跟其他使用者的登入帳號在同一個<a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>租用戶</a>下。</li><li>前往 <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>，按 <strong>新增應用程式</strong> 並用 <strong>Mattermost - <您的公司名稱></strong> 作為應用程式名稱。</li><li>在 <strong>應用程式密碼</strong> 下，按 <strong>產生新密碼</strong> 並記下用以完成底下的欄位。</li><li>在 <strong>平台</strong> 下，按 <strong>新增平台</strong> 選擇 <strong>Web</strong> 並在 <strong>重新導向 URI</strong> 欄位輸入 <strong><您的—mattermost-網址>/signup/office365/complete</strong> (如：http://localhost:8065/signup/office365/complete)。同時取消 <strong>允許隱含流程</strong>。</li><li>最後，按下 <strong>儲存</strong> 並完成底下的欄位 <strong>應用程式識別碼</strong> 與 <strong>應用程式密碼</strong>。</li></ol>",
+  "admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>登入</a>您的 Microsoft 或 Office 365 帳號。請確定該帳號跟其他使用者的登入帳號在同一個<a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>租用戶</a>下。</li><li>前往 <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>，按 <strong>前往應用程式列表</strong> > <strong>新增應用程式</strong> 並用 \"Mattermost - 您的公司名稱\" 作為<strong>應用程式名稱</strong>。</li><li>在 <strong>應用程式密碼</strong> 下，按 <strong>產生新密碼</strong> 並黏貼至底下的<strong>應用程式密碼</strong>欄位。</li><li>在 <strong>平台</strong> 下，按 <strong>新增平台</strong> 選擇 <strong>Web</strong> 並在 <strong>重新導向 URI</strong> 欄位輸入 <strong>您的-mattermost-網址/signup/office365/complete</strong> (如：http://localhost:8065/signup/office365/complete)。同時取消 <strong>允許隱含流程</strong>。</li><li>最後，按下 <strong>儲存</strong> 並貼上底下的<strong>應用程式識別碼</strong>欄位。</li></ol>",
   "admin.office365.authTitle": "認證端點：",
   "admin.office365.clientIdDescription": "當您在 Microsoft 註冊您的應用程式時收到的應用程式/用戶端識別碼。",
   "admin.office365.clientIdExample": "Ex \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
@@ -608,6 +640,9 @@
   "admin.service.sessionCache": "工作階段快取有效時間(分)：",
   "admin.service.sessionCacheDesc": "要將工作階段快取在記憶體中多久(分鐘)。",
   "admin.service.sessionDaysEx": "例如：\"30\"",
+  "admin.service.siteURL": "站台網址：",
+  "admin.service.siteURLDescription": "使用者用來存取 Mattermost 的網址，應包含通訊協定跟連接埠。留白則會自動根據傳入的流量設定。",
+  "admin.service.siteURLExample": "如：\"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "SSO 的工作階段長度(以天計)：",
   "admin.service.ssoSessionDaysDesc": "從使用者最後一次輸入他們的認證到工作階段過期之間的天數。如果認證方式是 SAML 或 GitLab 且他們已經登入 SAML 或 GitLab，使用者將會自動再次登入 Mattermost。修改設定之後新的工作階段長度會在下次使用者輸入認證之後開始生效。",
   "admin.service.testingDescription": "啟用時，將啟用 /loadtest 斜線命令，該命令會載入測試帳號、資料以及文字格式。修改此項需要重啟伺服器以生效。",
@@ -620,11 +655,13 @@
   "admin.sidebar.advanced": "進階",
   "admin.sidebar.audits": "規範與審計",
   "admin.sidebar.authentication": "認證",
+  "admin.sidebar.cluster": "高可用性 (Beta)",
   "admin.sidebar.compliance": "規範",
   "admin.sidebar.configuration": "設定",
   "admin.sidebar.connections": "連線",
   "admin.sidebar.customBrand": "自訂品牌",
   "admin.sidebar.customEmoji": "自訂顏文字",
+  "admin.sidebar.customIntegrations": "自訂整合",
   "admin.sidebar.customization": "自訂",
   "admin.sidebar.database": "資料庫",
   "admin.sidebar.developer": "開發者",
@@ -666,7 +703,6 @@
   "admin.sidebar.users": "使用者",
   "admin.sidebar.usersAndTeams": "使用者與團隊",
   "admin.sidebar.view_statistics": "系統統計",
-  "admin.sidebar.webhooks": "Webhook 與命令",
   "admin.sidebarHeader.systemConsole": "系統控制台",
   "admin.sql.dataSource": "資料來源：",
   "admin.sql.driverName": "驅動程式名稱：",
@@ -768,11 +804,11 @@
   "admin.webserverModeDisabled": "停用",
   "admin.webserverModeDisabledDescription": "Mattermost 不會傳送靜態檔案。",
   "admin.webserverModeGzip": "gzip",
-  "admin.webserverModeGzipDescription": "對於靜態檔案 Mattermost 伺服器將會傳送用 gzip 壓縮過的版本。",
+  "admin.webserverModeGzipDescription": "Mattermost 伺服器將會傳送用 gzip 壓縮過的靜態檔案。",
   "admin.webserverModeHelpText": "gzip 壓縮會用於靜態內容檔案。一般建議啟用 gzip 以增進效能，除非您的環境有特定限制，像是不適合使用 gzip 的網頁代理。這設定在重啟伺服器後才生效。",
   "admin.webserverModeTitle": "網頁伺服器模式：",
   "admin.webserverModeUncompressed": "不壓縮",
-  "admin.webserverModeUncompressedDescription": "對於靜態檔案 Mattermost 伺服器將會傳送不壓縮的版本。",
+  "admin.webserverModeUncompressedDescription": "Mattermost 伺服器將會傳送不壓縮的靜態檔案。",
   "analytics.chart.loading": "載入中…",
   "analytics.chart.meaningful": "沒有足夠有意義的資料可顯示。",
   "analytics.system.activeUsers": "有發文的活躍使用者",
@@ -861,12 +897,13 @@
   "authorize.allow": "允許",
   "authorize.app": "應用程式 <strong>{appName}</strong> 想要能夠存取並修改您的基本資料。",
   "authorize.deny": "禁止",
-  "authorize.title": "一個應用程序想要與您的 {teamName} 帳戶連結",
+  "authorize.title": "<strong>{appName}</strong> 想要連接到您的 <strong>Mattermost</strong> 使用者帳號",
   "backstage_list.search": "搜尋",
   "backstage_navbar.backToMattermost": "回到 {siteName}",
   "backstage_sidebar.integrations": "整合",
   "backstage_sidebar.integrations.commands": "斜線命令",
   "backstage_sidebar.integrations.incoming_webhooks": "傳入的 Webhook",
+  "backstage_sidebar.integrations.oauthApps": "OAuth 2.0 應用程式",
   "backstage_sidebar.integrations.outgoing_webhooks": "傳出的 Webhook",
   "center_panel.recent": "按這裡跳到最新的訊息。",
   "chanel_header.addMembers": "新增成員",
@@ -885,16 +922,16 @@
   "channel_flow.invalidName": "無效的頻道名稱",
   "channel_flow.set_url_title": "設定 {term} 網址",
   "channel_header.channel": "頻道",
-  "channel_header.channelHeader": "設定頻道標題...",
-  "channel_header.delete": "{term} 刪除中…",
+  "channel_header.channelHeader": "設定頻道標題…",
+  "channel_header.delete": "刪除{term}…",
   "channel_header.group": "群組",
-  "channel_header.leave": "退出 {term}",
+  "channel_header.leave": "退出{term}",
   "channel_header.manageMembers": "成員管理",
   "channel_header.notificationPreferences": "通知喜好設定",
   "channel_header.recentMentions": "最近提及",
-  "channel_header.rename": "{term} 變更名稱中...",
-  "channel_header.setHeader": "設定 {term} 標題中...",
-  "channel_header.setPurpose": "設定 {term} 用途...",
+  "channel_header.rename": "變更{term}名稱…",
+  "channel_header.setHeader": "設定{term}標題…",
+  "channel_header.setPurpose": "設定{term}用途…",
   "channel_header.viewInfo": "檢視資訊",
   "channel_header.viewMembers": "檢視成員",
   "channel_info.about": "關於",
@@ -923,21 +960,21 @@
   "channel_memebers_modal.members": " 成員",
   "channel_modal.cancel": "取消",
   "channel_modal.channel": "頻道",
-  "channel_modal.createNew": "建立新的 ",
-  "channel_modal.descriptionHelp": "說明 {term} 如何使用。",
+  "channel_modal.createNew": "建立新的",
+  "channel_modal.descriptionHelp": "說明{term}如何使用。",
   "channel_modal.displayNameError": "此欄位是必需的",
   "channel_modal.edit": "編輯",
   "channel_modal.group": "群組",
   "channel_modal.header": "標題",
-  "channel_modal.headerHelp": "設定除了 {term} 名字以外還會顯示在 {term} 標題的文字。舉例來說，可以輸入 [Link Title](http://example.com) 以顯示常用連結。",
-  "channel_modal.modalTitle": "新增 ",
+  "channel_modal.headerHelp": "設定除了{term}名字以外還會顯示在{term}標題的文字。舉例來說，可以輸入 [Link Title](http://example.com) 以顯示常用連結。",
+  "channel_modal.modalTitle": "新增",
   "channel_modal.name": "名字",
   "channel_modal.nameEx": "例如：\"Bugs\"、\"市場\"、\"客户支持\"",
   "channel_modal.optional": "(非必須)",
   "channel_modal.privateGroup1": "建立非開放的私人群組。 ",
   "channel_modal.privateGroup2": "建立私人群組",
   "channel_modal.publicChannel1": "建立公開頻道",
-  "channel_modal.publicChannel2": "建立一個人人可加入的頻道. ",
+  "channel_modal.publicChannel2": "建立一個人人可加入的頻道。 ",
   "channel_modal.purpose": "用途",
   "channel_notifications.allActivity": "所有的活動所有的活動",
   "channel_notifications.allUnread": "全部的未讀訊息",
@@ -1111,6 +1148,8 @@
   "find_team.placeholder": "you@domain.com",
   "find_team.send": "送出",
   "find_team.submitError": "請輸入一個有效的電子郵件位址",
+  "flag_post.flag": "標記以追蹤",
+  "flag_post.unflag": "取消標記",
   "general_tab.chooseName": "為您的團隊取名",
   "general_tab.codeDesc": "按下'修改'來重新產生邀請碼。",
   "general_tab.codeLongDesc": "邀請碼用來當作主選單中<strong>取得團隊邀請連結</strong>所產生的團隊邀請連結的一部分。重新產生會建立一個新的招待連結並且讓舊的連結失效。",
@@ -1161,14 +1200,35 @@
   "installed_incoming_webhooks.search": "搜尋傳入的 Webhook",
   "installed_incoming_webhooks.unknown_channel": "私人 Webhook",
   "installed_integrations.callback_urls": "回呼網址：{urls}",
+  "installed_integrations.client_id": "使用者 ID：<strong>{clientId}</strong>",
+  "installed_integrations.client_secret": "使用者密碼：<strong>{clientSecret}</strong>",
   "installed_integrations.content_type": "內容類型：{contentType}",
   "installed_integrations.creation": "由{creator}在{createAt, date, full}所建立",
   "installed_integrations.delete": "刪除",
+  "installed_integrations.hideSecret": "隱藏密碼",
   "installed_integrations.regenToken": "重新產生 Token",
+  "installed_integrations.showSecret": "顯示密碼",
   "installed_integrations.token": "Token：{token}",
   "installed_integrations.triggerWhen": "觸發於：{triggerWhen}",
   "installed_integrations.triggerWords": "觸發關鍵字：{triggerWords}",
+  "installed_integrations.unnamed_oauth_app": "沒有命名的 OAuth 2.0 應用程式",
   "installed_integrations.url": "網址：{url}",
+  "installed_oauth_apps.add": "新增 OAuth 2.0 應用程式",
+  "installed_oauth_apps.callbackUrls": "回呼網址(一行一個)",
+  "installed_oauth_apps.cancel": "取消",
+  "installed_oauth_apps.description": "敘述",
+  "installed_oauth_apps.empty": "沒有找到 OAuth 2.0 應用程式",
+  "installed_oauth_apps.header": "OAuth 2.0 應用程式",
+  "installed_oauth_apps.help": "OAuth 2.0 應用程式對所有在伺服器上的使用者開放。",
+  "installed_oauth_apps.homepage": "首頁",
+  "installed_oauth_apps.iconUrl": "圖示網址",
+  "installed_oauth_apps.is_trusted": "是受信任的：<strong>{isTrusted}</strong>",
+  "installed_oauth_apps.name": "顯示名稱",
+  "installed_oauth_apps.save": "儲存",
+  "installed_oauth_apps.search": "搜尋 OAuth 2.0 應用程式",
+  "installed_oauth_apps.trusted": "是受信任",
+  "installed_oauth_apps.trusted.no": "否",
+  "installed_oauth_apps.trusted.yes": "是",
   "installed_outgoing_webhooks.add": "增加傳出的 Webhook",
   "installed_outgoing_webhooks.empty": "沒有傳出的 Webhook",
   "installed_outgoing_webhooks.header": "傳出的 Webhook",
@@ -1181,6 +1241,8 @@
   "integrations.header": "整合",
   "integrations.incomingWebhook.description": "傳入的 Webhook 讓外部整合功能可以傳送訊息",
   "integrations.incomingWebhook.title": "傳入的 Webhook",
+  "integrations.oauthApps.description": "OAuth 2.0 允許外部應用程式向 Mattermost API 提出授權過的要求。",
+  "integrations.oauthApps.title": "OAuth 2.0 應用程式",
   "integrations.outgoingWebhook.description": "傳出的 Webhook 讓外部整合功能可以收訊並回應",
   "integrations.outgoingWebhook.title": "傳出的 Webhook",
   "intro_messages.DM": "這是您跟{teammate}之間直接訊息的起頭。<br />直接訊息跟在這邊分享的檔案除了在此處以外的人都看不到。",
@@ -1198,7 +1260,7 @@
   "intro_messages.setHeader": "設定標題",
   "intro_messages.teammate": "這是您跟這位團隊成員之間直接訊息的起頭。直接訊息跟在這邊分享的檔案除了在此處以外的人都看不到。",
   "invite_member.addAnother": "增加其他人",
-  "invite_member.autoJoin": "被邀請的人自動加入了<strong>{channel}</strong>頻道。",
+  "invite_member.autoJoin": "被邀請的人會自動加入<strong>{channel}</strong>頻道。",
   "invite_member.cancel": "取消",
   "invite_member.content": "目前此團隊的電子郵件功能被停用，沒有辦法寄送電子郵件邀請。請聯絡您的系統管理員以啟用電子郵件跟電子郵件邀請。",
   "invite_member.disabled": "在您的團隊新增成員已經被停用。請跟團隊管理員詢問詳情。",
@@ -1280,9 +1342,9 @@
   "navbar.manageMembers": "成員管理",
   "navbar.noHeader": "沒有頻道標語。{newline}{link}來增加。",
   "navbar.preferences": "通知喜好設定",
-  "navbar.rename": "變更頻道名稱中...",
-  "navbar.setHeader": "設定頻道標題中...",
-  "navbar.setPurpose": "設定頻道用途中...",
+  "navbar.rename": "變更頻道名稱…",
+  "navbar.setHeader": "設定頻道標題...",
+  "navbar.setPurpose": "設定頻道用途...",
   "navbar.toggle1": "切換側邊欄",
   "navbar.toggle2": "切換側邊欄",
   "navbar.viewInfo": "檢視資訊",
@@ -1334,29 +1396,12 @@
   "post_focus_view.beginning": "頻道封存的開頭",
   "post_info.del": "刪除",
   "post_info.edit": "編輯",
+  "post_info.mobile.flag": "標記",
+  "post_info.mobile.unflag": "取消標記",
   "post_info.permalink": "永久網址",
   "post_info.reply": "回覆",
   "posts_view.loadMore": "載入更多訊息",
   "posts_view.newMsg": "新訊息",
-  "register_app.callback": "回呼網址",
-  "register_app.callbackError": "請至少輸入一個回呼網址。",
-  "register_app.cancel": "取消",
-  "register_app.clientId": "客戶端ID",
-  "register_app.clientSecret": "用戶端密碼",
-  "register_app.close": "關閉",
-  "register_app.credentialsDescription": "請將這些保存在安全且機密的地方。請將用戶端 ID 視為您的應用程式的使用者名稱、用戶端密碼視為密碼一樣對待。",
-  "register_app.credentialsSave": "已經將用戶端 ID 與密碼保存在安全的地方",
-  "register_app.credentialsTitle": "您的應用程式認證",
-  "register_app.description": "描述",
-  "register_app.dev": "開發者應用程式",
-  "register_app.homepage": "首頁網址",
-  "register_app.homepageError": "必須填首頁。",
-  "register_app.name": "應用程式名稱：",
-  "register_app.nameError": "必須填應用程式名稱。",
-  "register_app.optional": "非必須",
-  "register_app.register": "註冊",
-  "register_app.required": "必須",
-  "register_app.title": "註冊新的應用程式",
   "removed_channel.channelName": "頻道",
   "removed_channel.from": "從下者中被移除：",
   "removed_channel.okay": "確定",
@@ -1376,7 +1421,10 @@
   "rhs_comment.comment": "註解",
   "rhs_comment.del": "刪除",
   "rhs_comment.edit": "編輯",
+  "rhs_comment.mobile.flag": "標記",
+  "rhs_comment.mobile.unflag": "取消標記",
   "rhs_comment.permalink": "永久網址",
+  "rhs_header.backToFlaggedTooltip": "回到被標記的訊息",
   "rhs_header.backToResultsTooltip": "回到搜尋結果",
   "rhs_header.closeSidebarTooltip": "關閉側邊欄",
   "rhs_header.details": "詳細訊息",
@@ -1385,12 +1433,15 @@
   "rhs_root.del": "刪除",
   "rhs_root.direct": "直接訊息",
   "rhs_root.edit": "編輯",
+  "rhs_root.mobile.flag": "標記",
+  "rhs_root.mobile.unflag": "取消標記",
   "rhs_root.permalink": "永久網址",
   "search_bar.cancel": "取消",
   "search_bar.search": "搜尋",
   "search_bar.usage": "<h4>搜尋選項</h4><ul><li><span>用</span><b>\"雙引號\"</b><span>來搜尋語句</span></li><li><span>用</span><b>from:</b><span>來搜尋特定使用者的訊息，用</span><b>in:</b><span>來搜尋特定頻道</span></li></ul>",
   "search_header.results": "搜尋結果",
   "search_header.title2": "最近提及",
+  "search_header.title3": "被標記的訊息",
   "search_item.direct": "直接傳訊",
   "search_item.jump": "跳至",
   "search_results.because": "<ul><li>如果要搜尋部份語句(如搜尋\"rea\"以尋找\"reach\"或\"reaction\")，請在搜尋詞尾附上*。</li><li>為了減少收尋結果，兩個字母的搜尋跟常用字像\"this\"、\"a\"跟\"is\"不會顯示在結果當中。</li></ul>",
@@ -1423,6 +1474,7 @@
   "sidebar_header.tutorial": "<h4>主選單</h4><p>在<strong>主選單</strong>您可以<strong>邀請新成員</strong>，存取您的<strong>帳號設定</strong>並設定您的<strong>主題顏色</strong>。</p><p>團隊管理員也可以在此存取他們的<strong>團隊設定</strong>。</p><p>系統管理員會在此看到<strong>系統控制台</strong>以管理整個系統。</p>",
   "sidebar_right_menu.accountSettings": "帳號設定",
   "sidebar_right_menu.console": "系統控制台",
+  "sidebar_right_menu.flagged": "被標記的訊息",
   "sidebar_right_menu.help": "說明",
   "sidebar_right_menu.inviteNew": "邀請新成員",
   "sidebar_right_menu.logout": "登出",
@@ -1581,10 +1633,6 @@
   "user.settings.custom_theme.sidebarTextHoverBg": "側邊欄文字暫留 BG",
   "user.settings.custom_theme.sidebarTitle": "側邊欄樣式",
   "user.settings.custom_theme.sidebarUnreadText": "側邊欄未讀文字",
-  "user.settings.developer.applicationsPreview": "應用程式(預覽)",
-  "user.settings.developer.register": "註冊新的應用程式",
-  "user.settings.developer.thirdParty": "開啟以註冊新的第三方應用程式",
-  "user.settings.developer.title": "開發者設定",
   "user.settings.display.channelDisplayTitle": "頻道顯示模式",
   "user.settings.display.channeldisplaymode": "選擇中央頻道的寬度。",
   "user.settings.display.clockDisplay": "顯示時間",
@@ -1668,6 +1716,7 @@
   "user.settings.import_theme.submit": "送出",
   "user.settings.import_theme.submitError": "無效的格式，請再一次嘗試複製貼上。",
   "user.settings.languages.change": "變更介面語言",
+  "user.settings.languages.promote": "選擇 Mattermost 用哪種語言顯示使用者界面。<br /><br />想要幫忙翻譯嘛？加入 <a href='http://translate.mattermost.com/' target='_blank'>Mattermost 翻譯伺服器</a> 來幫忙。",
   "user.settings.mfa.add": "為您的帳號加上多重要素驗證",
   "user.settings.mfa.addHelp": "在密碼之上您還可以要求使用智慧型手機所產生的代碼來登入 Mattermost。<br/><br/>若要啟用，請從<a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a>或<a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a>下載 Google Authenticator。<br/><br/>1. 按上面的<strong>為您的帳號加上多重要素驗證</strong>。<br/>2. 用 Google Authenticator 掃描出來的 QR 碼。<br/>3. 輸入 Google Authenticator 產生的 Token 並點擊<strong>儲存</strong>。<br/><br/>登入時，除了您原本的認證以外還會被要求輸入來自 Google Authenticator 的 Token。",
   "user.settings.mfa.addHelpQr": "請用您的智慧型手機上的 Google Authenticator 應用程式掃描條碼，並將應用程式提供的 Token 填寫於此。",
@@ -1675,19 +1724,17 @@
   "user.settings.mfa.qrCode": "條碼",
   "user.settings.mfa.remove": "從您的帳號移除多重要素驗證",
   "user.settings.mfa.removeHelp": "刪除多重因子認證意味著您將不再需要一個基於手機的密碼以登入您的帳戶。",
+  "user.settings.mfa.title": "多重要素驗證",
   "user.settings.modal.advanced": "進階",
   "user.settings.modal.confirmBtns": "是，放棄它們",
   "user.settings.modal.confirmMsg": "您還有未儲存的變更，您確定要放棄它們嘛？",
   "user.settings.modal.confirmTitle": "放棄變更？",
-  "user.settings.modal.developer": "開發者",
   "user.settings.modal.display": "顯示",
   "user.settings.modal.general": "一般",
   "user.settings.modal.notifications": "通知",
   "user.settings.modal.security": "安全",
   "user.settings.modal.title": "帳號設定",
-  "user.settings.notification.allActivity": "所有的活動",
-  "user.settings.notification.push": "行動推播",
-  "user.settings.notification.soundConfig": "請在您的瀏覽器設置中設定通知聲音",
+  "user.settings.notifications.allActivity": "所有的活動",
   "user.settings.notifications.channelWide": "對頻道全員的提及 \"@channel\"、\"@all\"",
   "user.settings.notifications.close": "關閉",
   "user.settings.notifications.comments": "註解串通知",
@@ -1706,9 +1753,11 @@
   "user.settings.notifications.off": "關閉",
   "user.settings.notifications.on": "打開",
   "user.settings.notifications.onlyMentions": "僅限於提及跟直接訊息",
+  "user.settings.notifications.push": "行動推播",
   "user.settings.notifications.sensitiveName": "您的區分大小寫的名字 \"{first_name}\"",
-  "user.settings.notifications.sensitiveUsername": "您的不區分大小寫的使用者名稱 \"{username}\"",
+  "user.settings.notifications.sensitiveUsername": "您的使用者名稱，不區分大小寫：\"{username}\"",
   "user.settings.notifications.sensitiveWords": "其他不區分大小寫的字，用逗號分隔：",
+  "user.settings.notifications.soundConfig": "請在您的瀏覽器設置中設定通知聲音",
   "user.settings.notifications.sounds_info": "只有 Firefox、Safari、Chrome、Internet Explorer 和 Edge 可以使用桌面通知音效。",
   "user.settings.notifications.teamWide": "對團隊全員的提及 \"@all\"",
   "user.settings.notifications.title": "通知設定",