daily translations 20160906 (#3961)

19 files changed, 2113 insertions, 1258 deletions

diff --git a/i18n/de.json b/i18n/de.json
index f8b9d687b..069fb2a9b 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -325,7 +325,7 @@
   },
   {
     "id": "api.channel.remove_member.removed",
-    "translation": "%v was removed from the channel."
+    "translation": "%v wurde vom Kanal entfernt."
   },
   {
     "id": "api.channel.remove_member.unable.app_error",
@@ -333,7 +333,7 @@
   },
   {
     "id": "api.channel.remove_member.user.app_error",
-    "translation": "Der hinzuzufügende Benutzer konnte nicht gefunden werden"
+    "translation": "Der zu löschende Benutzer konnte nicht gefunden werden"
   },
   {
     "id": "api.channel.remove_user_from_channel.deleted.app_error",
@@ -352,6 +352,10 @@
     "translation": "Versuch einer ungültigen Änderung am Standartkanal {{.Channel}} durchzuführen"
   },
   {
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
+    "translation": "Konnte die Ungelesen-Zahl für user_id=%v und channel_id=%v abrufen, err=%v"
+  },
+  {
     "id": "api.command.admin_only.app_error",
     "translation": "Integrationen sind den Administratoren vorbehalten."
   },
@@ -432,6 +436,18 @@
     "translation": "Die Berechtigungen für die Erneuerung des Befehls-Tokens sind ungeeignet"
   },
   {
+    "id": "api.command_away.desc",
+    "translation": "Setzen Sie Ihren Status auf abwesend"
+  },
+  {
+    "id": "api.command_away.name",
+    "translation": "abwesend"
+  },
+  {
+    "id": "api.command_away.success",
+    "translation": "Sie sind nun abwesend"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "Automatisches Einklappen von Bildervorschauen einschalten"
   },
@@ -564,12 +580,36 @@
     "translation": "Benachrichtigter Benutzer."
   },
   {
+    "id": "api.command_offline.desc",
+    "translation": "Setzen Sie Ihren Status auf Offline"
+  },
+  {
+    "id": "api.command_offline.name",
+    "translation": "Offline"
+  },
+  {
+    "id": "api.command_offline.success",
+    "translation": "Sie sind nun offline"
+  },
+  {
+    "id": "api.command_online.desc",
+    "translation": "Setzen Sie Ihren Status auf Online"
+  },
+  {
+    "id": "api.command_online.name",
+    "translation": "Online"
+  },
+  {
+    "id": "api.command_online.success",
+    "translation": "Sie sind nun online"
+  },
+  {
     "id": "api.command_shortcuts.browser",
-    "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+    "translation": "#### Eingebaute Browser Befehle\n\nAlt+Links: Vorheriger Kanal in Ihrem Verlauf\nAlt+Rechts: Nächster Kanal in Ihrem Verlauf\nStrg+Plus: Schriftgröße erhöhen (hineinzoomen)\nStrg+Minus: Schriftgröße verkleinern (herauszoomen)\nShift+Hoch (im Eingabefeld): Text bis zur vorherigen Zeile markieren\nShift+Runter (im Eingabefeld): Text bis zur nächsten Zeile markieren\nShift+Enter (im Eingabefeld): Eine neue Zeile erstellen\n"
   },
   {
     "id": "api.command_shortcuts.browser_mac",
-    "translation": "#### Built-in Browser Commands\n\nCMD+[: Previous channel in your history\nCMD+]: Next channel in your history\nCMD+PLUS: Increase font size (zoom in)\nCMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+    "translation": "#### Eingebaute Browser Befehle\n\nAlt+Links: Vorheriger Kanal in Ihrem Verlauf\nAlt+Rechts: Nächster Kanal in Ihrem Verlauf\nStrg+Plus: Schriftgröße erhöhen (hineinzoomen)\nStrg+Minus: Schriftgröße verkleinern (herauszoomen)\nShift+Hoch (im Eingabefeld): Text bis zur vorherigen Zeile markieren\nShift+Runter (im Eingabefeld): Text bis zur nächsten Zeile markieren\nShift+Enter (im Eingabefeld): Eine neue Zeile erstellen\n"
   },
   {
     "id": "api.command_shortcuts.desc",
@@ -577,19 +617,19 @@
   },
   {
     "id": "api.command_shortcuts.files",
-    "translation": "#### Files\n\nCTRL+U: Upload file(s)\n\n"
+    "translation": "#### Dateien\n\nStrg+U: Datei(en) hochladen\n\n"
   },
   {
     "id": "api.command_shortcuts.files_mac",
-    "translation": "#### Files\n\nCMD+U: Upload file(s)\n\n"
+    "translation": "#### Dateien\n\nCmd+U: Datei(en) hochladen\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": "#### Mitteilungen\n\nEsc: Alle Mitteilungen im aktuellen Kanal als gelesen markieren\nStrg+Hoch (in leerem Eingabefeld): Vorherige Mitteilung oder Slash Befehl anzeigen\nStrg+Runter (in leerem Eingabefeld): Nächste Mitteilung oder Slash Befehl anzeigen\nHoch (in leerem Eingabefeld): Die letzte Nachricht im aktuellen Kanal bearbeiten\n@[Zeichen]+Tab: @Benutzername beginnend mit [Zeichen] vervollständigen\n:[Zeichen]+Tab: Emoji beginnend mit [Zeichen] vervollständigen\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": "#### Mitteilungen\n\nEsc: Alle Mitteilungen im aktuellen Kanal als gelesen markieren\nCmd+Hoch (in leerem Eingabefeld): Vorherige Mitteilung oder Slash Befehl anzeigen\nCmd+Runter (in leerem Eingabefeld): Nächste Mitteilung oder Slash Befehl anzeigen\nHoch (in leerem Eingabefeld): Die letzte Nachricht im aktuellen Kanal bearbeiten\n@[Zeichen]+Tab: @Benutzername beginnend mit [Zeichen] vervollständigen\n:[Zeichen]+Tab: Emoji beginnend mit [Zeichen] vervollständigen\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -597,11 +637,11 @@
   },
   {
     "id": "api.command_shortcuts.nav",
-    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL+K: Open a quick channel switcher dialog\nCTRL+SHIFT+A: Open account settings\nCTRL+SHIFT+M: Open recent mentions\n\n"
+    "translation": "#### Tastenkürzel\n\n#### Navigation\n\nAlt+Hoch: Vorheriger Kanal oder Direktnachricht in der linken Seitenleiste\nAlt+Runter: Nächster Kanal oder Direktnachricht in der linken Seitenleiste\nAlt+Shift+Hoch: Vorheriger Kanal oder Direktnachricht in der linken Seitenleiste mit ungelesenen Nachrichteb\nAlt+Shift+Runter: Nächster Kanal oder Direktnachricht in der linken Seitenleiste mit ungelesenen Nachrichteb\nStrg+K: Einen Kanal Schnellwechseldialog anzeigen\nStrg+Shift+A: Benutzereinstellungen öffnen\nStrg+Shift+M: Die letzten Nennungen öffnen\n\n"
   },
   {
     "id": "api.command_shortcuts.nav_mac",
-    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n"
+    "translation": "#### Tastenkürzel\n\n#### Navigation\n\nAlt+Hoch: Vorheriger Kanal oder Direktnachricht in der linken Seitenleiste\nAlt+Runter: Nächster Kanal oder Direktnachricht in der linken Seitenleiste\nAlt+Shift+Hoch: Vorheriger Kanal oder Direktnachricht in der linken Seitenleiste mit ungelesenen Nachrichteb\nAlt+Shift+Runter: Nächster Kanal oder Direktnachricht in der linken Seitenleiste mit ungelesenen Nachrichteb\nCmd+K: Einen Kanal Schnellwechseldialog anzeigen\nCmd+Shift+A: Benutzereinstellungen öffnen\nCmd+Shift+M: Die letzten Nennungen öffnen\n\n"
   },
   {
     "id": "api.command_shrug.desc",
@@ -661,27 +701,27 @@
   },
   {
     "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
-    "translation": "Email batching job's receiving channel was full. Please increase the EmailBatchingBufferSize."
+    "translation": "E-Mail Stapelungsjob Kanal war voll. Bitte erhöhen Sie EmailBatchingBufferSize."
   },
   {
     "id": "api.email_batching.add_notification_email_to_batch.disabled.app_error",
-    "translation": "Öffentliche Verlinkungen wurden vom Systemadministrator deaktiviert"
+    "translation": "E-Mail Stapelung wurde vom Systemadministrator deaktiviert"
   },
   {
     "id": "api.email_batching.check_pending_emails.finished_running",
-    "translation": "Email batching job ran. %v user(s) still have notifications pending."
+    "translation": "E-Mail Stapelungsjob lief. %v Benutzer haben noch ausstehende Benachrichtigungen."
   },
   {
     "id": "api.email_batching.check_pending_emails.status.app_error",
-    "translation": "Unable to find status of recipient for batched email notification"
+    "translation": "Konnte Status für Empfänger der gestapelten E-Mail Benachrichtigung nicht finden"
   },
   {
     "id": "api.email_batching.render_batched_post.channel.app_error",
-    "translation": "Unable to find channel of post for batched email notification"
+    "translation": "Konnte Kanal für gestapelte E-Mail Benachrichtigung nicht finden"
   },
   {
     "id": "api.email_batching.render_batched_post.date",
-    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}"
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
@@ -693,7 +733,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
-    "translation": "Unable to find sender of post for batched email notification"
+    "translation": "Konnte Absender der Nachricht für gestapelte E-Mail Benachrichtigung nicht finden"
   },
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
@@ -704,26 +744,26 @@
   },
   {
     "id": "api.email_batching.send_batched_email_notification.preferences.app_error",
-    "translation": "Unable to find display preferences of recipient for batched email notification"
+    "translation": "Konnte Darstellungsoptionen für Empfänger der gestapelten E-Mail Benachrichtigung nicht finden"
   },
   {
     "id": "api.email_batching.send_batched_email_notification.send.app_error",
-    "translation": "Failed to send batched email notification to %v: %v"
+    "translation": "Konnte gestapelte E-Mail Benachrichtigungen nicht an %v versenden: %v"
   },
   {
     "id": "api.email_batching.send_batched_email_notification.subject",
     "translation": {
-      "one": "[{{.SiteName}}] New Notification for {{.Month}} {{.Day}}, {{.Year}}",
-      "other": "[{{.SiteName}}] New Notifications for {{.Month}} {{.Day}}, {{.Year}}"
+      "one": "[{{.SiteName}}] Neue Benachrichtigung für {{.Day}}. {{.Month}} {{.Year}}",
+      "other": "[{{.SiteName}}] Neue Benachrichtigungen für {{.Day}}. {{.Month}} {{.Year}}"
     }
   },
   {
     "id": "api.email_batching.send_batched_email_notification.user.app_error",
-    "translation": "Unable to find recipient for batched email notification"
+    "translation": "Konnte Empfänger für gestapelte E-Mail Benachrichtigungen nicht finden"
   },
   {
     "id": "api.email_batching.start.starting",
-    "translation": "Email batching job starting. Checking for pending emails every %v seconds."
+    "translation": "E-Mail Stapelung Job started. Überprüfe auf ausstehende E-Mails alle %v Sekunden."
   },
   {
     "id": "api.emoji.create.duplicate.app_error",
@@ -998,6 +1038,10 @@
     "translation": "Es fehlt mindestens eins der Folgenden: response_type, client_id, redirect_uri"
   },
   {
+    "id": "api.oauth.complete_oauth.missing_code.app_error",
+    "translation": "The service provider {{.service}} did not provide an authorization code in the redirect URL.\n\nFor [Google Apps](https://docs.mattermost.com/deployment/sso-google.html) make sure your administrator enabled the Google+ API.\n\nFor [Office 365](https://docs.mattermost.com/deployment/sso-office.html) make sure the administrator of your Microsoft organization has enabled the Mattermost app.\n\nFor [GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html) please make sure you followed the setup instructions.\n\nIf you reviewed the above and are still having trouble with configuration, you may post in our [Troubleshooting forum](https://forum.mattermost.org/c/general/trouble-shoot) where we'll be happy to help with issues during setup."
+  },
+  {
     "id": "api.oauth.delete.permissions.app_error",
     "translation": "Ungeeignete Berechtigungen um die OAth2 App zu entfernen"
   },
@@ -1066,6 +1110,10 @@
     "translation": "Initialisiere OAuth-Api-Routen"
   },
   {
+    "id": "api.oauth.regenerate_secret.app_error",
+    "translation": "Ungeeignete Berechtigungen um den OAth2 App Schlüssel neu zu generieren"
+  },
+  {
     "id": "api.oauth.register_oauth_app.turn_off.app_error",
     "translation": "Der Administrator hat die OAuth2 Authentifizierung deaktiviert."
   },
@@ -1127,7 +1175,7 @@
   },
   {
     "id": "api.post.delete_flagged_post.app_error.warn",
-    "translation": "Unable to delete flagged post preference when deleting post, err=%v"
+    "translation": "Konnte markierte Nachrichten Einstellungen beim entfernen der Nachricht nicht löschen, err=%v"
   },
   {
     "id": "api.post.delete_post.permissions.app_error",
@@ -1136,15 +1184,15 @@
   {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
-      "one": "{{.Count}} file sent: {{.Filenames}}",
-      "other": "{{.Count}} files sent: {{.Filenames}}"
+      "one": "{{.Count}} Datei versendet: {{.Filenames}}",
+      "other": "{{.Count}} Dateien versendet: {{.Filenames}}"
     }
   },
   {
     "id": "api.post.get_message_for_notification.images_sent",
     "translation": {
-      "one": "{{.Count}} image sent: {{.Filenames}}",
-      "other": "{{.Count}} images sent: {{.Filenames}}"
+      "one": "{{.Count}} Bild versendet: {{.Filenames}}",
+      "other": "{{.Count}} Bilder versendet: {{.Filenames}}"
     }
   },
   {
@@ -1213,7 +1261,11 @@
   },
   {
     "id": "api.post.notification.member_profile.warn",
-    "translation": "Unable to get profile for channel member, user_id=%v"
+    "translation": "Konnte Profil für Kanalmitglied laden, user_id=%v"
+  },
+  {
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "Leere Push-Mitteilung an %v mit channel_id %v"
   },
   {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
@@ -1253,11 +1305,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.debug",
-    "translation": "Sende Push-Mitteilung an %v mit dem Text '%v'"
+    "translation": "Sende Push-Mitteilung an %v mit der msg '%v'"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "Fehler beim Senden der Push-Mitteilung Notification-ID=%v, Fehler=%v"
+    "translation": "Fehler beim Senden der Push-Mitteilung device_id=%v, err=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.send.error",
@@ -1420,6 +1472,10 @@
     "translation": "Fehlerhafter Zeitstempel gefunden"
   },
   {
+    "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
+    "translation": "Konnte Regex Match für @Nennung für Slack Benutzer {{.UserID}} {{.Username}} nicht erstellen"
+  },
+  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Mattermost Slack Import Log\r\n"
   },
@@ -1684,8 +1740,12 @@
     "translation": "KANAL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}}.{{.Month}}"
   },
   {
-    "id": "api.templates.post_subject",
-    "translation": "{{.SubjectText}} bei {{.TeamDisplayName}} am {{.Day}}.{{.Month}}.{{.Year}}"
+    "id": "api.templates.post_subject_in_channel",
+    "translation": "{{.SubjectText}} bei {{.TeamDisplayName}} ({{.ChannelName}}) am {{.Day}}.{{.Month}}.{{.Year}}"
+  },
+  {
+    "id": "api.templates.post_subject_in_direct_message",
+    "translation": "{{.SubjectText}} bei {{.TeamDisplayName}} von {{.SenderDisplayName}} am {{.Day}}.{{.Month}}.{{.Year}}"
   },
   {
     "id": "api.templates.reset_body.button",
@@ -1729,7 +1789,7 @@
   },
   {
     "id": "api.templates.singin_change_email.body.info",
-    "translation": "Ihre Anmeldemethode wurde aktualisiert bei {{ .SiteName }} auf {{.Method}}.<br>Falls Sie diese Änderung nicht veranlasst haben wenden Sie sich bitte an den Systemadministrator."
+    "translation": "Sie haben Ihre Anmeldemethode für {{ .SiteName }} auf {{.Method}} geändert.<br>Falls Sie diese Änderung nicht veranlasst haben wenden Sie sich bitte an den Systemadministrator."
   },
   {
     "id": "api.templates.singin_change_email.subject",
@@ -2392,6 +2452,10 @@
     "translation": "Benutzerdefinierte Emojireaktionen durch die aktuelle Lizenz deaktiviert. Bitte kontaktieren Sie Ihren Systemadministrator wegen eines Enterprise Lizenzupgrades."
   },
   {
+    "id": "ent.ldap.disabled.app_error",
+    "translation": "LDAP deaktiviert oder Lizenz unterstützt kein LDAP."
+  },
+  {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
     "translation": "Bind zum LDAP Server nicht möglich. Überprüfen Sie BindUsername und BindPassword."
   },
@@ -2881,15 +2945,15 @@
   },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
-    "translation": "Unable to enable email batching when clustering is enabled"
+    "translation": "E-Mail Stapelung lässt sich bei aktiviertem Clustering nicht aktivieren"
   },
   {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
-    "translation": "Invalid email batching buffer size for email settings.  Must be zero or a positive number."
+    "translation": "Ungültige Buffer Größe für E-Mail Stapelung.  Muss 0 oder eine positive Ziffer sein."
   },
   {
     "id": "model.config.is_valid.email_batching_interval.app_error",
-    "translation": "Invalid email batching interval for email settings.  Must be 30 seconds or more."
+    "translation": "Ungültiges Intervall für E-Mail Stapelung.  Muss 30 Sekunden oder mehr sein."
   },
   {
     "id": "model.config.is_valid.email_reset_salt.app_error",
@@ -3040,10 +3104,6 @@
     "translation": "Ungültiges E-Mail Attribut. Muss gesetzt sein."
   },
   {
-    "id": "model.config.is_valid.saml_first_name_attribute.app_error",
-    "translation": "Ungültiges Vornamen Attribut. Muss gesetzt sein."
-  },
-  {
     "id": "model.config.is_valid.saml_idp_cert.app_error",
     "translation": "Öffentliches Zertifikat des Identitätsproviders fehlt. Haben Sie vergessen es hochzuladen?"
   },
@@ -3056,10 +3116,6 @@
     "translation": "SAML SSO URL muss eine gültige URL sein und mit http:// oder https:// beginnen."
   },
   {
-    "id": "model.config.is_valid.saml_last_name_attribute.app_error",
-    "translation": "Ungültiges Nachnamen Attribut. Muss gesetzt sein."
-  },
-  {
     "id": "model.config.is_valid.saml_private_key.app_error",
     "translation": "Privater Schlüssel des Service Providers fehlt. Haben Sie vergessen Ihn hochzuladen?"
   },
@@ -3077,7 +3133,7 @@
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
-    "translation": "Unable to enable email batching when SiteURL isn't set."
+    "translation": "E-Mail Stapelung lässt sich nicht aktivieren wenn Site URL nicht gesetzt ist."
   },
   {
     "id": "model.config.is_valid.sitename_length.app_error",
@@ -3940,6 +3996,10 @@
     "translation": "Beim Suchen des Zugangs-Tokens wurde ein Fehler festgestellt"
   },
   {
+    "id": "store.sql_oauth.get_access_data_by_user_for_app.app_error",
+    "translation": "Beim Suchen des Zugangs-Tokens wurde ein Fehler festgestellt"
+  },
+  {
     "id": "store.sql_oauth.get_app.find.app_error",
     "translation": "Die angefragte App konnte nicht gefunden werden"
   },
@@ -4400,6 +4460,10 @@
     "translation": "Es konnte nicht die Anzahl der ungelesenen Nachrichten für den Benutzer abgerufen werden"
   },
   {
+    "id": "store.sql_user.get_unread_count_for_channel.app_error",
+    "translation": "Die Anzahl der ungelesenen Nachrichten für den Benutzer konnte nicht abgerufen werden"
+  },
+  {
     "id": "store.sql_user.migrate_theme.critical",
     "translation": "Fehler beim Migrieren von User.ThemeProps in die Einstellungen Tabelle %v"
   },
diff --git a/i18n/en.json b/i18n/en.json
index 339c58e36..920e444ab 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -152,10 +152,6 @@
     "translation": "%v added to the channel by %v"
   },
   {
-    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
-    "translation": "Unable to get the unread count for user_id=%v and channel_id=%v, err=%v"
-  },
-  {
     "id": "api.channel.add_member.find_channel.app_error",
     "translation": "Failed to find channel"
   },
@@ -356,6 +352,10 @@
     "translation": "Tried to perform an invalid update of the default channel {{.Channel}}"
   },
   {
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
+    "translation": "Unable to get the unread count for user_id=%v and channel_id=%v, err=%v"
+  },
+  {
     "id": "api.command.admin_only.app_error",
     "translation": "Integrations have been limited to admins only."
   },
@@ -448,30 +448,6 @@
     "translation": "You are now away"
   },
   {
-    "id": "api.command_online.desc",
-    "translation": "Set your status online"
-  },
-  {
-    "id": "api.command_online.name",
-    "translation": "online"
-  },
-  {
-    "id": "api.command_online.success",
-    "translation": "You are now online"
-  },
-  {
-    "id": "api.command_offline.desc",
-    "translation": "Set your status offline"
-  },
-  {
-    "id": "api.command_offline.name",
-    "translation": "offline"
-  },
-  {
-    "id": "api.command_offline.success",
-    "translation": "You are now offline"
-  },
-  {
     "id": "api.command_collapse.desc",
     "translation": "Turn on auto-collapsing of image previews"
   },
@@ -604,6 +580,30 @@
     "translation": "Messaged user."
   },
   {
+    "id": "api.command_offline.desc",
+    "translation": "Set your status offline"
+  },
+  {
+    "id": "api.command_offline.name",
+    "translation": "offline"
+  },
+  {
+    "id": "api.command_offline.success",
+    "translation": "You are now offline"
+  },
+  {
+    "id": "api.command_online.desc",
+    "translation": "Set your status online"
+  },
+  {
+    "id": "api.command_online.name",
+    "translation": "online"
+  },
+  {
+    "id": "api.command_online.success",
+    "translation": "You are now online"
+  },
+  {
     "id": "api.command_shortcuts.browser",
     "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
   },
@@ -1010,10 +1010,6 @@
     "translation": "invalid_request: Bad client_id"
   },
   {
-    "id": "api.oauth.complete_oauth.missing_code.app_error",
-    "translation": "The service provider {{.service}} did not provide an authorization code in the redirect URL.\n\nFor [Google Apps](https://docs.mattermost.com/deployment/sso-google.html) make sure your administrator enabled the Google+ API.\n\nFor [Office 365](https://docs.mattermost.com/deployment/sso-office.html) make sure the administrator of your Microsoft organization has enabled the Mattermost app.\n\nFor [GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html) please make sure you followed the setup instructions.\n\nIf you reviewed the above and are still having trouble with configuration, you may post in our [Troubleshooting forum](https://forum.mattermost.org/c/general/trouble-shoot) where we'll be happy to help with issues during setup."
-  },
-  {
     "id": "api.oauth.allow_oauth.bad_redirect.app_error",
     "translation": "invalid_request: Missing or bad redirect_uri"
   },
@@ -1042,6 +1038,10 @@
     "translation": "Missing one or more of response_type, client_id, or redirect_uri"
   },
   {
+    "id": "api.oauth.complete_oauth.missing_code.app_error",
+    "translation": "The service provider {{.service}} did not provide an authorization code in the redirect URL.\n\nFor [Google Apps](https://docs.mattermost.com/deployment/sso-google.html) make sure your administrator enabled the Google+ API.\n\nFor [Office 365](https://docs.mattermost.com/deployment/sso-office.html) make sure the administrator of your Microsoft organization has enabled the Mattermost app.\n\nFor [GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html) please make sure you followed the setup instructions.\n\nIf you reviewed the above and are still having trouble with configuration, you may post in our [Troubleshooting forum](https://forum.mattermost.org/c/general/trouble-shoot) where we'll be happy to help with issues during setup."
+  },
+  {
     "id": "api.oauth.delete.permissions.app_error",
     "translation": "Inappropriate permissions to delete the OAuth2 App"
   },
@@ -1264,6 +1264,10 @@
     "translation": "Unable to get profile for channel member, user_id=%v"
   },
   {
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "Clearing push notification to %v with channel_id %v"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
     "translation": "Failed to retrieve comment thread posts in notifications root_post_id=%v, err=%v"
   },
@@ -1304,10 +1308,6 @@
     "translation": "Sending push notification to %v with msg of '%v'"
   },
   {
-    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
-    "translation": "Clearing push notification to %v with channel_id %v"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
     "translation": "Failed to send push device_id=%v, err=%v"
   },
@@ -2452,6 +2452,10 @@
     "translation": "Custom emoji restrictions disabled by current license. Please contact your system administrator about upgrading your enterprise license."
   },
   {
+    "id": "ent.ldap.disabled.app_error",
+    "translation": "LDAP disabled or licence does not support LDAP."
+  },
+  {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
     "translation": "Unable to bind to LDAP server. Check BindUsername and BindPassword."
   },
@@ -2504,10 +2508,6 @@
     "translation": "Invalid LDAP Filter"
   },
   {
-    "id": "ent.ldap.disabled.app_error",
-    "translation": "LDAP disabled or licence does not support LDAP."
-  },
-  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "Error attempting to authenticate MFA token"
   },
diff --git a/i18n/es.json b/i18n/es.json
index 0fc1f0d6d..f8d91a55f 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -352,6 +352,10 @@
     "translation": "Intento de realizar una actualización inválida al canal predeterminado {{.Channel}}"
   },
   {
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
+    "translation": "No se puede obtener el número de mensajes no leídos para user_id=%v y channel_id=%v, err=%v"
+  },
+  {
     "id": "api.command.admin_only.app_error",
     "translation": "Las integraciones han sido limitadas a los adminitradores."
   },
@@ -432,6 +436,18 @@
     "translation": "Permisos inapropiados para utilizar le comando de regenerar token"
   },
   {
+    "id": "api.command_away.desc",
+    "translation": "Establece tu estado como ausente"
+  },
+  {
+    "id": "api.command_away.name",
+    "translation": "ausente"
+  },
+  {
+    "id": "api.command_away.success",
+    "translation": "Ahora estás ausente"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "Activar auto-colapso de previsualizaciones de imagen"
   },
@@ -564,6 +580,30 @@
     "translation": "Mensaje enviado al usuario."
   },
   {
+    "id": "api.command_offline.desc",
+    "translation": "Estable tu estado como desconectado"
+  },
+  {
+    "id": "api.command_offline.name",
+    "translation": "desconectado"
+  },
+  {
+    "id": "api.command_offline.success",
+    "translation": "Ahora estás desconectado"
+  },
+  {
+    "id": "api.command_online.desc",
+    "translation": "Establece tu estado como disponible"
+  },
+  {
+    "id": "api.command_online.name",
+    "translation": "disponible"
+  },
+  {
+    "id": "api.command_online.success",
+    "translation": "Ahora estás disponible"
+  },
+  {
     "id": "api.command_shortcuts.browser",
     "translation": "#### Comandos incluidos en el Navegador\n\nALT+IZQ: Canal anterior en tu historial\nALT+DER: Canal siguiente en tu historial\nCTRL+MAS: Incrementa el tamaño de las letras (hace zoom)\nCTRL+MENOS: Reduce el tamaño de las letras (quita zoom)\nSHIFT+ARRIBA (en el cuadro de texto): Selecciona el texto en las lineas de arriba\nSHIFT+ABAJO (en el cuadro de texto): Selecciona el texto en las lineas de abajo\nSHIFT+RETORNO (en el cuadro de texto): Crea una nueva línea\n"
   },
@@ -998,6 +1038,10 @@
     "translation": "Falta uno o más parametros: response_type, client_id, o redirect_uri"
   },
   {
+    "id": "api.oauth.complete_oauth.missing_code.app_error",
+    "translation": "El proveedor de servicios {{.servicio}} no proporcionó un código de autorización en la URL de redirección.\n\nPara [Google Apps](https://docs.mattermost.com/deployment/sso-google.html) asegúrate de que el administrador ha habilitado Google+ API.\n\nPara [Office 365](https://docs.mattermost.com/deployment/sso-office.html) asegúrate de que el administrador de tu organización en Microsoft ha habilitado la aplicación de Mattermost.\n\nPara [GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html) por favor, asegúrate de haber seguido las instrucciones de instalación.\n\nSi has revisado lo anterior, y sigue teniendo problemas con la configuración, puedes publicar en nuestro foro de [Solución de problemas](https://forum.mattermost.org/c/general/trouble-shoot), donde estaremos encantados de ayudar con problemas que ocurran durante la instalación."
+  },
+  {
     "id": "api.oauth.delete.permissions.app_error",
     "translation": "Permisos inapropiados para eliminar la App de OAuth2"
   },
@@ -1066,6 +1110,10 @@
     "translation": "Inicializando rutas del API para el OAuth"
   },
   {
+    "id": "api.oauth.regenerate_secret.app_error",
+    "translation": "Permisos inapropiados para regenerar el secreto la App de OAuth2"
+  },
+  {
     "id": "api.oauth.register_oauth_app.turn_off.app_error",
     "translation": "El administrador de sistema ha desactivado el Proveedor de Servicio OAuth2."
   },
@@ -1216,6 +1264,10 @@
     "translation": "No se puede obtener el perfil del miembro del canal, user_id=%v"
   },
   {
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "Limpiando notificaciones push a %v con el channel_id '%v'"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
     "translation": "No se pudo recuperar el hilo de comentarios en las notificaciones root_post_id=%v, err=%v"
   },
@@ -1257,7 +1309,7 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "Falló el envio de la notificación push notificationid=%v, err=%v"
+    "translation": "Falló el envio de la notificación push al device_id=%v, err=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.send.error",
@@ -1420,6 +1472,10 @@
     "translation": "Se ha detectado la marca del tiempo errada"
   },
   {
+    "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
+    "translation": "No se pudo compilar la coincidencia de la @mención con expresión regular para el usuario de Slack {{.UserID}} {{.Username}}"
+  },
+  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Mattermost Registros de importación de Slack\r\n"
   },
@@ -1684,8 +1740,12 @@
     "translation": "Canal: {{.ChannelName}}<br>{{.SenderName}} - {{.Day}} {{.Month}}, {{.Hour}}:{{.Minute}} {{.TimeZone}}"
   },
   {
-    "id": "api.templates.post_subject",
-    "translation": "{{.SubjectText}} en {{.TeamDisplayName}} el {{.Day}} {{.Month}}, {{.Year}}"
+    "id": "api.templates.post_subject_in_channel",
+    "translation": "{{.SubjectText}} en {{.TeamDisplayName}} ({{.ChannelName}}) el {{.Day}} {{.Month}}, {{.Year}}"
+  },
+  {
+    "id": "api.templates.post_subject_in_direct_message",
+    "translation": "{{.SubjectText}} en {{.TeamDisplayName}} de {{.SenderDisplayName}} on {{.Day}} {{.Month}}, {{.Year}}"
   },
   {
     "id": "api.templates.reset_body.button",
@@ -1729,7 +1789,7 @@
   },
   {
     "id": "api.templates.singin_change_email.body.info",
-    "translation": "Haz actualizado tu método de inicio de sesión en {{ .SiteName }} a {{.Method}}.<br>Sí este cambio no fue realizado por ti, por favor contacta a un adminsitrador del sistema."
+    "translation": "Haz actualizado tu método de inicio de sesión en {{ .SiteName }} a {{.Method}}.<br>Sí este cambio no fue realizado por ti, por favor contacta a tu administrador de sistema."
   },
   {
     "id": "api.templates.singin_change_email.subject",
@@ -2392,6 +2452,10 @@
     "translation": "Las restricciones de los Emoticones Personalizados están desactivadas por la licencia actual. Por favor contacta a un Administrador del Sistema sobre como actualizar a una licencia enterprise."
   },
   {
+    "id": "ent.ldap.disabled.app_error",
+    "translation": "LDAP deshabilitado o la licencia no es compatible con LDAP."
+  },
+  {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
     "translation": "No se pudo enlazar con el servidor LDAP. Revisa las opciones de BindUsername y BindPassword."
   },
@@ -3040,10 +3104,6 @@
     "translation": "Atributo de Correo Electrónico no válido. Se debe establecer."
   },
   {
-    "id": "model.config.is_valid.saml_first_name_attribute.app_error",
-    "translation": "Atributo del Nombre no válido. Se debe establecer."
-  },
-  {
     "id": "model.config.is_valid.saml_idp_cert.app_error",
     "translation": "Falta el Certificado Público del Proveedor de Identidad. ¿Te olvideste de subirlo?"
   },
@@ -3056,10 +3116,6 @@
     "translation": "SAML SSO URL debe ser una URL válida y empezar con http:// o https://."
   },
   {
-    "id": "model.config.is_valid.saml_last_name_attribute.app_error",
-    "translation": "Atributo del Apellido no válido. Se debe establecer."
-  },
-  {
     "id": "model.config.is_valid.saml_private_key.app_error",
     "translation": "Falta la Llave Privada del Proveedor de Servicios. ¿Te olvideste de subirla?"
   },
@@ -3940,6 +3996,10 @@
     "translation": "Encontramos un error buscando el token de acceso"
   },
   {
+    "id": "store.sql_oauth.get_access_data_by_user_for_app.app_error",
+    "translation": "Encontramos un error buscando todos los token de acceso"
+  },
+  {
     "id": "store.sql_oauth.get_app.find.app_error",
     "translation": "No pudimos encontrar la app solicitada"
   },
@@ -4400,6 +4460,10 @@
     "translation": "No pudimos obtener la cantidad de mensajes sin leer del usuario"
   },
   {
+    "id": "store.sql_user.get_unread_count_for_channel.app_error",
+    "translation": "No pudimos obtener la cantidad de mensajes sin leer del usuario y canal"
+  },
+  {
     "id": "store.sql_user.migrate_theme.critical",
     "translation": "Falla al migrar User.ThemeProps a la table Preferences %v"
   },
diff --git a/i18n/fr.json b/i18n/fr.json
index dbf954a14..8fe64257c 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -325,7 +325,7 @@
   },
   {
     "id": "api.channel.remove_member.removed",
-    "translation": "%v was removed from the channel."
+    "translation": "%v a été retiré du canal."
   },
   {
     "id": "api.channel.remove_member.unable.app_error",
@@ -352,6 +352,10 @@
     "translation": "Échec de la tentative de mise à jour du canal par défaut {{.Channel}}"
   },
   {
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
+    "translation": "Unable to get the unread count for user_id=%v and channel_id=%v, err=%v"
+  },
+  {
     "id": "api.command.admin_only.app_error",
     "translation": "Les intégrations sont réservées aux administrateurs."
   },
@@ -432,6 +436,18 @@
     "translation": "Droits insuffisants pour regénérer la clé de commande"
   },
   {
+    "id": "api.command_away.desc",
+    "translation": "Set your status away"
+  },
+  {
+    "id": "api.command_away.name",
+    "translation": "away"
+  },
+  {
+    "id": "api.command_away.success",
+    "translation": "You are now away"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "Activer la réduction automatique des aperçus d'images"
   },
@@ -564,6 +580,30 @@
     "translation": "Message envoyé."
   },
   {
+    "id": "api.command_offline.desc",
+    "translation": "Set your status offline"
+  },
+  {
+    "id": "api.command_offline.name",
+    "translation": "offline"
+  },
+  {
+    "id": "api.command_offline.success",
+    "translation": "You are now offline"
+  },
+  {
+    "id": "api.command_online.desc",
+    "translation": "Set your status online"
+  },
+  {
+    "id": "api.command_online.name",
+    "translation": "online"
+  },
+  {
+    "id": "api.command_online.success",
+    "translation": "You are now online"
+  },
+  {
     "id": "api.command_shortcuts.browser",
     "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
   },
@@ -698,7 +738,7 @@
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
     "translation": {
-      "one": "Vous avez un nouveau message.",
+      "one": "Vous avez un nouveau message.Vous avez {{.Count}} nouveaux messages.",
       "other": ""
     }
   },
@@ -708,7 +748,7 @@
   },
   {
     "id": "api.email_batching.send_batched_email_notification.send.app_error",
-    "translation": "Failed to send batched email notification to %v: %v"
+    "translation": "Echec de l'envoi du courriel groupé à %v: %v"
   },
   {
     "id": "api.email_batching.send_batched_email_notification.subject",
@@ -998,6 +1038,10 @@
     "translation": "Il manque une des valeurs parmi response_type, client_id ou redirect_uri"
   },
   {
+    "id": "api.oauth.complete_oauth.missing_code.app_error",
+    "translation": "The service provider {{.service}} did not provide an authorization code in the redirect URL.\n\nFor [Google Apps](https://docs.mattermost.com/deployment/sso-google.html) make sure your administrator enabled the Google+ API.\n\nFor [Office 365](https://docs.mattermost.com/deployment/sso-office.html) make sure the administrator of your Microsoft organization has enabled the Mattermost app.\n\nFor [GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html) please make sure you followed the setup instructions.\n\nIf you reviewed the above and are still having trouble with configuration, you may post in our [Troubleshooting forum](https://forum.mattermost.org/c/general/trouble-shoot) where we'll be happy to help with issues during setup."
+  },
+  {
     "id": "api.oauth.delete.permissions.app_error",
     "translation": "Permissions insuffisantes pour supprimer l'application OAuth 2"
   },
@@ -1066,6 +1110,10 @@
     "translation": "Initialisation des routes de l'api oauth"
   },
   {
+    "id": "api.oauth.regenerate_secret.app_error",
+    "translation": "Permissions insuffisantes pour supprimer l'application OAuth 2"
+  },
+  {
     "id": "api.oauth.register_oauth_app.turn_off.app_error",
     "translation": "L'administrateur système a désactivé l'authentification par OAuth2."
   },
@@ -1136,15 +1184,15 @@
   {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
-      "one": "{{.Count}} file sent: {{.Filenames}}",
-      "other": "{{.Count}} files sent: {{.Filenames}}"
+      "one": "{{.Count}} fichier envoyé: {{.Filenames}}",
+      "other": "{{.Count}} fichiers envoyés: {{.Filenames}}"
     }
   },
   {
     "id": "api.post.get_message_for_notification.images_sent",
     "translation": {
-      "one": "{{.Count}} image sent: {{.Filenames}}",
-      "other": "{{.Count}} images sent: {{.Filenames}}"
+      "one": "{{.Count}} image envoyée: {{.Filenames}}",
+      "other": "{{.Count}} images envoyées: {{.Filenames}}"
     }
   },
   {
@@ -1216,6 +1264,10 @@
     "translation": "Unable to get profile for channel member, user_id=%v"
   },
   {
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "Clearing push notification to %v with channel_id %v"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
     "translation": "Impossible de récupérer les fils de commentaires dans les notifications root_post_id=%v, err=%v"
   },
@@ -1420,6 +1472,10 @@
     "translation": "Mauvais timestamp détecté"
   },
   {
+    "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
+    "translation": "Failed to compile the @mention matching regular expression for Slack user {{.UserID}} {{.Username}}"
+  },
+  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Journal import Slack Mattermost\r\n"
   },
@@ -1684,7 +1740,11 @@
     "translation": "CANAL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
-    "id": "api.templates.post_subject",
+    "id": "api.templates.post_subject_in_channel",
+    "translation": "{{.SubjectText}} sur {{.TeamDisplayName}} le {{.Day}} {{.Month}} {{.Year}}"
+  },
+  {
+    "id": "api.templates.post_subject_in_direct_message",
     "translation": "{{.SubjectText}} sur {{.TeamDisplayName}} le {{.Day}} {{.Month}} {{.Year}}"
   },
   {
@@ -2392,6 +2452,10 @@
     "translation": "Emoji personnalisés désactivés par la licence courante. Veuillez contacter votre administrateur système concernant la mise à niveau de votre licence entreprise."
   },
   {
+    "id": "ent.ldap.disabled.app_error",
+    "translation": "LDAP disabled or licence does not support LDAP."
+  },
+  {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
     "translation": "Impossible de se connecter au serveur LDAP. Vérifiez l'utilisateur et le mot de passe du compte utilisé pour se connecter au serveur LDAP."
   },
@@ -3040,10 +3104,6 @@
     "translation": "L'attribut \"Email\" est invalide. Il doit être renseigné."
   },
   {
-    "id": "model.config.is_valid.saml_first_name_attribute.app_error",
-    "translation": "L'attribut \"Prénom\" est invalide. Il doit être renseigné."
-  },
-  {
     "id": "model.config.is_valid.saml_idp_cert.app_error",
     "translation": "Certificat public du fournisseur d'identité introuvable. Auriez-vous oublié de le télécharger ?"
   },
@@ -3056,10 +3116,6 @@
     "translation": "URL SSO SAML invalide. Il doit s'agir d'une URL valide et commencer par http:// ou https://."
   },
   {
-    "id": "model.config.is_valid.saml_last_name_attribute.app_error",
-    "translation": "L'attribut \"Nom de famille\" est invalide. Il doit être renseigné."
-  },
-  {
     "id": "model.config.is_valid.saml_private_key.app_error",
     "translation": "Clé privée du fournisseur d'identité introuvable. Auriez-vous oublié de la télécharger ?"
   },
@@ -3940,6 +3996,10 @@
     "translation": "Nous avons rencontré une erreur lors de la recherche du jeton d'accès"
   },
   {
+    "id": "store.sql_oauth.get_access_data_by_user_for_app.app_error",
+    "translation": "Nous avons rencontré une erreur lors de la recherche du jeton d'accès"
+  },
+  {
     "id": "store.sql_oauth.get_app.find.app_error",
     "translation": "Nous n'avons pas pu trouver l'application"
   },
@@ -4400,6 +4460,10 @@
     "translation": "Nous n'avons pas pu compter le nombre de messages non lus pour l'utilisateur"
   },
   {
+    "id": "store.sql_user.get_unread_count_for_channel.app_error",
+    "translation": "Nous n'avons pas pu compter le nombre de messages non lus pour l'utilisateur"
+  },
+  {
     "id": "store.sql_user.migrate_theme.critical",
     "translation": "Impossible de migrer User.ThemeProps vers la table de préférences %v"
   },
diff --git a/i18n/ja.json b/i18n/ja.json
index 15493848f..b068ced78 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -325,7 +325,7 @@
   },
   {
     "id": "api.channel.remove_member.removed",
-    "translation": "%v was removed from the channel."
+    "translation": "%vはチャンネルから削除されました。"
   },
   {
     "id": "api.channel.remove_member.unable.app_error",
@@ -333,7 +333,7 @@
   },
   {
     "id": "api.channel.remove_member.user.app_error",
-    "translation": "追加しようとしているユーザーが見付かりませんでした"
+    "translation": "削除しようとしているユーザーが見付かりませんでした"
   },
   {
     "id": "api.channel.remove_user_from_channel.deleted.app_error",
@@ -352,6 +352,10 @@
     "translation": "デフォルトのチャンネル{{.Channel}}に不正な更新をしようとしました"
   },
   {
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
+    "translation": "未読数を取得できませんでした user_id=%v and channel_id=%v, err=%v"
+  },
+  {
     "id": "api.command.admin_only.app_error",
     "translation": "統合機能は管理者のみ実行可能です。"
   },
@@ -432,6 +436,18 @@
     "translation": "コマンドトークンを再生成するために必要な権限が付与されていません"
   },
   {
+    "id": "api.command_away.desc",
+    "translation": "離席状態に設定します"
+  },
+  {
+    "id": "api.command_away.name",
+    "translation": "離席"
+  },
+  {
+    "id": "api.command_away.success",
+    "translation": "あなたは離席中です"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "画像プレビューの自動折りたたみをオンにします"
   },
@@ -564,12 +580,36 @@
     "translation": "ユーザーにメッセージを送信しました。"
   },
   {
+    "id": "api.command_offline.desc",
+    "translation": "オフライン状態に設定します"
+  },
+  {
+    "id": "api.command_offline.name",
+    "translation": "オフライン"
+  },
+  {
+    "id": "api.command_offline.success",
+    "translation": "あなたはオフライン状態です"
+  },
+  {
+    "id": "api.command_online.desc",
+    "translation": "オンライン状態に設定します"
+  },
+  {
+    "id": "api.command_online.name",
+    "translation": "オンライン"
+  },
+  {
+    "id": "api.command_online.success",
+    "translation": "あなたはオンライン状態です"
+  },
+  {
     "id": "api.command_shortcuts.browser",
-    "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+    "translation": "#### 内蔵ブラウザーコマンド\n\nALT+左: 履歴の前のチャンネル\nALT+右: 履歴の次のチャンネル\nCTRL+プラス: フォントを大きくする(ズームイン)\nCTRL+マイナス: フォントを小さくする(ズームアウト)\nSHIFT+UP (入力欄で): 一つ上の行のテキストをハイライトする\nSHIFT+DOWN (入力欄で): 一つ下の行のテキストをハイライトする\nSHIFT+ENTER (入力欄で): 改行する\n"
   },
   {
     "id": "api.command_shortcuts.browser_mac",
-    "translation": "#### Built-in Browser Commands\n\nCMD+[: Previous channel in your history\nCMD+]: Next channel in your history\nCMD+PLUS: Increase font size (zoom in)\nCMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+    "translation": "#### 内蔵ブラウザーコマンド\n\nCMD+[: 履歴の前のチャンネル\nCMD+]: 履歴の次のチャンネル\nCMD+プラス: フォントを大きくする(ズームイン)\nCMD+マイナス: フォントを小さくする(ズームアウト)\nSHIFT+UP (入力欄で): 一つ上の行のテキストをハイライトする\nSHIFT+DOWN (入力欄で): 一つ下の行のテキストをハイライトする\nSHIFT+ENTER (入力欄で): 改行する\n"
   },
   {
     "id": "api.command_shortcuts.desc",
@@ -577,19 +617,19 @@
   },
   {
     "id": "api.command_shortcuts.files",
-    "translation": "#### Files\n\nCTRL+U: Upload file(s)\n\n"
+    "translation": "#### ファイル\n\nCTRL+U: ファイルをアップロードする\n\n"
   },
   {
     "id": "api.command_shortcuts.files_mac",
-    "translation": "#### Files\n\nCMD+U: Upload file(s)\n\n"
+    "translation": "#### ファイル\n\nCMD+U: ファイルをアップロードする\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": "#### メッセージ\n\nESC: 現在のチャンネルの全てのメッセージを既読にする\nCTRL+UP (空白の入力欄で): 一つ前に入力したメッセージやスラッシュコマンドを呼び出す\nCTRL+DOWN (空白の入力欄で): 一つ次に入力したメッセージやスラッシュコマンドを呼び出す\nUP (空白の入力欄で): 現在のチャンネルの最新のメッセージを修正する\n@[文字]+TAB: [文字]で始まる@usernameを自動補完する\n:[文字]+TAB: [文字]で始まる絵文字を自動補完する\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": "#### メッセージ\n\nESC: 現在のチャンネルの全てのメッセージを既読にする\nCMD+UP (空白の入力欄で): 一つ前に入力したメッセージやスラッシュコマンドを呼び出す\nCMD+DOWN (空白の入力欄で): 一つ次に入力したメッセージやスラッシュコマンドを呼び出す\nUP (空白の入力欄で): 現在のチャンネルの最新のメッセージを修正する\n@[文字]+TAB: [文字]で始まる@usernameを自動補完する\n:[文字]+TAB: [文字]で始まる絵文字を自動補完する\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -597,11 +637,11 @@
   },
   {
     "id": "api.command_shortcuts.nav",
-    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL+K: Open a quick channel switcher dialog\nCTRL+SHIFT+A: Open account settings\nCTRL+SHIFT+M: Open recent mentions\n\n"
+    "translation": "### キーボードショートカット\n\n#### 移動\n\nALT+UP: 左側のサイドバーの前のチャンネルまたはダイレクトメッセージに移動する\nALT+DOWN: 左側のサイドバーの次のチャンネルまたはダイレクトメッセージに移動する\nALT+SHIFT+UP: 左側のサイドバーの未読のメッセージのある前のチャンネルまたはダイレクトメッセージに移動する\nALT+SHIFT+DOWN: 左側のサイドバーの未読のメッセージのある次のチャンネルまたはダイレクトメッセージに移動する\nCTRL+K: 高速チャンネル切り替えダイアログボックスを開く\nCTRL+SHIFT+A: アカウント設定を開く\nCTRL+SHIFT+M: 最近の自分についての投稿を開く\n\n"
   },
   {
     "id": "api.command_shortcuts.nav_mac",
-    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n"
+    "translation": "### キーボードショートカット\n\n#### 移動\n\nALT+UP: 左側のサイドバーの前のチャンネルまたはダイレクトメッセージに移動する\nALT+DOWN: 左側のサイドバーの次のチャンネルまたはダイレクトメッセージに移動する\nALT+SHIFT+UP: 左側のサイドバーの未読のメッセージのある前のチャンネルまたはダイレクトメッセージに移動する\nALT+SHIFT+DOWN: 左側のサイドバーの未読のメッセージのある次のチャンネルまたはダイレクトメッセージに移動する\nCMD+K: 高速チャンネル切り替えダイアログボックスを開く\nCMD+SHIFT+A: アカウント設定を開く\nCMD+SHIFT+M: 最近の自分についての投稿を開く\n\n"
   },
   {
     "id": "api.command_shrug.desc",
@@ -669,7 +709,7 @@
   },
   {
     "id": "api.email_batching.check_pending_emails.finished_running",
-    "translation": "Email batching job ran. %v user(s) still have notifications pending."
+    "translation": "電子メールのバッチジョブが稼働中です。%vユーザーはまだ通知を保留されています。"
   },
   {
     "id": "api.email_batching.check_pending_emails.status.app_error",
@@ -723,7 +763,7 @@
   },
   {
     "id": "api.email_batching.start.starting",
-    "translation": "Email batching job starting. Checking for pending emails every %v seconds."
+    "translation": "電子メールのバッチジョブが開始されました。%v秒ごとに保留されている電子メールを確認します。"
   },
   {
     "id": "api.emoji.create.duplicate.app_error",
@@ -998,6 +1038,10 @@
     "translation": "response_type、client_id、redirect_uriのうち１つ以上が不足しています"
   },
   {
+    "id": "api.oauth.complete_oauth.missing_code.app_error",
+    "translation": "The service provider {{.service}} did not provide an authorization code in the redirect URL.\n\nFor [Google Apps](https://docs.mattermost.com/deployment/sso-google.html) make sure your administrator enabled the Google+ API.\n\nFor [Office 365](https://docs.mattermost.com/deployment/sso-office.html) make sure the administrator of your Microsoft organization has enabled the Mattermost app.\n\nFor [GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html) please make sure you followed the setup instructions.\n\nIf you reviewed the above and are still having trouble with configuration, you may post in our [Troubleshooting forum](https://forum.mattermost.org/c/general/trouble-shoot) where we'll be happy to help with issues during setup."
+  },
+  {
     "id": "api.oauth.delete.permissions.app_error",
     "translation": "OAuth2アプリケーションの削除に必要な権限が付与されていません"
   },
@@ -1066,6 +1110,10 @@
     "translation": "OAuth APIルートを初期化しています"
   },
   {
+    "id": "api.oauth.regenerate_secret.app_error",
+    "translation": "OAuth2アプリケーションの秘密情報の再生成に必要な権限が付与されていません"
+  },
+  {
     "id": "api.oauth.register_oauth_app.turn_off.app_error",
     "translation": "システム管理者はOAuth2サービスプロバイダーを無効にしています。"
   },
@@ -1127,7 +1175,7 @@
   },
   {
     "id": "api.post.delete_flagged_post.app_error.warn",
-    "translation": "Unable to delete flagged post preference when deleting post, err=%v"
+    "translation": "投稿を削除する際に、フラッグの付いた投稿の設定を削除できません。err=%v"
   },
   {
     "id": "api.post.delete_post.permissions.app_error",
@@ -1143,7 +1191,7 @@
   {
     "id": "api.post.get_message_for_notification.images_sent",
     "translation": {
-      "one": "{{.Count}} ファイル送信: {{.Filenames}}{{.Count}} ファイル送信: {{.Filenames}}",
+      "one": "{{.Count}} 画像送信: {{.Filenames}}{{.Count}} 画像送信: {{.Filenames}}",
       "other": ""
     }
   },
@@ -1216,6 +1264,10 @@
     "translation": "チャンネルメンバーのプロフィールを取得できませんでした user_id=%v"
   },
   {
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "%vへのプッシュ通知をクリアーしています(channel_id %v)"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
     "translation": "通知内のコメントスレッドの投稿を取得できませんでした root_post_id=%v、err=%v"
   },
@@ -1253,11 +1305,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.debug",
-    "translation": "%vに'%v'のプッシュ通知を送っています。"
+    "translation": "%vにメッセージ'%v'のプッシュ通知を送っています。"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "プッシュ通知を送れませんでした notificationid=%v, err=%v"
+    "translation": "プッシュ通知を送れませんでした device_id=%v, err=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.send.error",
@@ -1420,6 +1472,10 @@
     "translation": "不正なタイムスタンプが検出されました"
   },
   {
+    "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
+    "translation": "Slackユーザー{{.UserID}} {{.Username}}の@mensionに一致する正規表現のコンパイルに失敗しました。"
+  },
+  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Mattermost Slackインポートログ\r\n"
   },
@@ -1684,8 +1740,12 @@
     "translation": "チャンネル: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
-    "id": "api.templates.post_subject",
-    "translation": "{{.TeamDisplayName}}の{{.SubjectText}} 日付: {{.Month}} {{.Day}}, {{.Year}}"
+    "id": "api.templates.post_subject_in_channel",
+    "translation": "{{.TeamDisplayName}} (チャンネル: {{.ChannelName}})の{{.SubjectText}} 日付: {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
+    "id": "api.templates.post_subject_in_direct_message",
+    "translation": "{{.SenderDisplayName}}の投稿した{{.TeamDisplayName}}の{{.SubjectText}} 日付: {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
     "id": "api.templates.reset_body.button",
@@ -1729,7 +1789,7 @@
   },
   {
     "id": "api.templates.singin_change_email.body.info",
-    "translation": "{{ .SiteURL }}のサインイン方法は{{.Method}}に更新されました。<br>あなたが変更したのでなければ、システム管理者へ問い合わせてください。"
+    "translation": "{{ .SiteName }}のサインイン方法は{{.Method}}に更新されました。<br>あなたが変更したのでなければ、システム管理者へ問い合わせてください。"
   },
   {
     "id": "api.templates.singin_change_email.subject",
@@ -2392,6 +2452,10 @@
     "translation": "カスタム絵文字の制限機能が現在のライセンスでは無効になっています。システム管理者にエンタープライズライセンスをアップグレードするように連絡してください。"
   },
   {
+    "id": "ent.ldap.disabled.app_error",
+    "translation": "LDAPが無効化されている、またはライセンスがLDAPをサポートしていません。"
+  },
+  {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
     "translation": "LDAPサーバーに接続できません。BindUsernameとBindPasswordを確認してください。"
   },
@@ -2881,7 +2945,7 @@
   },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
-    "translation": "Unable to enable email batching when clustering is enabled"
+    "translation": "クラスタリングが有効化されている場合、電子メールのバッチ処理は有効化できません"
   },
   {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
@@ -2957,7 +3021,7 @@
   },
   {
     "id": "model.config.is_valid.ldap_firstname",
-    "translation": "LDAP項目 \"FIrst Name Attribute\" は必須です。"
+    "translation": "LDAP項目 \"First Name Attribute\" は必須です。"
   },
   {
     "id": "model.config.is_valid.ldap_id",
@@ -3040,10 +3104,6 @@
     "translation": "電子メールの属性値が不正です。設定してください。"
   },
   {
-    "id": "model.config.is_valid.saml_first_name_attribute.app_error",
-    "translation": "ファーストネームの属性値が不正です。設定してください。"
-  },
-  {
     "id": "model.config.is_valid.saml_idp_cert.app_error",
     "translation": "認証プロバイダーの公開証明書が見付かりません。アップロードを忘れていませんか?"
   },
@@ -3056,10 +3116,6 @@
     "translation": "SAML SSOのURLを正しく設定してください。URLはhttp://またはhttps://で始まります。"
   },
   {
-    "id": "model.config.is_valid.saml_last_name_attribute.app_error",
-    "translation": "ラストネームの属性値が不正です。設定してください。"
-  },
-  {
     "id": "model.config.is_valid.saml_private_key.app_error",
     "translation": "サービスプロバイダーの秘密鍵が見付かりません。アップロードを忘れていませんか?"
   },
@@ -3077,7 +3133,7 @@
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
-    "translation": "Unable to enable email batching when SiteURL isn't set."
+    "translation": "SiteURLが設定されていないため電子メールのバッチ処理は有効化できません。"
   },
   {
     "id": "model.config.is_valid.sitename_length.app_error",
@@ -3940,6 +3996,10 @@
     "translation": "アクセストークンを探す際にエラーが発生しました"
   },
   {
+    "id": "store.sql_oauth.get_access_data_by_user_for_app.app_error",
+    "translation": "全てのアクセストークンを探す際にエラーが発生しました"
+  },
+  {
     "id": "store.sql_oauth.get_app.find.app_error",
     "translation": "リクエストされたアプリケーションが見付かりませんでした"
   },
@@ -4400,6 +4460,10 @@
     "translation": "ユーザーの未読のメッセージ数を取得できませんでした"
   },
   {
+    "id": "store.sql_user.get_unread_count_for_channel.app_error",
+    "translation": "ユーザーとチャンネルの未読のメッセージ数を取得できませんでした"
+  },
+  {
     "id": "store.sql_user.migrate_theme.critical",
     "translation": "User.ThemePropsをPreferenceテーブル %v に移行できませんでした"
   },
diff --git a/i18n/ko.json b/i18n/ko.json
index 9f58d785a..fff68e37f 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -352,6 +352,10 @@
     "translation": "기본 채널 {{.Channel}}에 적절하지 않은 갱신을 시도했습니다"
   },
   {
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
+    "translation": "Unable to get the unread count for user_id=%v and channel_id=%v, err=%v"
+  },
+  {
     "id": "api.command.admin_only.app_error",
     "translation": "연동은 관리자만 사용할 수 있습니다."
   },
@@ -432,6 +436,18 @@
     "translation": "명령어 토큰을 재생성할 권한 없음"
   },
   {
+    "id": "api.command_away.desc",
+    "translation": "Set your status away"
+  },
+  {
+    "id": "api.command_away.name",
+    "translation": "away"
+  },
+  {
+    "id": "api.command_away.success",
+    "translation": "You are now away"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "이미지 미리보기를 자동으로 접습니다"
   },
@@ -564,6 +580,30 @@
     "translation": "메세지를 보낸 유저."
   },
   {
+    "id": "api.command_offline.desc",
+    "translation": "Set your status offline"
+  },
+  {
+    "id": "api.command_offline.name",
+    "translation": "offline"
+  },
+  {
+    "id": "api.command_offline.success",
+    "translation": "You are now offline"
+  },
+  {
+    "id": "api.command_online.desc",
+    "translation": "Set your status online"
+  },
+  {
+    "id": "api.command_online.name",
+    "translation": "online"
+  },
+  {
+    "id": "api.command_online.success",
+    "translation": "You are now online"
+  },
+  {
     "id": "api.command_shortcuts.browser",
     "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
   },
@@ -998,6 +1038,10 @@
     "translation": "response_type, client_id, redirect_uri 중 하나 이상이 누락되었습니다."
   },
   {
+    "id": "api.oauth.complete_oauth.missing_code.app_error",
+    "translation": "The service provider {{.service}} did not provide an authorization code in the redirect URL.\n\nFor [Google Apps](https://docs.mattermost.com/deployment/sso-google.html) make sure your administrator enabled the Google+ API.\n\nFor [Office 365](https://docs.mattermost.com/deployment/sso-office.html) make sure the administrator of your Microsoft organization has enabled the Mattermost app.\n\nFor [GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html) please make sure you followed the setup instructions.\n\nIf you reviewed the above and are still having trouble with configuration, you may post in our [Troubleshooting forum](https://forum.mattermost.org/c/general/trouble-shoot) where we'll be happy to help with issues during setup."
+  },
+  {
     "id": "api.oauth.delete.permissions.app_error",
     "translation": "Inappropriate permissions to delete the OAuth2 App"
   },
@@ -1066,6 +1110,10 @@
     "translation": "oauth API 경로 초기화 중"
   },
   {
+    "id": "api.oauth.regenerate_secret.app_error",
+    "translation": "Inappropriate permissions to delete the OAuth2 App"
+  },
+  {
     "id": "api.oauth.register_oauth_app.turn_off.app_error",
     "translation": "OAuth2 서비스 제공자가 시스템 관리자에 의해 종료되었습니다."
   },
@@ -1216,6 +1264,10 @@
     "translation": "Unable to get profile for channel member, user_id=%v"
   },
   {
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "Clearing push notification to %v with channel_id %v"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
     "translation": "Failed to retrieve comment thread posts in notifications root_post_id=%v, err=%v"
   },
@@ -1420,6 +1472,10 @@
     "translation": "잘못된 시간 서식이 있습니다."
   },
   {
+    "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
+    "translation": "Failed to compile the @mention matching regular expression for Slack user {{.UserID}} {{.Username}}"
+  },
+  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Slack에서 가져오기 Log\r\n"
   },
@@ -1684,7 +1740,11 @@
     "translation": "채널: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
-    "id": "api.templates.post_subject",
+    "id": "api.templates.post_subject_in_channel",
+    "translation": "{{.SubjectText}} on {{.TeamDisplayName}} at {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
+    "id": "api.templates.post_subject_in_direct_message",
     "translation": "{{.SubjectText}} on {{.TeamDisplayName}} at {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
@@ -2392,6 +2452,10 @@
     "translation": "Compliance 기능을 활성화 하려면 엔터프라이즈 라이센스가 필요합니다. 시스템 관리자에게 업그레이드를 문의해보세요."
   },
   {
+    "id": "ent.ldap.disabled.app_error",
+    "translation": "LDAP disabled or licence does not support LDAP."
+  },
+  {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
     "translation": "LDAP 서버에 연결할 수 없습니다. 계정을 확인하세요."
   },
@@ -3040,10 +3104,6 @@
     "translation": "Invalid Email attribute. Must be set."
   },
   {
-    "id": "model.config.is_valid.saml_first_name_attribute.app_error",
-    "translation": "Invalid First Name attribute. Must be set."
-  },
-  {
     "id": "model.config.is_valid.saml_idp_cert.app_error",
     "translation": "Identity Provider Public Certificate missing. Did you forget to upload it?"
   },
@@ -3056,10 +3116,6 @@
     "translation": "SAML SSO URL must be a valid URL and start with http:// or https://."
   },
   {
-    "id": "model.config.is_valid.saml_last_name_attribute.app_error",
-    "translation": "Invalid Last Name attribute. Must be set."
-  },
-  {
     "id": "model.config.is_valid.saml_private_key.app_error",
     "translation": "Service Provider Private Key missing. Did you forget to upload it?"
   },
@@ -3940,6 +3996,10 @@
     "translation": "We encountered an error finding the access token"
   },
   {
+    "id": "store.sql_oauth.get_access_data_by_user_for_app.app_error",
+    "translation": "We encountered an error finding the access token"
+  },
+  {
     "id": "store.sql_oauth.get_app.find.app_error",
     "translation": "채널을 찾을 수 없습니다"
   },
@@ -4400,6 +4460,10 @@
     "translation": "We could not get the unread message count for the user"
   },
   {
+    "id": "store.sql_user.get_unread_count_for_channel.app_error",
+    "translation": "We could not get the unread message count for the user"
+  },
+  {
     "id": "store.sql_user.migrate_theme.critical",
     "translation": "Failed to migrate User.ThemeProps to Preferences table %v"
   },
diff --git a/i18n/nl.json b/i18n/nl.json
index d7c452ed4..28dddc281 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -333,7 +333,7 @@
   },
   {
     "id": "api.channel.remove_member.user.app_error",
-    "translation": "Gebruiker om toe te voegen kon niet gevonden worden"
+    "translation": "Gebruiker om te verwijderen kon niet gevonden worden"
   },
   {
     "id": "api.channel.remove_user_from_channel.deleted.app_error",
@@ -352,6 +352,10 @@
     "translation": "Een ongeldige bijwerkings-poging van het standaard kanaal {{.Channel}} is geprobeerd"
   },
   {
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
+    "translation": "Unable to get the unread count for user_id=%v and channel_id=%v, err=%v"
+  },
+  {
     "id": "api.command.admin_only.app_error",
     "translation": "Intergratie is beperkt voor alleen beheerders."
   },
@@ -432,6 +436,18 @@
     "translation": "Ongeldige rechten om commando tokens opnieuw te genereren"
   },
   {
+    "id": "api.command_away.desc",
+    "translation": "Stel uw status in naar afwezig"
+  },
+  {
+    "id": "api.command_away.name",
+    "translation": "afwezig "
+  },
+  {
+    "id": "api.command_away.success",
+    "translation": "Je bent nu afwezig"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "Automatisch inklappen van afbeelding voorbeeldweergave aanzetten"
   },
@@ -564,6 +580,30 @@
     "translation": "Bericht verzonden."
   },
   {
+    "id": "api.command_offline.desc",
+    "translation": "Stel uw status in naar offline"
+  },
+  {
+    "id": "api.command_offline.name",
+    "translation": "offline"
+  },
+  {
+    "id": "api.command_offline.success",
+    "translation": "U bent nu offline"
+  },
+  {
+    "id": "api.command_online.desc",
+    "translation": "Stel uw status in naar Online."
+  },
+  {
+    "id": "api.command_online.name",
+    "translation": "online"
+  },
+  {
+    "id": "api.command_online.success",
+    "translation": "Je bent nu online"
+  },
+  {
     "id": "api.command_shortcuts.browser",
     "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
   },
@@ -998,6 +1038,10 @@
     "translation": "Mist een of meerdere elementen uit: response_type, client_id of redirect_uri"
   },
   {
+    "id": "api.oauth.complete_oauth.missing_code.app_error",
+    "translation": "The service provider {{.service}} did not provide an authorization code in the redirect URL.\n\nFor [Google Apps](https://docs.mattermost.com/deployment/sso-google.html) make sure your administrator enabled the Google+ API.\n\nFor [Office 365](https://docs.mattermost.com/deployment/sso-office.html) make sure the administrator of your Microsoft organization has enabled the Mattermost app.\n\nFor [GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html) please make sure you followed the setup instructions.\n\nIf you reviewed the above and are still having trouble with configuration, you may post in our [Troubleshooting forum](https://forum.mattermost.org/c/general/trouble-shoot) where we'll be happy to help with issues during setup."
+  },
+  {
     "id": "api.oauth.delete.permissions.app_error",
     "translation": "Onvoldoende rechten voor het verwijderen van de OAuth2 applicatie"
   },
@@ -1066,6 +1110,10 @@
     "translation": "Initialisatie van de oauth api"
   },
   {
+    "id": "api.oauth.regenerate_secret.app_error",
+    "translation": "Onvoldoende rechten voor het verwijderen van de OAuth2 applicatie"
+  },
+  {
     "id": "api.oauth.register_oauth_app.turn_off.app_error",
     "translation": "De systeembeheerder heeft de OAuth2 Service Provider uitgeschakeld."
   },
@@ -1216,6 +1264,10 @@
     "translation": "Unable to get profile for channel member, user_id=%v"
   },
   {
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "Clearing push notification to %v with channel_id %v"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
     "translation": "Niet gelukt om commentaar thread berichten op te halen uit notificaties root_post_id=%v, err=%v"
   },
@@ -1420,6 +1472,10 @@
     "translation": "Ongeldige 'timestamp' gevonden"
   },
   {
+    "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
+    "translation": "Failed to compile the @mention matching regular expression for Slack user {{.UserID}} {{.Username}}"
+  },
+  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Mattermost Slack importeer log\r\n"
   },
@@ -1684,7 +1740,11 @@
     "translation": "KANAAL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
-    "id": "api.templates.post_subject",
+    "id": "api.templates.post_subject_in_channel",
+    "translation": "{{.SubjectText}} op {{.TeamDisplayName}} om {{.Month}} {{.Day}} {{.Year}}"
+  },
+  {
+    "id": "api.templates.post_subject_in_direct_message",
     "translation": "{{.SubjectText}} op {{.TeamDisplayName}} om {{.Month}} {{.Day}} {{.Year}}"
   },
   {
@@ -2392,6 +2452,10 @@
     "translation": "Aangepaste emoji restricties is uitgeschakeld vanwege de huidige licentie. Neem contact op met de beheerder voor een upgrade van de licentie."
   },
   {
+    "id": "ent.ldap.disabled.app_error",
+    "translation": "LDAP disabled or licence does not support LDAP."
+  },
+  {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
     "translation": "Kan verbinding maken met de LDAP server. Controleer de opgegeven gebruikersnaam en wachtwoord."
   },
@@ -3040,10 +3104,6 @@
     "translation": "Ongeldig Email attribuut. Dit moet ingesteld worden."
   },
   {
-    "id": "model.config.is_valid.saml_first_name_attribute.app_error",
-    "translation": "Ongeldig voornaam attribuut. Dit moet ingesteld worden."
-  },
-  {
     "id": "model.config.is_valid.saml_idp_cert.app_error",
     "translation": "Publiek certificaat van Identity Provider is niet gevonden. Vergeten te uploaden?"
   },
@@ -3056,10 +3116,6 @@
     "translation": "Ongeldige URL. Een geldige URl begint met http:// of https://."
   },
   {
-    "id": "model.config.is_valid.saml_last_name_attribute.app_error",
-    "translation": "Ongeldig Achternaam attribuut. Dit moet ingesteld worden."
-  },
-  {
     "id": "model.config.is_valid.saml_private_key.app_error",
     "translation": "Service Provider Private Key mist. Wellicht vergeten deze up te loaden?"
   },
@@ -3940,6 +3996,10 @@
     "translation": "Er is een probleem opgetreden bij het ophalen van het access token"
   },
   {
+    "id": "store.sql_oauth.get_access_data_by_user_for_app.app_error",
+    "translation": "Er is een probleem opgetreden bij het ophalen van het access token"
+  },
+  {
     "id": "store.sql_oauth.get_app.find.app_error",
     "translation": "De gezochte app kan niet gevonden worden"
   },
@@ -4400,6 +4460,10 @@
     "translation": "Het aantal ongelezen berichten voor de gebruiker kan niet geteld worden"
   },
   {
+    "id": "store.sql_user.get_unread_count_for_channel.app_error",
+    "translation": "Het aantal ongelezen berichten voor de gebruiker kan niet geteld worden"
+  },
+  {
     "id": "store.sql_user.migrate_theme.critical",
     "translation": "Mislukt om de gebruiker te migreren. ThemeProps naar Voorkeuren tabel %v"
   },
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index bd1f17b60..dd6ed3823 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -325,7 +325,7 @@
   },
   {
     "id": "api.channel.remove_member.removed",
-    "translation": "%v was removed from the channel."
+    "translation": "%v foi removido do canal"
   },
   {
     "id": "api.channel.remove_member.unable.app_error",
@@ -333,7 +333,7 @@
   },
   {
     "id": "api.channel.remove_member.user.app_error",
-    "translation": "Não foi possível encontrar o usuário a ser adicionado"
+    "translation": "Não foi possível encontrar o usuário a ser removido"
   },
   {
     "id": "api.channel.remove_user_from_channel.deleted.app_error",
@@ -352,6 +352,10 @@
     "translation": "Tentou executar uma atualização inválida para o canal padrão {{.Channel}}"
   },
   {
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
+    "translation": "Não foi possível obter o número de não lidos para o user_id=%v e channel_id=%v, err=%v"
+  },
+  {
     "id": "api.command.admin_only.app_error",
     "translation": "Integrações estão limitadas a administradores somente."
   },
@@ -432,6 +436,18 @@
     "translation": "Permissões inadequadas para re-gerar o token de comando"
   },
   {
+    "id": "api.command_away.desc",
+    "translation": "Defina seu status como ausente"
+  },
+  {
+    "id": "api.command_away.name",
+    "translation": "ausente"
+  },
+  {
+    "id": "api.command_away.success",
+    "translation": "Você está agora ausente"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "Ativar auto-recolher preview de imagens"
   },
@@ -564,12 +580,36 @@
     "translation": "Mensagem enviada."
   },
   {
+    "id": "api.command_offline.desc",
+    "translation": "Defina seu status como desconectado"
+  },
+  {
+    "id": "api.command_offline.name",
+    "translation": "desconectado"
+  },
+  {
+    "id": "api.command_offline.success",
+    "translation": "Agora você está desconectado"
+  },
+  {
+    "id": "api.command_online.desc",
+    "translation": "Defina seu status como conectado"
+  },
+  {
+    "id": "api.command_online.name",
+    "translation": "conectado"
+  },
+  {
+    "id": "api.command_online.success",
+    "translation": "Você está agora conectado"
+  },
+  {
     "id": "api.command_shortcuts.browser",
-    "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+    "translation": "#### Comandos Nativos do Navegador\n\nALT+LEFT: Canal anterior no seu histórico\nALT+RIGHT: Próximo canal no seu histórico\nCTRL+PLUS: Aumenta o tamanho da fonte (zoom in)\nCTRL+MINUS: Diminui o tamanho da fonte (zoom out)\nSHIFT+UP (no campo de entrada): Seleciona o texto até a linha anterior\nSHIFT+DOWN (no campo de entrada): Seleciona o texto até a próxima linha\nSHIFT+ENTER (no campo de entrada): Cria nova linha\n"
   },
   {
     "id": "api.command_shortcuts.browser_mac",
-    "translation": "#### Built-in Browser Commands\n\nCMD+[: Previous channel in your history\nCMD+]: Next channel in your history\nCMD+PLUS: Increase font size (zoom in)\nCMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+    "translation": "#### Comandos Nativos do Navegador\n\nCMD+[: Canal anterior no seu histórico\nCMD+]: Próximo canal no seu histórico\nCMD+PLUS: Aumenta o tamanho da fonte (zoom in)\nCMD+MINUS: Diminui o tamanho da fonte (zoom out)\nSHIFT+UP (no campo de entrada): Seleciona o texto até a linha anterior\nSHIFT+DOWN (no campo de entrada): Seleciona o texto até a próxima linha\nSHIFT+ENTER (no campo de entrada): Cria nova linha\n"
   },
   {
     "id": "api.command_shortcuts.desc",
@@ -577,19 +617,19 @@
   },
   {
     "id": "api.command_shortcuts.files",
-    "translation": "#### Files\n\nCTRL+U: Upload file(s)\n\n"
+    "translation": "#### Arquivos\n\nCTRL+U: Enviar arquivo(s)\n\n"
   },
   {
     "id": "api.command_shortcuts.files_mac",
-    "translation": "#### Files\n\nCMD+U: Upload file(s)\n\n"
+    "translation": "#### Arquivos\n\nCMD+U: Enviar arquivo(s)\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": "#### Mensagens\n\nESC: Marca todas as mensagens do canal atual como lida\nCTRL+UP (campo de entrada vazio): Reimprimi a mensagem anterior ou comando slash digitado\nCTRL+DOWN (campo de entrada vazio): Reimprimi a próxima mensagem ou comando slash digitado\nUP (campo de entrada vazio): Editar sua última mensagem no canal atual\n@[caracter]+TAB: Autocompleta @usuário começando com [caracter]\n:[caracter]+TAB: Autocompleta o emoji começando com [caracter]\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": "#### Mensagens\n\nESC: Marca todas as mensagens do canal atual como lida\nCMD+UP (campo de entrada vazio): Reimprimi a mensagem anterior ou comando slash digitado\nCMD+DOWN (campo de entrada vazio): Reimprimi a próxima mensagem ou comando slash digitado\nUP (campo de entrada vazio): Editar sua última mensagem no canal atual\n@[caracter]+TAB: Autocompleta @usuário começando com [caracter]\n:[caracter]+TAB: Autocompleta o emoji começando com [caracter]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -597,11 +637,11 @@
   },
   {
     "id": "api.command_shortcuts.nav",
-    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL+K: Open a quick channel switcher dialog\nCTRL+SHIFT+A: Open account settings\nCTRL+SHIFT+M: Open recent mentions\n\n"
+    "translation": "### Atalhos do Teclado\n\n#### Navegação\n\nALT+UP: Canal ou mensagem direta anterior na barra lateral esquerda\nALT+DOWN: Próximo canal ou mensagem direta na barra lateral esquerda\nALT+SHIFT+UP: Canal anterior ou mensagem direta na barra lateral esquerda com mensagens não lidas\nALT+SHIFT+DOWN: Próximo canal ou mensagem direta na barra lateral esquerda com mensagens não lidas\nCTRL+K: Abra uma janela de troca rápida de canal\nCTRL+SHIFT+A: Abre as configurações de conta\nCTRL+SHIFT+M: Abre as menções recentes\n\n"
   },
   {
     "id": "api.command_shortcuts.nav_mac",
-    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n"
+    "translation": "### Atalhos do Teclado\n\n#### Navegação\n\nALT+UP: Canal ou mensagem direta anterior na barra lateral esquerda\nALT+DOWN: Próximo canal ou mensagem direta na barra lateral esquerda\nALT+SHIFT+UP: Canal anterior ou mensagem direta na barra lateral esquerda com mensagens não lidas\nALT+SHIFT+DOWN: Próximo canal ou mensagem direta na barra lateral esquerda com mensagens não lidas\nCMD+K: Abra uma janela de troca rápida de canal\nCMD+SHIFT+A: Abre as configurações de conta\nCMD+SHIFT+M: Abre as menções recentes\n\n"
   },
   {
     "id": "api.command_shrug.desc",
@@ -708,7 +748,7 @@
   },
   {
     "id": "api.email_batching.send_batched_email_notification.send.app_error",
-    "translation": "Failed to send batched email notification to %v: %v"
+    "translation": "Falha ou enviar notificações por email em lote para %v: %v"
   },
   {
     "id": "api.email_batching.send_batched_email_notification.subject",
@@ -719,11 +759,11 @@
   },
   {
     "id": "api.email_batching.send_batched_email_notification.user.app_error",
-    "translation": "Não foi possível encontrar o status do destinatário para a notificação de e-mail em lote"
+    "translation": "Não foi possível encontrar o o destinatário para a notificação de e mail em lote"
   },
   {
     "id": "api.email_batching.start.starting",
-    "translation": "Email batching job starting. Checking for pending emails every %v seconds."
+    "translation": "Iniciando tarefa de email em lote. Verificando por emails pendentes a cada %v segundos."
   },
   {
     "id": "api.emoji.create.duplicate.app_error",
@@ -998,6 +1038,10 @@
     "translation": "Faltando um ou mais response_type, client_id, ou redirect_uri"
   },
   {
+    "id": "api.oauth.complete_oauth.missing_code.app_error",
+    "translation": "The service provider {{.service}} did not provide an authorization code in the redirect URL.\n\nFor [Google Apps](https://docs.mattermost.com/deployment/sso-google.html) make sure your administrator enabled the Google+ API.\n\nFor [Office 365](https://docs.mattermost.com/deployment/sso-office.html) make sure the administrator of your Microsoft organization has enabled the Mattermost app.\n\nFor [GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html) please make sure you followed the setup instructions.\n\nIf you reviewed the above and are still having trouble with configuration, you may post in our [Troubleshooting forum](https://forum.mattermost.org/c/general/trouble-shoot) where we'll be happy to help with issues during setup."
+  },
+  {
     "id": "api.oauth.delete.permissions.app_error",
     "translation": "Permissão inapropriada para deletar o App OAuth2"
   },
@@ -1066,6 +1110,10 @@
     "translation": "Inicializando oauth api routes"
   },
   {
+    "id": "api.oauth.regenerate_secret.app_error",
+    "translation": "Permissão inapropriada para gerar novo OAuth2 App Secret"
+  },
+  {
     "id": "api.oauth.register_oauth_app.turn_off.app_error",
     "translation": "O administrador do sistema desligou o Provedor de Serviço OAuth2."
   },
@@ -1127,7 +1175,7 @@
   },
   {
     "id": "api.post.delete_flagged_post.app_error.warn",
-    "translation": "Unable to delete flagged post preference when deleting post, err=%v"
+    "translation": "Não é possível deletar a preferencia da postagem marcada ao deletar a postagem, err=%v"
   },
   {
     "id": "api.post.delete_post.permissions.app_error",
@@ -1209,11 +1257,15 @@
   },
   {
     "id": "api.post.notification.here.warn",
-    "translation": "Não foi possível enviar a notificação para os usuários online com @here, err=%v"
+    "translation": "Não foi possível enviar a notificação para os usuários conectados usando @here, err=%v"
   },
   {
     "id": "api.post.notification.member_profile.warn",
-    "translation": "Unable to get profile for channel member, user_id=%v"
+    "translation": "Não foi possível obter o perfil do membro do canal, user_id=%v"
+  },
+  {
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "Limpando notificação push para %v com channel_id %v"
   },
   {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
@@ -1257,7 +1309,7 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "Falha ao enviar notificação push id=%v, err=%v"
+    "translation": "Falha ao enviar notificação push device_id=%v, err=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.send.error",
@@ -1420,6 +1472,10 @@
     "translation": "Data e hora ruim detectada"
   },
   {
+    "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
+    "translation": "Falha ao compilar a @menção correspondendo a expressão regular para o usuário Slack {{.UserID}} {{.Username}}"
+  },
+  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Mattermost Log de Importação Slack\r\n"
   },
@@ -1684,8 +1740,12 @@
     "translation": "CANAL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
-    "id": "api.templates.post_subject",
-    "translation": "{{.SubjectText}} no {{.TeamDisplayName}} em {{.Month}} {{.Day}}, {{.Year}}"
+    "id": "api.templates.post_subject_in_channel",
+    "translation": "{{.SubjectText}} de {{.TeamDisplayName}} ({{.ChannelName}}) em {{.Day}} {{.Month}}, {{.Year}}"
+  },
+  {
+    "id": "api.templates.post_subject_in_direct_message",
+    "translation": "{{.SubjectText}} de {{.TeamDisplayName}} para {{.SenderDisplayName}} em {{.Day}} {{.Month}}, {{.Year}}"
   },
   {
     "id": "api.templates.reset_body.button",
@@ -2392,6 +2452,10 @@
     "translation": "Emoji personalizado desabilitado pela licença atual. Entre em contato com o administrador do sistema sobre como atualizar sua licença enterprise."
   },
   {
+    "id": "ent.ldap.disabled.app_error",
+    "translation": "LDAP desabilitado ou licença não suporta LDAP."
+  },
+  {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
     "translation": "Não foi possível ligar ao servidor LDAP. Verifique BindUsername e BindPassword."
   },
@@ -2881,15 +2945,15 @@
   },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
-    "translation": "Unable to enable email batching when clustering is enabled"
+    "translation": "Não é possível ativar email em lote quando clustering está ativo"
   },
   {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
-    "translation": "Invalid email batching buffer size for email settings.  Must be zero or a positive number."
+    "translation": "Tamanho do buffer de email em lote inválido nas configurações de e-mail.  Deve ser zero ou um número positivo."
   },
   {
     "id": "model.config.is_valid.email_batching_interval.app_error",
-    "translation": "Invalid email batching interval for email settings.  Must be 30 seconds or more."
+    "translation": "Intervalo de email em lote inválido nas configurações de e-mail. Deve ser 30 segundos ou mais."
   },
   {
     "id": "model.config.is_valid.email_reset_salt.app_error",
@@ -3040,10 +3104,6 @@
     "translation": "Atributo Email Inválido. Deve ser definido."
   },
   {
-    "id": "model.config.is_valid.saml_first_name_attribute.app_error",
-    "translation": "Atributo Primeiro Nome Inválido. Deve ser definido."
-  },
-  {
     "id": "model.config.is_valid.saml_idp_cert.app_error",
     "translation": "Faltando Certificado Público do Provedor de Identidade. Esqueceu-se de carregá-lo?"
   },
@@ -3056,10 +3116,6 @@
     "translation": "URL SAML SSO deve ser uma URL válida e começar com http:// ou https://."
   },
   {
-    "id": "model.config.is_valid.saml_last_name_attribute.app_error",
-    "translation": "Atributo Último Nome Inválido. Deve ser definido."
-  },
-  {
     "id": "model.config.is_valid.saml_private_key.app_error",
     "translation": "Chave Privada do Provedor de Serviço. Esqueceu-se de carregá-lo?"
   },
@@ -3077,7 +3133,7 @@
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
-    "translation": "Unable to enable email batching when SiteURL isn't set."
+    "translation": "Não é possível ativar o email em lote quando SiteURL não está definido."
   },
   {
     "id": "model.config.is_valid.sitename_length.app_error",
@@ -3940,6 +3996,10 @@
     "translation": "Encontramos um erro ao procurar o token de acesso"
   },
   {
+    "id": "store.sql_oauth.get_access_data_by_user_for_app.app_error",
+    "translation": "Encontramos um erro ao procurar todos os token de acesso"
+  },
+  {
     "id": "store.sql_oauth.get_app.find.app_error",
     "translation": "Não foi possível encontrar o app solicitado"
   },
@@ -4217,11 +4277,11 @@
   },
   {
     "id": "store.sql_status.get_online.app_error",
-    "translation": "Encontrado um erro ao obter todos os status online"
+    "translation": "Encontrado um erro ao obter todos os status conectados"
   },
   {
     "id": "store.sql_status.get_online_away.app_error",
-    "translation": "Encontrado um erro ao obter todos os status online/ausente"
+    "translation": "Encontrado um erro ao obter todos os status conectado/ausente"
   },
   {
     "id": "store.sql_status.get_total_active_users_count.app_error",
@@ -4400,6 +4460,10 @@
     "translation": "Não foi possível obter o número de mensagens não lidas para o usuário"
   },
   {
+    "id": "store.sql_user.get_unread_count_for_channel.app_error",
+    "translation": "Não foi possível obter o número de mensagens não lidas para o usuário e canal"
+  },
+  {
     "id": "store.sql_user.migrate_theme.critical",
     "translation": "Migração do usuário falhou. ThemeProps to Preferences table %v"
   },
diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index f32d68e0a..97fd99435 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -105,7 +105,7 @@
   },
   {
     "id": "api.admin.test_email.reenter_password",
-    "translation": "SMTP服务，端口或者用户名已经被修改。请重新输入SMTP密码进行连接测试。"
+    "translation": "SMTP 服务器地址、端口或者用户名已经被修改。请重新输入 SMTP 密码进行连接测试。"
   },
   {
     "id": "api.admin.test_email.subject",
@@ -149,7 +149,7 @@
   },
   {
     "id": "api.channel.add_member.added",
-    "translation": "%v 添加到频道 %v"
+    "translation": "%v 由 %v 邀请加入频道"
   },
   {
     "id": "api.channel.add_member.find_channel.app_error",
@@ -169,7 +169,7 @@
   },
   {
     "id": "api.channel.add_user.to.channel.failed.deleted.app_error",
-    "translation": "无法将用户添加到频道因用户已从团队中移除。"
+    "translation": "无法将用户添加到频道，因为用户已从团队中移除。"
   },
   {
     "id": "api.channel.add_user_to_channel.deleted.app_error",
@@ -193,7 +193,7 @@
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
-    "translation": "只有团体和系统管理员能管理与创建公开频道。"
+    "translation": "只有团队和系统管理员能创建与管理公开频道。"
   },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
@@ -301,19 +301,19 @@
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.removed",
-    "translation": "%s 删除频道标语 (原为: %s)"
+    "translation": "%s 删除了频道标题 (原为: %s)"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.retrieve_user.error",
-    "translation": "尝试获取用户同时保存更新频标语消息时失败 %v"
+    "translation": "尝试保存更新的频道标题消息 %v 时获取用户信息失败"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.updated_from",
-    "translation": "%s 更新频道标语从: %s 到: %s"
+    "translation": "%s 将频道标题从 %s 更新为 %s"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.updated_to",
-    "translation": "%s 更新频道标语为: %s"
+    "translation": "%s 更新频道标题为: %s"
   },
   {
     "id": "api.channel.post_user_add_remove_message_and_forget.error",
@@ -349,7 +349,11 @@
   },
   {
     "id": "api.channel.update_channel.tried.app_error",
-    "translation": "对一个默认频道试图执行一个无效的更新 {{.Channel}}"
+    "translation": "对默认频道试图执行一个无效的更新 {{.Channel}}"
+  },
+  {
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
+    "translation": "无法获取 user_id=%v 以及 channel_id=%v 的未读数量，err=%v"
   },
   {
     "id": "api.command.admin_only.app_error",
@@ -389,7 +393,7 @@
   },
   {
     "id": "api.command.execute_command.save.app_error",
-    "translation": "保存回复到频道出错"
+    "translation": "保存命令响应到频道时出错"
   },
   {
     "id": "api.command.execute_command.start.app_error",
@@ -432,6 +436,18 @@
     "translation": "没有重新生成命令令牌的权限"
   },
   {
+    "id": "api.command_away.desc",
+    "translation": "设置您的状态设为离开"
+  },
+  {
+    "id": "api.command_away.name",
+    "translation": "离开"
+  },
+  {
+    "id": "api.command_away.success",
+    "translation": "您现在离开了"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "打开图像预览自动折叠"
   },
@@ -564,12 +580,36 @@
     "translation": "消息已发送给用户。"
   },
   {
+    "id": "api.command_offline.desc",
+    "translation": "设置您的状态设为离线"
+  },
+  {
+    "id": "api.command_offline.name",
+    "translation": "离线"
+  },
+  {
+    "id": "api.command_offline.success",
+    "translation": "您现在离线了"
+  },
+  {
+    "id": "api.command_online.desc",
+    "translation": "设置您的状态设为在线"
+  },
+  {
+    "id": "api.command_online.name",
+    "translation": "在线"
+  },
+  {
+    "id": "api.command_online.success",
+    "translation": "您现在在线了"
+  },
+  {
     "id": "api.command_shortcuts.browser",
-    "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+    "translation": "#### 浏览器自带命令\n\nALT+向左键：您历史里的上一个频道\nALT+向右键：您历史里的下一个频道\nCTRL+加号：加大字体大小 (放大)\nCTRL+减号：减小字体大小 (缩小)\nSHIFT+向上键 (在输入框)：高亮字到上一行\nSHIFT+向下键 (在输入框)：高亮字到下一行\nSHIFT+回车 (在输入框)：创建新一行\n"
   },
   {
     "id": "api.command_shortcuts.browser_mac",
-    "translation": "#### Built-in Browser Commands\n\nCMD+[: Previous channel in your history\nCMD+]: Next channel in your history\nCMD+PLUS: Increase font size (zoom in)\nCMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+    "translation": "#### 浏览器自带命令\n\nCMD +[：您历史里的上一个频道\nCMD +]：您历史里的下一个频道\nCMD +加号：加大字体大小 (放大)\nCMD +减号：减小字体大小 (缩小)\nSHIFT+向上键 (在输入框)：高亮字到上一行\nSHIFT+向下键 (在输入框)：高亮字到下一行\nSHIFT+回车 (在输入框)：创建新一行\n"
   },
   {
     "id": "api.command_shortcuts.desc",
@@ -577,19 +617,19 @@
   },
   {
     "id": "api.command_shortcuts.files",
-    "translation": "#### Files\n\nCTRL+U: Upload file(s)\n\n"
+    "translation": "#### 文件\n\nCTRL+U：上传文件\n\n"
   },
   {
     "id": "api.command_shortcuts.files_mac",
-    "translation": "#### Files\n\nCMD+U: Upload file(s)\n\n"
+    "translation": "#### 文件\n\nCMD+U：上传文件\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": "#### 消息\n\nESC：标此频道所有消息为已读\nCTRL+向上键 (在空输入框)：重输入您上个输入的消息或斜杠命令\nCTRL+向下键 (在空输入框)：重输入您下个输入的消息或斜杠命令\n向上键 (在空输入框)：编辑你在本频道发的上一条消息\n@[字]+TAB：自动完成以[字]开头的 @用户名\n:[字]+TAB: 自动完成以[字]开头的表情符\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": "#### 消息\n\nESC：标此频道所有消息为已读\nCMD +向上键 (在空输入框)：重输入您上个输入的消息或斜杠命令\nCMD +向下键 (在空输入框)：重输入您下个输入的消息或斜杠命令\n向上键 (在空输入框)：编辑你在本频道发的上一条消息\n@[字]+TAB：自动完成以[字]开头的 @用户名\n:[字]+TAB: 自动完成以[字]开头的表情符\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -597,11 +637,11 @@
   },
   {
     "id": "api.command_shortcuts.nav",
-    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL+K: Open a quick channel switcher dialog\nCTRL+SHIFT+A: Open account settings\nCTRL+SHIFT+M: Open recent mentions\n\n"
+    "translation": "### 键盘快捷键\n\n#### 导航\n\nALT+向上键：左栏中上一频道或私信\nALT+向下键：左栏中下一频道或私信\nALT+SHIFT+向上键：左栏中上一个有未读消息的频道或私信\nALT+SHIFT+向下键：左栏中下一个有未读消息的频道或私信\nCTRL+K：打开快速频道切换对话框\nCTRL+SHIFT+A：打开帐号设定\nCTRL+SHIFT+M：打开最近提及\n\n"
   },
   {
     "id": "api.command_shortcuts.nav_mac",
-    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n"
+    "translation": "### 键盘快捷键\n\n#### 导航\n\nALT+向上键：左栏中上一频道或私信\nALT+向下键：左栏中下一频道或私信\nALT+SHIFT+向上键：左栏中上一个有未读消息的频道或私信\nALT+SHIFT+向下键：左栏中下一个有未读消息的频道或私信\nCMD +K：打开快速频道切换对话框\nCMD +SHIFT+A：打开帐号设定\nCMD +SHIFT+M：打开最近提及\n\n"
   },
   {
     "id": "api.command_shrug.desc",
@@ -609,7 +649,7 @@
   },
   {
     "id": "api.command_shrug.hint",
-    "translation": "[message]"
+    "translation": "[信息]"
   },
   {
     "id": "api.command_shrug.name",
@@ -677,7 +717,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.channel.app_error",
-    "translation": "无法找到批量电子邮件通知的贴文频道"
+    "translation": "无法找到批量电子邮件通知信息的频道"
   },
   {
     "id": "api.email_batching.render_batched_post.date",
@@ -903,7 +943,7 @@
   },
   {
     "id": "api.import.import_post.saving.debug",
-    "translation": "保存帖子时出错。user=%v，message=%v"
+    "translation": "保存信息时出错。user=%v，message=%v"
   },
   {
     "id": "api.import.import_user.join_team.error",
@@ -911,7 +951,7 @@
   },
   {
     "id": "api.import.import_user.joining_default.error",
-    "translation": "加入默认频道遇到一个问题 user_id=%s, team_id=%s, err=%v"
+    "translation": "加入默认频道时遇到一个问题 user_id=%s, team_id=%s, err=%v"
   },
   {
     "id": "api.import.import_user.saving.error",
@@ -998,6 +1038,10 @@
     "translation": "response_type, client_id, 或 redirect_uri 至少却一项"
   },
   {
+    "id": "api.oauth.complete_oauth.missing_code.app_error",
+    "translation": "The service provider {{.service}} did not provide an authorization code in the redirect URL.\n\nFor [Google Apps](https://docs.mattermost.com/deployment/sso-google.html) make sure your administrator enabled the Google+ API.\n\nFor [Office 365](https://docs.mattermost.com/deployment/sso-office.html) make sure the administrator of your Microsoft organization has enabled the Mattermost app.\n\nFor [GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html) please make sure you followed the setup instructions.\n\nIf you reviewed the above and are still having trouble with configuration, you may post in our [Troubleshooting forum](https://forum.mattermost.org/c/general/trouble-shoot) where we'll be happy to help with issues during setup."
+  },
+  {
     "id": "api.oauth.delete.permissions.app_error",
     "translation": "没有权限删除 OAuth2 应用"
   },
@@ -1066,6 +1110,10 @@
     "translation": "初始化认证API路由"
   },
   {
+    "id": "api.oauth.regenerate_secret.app_error",
+    "translation": "没有权限重新生成 OAuth2 应用秘钥"
+  },
+  {
     "id": "api.oauth.register_oauth_app.turn_off.app_error",
     "translation": "系统管理员已经关闭的 OAuth2 服务商。"
   },
@@ -1111,7 +1159,7 @@
   },
   {
     "id": "api.post.create_post.last_viewed.error",
-    "translation": "更新上次访问遇到错误，channel_id=%s, user_id=%s, err=%v"
+    "translation": "更新最近浏览记录遇到错误，channel_id=%s, user_id=%s, err=%v"
   },
   {
     "id": "api.post.create_post.parent_id.app_error",
@@ -1127,7 +1175,7 @@
   },
   {
     "id": "api.post.delete_flagged_post.app_error.warn",
-    "translation": "Unable to delete flagged post preference when deleting post, err=%v"
+    "translation": "无法在删除信息时删除标记偏好，err=%v"
   },
   {
     "id": "api.post.delete_post.permissions.app_error",
@@ -1201,11 +1249,11 @@
   },
   {
     "id": "api.post.make_direct_channel_visible.save_pref.error",
-    "translation": "保存私聊频道优先级失败 user_id=%v other_user_id=%v err=%v"
+    "translation": "保存私信频道设置失败 user_id=%v other_user_id=%v err=%v"
   },
   {
     "id": "api.post.make_direct_channel_visible.update_pref.error",
-    "translation": "更新死里爱哦频道优先级失败 user_id=%v other_user_id=%v err=%v"
+    "translation": "更新私信频道设置失败 user_id=%v other_user_id=%v err=%v"
   },
   {
     "id": "api.post.notification.here.warn",
@@ -1216,16 +1264,20 @@
     "translation": "无法获取频道成员个人资料，user_id=%v"
   },
   {
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "清除 %v 拥有 channel_id %v 的通知中"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
     "translation": "在发送通知时获取注解内容时失败 root_post_id=%v, err=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.mention_body",
-    "translation": "你有一个新的提到。"
+    "translation": "您有一个新的提及。"
   },
   {
     "id": "api.post.send_notifications_and_forget.mention_subject",
-    "translation": "新提到"
+    "translation": "新的提及"
   },
   {
     "id": "api.post.send_notifications_and_forget.message_body",
@@ -1253,11 +1305,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.debug",
-    "translation": "发送推送通知到 %v wi msg of '%v'"
+    "translation": "发送拥有信息 '%v' 的推送通知到 %v"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "发送推送失败notificationid=%v, err=%v"
+    "translation": "发送推送失败 device_id=%v, err=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.send.error",
@@ -1281,7 +1333,7 @@
   },
   {
     "id": "api.post.update_post.find.app_error",
-    "translation": "我们找不到现有的文章或评论去更新。"
+    "translation": "我们找不到现有的信息或评论去更新。"
   },
   {
     "id": "api.post.update_post.permissions.app_error",
@@ -1420,6 +1472,10 @@
     "translation": "检测到错误的时间"
   },
   {
+    "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
+    "translation": "给 Slack 用户 {{.UserID}} {{.Username}} 编译 @提及 正规表达式时失败"
+  },
+  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Mattermost Slack 导入日志 \r\n"
   },
@@ -1597,15 +1653,15 @@
   },
   {
     "id": "api.templates.email_change_verify_body.info",
-    "translation": "完成更新您在{{.TeamDisplayName}}的电子邮件地址，请点击下面的链接以确认这是正确的地址。"
+    "translation": "请点击下面的链接确认这是正确的地址，以完成在{{.TeamDisplayName}}的电子邮件地址更新。"
   },
   {
     "id": "api.templates.email_change_verify_body.title",
-    "translation": "您更新您的电子邮件"
+    "translation": "您已更新电子邮件地址"
   },
   {
     "id": "api.templates.email_change_verify_subject",
-    "translation": "验证新的电子邮件地址 {{.TeamDisplayName}}"
+    "translation": "验证在 {{.TeamDisplayName}} 上的新电子邮件地址"
   },
   {
     "id": "api.templates.email_footer",
@@ -1617,7 +1673,7 @@
   },
   {
     "id": "api.templates.email_organization",
-    "translation": "发送人"
+    "translation": "发送人 "
   },
   {
     "id": "api.templates.error.link",
@@ -1641,7 +1697,7 @@
   },
   {
     "id": "api.templates.find_teams_subject",
-    "translation": "你的团队 {{ .SiteName }} "
+    "translation": "你在 {{ .SiteName }} 的团队"
   },
   {
     "id": "api.templates.invite_body.button",
@@ -1684,8 +1740,12 @@
     "translation": "频道: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
-    "id": "api.templates.post_subject",
-    "translation": "{{.SubjectText}} 在 {{.TeamDisplayName}} 日期 {{.Month}} {{.Day}}, {{.Year}}"
+    "id": "api.templates.post_subject_in_channel",
+    "translation": "{{.SubjectText}} 在 {{.TeamDisplayName}} ({{.ChannelName}}) 于 {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
+    "id": "api.templates.post_subject_in_direct_message",
+    "translation": "{{.SubjectText}} 在 {{.TeamDisplayName}} 来自 {{.SenderDisplayName}} 于 {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
     "id": "api.templates.reset_body.button",
@@ -2233,11 +2293,11 @@
   },
   {
     "id": "api.webhook.create_outgoing.intersect.app_error",
-    "translation": "同样的频道的传出的webhooks不能具有同样的触发词/回调URLs。"
+    "translation": "同一频道的传出 webhooks 不能具有同样的触发词/回调URLs。"
   },
   {
     "id": "api.webhook.create_outgoing.not_open.app_error",
-    "translation": "传出的webhooks只能创建公共频道。"
+    "translation": "只有公共频道可以创建传出 webhooks。"
   },
   {
     "id": "api.webhook.create_outgoing.permissions.app_error",
@@ -2293,7 +2353,7 @@
   },
   {
     "id": "api.websocket_handler.invalid_param.app_error",
-    "translation": "无效的参数 {{.Name}} "
+    "translation": "无效的参数 {{.Name}}"
   },
   {
     "id": "cli.license.critical",
@@ -2392,24 +2452,28 @@
     "translation": "当前许可证禁用了自定义表情符。请联系您的系统管理员关于升级您的企业许可证。"
   },
   {
+    "id": "ent.ldap.disabled.app_error",
+    "translation": "LDAP 已禁用或许可证不支持 LDAP。"
+  },
+  {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
     "translation": "无法绑定到LDAP服务器。请检查 BindUsername 和 BindPassword。"
   },
   {
     "id": "ent.ldap.do_login.invalid_password.app_error",
-    "translation": "无效密码"
+    "translation": "无效的密码"
   },
   {
     "id": "ent.ldap.do_login.licence_disable.app_error",
-    "translation": "LDAP功能禁用当前许可证，请联系您的系统管理员关于升级您的企业许可证。"
+    "translation": "当前许可证无法使用 LDAP 功能，请联系您的系统管理员关于升级您的企业许可证。"
   },
   {
     "id": "ent.ldap.do_login.matched_to_many_users.app_error",
-    "translation": "给定多个用户的用户名"
+    "translation": "提供的用户名有多个用户"
   },
   {
     "id": "ent.ldap.do_login.search_ldap_server.app_error",
-    "translation": "没有搜索LDAP服务器"
+    "translation": "搜索 LDAP 服务器失败"
   },
   {
     "id": "ent.ldap.do_login.unable_to_connect.app_error",
@@ -2433,7 +2497,7 @@
   },
   {
     "id": "ent.ldap.syncdone.info",
-    "translation": "LDAP同步完成"
+    "translation": "LDAP 同步完成"
   },
   {
     "id": "ent.ldap.syncronize.get_all.app_error",
@@ -2441,7 +2505,7 @@
   },
   {
     "id": "ent.ldap.validate_filter.app_error",
-    "translation": "无效的LDAP筛选器"
+    "translation": "无效的 LDAP 筛选器"
   },
   {
     "id": "ent.mfa.activate.authenticate.app_error",
@@ -2465,7 +2529,7 @@
   },
   {
     "id": "ent.mfa.generate_qr_code.create_code.app_error",
-    "translation": "QR码生成出错"
+    "translation": "QR 码生成出错"
   },
   {
     "id": "ent.mfa.generate_qr_code.save_secret.app_error",
@@ -2541,7 +2605,7 @@
   },
   {
     "id": "ent.saml.license_disable.app_error",
-    "translation": "您的证书不支持SAML验证。"
+    "translation": "您的证书不支持 SAML 验证。"
   },
   {
     "id": "ent.saml.metadata.app_error",
@@ -2557,7 +2621,7 @@
   },
   {
     "id": "error.generic.link_message",
-    "translation": "返回到Mattermost"
+    "translation": "返回到 Mattermost"
   },
   {
     "id": "error.generic.message",
@@ -2597,7 +2661,7 @@
   },
   {
     "id": "manaultesting.get_channel_id.no_found.debug",
-    "translation": "找不到频道: %v, %v 易搜索"
+    "translation": "找不到频道：%v，已搜索 %v 可能性"
   },
   {
     "id": "manaultesting.get_channel_id.unable.debug",
@@ -2617,11 +2681,11 @@
   },
   {
     "id": "manaultesting.manual_test.uid.debug",
-    "translation": "URL没有UID"
+    "translation": "URL 中没有 UID"
   },
   {
     "id": "manaultesting.test_autolink.info",
-    "translation": "手动自环测试"
+    "translation": "手动自动连接测试"
   },
   {
     "id": "manaultesting.test_autolink.unable.app_error",
@@ -2629,11 +2693,11 @@
   },
   {
     "id": "mattermost.bulletin.subject",
-    "translation": "Mattermost安全公告"
+    "translation": "Mattermost 安全公告"
   },
   {
     "id": "mattermost.config_file",
-    "translation": "加载配置文件从 %v"
+    "translation": "从 %v 加载配置文件"
   },
   {
     "id": "mattermost.current_version",
@@ -2657,11 +2721,11 @@
   },
   {
     "id": "mattermost.security_checks.debug",
-    "translation": "检查安全更新从Mattermost"
+    "translation": "检查 Mattermost 安全更新中"
   },
   {
     "id": "mattermost.security_info.error",
-    "translation": "未能从Mattermost获得安全更新信息。"
+    "translation": "未能从 Mattermost 获得安全更新信息。"
   },
   {
     "id": "mattermost.send_bulletin.info",
@@ -2745,7 +2809,7 @@
   },
   {
     "id": "model.channel.is_valid.header.app_error",
-    "translation": "无效头"
+    "translation": "无效标题"
   },
   {
     "id": "model.channel.is_valid.id.app_error",
@@ -2757,7 +2821,7 @@
   },
   {
     "id": "model.channel.is_valid.purpose.app_error",
-    "translation": "无效目的"
+    "translation": "无效用途"
   },
   {
     "id": "model.channel.is_valid.type.app_error",
@@ -2769,7 +2833,7 @@
   },
   {
     "id": "model.channel_member.is_valid.channel_id.app_error",
-    "translation": "无效频道id"
+    "translation": "无效的频道id"
   },
   {
     "id": "model.channel_member.is_valid.notify_level.app_error",
@@ -2781,7 +2845,7 @@
   },
   {
     "id": "model.channel_member.is_valid.unread_level.app_error",
-    "translation": "无效标记未读的级别"
+    "translation": "无效的未读标记级别"
   },
   {
     "id": "model.channel_member.is_valid.user_id.app_error",
@@ -2837,7 +2901,7 @@
   },
   {
     "id": "model.command.is_valid.trigger.app_error",
-    "translation": "无效trigger"
+    "translation": "无效的触发"
   },
   {
     "id": "model.command.is_valid.update_at.app_error",
@@ -2881,7 +2945,7 @@
   },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
-    "translation": "Unable to enable email batching when clustering is enabled"
+    "translation": "当机群启用时没法启动批量电子邮件"
   },
   {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
@@ -2929,7 +2993,7 @@
   },
   {
     "id": "model.config.is_valid.file_salt.app_error",
-    "translation": "文件设置中公共链接无效.  至少32位及以上字符."
+    "translation": "文件设置中的公共链接盐无效。必须至少32位字符。"
   },
   {
     "id": "model.config.is_valid.file_thumb_height.app_error",
@@ -3005,11 +3069,11 @@
   },
   {
     "id": "model.config.is_valid.max_file_size.app_error",
-    "translation": "文件设置中最大数值设定无效.  必须是0或者正整数."
+    "translation": "文件设置中最大大小无效。必须是0或者正整数。"
   },
   {
     "id": "model.config.is_valid.max_users.app_error",
-    "translation": "团队设置中一个团队的最大用户数无效. 必须是正整数."
+    "translation": "团队设置中每团队的最大用户数无效。必须是正整数。"
   },
   {
     "id": "model.config.is_valid.password_length.app_error",
@@ -3021,15 +3085,15 @@
   },
   {
     "id": "model.config.is_valid.rate_mem.app_error",
-    "translation": "内存大小限制撤职无效.  必须是正整数"
+    "translation": "用于速率的内存大小设置无效。必须是正整数"
   },
   {
     "id": "model.config.is_valid.rate_sec.app_error",
-    "translation": "速率限制设置无效. 必须是正整数"
+    "translation": "速率限制设置无效。必须是正整数"
   },
   {
     "id": "model.config.is_valid.restrict_direct_message.app_error",
-    "translation": "禁止私人消息。必须为'any'或者'team'。"
+    "translation": "无效的私信限制。必须为 'any' 或 'team'"
   },
   {
     "id": "model.config.is_valid.saml_assertion_consumer_service_url.app_error",
@@ -3040,10 +3104,6 @@
     "translation": "无效的电子邮件属性。此属性必须设定。"
   },
   {
-    "id": "model.config.is_valid.saml_first_name_attribute.app_error",
-    "translation": "无效的名字属性。此属性必须设定。"
-  },
-  {
     "id": "model.config.is_valid.saml_idp_cert.app_error",
     "translation": "找不到身份识别提供商公开凭证。您忘了上传？"
   },
@@ -3056,10 +3116,6 @@
     "translation": "SAML SSO网址必须为有效URL并且以 http:// 或 https:// 开头。"
   },
   {
-    "id": "model.config.is_valid.saml_last_name_attribute.app_error",
-    "translation": "无效的姓氏属性。此属性必须设定。"
-  },
-  {
     "id": "model.config.is_valid.saml_private_key.app_error",
     "translation": "找不到服务提供商私钥。您忘了上传？"
   },
@@ -3077,7 +3133,7 @@
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
-    "translation": "Unable to enable email batching when SiteURL isn't set."
+    "translation": "当SiteURL未设置时没法启动批量电子邮件。"
   },
   {
     "id": "model.config.is_valid.sitename_length.app_error",
@@ -3085,19 +3141,19 @@
   },
   {
     "id": "model.config.is_valid.sql_data_src.app_error",
-    "translation": "SQL设置中数据源无效.  必须重设."
+    "translation": "SQL 设置中的数据源无效。必须设定。"
   },
   {
     "id": "model.config.is_valid.sql_driver.app_error",
-    "translation": "SQL设置中驱动名无效.  必须是 'mysql' 或者'postgres'"
+    "translation": "SQL 设置中的驱动名无效。必须是 'mysql' 或者 'postgres'"
   },
   {
     "id": "model.config.is_valid.sql_idle.app_error",
-    "translation": "SQL设置中最大的idle数无效.  必须是正整数."
+    "translation": "SQL 设置中的最大的空闲连接数无效。必须是正整数。"
   },
   {
     "id": "model.config.is_valid.sql_max_conn.app_error",
-    "translation": "SQL设置中最大开启连接数无效.  必须是正整数."
+    "translation": "SQL 设置中最大开启连接数无效。必须是正整数。"
   },
   {
     "id": "model.emoji.create_at.app_error",
@@ -3157,7 +3213,7 @@
   },
   {
     "id": "model.oauth.is_valid.app_id.app_error",
-    "translation": "无效app id"
+    "translation": "无效应用 id"
   },
   {
     "id": "model.oauth.is_valid.callback.app_error",
@@ -3197,7 +3253,7 @@
   },
   {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
-    "translation": "无效回调urls"
+    "translation": "无效回调网址"
   },
   {
     "id": "model.outgoing_hook.is_valid.channel_id.app_error",
@@ -3229,7 +3285,7 @@
   },
   {
     "id": "model.outgoing_hook.is_valid.trigger_words.app_error",
-    "translation": "无效的触发词"
+    "translation": "无效的触发关键词"
   },
   {
     "id": "model.outgoing_hook.is_valid.update_at.app_error",
@@ -3245,11 +3301,11 @@
   },
   {
     "id": "model.outgoing_hook.is_valid.words.app_error",
-    "translation": "无效的触发词"
+    "translation": "无效的触发关键词"
   },
   {
     "id": "model.post.is_valid.channel_id.app_error",
-    "translation": "无效频道id"
+    "translation": "无效的频道id"
   },
   {
     "id": "model.post.is_valid.create_at.app_error",
@@ -3321,7 +3377,7 @@
   },
   {
     "id": "model.preference.is_valid.value.app_error",
-    "translation": "值太长"
+    "translation": "值过长"
   },
   {
     "id": "model.team.is_valid.characters.app_error",
@@ -3401,7 +3457,7 @@
   },
   {
     "id": "model.user.is_valid.first_name.app_error",
-    "translation": "无效姓"
+    "translation": "无效的名字"
   },
   {
     "id": "model.user.is_valid.id.app_error",
@@ -3409,11 +3465,11 @@
   },
   {
     "id": "model.user.is_valid.last_name.app_error",
-    "translation": "无效名"
+    "translation": "无效的姓氏"
   },
   {
     "id": "model.user.is_valid.nickname.app_error",
-    "translation": "无效昵称"
+    "translation": "无效的昵称"
   },
   {
     "id": "model.user.is_valid.pwd.app_error",
@@ -3505,7 +3561,7 @@
   },
   {
     "id": "store.sql.closing.info",
-    "translation": "关闭sql存储"
+    "translation": "关闭 SqlStore"
   },
   {
     "id": "store.sql.column_exists.critical",
@@ -3517,23 +3573,23 @@
   },
   {
     "id": "store.sql.convert_encrypt_string_map",
-    "translation": "来自数据库: 不能从EncryptStringMap转换到*string"
+    "translation": "来自数据库：不能从 EncryptStringMap 转换到 *string"
   },
   {
     "id": "store.sql.convert_string_array",
-    "translation": "来自数据库: 不能从StringArray到*string"
+    "translation": "来自数据库：不能从 StringArray 转换到 *string"
   },
   {
     "id": "store.sql.convert_string_interface",
-    "translation": "来自数据库: 不能从StringInterface到*string"
+    "translation": "来自数据库：不能从 StringInterface 转换到 *string"
   },
   {
     "id": "store.sql.convert_string_map",
-    "translation": "来自数据库: 不能从StringMap到*string"
+    "translation": "来自数据库：不能从 StringMap 转换到 *string"
   },
   {
     "id": "store.sql.create_column.critical",
-    "translation": "创建列失败 %v"
+    "translation": "创建列 %v 失败"
   },
   {
     "id": "store.sql.create_column_missing_driver.critical",
@@ -3549,7 +3605,7 @@
   },
   {
     "id": "store.sql.creating_tables.critical",
-    "translation": "创建数据库表出错: %v"
+    "translation": "创建数据库表出错：%v"
   },
   {
     "id": "store.sql.dialect_driver.critical",
@@ -3601,19 +3657,19 @@
   },
   {
     "id": "store.sql.schema_out_of_date.warn",
-    "translation": "数据库模式版本%v似乎过期"
+    "translation": "数据库结构版本 %v 似乎过旧"
   },
   {
     "id": "store.sql.schema_set.info",
-    "translation": "数据库架构设置版本为%v"
+    "translation": "数据库结构版本设为 %v"
   },
   {
     "id": "store.sql.schema_upgrade_attempt.warn",
-    "translation": "试图将数据库模式版本升级到 %v"
+    "translation": "试图将数据库结构版本升级到 %v"
   },
   {
     "id": "store.sql.schema_version.critical",
-    "translation": "数据库模式版本 %v 不能升级。你不能跳过一个版本。"
+    "translation": "数据库结构版本 %v 不能升级。你不能跳过一个版本。"
   },
   {
     "id": "store.sql.short_ciphertext",
@@ -3641,7 +3697,7 @@
   },
   {
     "id": "store.sql_audit.get.limit.app_error",
-    "translation": "分页限制"
+    "translation": "已达到分页限制"
   },
   {
     "id": "store.sql_audit.permanent_delete_by_user.app_error",
@@ -3685,11 +3741,11 @@
   },
   {
     "id": "store.sql_channel.get_all.app_error",
-    "translation": "我们不能得到所有的频道"
+    "translation": "我们无法获取所有的频道"
   },
   {
     "id": "store.sql_channel.get_by_name.existing.app_error",
-    "translation": "发现的渠道"
+    "translation": "找不到现有的频道"
   },
   {
     "id": "store.sql_channel.get_by_name.missing.app_error",
@@ -3753,7 +3809,7 @@
   },
   {
     "id": "store.sql_channel.save.direct_channel.app_error",
-    "translation": "使用SaveDirectChannel创建私聊频道"
+    "translation": "使用 SaveDirectChannel 创建私聊频道"
   },
   {
     "id": "store.sql_channel.save.open_transaction.app_error",
@@ -3769,15 +3825,15 @@
   },
   {
     "id": "store.sql_channel.save_channel.exists.app_error",
-    "translation": "一个频道网址已经存在"
+    "translation": "已存在使用该 URL 的频道"
   },
   {
     "id": "store.sql_channel.save_channel.limit.app_error",
-    "translation": "你已经达到了允许的频道数量限制。"
+    "translation": "您已经达到了允许的频道数量上限。"
   },
   {
     "id": "store.sql_channel.save_channel.previously.app_error",
-    "translation": "一个频道网址是以前创建的"
+    "translation": "先前已创建使用该 URL 的频道"
   },
   {
     "id": "store.sql_channel.save_channel.save.app_error",
@@ -3805,7 +3861,7 @@
   },
   {
     "id": "store.sql_channel.save_member.exists.app_error",
-    "translation": "一个频道成员id已经存在"
+    "translation": "该频道成员 id 已存在"
   },
   {
     "id": "store.sql_channel.save_member.open_transaction.app_error",
@@ -3825,11 +3881,11 @@
   },
   {
     "id": "store.sql_channel.update.exists.app_error",
-    "translation": "一个频道的操作已经存在"
+    "translation": "已存在使用该识别名的频道"
   },
   {
     "id": "store.sql_channel.update.previously.app_error",
-    "translation": "一个频道的操作已经被创建"
+    "translation": "先前已创建过使用该识别名的频道"
   },
   {
     "id": "store.sql_channel.update.updating.app_error",
@@ -3940,6 +3996,10 @@
     "translation": "我们查找访问令牌时遇到一个错误"
   },
   {
+    "id": "store.sql_oauth.get_access_data_by_user_for_app.app_error",
+    "translation": "我们查找访问令牌时遇到一个错误"
+  },
+  {
     "id": "store.sql_oauth.get_app.find.app_error",
     "translation": "我们无法查找请求的应用"
   },
@@ -4037,7 +4097,7 @@
   },
   {
     "id": "store.sql_post.get_parents_posts.app_error",
-    "translation": "我们无法获取这个频道父邮件"
+    "translation": "我们无法获取这个频道的父信息"
   },
   {
     "id": "store.sql_post.get_posts.app_error",
@@ -4045,19 +4105,19 @@
   },
   {
     "id": "store.sql_post.get_posts_around.get.app_error",
-    "translation": "我们无法获取这个频道邮件"
+    "translation": "我们无法获取这个频道的信息"
   },
   {
     "id": "store.sql_post.get_posts_around.get_parent.app_error",
-    "translation": "我们无法获取这个频道父邮件"
+    "translation": "我们无法获取这个频道的父信息"
   },
   {
     "id": "store.sql_post.get_posts_since.app_error",
-    "translation": "我们无法获取这个频道邮件"
+    "translation": "我们无法获取这个频道的信息"
   },
   {
     "id": "store.sql_post.get_root_posts.app_error",
-    "translation": "我们无法获取这个频道邮件"
+    "translation": "我们无法获取这个频道的信息"
   },
   {
     "id": "store.sql_post.permanent_delete.app_error",
@@ -4069,11 +4129,11 @@
   },
   {
     "id": "store.sql_post.permanent_delete_by_user.app_error",
-    "translation": "我们不能为用户选择删除的帖子"
+    "translation": "我们不能为用户选择要删除的信息"
   },
   {
     "id": "store.sql_post.permanent_delete_by_user.too_many.app_error",
-    "translation": "我们不能为用户选择删除的帖子（太多），请重新运行"
+    "translation": "我们不能为用户选择要删除的信息（数量太多），请重新运行"
   },
   {
     "id": "store.sql_post.save.app_error",
@@ -4293,7 +4353,7 @@
   },
   {
     "id": "store.sql_team.get_member.missing.app_error",
-    "translation": "无法找到此用户id和频道id相关联的团队成员"
+    "translation": "无法找到此用户id和团队id相关联的团队成员"
   },
   {
     "id": "store.sql_team.get_members.app_error",
@@ -4400,6 +4460,10 @@
     "translation": "我们无法为用户获取到未读信息数量"
   },
   {
+    "id": "store.sql_user.get_unread_count_for_channel.app_error",
+    "translation": "我们无法为用户和频道获取未读信息数量"
+  },
+  {
     "id": "store.sql_user.migrate_theme.critical",
     "translation": "移植 User.ThemeProps 到 Preferences 表 %v 时失败"
   },
@@ -4745,7 +4809,7 @@
   },
   {
     "id": "web.incoming_webhook.channel.app_error",
-    "translation": "不能找到该频道"
+    "translation": "找不到该频道"
   },
   {
     "id": "web.incoming_webhook.disabled.app_error",
diff --git a/i18n/zh_TW.json b/i18n/zh_TW.json
index 80099ab93..d412abe50 100644
--- a/i18n/zh_TW.json
+++ b/i18n/zh_TW.json
@@ -352,6 +352,10 @@
     "translation": "已對預設頻道 {{.Channel}} 嘗試執行無效的更新"
   },
   {
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
+    "translation": "無法計算未讀訊息數量：user_id=%v, channel_id=%v, err=%v"
+  },
+  {
     "id": "api.command.admin_only.app_error",
     "translation": "整合功能被限定為只有管理員可以設定。"
   },
@@ -432,6 +436,18 @@
     "translation": "沒有適當的權限重新產生命令 Token"
   },
   {
+    "id": "api.command_away.desc",
+    "translation": "將狀態設定為「離開」"
+  },
+  {
+    "id": "api.command_away.name",
+    "translation": "離開"
+  },
+  {
+    "id": "api.command_away.success",
+    "translation": "現在狀態為「離開」"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "開啟圖片預覽的自動折疊功能"
   },
@@ -564,12 +580,36 @@
     "translation": "已傳訊給使用者。"
   },
   {
+    "id": "api.command_offline.desc",
+    "translation": "將狀態設定為「離線」"
+  },
+  {
+    "id": "api.command_offline.name",
+    "translation": "離線"
+  },
+  {
+    "id": "api.command_offline.success",
+    "translation": "現在狀態為「離線」"
+  },
+  {
+    "id": "api.command_online.desc",
+    "translation": "將狀態設定為「上線」"
+  },
+  {
+    "id": "api.command_online.name",
+    "translation": "上線"
+  },
+  {
+    "id": "api.command_online.success",
+    "translation": "現在狀態為「上線」"
+  },
+  {
     "id": "api.command_shortcuts.browser",
-    "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+    "translation": "#### 瀏覽器內建命令\n\nALT+LEFT：瀏覽紀錄的前一個頻道\nALT+RIGHT：瀏覽紀錄的下一個頻道\nCTRL+PLUS：增加字體尺寸(放大)\nCTRL+MINUS：減少字體尺寸(縮小)\nSHIFT+UP (在輸入欄)：標記現在到上一行同位置之間的文字\nSHIFT+DOWN (在輸入欄)：標記現在到下一行同位置之間的文字\nSHIFT+ENTER (在輸入欄)：新增一行\n"
   },
   {
     "id": "api.command_shortcuts.browser_mac",
-    "translation": "#### Built-in Browser Commands\n\nCMD+[: Previous channel in your history\nCMD+]: Next channel in your history\nCMD+PLUS: Increase font size (zoom in)\nCMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+    "translation": "#### 瀏覽器內建命令\n\nCMD+[：瀏覽紀錄的前一個頻道\nCMD+]：瀏覽紀錄的下一個頻道\nCMD+PLUS：增加字體尺寸(放大)\nCMD+MINUS：減少字體尺寸(縮小)\nSHIFT+UP (在輸入欄)：標記現在到上一行同位置之間的文字\nSHIFT+DOWN (在輸入欄)：標記現在到下一行同位置之間的文字\nSHIFT+ENTER (在輸入欄)：新增一行\n"
   },
   {
     "id": "api.command_shortcuts.desc",
@@ -577,19 +617,19 @@
   },
   {
     "id": "api.command_shortcuts.files",
-    "translation": "#### Files\n\nCTRL+U: Upload file(s)\n\n"
+    "translation": "#### 檔案\n\nCTRL+U：上傳檔案\n\n"
   },
   {
     "id": "api.command_shortcuts.files_mac",
-    "translation": "#### Files\n\nCMD+U: Upload file(s)\n\n"
+    "translation": "#### 檔案\n\nCMD+U：上傳檔案\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": "#### 訊息\n\nESC：將當前頻道所有訊息設為已讀\nCTRL+UP (在空的輸入欄)：顯示上一個您輸入的訊息或是斜線命令\nCTRL+DOWN (在空的輸入欄)：顯示下一個您輸入的訊息或是斜線命令\nUP (在空的輸入欄)：編輯當前頻道您的上一個訊息\n@[文字]+TAB：自動完成以[文字]起始的@使用者帳號\n:[文字]+TAB：自動完成以[文字]起始的顏文字\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": "#### 訊息\n\nESC：將當前頻道所有訊息設為已讀\nCMD+UP (在空的輸入欄)：顯示上一個您輸入的訊息或是斜線命令\nCMD+DOWN (在空的輸入欄)：顯示下一個您輸入的訊息或是斜線命令\nUP (在空的輸入欄)：編輯當前頻道您的上一個訊息\n@[文字]+TAB：自動完成以[文字]起始的@使用者帳號\n:[文字]+TAB：自動完成以[文字]起始的顏文字\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -597,11 +637,11 @@
   },
   {
     "id": "api.command_shortcuts.nav",
-    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL+K: Open a quick channel switcher dialog\nCTRL+SHIFT+A: Open account settings\nCTRL+SHIFT+M: Open recent mentions\n\n"
+    "translation": "### 鍵盤快捷鍵\n\n#### 瀏覽\n\nALT+UP：側邊欄裡面上一個頻道或直接訊息\nALT+DOWN：側邊欄裡面下一個頻道或直接訊息\nALT+SHIFT+UP：側邊欄裡面上一個有未讀訊息的頻道或直接訊息\nALT+SHIFT+DOWN：側邊欄裡面下一個有未讀訊息的頻道或直接訊息\nCTRL+K：開啟快速切換頻道對話框\nCTRL+SHIFT+A：開啟帳號設定\nCTRL+SHIFT+M：開啟最近提及您的訊息\n\n"
   },
   {
     "id": "api.command_shortcuts.nav_mac",
-    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n"
+    "translation": "### 鍵盤快捷鍵\n\n#### 瀏覽\n\nALT+UP：側邊欄裡面上一個頻道或直接訊息\nALT+DOWN：側邊欄裡面下一個頻道或直接訊息\nALT+SHIFT+UP：側邊欄裡面上一個有未讀訊息的頻道或直接訊息\nALT+SHIFT+DOWN：側邊欄裡面下一個有未讀訊息的頻道或直接訊息\nCMD+K：開啟快速切換頻道對話框\nCMD+SHIFT+A：開啟帳號設定\nCMD+SHIFT+M：開啟最近提及您的訊息\n\n"
   },
   {
     "id": "api.command_shrug.desc",
@@ -998,6 +1038,10 @@
     "translation": "response_type、client_id 或 redirect_uri 中缺少一個以上"
   },
   {
+    "id": "api.oauth.complete_oauth.missing_code.app_error",
+    "translation": "The service provider {{.service}} did not provide an authorization code in the redirect URL.\n\nFor [Google Apps](https://docs.mattermost.com/deployment/sso-google.html) make sure your administrator enabled the Google+ API.\n\nFor [Office 365](https://docs.mattermost.com/deployment/sso-office.html) make sure the administrator of your Microsoft organization has enabled the Mattermost app.\n\nFor [GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html) please make sure you followed the setup instructions.\n\nIf you reviewed the above and are still having trouble with configuration, you may post in our [Troubleshooting forum](https://forum.mattermost.org/c/general/trouble-shoot) where we'll be happy to help with issues during setup."
+  },
+  {
     "id": "api.oauth.delete.permissions.app_error",
     "translation": "權限不足以刪除 OAuth2 應用程式"
   },
@@ -1066,6 +1110,10 @@
     "translation": "正在初始化 OAuth API 路徑"
   },
   {
+    "id": "api.oauth.regenerate_secret.app_error",
+    "translation": "權限不足以重新產生 OAuth2 應用程式密碼"
+  },
+  {
     "id": "api.oauth.register_oauth_app.turn_off.app_error",
     "translation": "系統管理員已關閉 OAuth2 服務提供者。"
   },
@@ -1127,7 +1175,7 @@
   },
   {
     "id": "api.post.delete_flagged_post.app_error.warn",
-    "translation": "Unable to delete flagged post preference when deleting post, err=%v"
+    "translation": "刪除發文時無法刪除發文的標記設定：err=%v"
   },
   {
     "id": "api.post.delete_post.permissions.app_error",
@@ -1216,6 +1264,10 @@
     "translation": "無法取得頻道成員資訊 user_id=%v"
   },
   {
+    "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
+    "translation": "正在清除至 %v 的推播通知，channel_id %v"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
     "translation": "在發送通知時取得註解文章失敗 root_post_id=%v err=%v"
   },
@@ -1253,11 +1305,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.debug",
-    "translation": "正在傳送推播通知至 %v，來自於 '%v'"
+    "translation": "正在傳送推播通知至 %v，訊息為 '%v'"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "推播傳送失敗 notificationid=%v, err=%v"
+    "translation": "無法發送推播 device_id=%v, err=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.send.error",
@@ -1420,6 +1472,10 @@
     "translation": "發現錯誤的時間戳記"
   },
   {
+    "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
+    "translation": "無法為 Slack 使用者 {{.UserID}} {{.Username}} 編譯匹配@提及的正規表示式"
+  },
+  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Mattermost Slack 匯入記錄\r\n"
   },
@@ -1684,8 +1740,12 @@
     "translation": "頻道：{{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
-    "id": "api.templates.post_subject",
-    "translation": "於 {{.Month}} {{.Day}}, {{.Year}} {{.TeamDisplayName}} 上的 {{.SubjectText}}"
+    "id": "api.templates.post_subject_in_channel",
+    "translation": "{{.SubjectText}}，在{{.TeamDisplayName}}團隊，發於 {{.Year}} {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "api.templates.post_subject_in_direct_message",
+    "translation": "{{.SubjectText}}，來自於{{.TeamDisplayName}}團隊的{{.SenderDisplayName}}，發於 {{.Year}} {{.Month}} {{.Day}}"
   },
   {
     "id": "api.templates.reset_body.button",
@@ -1729,7 +1789,7 @@
   },
   {
     "id": "api.templates.singin_change_email.body.info",
-    "translation": "您已經變更了 {{ .TeamURL }} 上 {{.TeamDisplayName}} 的登入方式為 {{.Method}}。<br>如果這項變更不是您做的，請聯繫系統管理員。"
+    "translation": "您已經將 {{ .SiteName }} 上的登入方式變更為 {{.Method}}。<br>如果這項變更不是您做的，請聯繫系統管理員。"
   },
   {
     "id": "api.templates.singin_change_email.subject",
@@ -2392,6 +2452,10 @@
     "translation": "目前授權不提供限制自訂繪文字，請聯繫系統管理員將系統升級為企業版授權。"
   },
   {
+    "id": "ent.ldap.disabled.app_error",
+    "translation": "已停用 LDAP 或授權不支援 LDAP。"
+  },
+  {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
     "translation": "無法綁定 LDAP 伺服器，請檢查綁定使用者帳號與綁定密碼。"
   },
@@ -2881,7 +2945,7 @@
   },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
-    "translation": "Unable to enable email batching when clustering is enabled"
+    "translation": "啟用叢集時無法啟用批次郵件"
   },
   {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
@@ -3040,10 +3104,6 @@
     "translation": "無效的電子郵件屬性。此屬性必須設定。"
   },
   {
-    "id": "model.config.is_valid.saml_first_name_attribute.app_error",
-    "translation": "無效的名字屬性。此屬性必須設定。"
-  },
-  {
     "id": "model.config.is_valid.saml_idp_cert.app_error",
     "translation": "找不到身份識別提供者公開憑證。是否忘記上傳？"
   },
@@ -3056,10 +3116,6 @@
     "translation": "SAML SSO 網址必須使用以 http:// 或 https:// 開頭的有效網址。"
   },
   {
-    "id": "model.config.is_valid.saml_last_name_attribute.app_error",
-    "translation": "無效的姓氏屬性。此屬性必須設定。"
-  },
-  {
     "id": "model.config.is_valid.saml_private_key.app_error",
     "translation": "找不到身份識別提供者私鑰。是否忘記上傳？"
   },
@@ -3077,7 +3133,7 @@
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
-    "translation": "Unable to enable email batching when SiteURL isn't set."
+    "translation": "站台網址設定完畢之前無法啟用批次郵件"
   },
   {
     "id": "model.config.is_valid.sitename_length.app_error",
@@ -3940,6 +3996,10 @@
     "translation": "尋找存取 Token 時遇到錯誤"
   },
   {
+    "id": "store.sql_oauth.get_access_data_by_user_for_app.app_error",
+    "translation": "尋找存取 Token 時遇到錯誤"
+  },
+  {
     "id": "store.sql_oauth.get_app.find.app_error",
     "translation": "找不到要求的應用程式"
   },
@@ -4400,6 +4460,10 @@
     "translation": "無法計算該使用者的未讀訊息數量"
   },
   {
+    "id": "store.sql_user.get_unread_count_for_channel.app_error",
+    "translation": "無法取得使用者跟頻道的未讀訊息數量"
+  },
+  {
     "id": "store.sql_user.migrate_theme.critical",
     "translation": "轉移 User.ThemeProps 到偏好設定表格 %v 時失敗"
   },
diff --git a/webapp/i18n/de.json b/webapp/i18n/de.json
index 729407a13..f7bd731a3 100644
--- a/webapp/i18n/de.json
+++ b/webapp/i18n/de.json
@@ -42,7 +42,7 @@
   "add_command.description.help": "Beschreibung des eingehenden Webhooks.",
   "add_command.displayName": "Anzeigename",
   "add_command.displayName.help": "Anzeigename für den Slash Befehl mit bis zu 64 Zeichen.",
-  "add_command.doneHelp": "Your slash command has been set up. The following token will be sent in the outgoing payload. Please use it to verify the request came from your Mattermost team (see <a href=\"https://docs.mattermost.com/developer/slash-commands.html\">documentation</a> for further details).",
+  "add_command.doneHelp": "Ihr Slash Befehl wurde eingerichtet. Der folgende Token wird in der ausgehenden Payload mitgesendet. Bitte verwenden Sie ihn um zu verifizieren das er von Ihrem Mattermost Team kam (sehen Sie in die <a href=\"https://docs.mattermost.com/developer/slash-commands.html\">Dokumentation</a> für mehr Details).",
   "add_command.iconUrl": "Antwort Icon",
   "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",
@@ -91,7 +91,7 @@
   "add_incoming_webhook.description.help": "Beschreibung des eingehenden Webhooks.",
   "add_incoming_webhook.displayName": "Anzeigename",
   "add_incoming_webhook.displayName.help": "Anzeigename des eingehenden Webhooks mit bis zu 64 Zeichen.",
-  "add_incoming_webhook.doneHelp": "Your incoming webhook has been set up. Please send data to the following URL (see <a href=\"https://docs.mattermost.com/developer/webhooks-incoming.html\">documentation</a> for further details).",
+  "add_incoming_webhook.doneHelp": "Ihr eingehender Webhook wurde eingerichtet. Bitte senden Sie die Daten an folgende URL (sehen Sie in die <a href=\"https://docs.mattermost.com/developer/webhooks-incoming.html\">Dokumentation</a> für mehr Details).",
   "add_incoming_webhook.name": "Name",
   "add_incoming_webhook.save": "Speichern",
   "add_incoming_webhook.url": "<b>URL</b>: {url}",
@@ -101,8 +101,8 @@
   "add_oauth_app.clientSecret": "<b>Client Secret</b>: {secret}",
   "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.doneHelp": "Your OAuth 2.0 application has been set up. Please use the following Client ID and Client Secret when requesting authorization for your application.",
-  "add_oauth_app.doneUrlHelp": "Please send data to the following URL.",
+  "add_oauth_app.doneHelp": "Ihre OAuth 2.0 Anwendung wurde eingerichtet. Bitte verwenden Sie die folgende Client ID und Secret bei Autorisierungsanforderungen Ihrer Anwendung.",
+  "add_oauth_app.doneUrlHelp": "Die folgenden sind Ihre autorisierten Umleitungs-URL(s).",
   "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.",
@@ -125,7 +125,7 @@
   "add_outgoing_webhook.description.help": "Beschreibung für Ihren ausgehenden Webhook.",
   "add_outgoing_webhook.displayName": "Anzeigename",
   "add_outgoing_webhook.displayName.help": "Anzeigename für Ihren ausgehenden Webhook aus bis zu 64 Zeichen.",
-  "add_outgoing_webhook.doneHelp": "Your outgoing webhook has been set up. The following token will be sent in the outgoing payload. Please use it to verify the request came from your Mattermost team (see <a href=\"https://docs.mattermost.com/developer/webhooks-outgoing.html\">documentation</a> for further details).",
+  "add_outgoing_webhook.doneHelp": "Ihr ausgehender Webhook wurde eingerichtet. Der folgende Token wird in der ausgehenden Payload mitgesendet. Der folgende Token wird in der ausgehenden Payload mitgesendet. Bitte verwenden Sie ihn um zu verifizieren das er von Ihrem Mattermost Team kam (sehen Sie in die <a href=\"https://docs.mattermost.com/developer/webhooks-outgoing.html\">Dokumentation</a> für mehr Details).",
   "add_outgoing_webhook.name": "Name",
   "add_outgoing_webhook.save": "Speichern",
   "add_outgoing_webhook.token": "<b>Token</b>: {token}",
@@ -141,6 +141,7 @@
   "admin.audits.title": "Benutzeraktivitäten Log",
   "admin.authentication.email": "E-Mail Authentisierung",
   "admin.authentication.gitlab": "GitLab",
+  "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "Notiz:",
@@ -198,6 +199,8 @@
   "admin.compliance_table.userId": "Benötigt von",
   "admin.connectionSecurityNone": "Keine",
   "admin.connectionSecurityNoneDescription": "Mattermost wird sich über eine Verbindung verbinde.",
+  "admin.connectionSecurityPlain": "PLAIN",
+  "admin.connectionSecurityPlainDescription": "Mattermost wird sich über eine unsichere Verbindung verbinden und authentifizieren.",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "Versucht eine existierende unsichere Verbindung in eine TLS Verbindung zu ändern.",
   "admin.connectionSecurityTest": "Verbindung testen",
@@ -214,7 +217,7 @@
   "admin.customization.enableCustomEmojiTitle": "Eigene Emoji ermöglichen:",
   "admin.customization.iosAppDownloadLinkDesc": "Einen Link zum Download der iOS App hinzufügen. Benutzer die die Seite über einen mobilen Browser aufrufen werden eine Seite mit der Option die App herunterzuladen angezeigt. Dieses Feld leer lassen um zu verhindern dass die Seite angezeigt wird.",
   "admin.customization.iosAppDownloadLinkTitle": "iOS App Download Link:",
-  "admin.customization.nativeAppLinks": "Native App Links",
+  "admin.customization.nativeAppLinks": "Links zu Mattermost Anwendungen",
   "admin.customization.restrictCustomEmojiCreationAdmin": "Erlaube System- und Teamadministratoren eigene Emojis zu erstellen",
   "admin.customization.restrictCustomEmojiCreationAll": "Erlaube jedem eigene Emoji zu erstellen",
   "admin.customization.restrictCustomEmojiCreationDesc": "Beschränke die Erstellung eigener Emoji auf bestimmte Benutzer.",
@@ -234,10 +237,10 @@
   "admin.email.easHelp": "Erfahren Sie mehr zum Erstellen und Ausrollen Ihrer eigenen mobilen App aus einem <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target=\"_blank\">Enterprise App Store</a>.",
   "admin.email.emailFail": "Verbindung nicht erfolgreich: {error}",
   "admin.email.emailSuccess": "Es wurden keine Fehler beim Sendern der E-Mail gemeldet.  Bitte überprüfen Sie Ihr Postfach um sicherzugehen.",
-  "admin.email.enableEmailBatching.clusterEnabled": "Email batching cannot be enabled when High Availability mode is enabled.",
-  "admin.email.enableEmailBatching.siteURL": "Email batching cannot be enabled unless the SiteURL is configured in <b>Configuration > SiteURL</b>.",
-  "admin.email.enableEmailBatchingDesc": "When true, users can have email notifications for multiple direct messages and mentions combined into a single email, configurable in <b>Account Settings > Notifications</b>.",
-  "admin.email.enableEmailBatchingTitle": "Enable Email Batching:",
+  "admin.email.enableEmailBatching.clusterEnabled": "E-Mail Stapelung kann nicht aktiviert werden wenn High Availability Modus aktiviert ist.",
+  "admin.email.enableEmailBatching.siteURL": "E-Mail Stapelung kann nicht aktiviert werden solange Site URL nicht in <b>Konfiguration > Site URL</b> konfiguriert ist.",
+  "admin.email.enableEmailBatchingDesc": "Wenn wahr können Benutzer Benachrichtigungen für mehrere Direktnachrichten und Nennungen in eine einzelne E-Mail kombinieren, konfigurierbar unter <b>Kontoeinstellungen > Benachrichtigungen</b>.",
+  "admin.email.enableEmailBatchingTitle": "E-Mail Stapelung aktivieren:",
   "admin.email.fullPushNotification": "Senden eines Ausschnitts der vollständigen Nachricht",
   "admin.email.genericPushNotification": "Sende allgemeine Beschreibung mit Benutzer- und Kanalnamen",
   "admin.email.inviteSaltDescription": "32 Zeichen langer Salt der zum Signieren von E-Mail Einladungen hinzugefügt wird. Zufallsgeneriert bei Installation. \"Neu generieren\" klicken um einen neuen Salt zu erstellen.",
@@ -294,7 +297,7 @@
   "admin.files.storage": "Speicher",
   "admin.general.configuration": "Konfiguration",
   "admin.general.localization": "Lokalisation",
-  "admin.general.localization.availableLocalesDescription": "Set which languages are available for users in Account Settings (leave this field blank to have all supported languages available). If you’re manually adding new languages, the <strong>Default Client Language</strong> must be added before saving this setting.<br /><br />Would like to help with translations? Join the <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> to contribute.",
+  "admin.general.localization.availableLocalesDescription": "Einstellen welche Sprachen für die Benutzer in den Kontoeinstellungen verfügbar sein sollen (lassen Sie dieses Feld leer um alle unterstützten Sprachen zur Verfügung zu stellen). Wenn Sie neue Sprachen manuell hinzufügen. die <strong>Standardsprache Client</strong> muss vorher geändert werden.<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:",
@@ -401,13 +404,13 @@
   "admin.ldap.emailAttrTitle": "E-Mail Attribut:",
   "admin.ldap.enableDesc": "Wenn wahr, erlaubt Mattermost den Login mit LDAP",
   "admin.ldap.enableTitle": "Erlaube Login mit LDAP:",
-  "admin.ldap.firstnameAttrDesc": "Das Attribut des LDAP Servers, welches benutzt wird, um den Vornamen des Nutzers in Mattermost zu anzuzeigen.",
+  "admin.ldap.firstnameAttrDesc": "(Optional) Das Attribut des LDAP Servers, welches benutzt wird um den Vornamen des Nutzers in Mattermost auszufüllen.",
   "admin.ldap.firstnameAttrEx": "z.B.: \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "Attribut Vorname",
   "admin.ldap.idAttrDesc": "Das Attribut des LDAP Server, welches von Mattermost als eindeutiger Identifikator benutzt wird. Es sollte ein LDAP Attribut sein, dessen Wert sich nicht ändert, z.B. Nutzername oder UID. Wenn die ID eines Nutzer sich ändert, wird Mattermost einen neues Konto erstellen, welches nicht mit dem Alten verbunden ist. Dieser Wert wird für den Login in Mattermost als \"LDAP Nutzername\" auf der Anmeldeseite verwendet. Normalerweise ist das Attribut dasselbe wie das vorherige Feld \"Attribut Benutzername\". Wenn ihr Team, zur Anmeldung an andere Dienste mittels LDAP, die Formulierung Domäne\\Benutzername verwendet, wählen Sie Domäne\\Benutzername in diesem Feld, um die Konsistenz zwischen den Seiten beizubehalten.",
   "admin.ldap.idAttrEx": "z.B.: \"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "Attribut ID: ",
-  "admin.ldap.lastnameAttrDesc": "Das Attribut des LDAP Servers, welches benutzt wird um den Nachname des Nutzers in Mattermost auszfüllen.",
+  "admin.ldap.lastnameAttrDesc": "(Optional) Das Attribut des LDAP Servers, welches benutzt wird um den Nachname des Nutzers in Mattermost auszufüllen.",
   "admin.ldap.lastnameAttrEx": "z.B.: \"sn\"",
   "admin.ldap.lastnameAttrTitle": "Attibut Nachname:",
   "admin.ldap.loginNameDesc": "Der Platzhalter der im Loginfeld der Loginseite angezeigt wird. Standart ist \"LDAP Benutzername\".",
@@ -415,7 +418,7 @@
   "admin.ldap.loginNameTitle": "Login Feld Name:",
   "admin.ldap.maxPageSizeEx": "z.B.: \"2000\"",
   "admin.ldap.maxPageSizeHelpText": "Die maximale Anzahl von Benutzern, die der Mattermost Server vom LDAP Server auf einmal anfordern wird. 0 ist unendlich.",
-  "admin.ldap.maxPageSizeTitle": "Maximale Seitengröße",
+  "admin.ldap.maxPageSizeTitle": "Maximale Seitengröße:",
   "admin.ldap.nicknameAttrDesc": "(Optional) Das Attribut des LDAP Servers, welches benutzt wird um den Nachname des Nutzers in Mattermost auszufüllen.",
   "admin.ldap.nicknameAttrEx": "z.B.: \"Spitzname\"",
   "admin.ldap.nicknameAttrTitle": "Spitznamen Attribut:",
@@ -429,13 +432,15 @@
   "admin.ldap.serverDesc": "Die Domäne oder IP-Adresse des LDAP Server.",
   "admin.ldap.serverEx": "z.B.: \"10.0.0.23\"",
   "admin.ldap.serverTitle": "LDAP Server:",
-  "admin.ldap.skipCertificateVerification": "Zertifikatsprüfung überspringen",
+  "admin.ldap.skipCertificateVerification": "Zertifikatsprüfung überspringen:",
   "admin.ldap.skipCertificateVerificationDesc": "Zertifikatsprüfung für TLS oder STARTTLS Verbindungen überspringen. Nicht empfohlen bei Produktiv-Umgebungen bei denen TLS benötigt wird. Nur zum Test gedacht.",
   "admin.ldap.syncFailure": "Sync Fehler: {error}",
   "admin.ldap.syncIntervalHelpText": "Die LDAP Synchronisation aktualisiert die Mattermost Benutzerinformationen um die Änderungen auf dem LDAP Server zu spiegeln. Wenn zum Beispiel der Name eines Benutzers auf dem LDAP Server geändert wird, wird die Änderung in Mattermost bei der nächsten Synchronisierung durchgeführt. Gelöschte oder deaktivierte Accounts auf dem LDAP Server setzen die Benutzer als \"Inaktiv\" und die Benutzersessions werden entfernt. Mattermost führt die Synchronisation im hier spezifizierten Intervall durch. Wenn zum Beispiel 60 eingegeben wird, synchronisiert Mattermost alle 60 Minuten.",
-  "admin.ldap.syncIntervalTitle": "Synchronisationsintervall (in Minuten)",
+  "admin.ldap.syncIntervalTitle": "Synchronisationsintervall (in Minuten):",
   "admin.ldap.syncNowHelpText": "Initiiert eine sofortige LDAP Synchronisation.",
   "admin.ldap.sync_button": "LDAP jetzt abgleichen",
+  "admin.ldap.testFailure": "LDAP Test Fehler: {error}",
+  "admin.ldap.testHelpText": "Überprüft ob der Mattermost sich mit dem angegebenen LDAP Server verbinden kann. Schauen Sie im Log für detailliertere Fehlermeldungen nach.",
   "admin.ldap.uernameAttrDesc": "Das Attribut des LDAP-Servers das zum Befüllen des Benutzernamens in Mattermost verwendet wird. Das kann auch dem des ID-Attributes entsprechen.",
   "admin.ldap.userFilterDisc": "(Optional)Geben Sie einen LDAP-Filters zur Begrenzung bei der Suche nach Benutzer-Objekten ein. Nur die zurückgegebenen Benutzer dieser Abfrage werden Zugriff auf Mattermost erhalten. Für Active-Directory lautet die Abfrage zum Ausschluss von deaktivierten Benutzern (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "z.B.: \"(objectClass=user)\"",
@@ -558,7 +563,7 @@
   "admin.saml.enableTitle": "Erlaube Login mit SAML:",
   "admin.saml.encryptDescription": "Wenn wahr wird Mattermost SAML Assertions entschlüsseln, die mit Ihrem öffentlichen Zertifikat des Service Providers verschlüsselt wurden.",
   "admin.saml.encryptTitle": "Verschlüsselung aktivieren:",
-  "admin.saml.firstnameAttrDesc": "Das Attribut des LDAP Servers, welches benutzt wird, um den Vornamen des Nutzers in Mattermost zu anzuzeigen.",
+  "admin.saml.firstnameAttrDesc": "(Optional) Das Attribut in der SAML Erklärung, welches benutzt wird um den Vornamen des Nutzers in Mattermost auszufüllen.",
   "admin.saml.firstnameAttrEx": "z.B. \"Vorname\"",
   "admin.saml.firstnameAttrTitle": "Attribut Vorname:",
   "admin.saml.idpCertificateFileDesc": "Das öffentliche Authentifizierungszertifikat, ausgestellt durch Ihren Identitätsprovider.",
@@ -570,7 +575,7 @@
   "admin.saml.idpUrlDesc": "Die URL, an die Mattermost SAML Anfragen zum Start der Loginsequenz schickt.",
   "admin.saml.idpUrlEx": "z.B. \"https://idp.beispiel.org/SAML2/SSO\"Login\"",
   "admin.saml.idpUrlTitle": "SAML SSO URL:",
-  "admin.saml.lastnameAttrDesc": "Das Attribut des LDAP Servers, welches benutzt wird um den Nachname des Nutzers in Mattermost auszfüllen.",
+  "admin.saml.lastnameAttrDesc": "(Optional) Das Attribut in der SAML Erklärung, welches benutzt wird um den Nachnamen des Nutzers in Mattermost auszufüllen.",
   "admin.saml.lastnameAttrEx": "z.B. \"Nachname\"",
   "admin.saml.lastnameAttrTitle": "Attribut Nachname:",
   "admin.saml.localeAttrDesc": "(Optional) Das Attribut des LDAP Servers, welches benutzt wird um de Sprache des Nutzers in Mattermost auszufüllen.",
@@ -627,8 +632,8 @@
   "admin.service.googleDescription": "Diesen Key setzen um den Titel von eingebetteten YouTube Videovorschauen anzeigen zu lassen. Ohne den Schlüssel werden YouTube Vorschauen basierend auf den Hyperlinks in Nachrichten und Kommentaren erstellt, sie werden aber nicht den Video Titel enthalten. Sehen Sie sich das <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> für eine Anleitung, wie Sie an den Schlüssel kommen, an.",
   "admin.service.googleExample": "z.B.: \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Google API Key:",
-  "admin.service.iconDescription": "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.",
-  "admin.service.iconTitle": "Erlaube Webhooks und Slashbefehlen das Profilbild zu ersetzen:",
+  "admin.service.iconDescription": "Wenn wahr, werden Webhooks, Slash Befehle und andere Integrationen wie <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a> erlaubt das Profilbild zu ändern mit dem Sie Nachrichten senden. Hinweis: Kombiniert mit der Erlaubnis den Benutzernamen zu ändern können Benutzer Phishing Attacken ausführen indem Sie sich als andere Nutzer ausgeben.",
+  "admin.service.iconTitle": "Erlaube Integrationen das Profilbild zu ändern:",
   "admin.service.insecureTlsDesc": "Wenn Wahr werden alle ausgehenden HTTPS Anfragen von selbst-signierten Zertifikaten ungeprüft angenommen. Zum Beispiel werden ausgehende Webhooks an einen Server mit einem selbst-signiertem TLS Zertifikat an eine beliebige Domäne zugelassen. Hinweis: das macht diese Verbindungen anfällig für \"Man-In-The-Middle\" Attacken.",
   "admin.service.insecureTlsTitle": "Erlaube unsichere ausgehende Verbindungen: ",
   "admin.service.integrationAdmin": "Begrenze die Erstellung von Integrationen auf Team- und Systemadministratoren: ",
@@ -642,8 +647,8 @@
   "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.",
-  "admin.service.overrideTitle": "Erlaube Webhooks und Slashbefehlen den Benutzernamen zu ersetzen:",
+  "admin.service.overrideDescription": "Wenn wahr, werden Webhooks, Slash Befehle und andere Integrationen wie <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a> erlaubt den Benutzernamen zu ändern mit dem Sie Nachrichten senden. Hinweis: Kombiniert mit der Erlaubnis das Profilbild zu ändern können Benutzer Phishing Attacken ausführen indem Sie sich als andere Nutzer ausgeben.",
+  "admin.service.overrideTitle": "Erlaube Integrationen den Benutzernamen zu ändern:",
   "admin.service.securityDesc": "Wenn Wahr werden System Administratoren durch E-Mails informiert, dass ein Sicherheitsrelevantes Update in den letzen 12 Stunden angekündigt wurde. Setzt voraus, dass E-Mail aktiviert wurde.",
   "admin.service.securityTitle": "Sicherheitsbenachrichtigungen aktivieren: ",
   "admin.service.segmentDescription": "Segment.com ist ein Online Dienst der zur optionalen Erhebung von detaillierten Systemstatistiken. Sie können einen Schlüssel über einen kostenlosen Account bei Segment.com erhalten.",
@@ -684,14 +689,14 @@
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.images": "Bilder",
   "admin.sidebar.integrations": "Integrationen",
-  "admin.sidebar.ldap": "LDAP",
+  "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Rechtsabteilung und Support",
   "admin.sidebar.license": "Edition und Lizenz",
   "admin.sidebar.localization": "Lokalisation",
   "admin.sidebar.logging": "Protokollierung",
   "admin.sidebar.login": "Anmelden",
   "admin.sidebar.logs": "Protokolle",
-  "admin.sidebar.nativeAppLinks": "Native App Links",
+  "admin.sidebar.nativeAppLinks": "Mattermost App Links",
   "admin.sidebar.notifications": "Benachrichtigungen",
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "ANDERE",
@@ -932,7 +937,7 @@
   "channel_flow.channel": "Kanal",
   "channel_flow.create": "Erstelle {term}",
   "channel_flow.group": "Gruppe",
-  "channel_flow.handleTooShort": "Channel URL must be 2 or more lowercase alphanumeric characters",
+  "channel_flow.handleTooShort": "Kanal-URL muss zwei oder mehr alphanumerische Zeichen enthalten",
   "channel_flow.invalidName": "Ungültiger Kanal Name",
   "channel_flow.set_url_title": "Setze {term} URL",
   "channel_header.channel": "Kanal",
@@ -1055,7 +1060,7 @@
   "create_comment.files": "Dateien werden hochgeladen",
   "create_post.comment": "Kommentar",
   "create_post.post": "Senden",
-  "create_post.shortcutsNotSupported": "Keyboard shortcuts are not supported on your device.",
+  "create_post.shortcutsNotSupported": "Tastenkürzel werden auf Ihrem Gerät nicht unterstützt.",
   "create_post.tutorialTip": "<h4>Nachrichten senden</h4><p>Geben Sie hier Ihre Nachricht ein und drücken Sie <strong>Enter</strong> um sie senden.</p><p>Klicken Sie den <strong>Anhang</strong> Button um ein Bild oder eine Datei hochzuladen.</p>",
   "create_post.write": "Schreiben Sie eine Nachricht...",
   "create_team.agreement": "Wenn Sie die Erstellung Ihres Accounts fortsetzen und {siteName} nutzen, verstehen Sie sich mit unseren <a href='/static/help/terms.html'>Nutzungsbedingungen</a> und <a href='/static/help/privacy.html'>Datenschutzbedingungen</a> einverstanden. Wenn Sie nicht zustimmen, dürfen Sie {siteName} nicht nutzen.",
@@ -1199,9 +1204,9 @@
   "get_team_invite_link_modal.help": "Senden Sie Teammitgliedern den unten stehenden Link damit diese sich für dieses Team registrieren können. Der Team Einladungslink kann mit mehreren Teammitgliedern geteilt werden da er sich nicht ändert, sofern er nicht in den Teameinstellungen durch den Team Admin geändert wird.",
   "get_team_invite_link_modal.helpDisabled": "Erstellung von Benutzern wurde für Ihr Team deaktiviert. Für Details, fragen Sie bitte Ihren Administrator.",
   "get_team_invite_link_modal.title": "Team Einladungslink",
-  "help.attaching.downloading": "#### Downloading Files\nDownload an attached file by clicking the download icon next to the file thumbnail or by opening the file previewer and clicking **Download**.",
-  "help.attaching.dragdrop": "#### Drag and Drop\nUpload a file or selection of files by dragging the files from your computer into the RHS or center pane. Dragging and dropping attaches the files to the message input box, then you can optionally type a message and press **ENTER** to post.",
-  "help.attaching.icon": "#### Attachment Icon\nAlternatively, upload files by clicking the grey paperclip icon inside the message input box. This opens up your system file viewer where you can navigate to the desired files and then click **Open** to upload the files to the message input box. Optionally type a message and then press **ENTER** to post.",
+  "help.attaching.downloading": "#### Dateien herunterladen\nLaden Sie eine angehängte Datei herunter indem dem Sie das Herunterladen-Icon neben der Vorschau anklicken oder durch öffnen in der Dateivorschau und auf **Herunterladen** klicken.",
+  "help.attaching.dragdrop": "#### Drag and Drop\nLaden Sie eine oder mehrere Dateien hoch indem Sie die Datei(en) vom Ihrem Computer in die rechte oder mittige Fläche ziehen. Wenn Sie die Datei(en) in die Nachrichtenbox ziehen können Sie optional eine Nachricht dazu verfassen und durch **ENTER** absenden.",
+  "help.attaching.icon": "#### Anhänge Icon\nAlternativ können Sie Dateien über einen Klick auf die graue Büroklammer in der Nachrichtenbox hochladen. Dies öffnet den Systemdatei Dialog in dem Sie zu den gewünschten Dateien navigieren können und durch einen Klick auf **Öffnen** hochladen können. Optional können Sie noch eine Nachricht verfassen und mit **ENTER** absenden.",
   "help.attaching.limitations": "## File Size Limitations\nMattermost supports a maximum of five attached files per post, each with a maximum file size of 50Mb.",
   "help.attaching.methods": "## Attachment Methods\nAttach a file by drag and drop or by clicking the attachment icon in the message input box.",
   "help.attaching.notSupported": "Document preview (Word, Excel, PPT) is not yet supported.",
@@ -1308,6 +1313,7 @@
   "installed_integrations.creation": "Erstellt durch {creator} am {createAt, date, full}",
   "installed_integrations.delete": "Löschen",
   "installed_integrations.hideSecret": "Secret ausblenden",
+  "installed_integrations.regenSecret": "Regenerate Secret",
   "installed_integrations.regenToken": "Token neu generieren",
   "installed_integrations.showSecret": "Secret einblenden",
   "installed_integrations.token": "Token: {token}",
@@ -1468,7 +1474,7 @@
   "navbar_dropdown.leave": "Team verlassen",
   "navbar_dropdown.logout": "Abmelden",
   "navbar_dropdown.manageMembers": "Mitglieder verwalten",
-  "navbar_dropdown.nativeApps": "Native Apps herunterladen",
+  "navbar_dropdown.nativeApps": "Download Mattermost Apps",
   "navbar_dropdown.report": "Fehler melden",
   "navbar_dropdown.switchTeam": "Wechsel zu {team}",
   "navbar_dropdown.switchTo": "Wechsel zu ",
@@ -1589,7 +1595,7 @@
   "sidebar_right_menu.inviteNew": "Neues Mitglied einladen",
   "sidebar_right_menu.logout": "Abmelden",
   "sidebar_right_menu.manageMembers": "Mitglieder verwalten",
-  "sidebar_right_menu.nativeApps": "Native App herunterladen",
+  "sidebar_right_menu.nativeApps": "Download Mattermost Apps",
   "sidebar_right_menu.recentMentions": "Kürzliche Erwähnungen",
   "sidebar_right_menu.report": "Fehler melden",
   "sidebar_right_menu.switch_team": "Teamauswahl",
@@ -1859,21 +1865,39 @@
   "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",
-  "user.settings.notifications.commentsAny": "Bei allen Kommentaren im Thread an dem Sie teilnehmen (Dies beinhaltet Nennungen zu Ihrer Hauptnachricht sowie jeder Kommentar nachdem Sie auf eine Nachricht kommentiert haben)",
-  "user.settings.notifications.commentsInfo": "Modus für das Auslösen von Benachrichtigungen von Kommentarthreads an denen Sie teilnehmen.",
-  "user.settings.notifications.commentsNever": "Keine Nennungen für Kommentare",
-  "user.settings.notifications.commentsRoot": "Nennung für jeden Kommentar in den Sie posten",
+  "user.settings.notifications.comments": "Reply notifications",
+  "user.settings.notifications.commentsAny": "Trigger notifications on messages in reply threads that I start or participate in",
+  "user.settings.notifications.commentsInfo": "In addition to notifications for when you're mentioned, select if you would like to receive notifications on reply threads.",
+  "user.settings.notifications.commentsNever": "Do not trigger notifications on messages in reply threads unless I'm mentioned",
+  "user.settings.notifications.commentsRoot": "Trigger notifications on messages in threads that I start",
   "user.settings.notifications.desktop": "Desktop Benachrichtigungen senden",
+  "user.settings.notifications.desktop.allFirefoxForever": "For all activity, shown indefinitely",
+  "user.settings.notifications.desktop.allFirefoxTimed": "For all activity, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.allNoSoundForever": "For all activity, without sound, shown indefinitely",
+  "user.settings.notifications.desktop.allNoSoundTimed": "For all activity, without sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.allSoundForever": "For all activity, with sound, shown indefinitely",
+  "user.settings.notifications.desktop.allSoundTimed": "For all activity, with sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.duration": "Notification duration",
+  "user.settings.notifications.desktop.durationInfo": "Sets how long desktop notifications will remain on screen.",
+  "user.settings.notifications.desktop.mentionsFirefoxForever": "For mentions and direct messages, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsFirefoxTimed": "For mentions and direct messages, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.mentionsNoSoundForever": "For mentions and direct messages, without sound, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsNoSoundTimed": "For mentions and direct messages, without sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.mentionsSoundForever": "For mentions and direct messages, with sound, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsSoundTimed": "For mentions and direct messages, with sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.seconds": "{seconds} seconds",
+  "user.settings.notifications.desktop.sound": "Notification sound",
+  "user.settings.notifications.desktop.title": "Töne der Desktopbenachrichtigungen",
+  "user.settings.notifications.desktop.unlimited": "Unlimited",
   "user.settings.notifications.desktopSounds": "Töne der Desktopbenachrichtigungen",
-  "user.settings.notifications.emailBatchingInfo": "Benachrichtigungen werden in eine einzelne E-Mail kombiniert und zur hier gewählten maximalen Frequenz versendet.",
+  "user.settings.notifications.emailBatchingInfo": "Notifications received over the time period selected are combined and sent in a single email.",
   "user.settings.notifications.emailInfo": "E-Mail Benachrichtigungen werden bei Nennungen und Direktnachrichten gesendet, sobald Sie von {siteName} mehr als 5 Minuten offline oder abwesend waren.",
-  "user.settings.notifications.emailNotifications": "Desktop Benachrichtigungen senden",
+  "user.settings.notifications.emailNotifications": "E-Mail Benachrichtigung",
   "user.settings.notifications.everyHour": "Jede Stunde",
   "user.settings.notifications.everyXMinutes": "{count, plural, one {Jede Minute} other {Alle {count, number} Minuten}}",
   "user.settings.notifications.header": "Benachrichtigungen",
   "user.settings.notifications.immediately": "Sofort",
-  "user.settings.notifications.info": "Desktopbenachrichtigung ist für Firefox, Safari, Chrome, Internet Explorer und Edge verfügbar.",
+  "user.settings.notifications.info": "Desktop notifications are available on Firefox, Safari, and Chrome.",
   "user.settings.notifications.never": "Nie",
   "user.settings.notifications.noWords": "Keine Wörter konfiguriert",
   "user.settings.notifications.off": "Aus",
@@ -1884,7 +1908,7 @@
   "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.sounds_info": "Notification sounds are available on IE11, Edge, Safari and Chrome.",
   "user.settings.notifications.teamWide": "Team-weite Nennungen \"@all\"",
   "user.settings.notifications.title": "Benachrichtigungseinstellungen",
   "user.settings.notifications.usernameMention": "Nennung Ihres Benutzernamens \"@{username}\"",
@@ -1902,10 +1926,13 @@
   "user.settings.push_notification.onlyMentionsAway": "For mentions and direct messages when away or offline",
   "user.settings.push_notification.onlyMentionsOffline": "For mentions and direct messages when offline",
   "user.settings.push_notification.onlyMentionsOnline": "For mentions and direct messages when online, away or offline",
-  "user.settings.push_notification.status_info": "Notification alerts are pushed to your mobile device depending on your online status.",
+  "user.settings.push_notification.send": "Mobile Push-Nachrichten versenden",
+  "user.settings.push_notification.status": "Trigger push notifications when",
+  "user.settings.push_notification.status_info": "Notification alerts are only pushed to your mobile device when your online status matches the selection above.",
   "user.settings.security.close": "Schließen",
   "user.settings.security.currentPassword": "Aktuelles Passwort",
   "user.settings.security.currentPasswordError": "Bitte geben Sie Ihr aktuelles Passwort ein.",
+  "user.settings.security.deauthorize": "Deauthorize",
   "user.settings.security.emailPwd": "E-Mail-Adresse und Passwort",
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "Google",
@@ -1916,6 +1943,10 @@
   "user.settings.security.logoutActiveSessions": "Zeigen und beenden von aktiven Sitzungen",
   "user.settings.security.method": "Anmeldemethode",
   "user.settings.security.newPassword": "Neues Passwort",
+  "user.settings.security.noApps": "No OAuth 2.0 Applications are authorized.",
+  "user.settings.security.oauthApps": "OAuth 2.0 Applikationen",
+  "user.settings.security.oauthAppsDescription": "Click 'Edit' to manage your OAuth 2.0 Applications",
+  "user.settings.security.oauthAppsHelp": "Applications act on your behalf to access your data based on the permissions you grant them.",
   "user.settings.security.office365": "Office 365",
   "user.settings.security.oneSignin": "Sie können immer nur eine Anmeldemethode haben. Der Wechsel der Anmeldemethode löst eine E-Mail mit dem Umstellungserfolg aus.",
   "user.settings.security.password": "Passwort",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index 342e64388..281b4ee94 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -102,7 +102,7 @@
   "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.doneHelp": "La aplicación de OAuth 2.0 se ha establecido. Por favor utiliza el siguiente ID de Cliente y Secreto de Cliente cuando solicites autorización para tu aplicación.",
-  "add_oauth_app.doneUrlHelp": "Por favor enviar los datos a la siguiente dirección URL.",
+  "add_oauth_app.doneUrlHelp": "Los siguientes son los URL de redireccionamiento autorizado(s).",
   "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.",
@@ -141,6 +141,7 @@
   "admin.audits.title": "Auditorías del Servidor",
   "admin.authentication.email": "Correo Electrónico",
   "admin.authentication.gitlab": "GitLab",
+  "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "Nota:",
@@ -198,6 +199,8 @@
   "admin.compliance_table.userId": "Solicitado por",
   "admin.connectionSecurityNone": "Ninguna",
   "admin.connectionSecurityNoneDescription": "Mattermost podrá utilizar una conexión insegura.",
+  "admin.connectionSecurityPlain": "PLANO",
+  "admin.connectionSecurityPlainDescription": "Mattermost se conectará y realizará la autenticación con una conexión insegura.",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "Intenta convertir una conexión insegura a una conexión segura utilizando TLS.",
   "admin.connectionSecurityTest": "Probar Conexión",
@@ -214,7 +217,7 @@
   "admin.customization.enableCustomEmojiTitle": "Habilitar Emoticones Personalizados:",
   "admin.customization.iosAppDownloadLinkDesc": "Agrega un enlace para descargar la aplicación para iOS. Los usuarios que tienen acceso al sitio en un navegador de web móvil serán presentados con una página que les da la opción de descargar la aplicación. Deja este campo en blanco para evitar que la página aparezca.",
   "admin.customization.iosAppDownloadLinkTitle": "Enlace de Descarga de la Aplicación para iOS:",
-  "admin.customization.nativeAppLinks": "Enlaces de Aplicaciones Nativas",
+  "admin.customization.nativeAppLinks": "Enlaces de Mattermost App",
   "admin.customization.restrictCustomEmojiCreationAdmin": "Permitir la creación de emoticones a los Administradores de Sistema y Equipo",
   "admin.customization.restrictCustomEmojiCreationAll": "Permitir a todos que puedan crear emoticones personalizados",
   "admin.customization.restrictCustomEmojiCreationDesc": "Restringir la creación de emoticones personalizados a ciertos usuarios.",
@@ -401,13 +404,13 @@
   "admin.ldap.emailAttrTitle": "Atributo de Correo Electrónico:",
   "admin.ldap.enableDesc": "Cuando es verdadero, Mattermost permite realizar inicio de sesión utilizando LDAP",
   "admin.ldap.enableTitle": "Habilitar el inicio de sesión con LDAP:",
-  "admin.ldap.firstnameAttrDesc": "El atributo en el servidor LDAP que será utilizado para poblar el nombre de los usuarios en Mattermost.",
+  "admin.ldap.firstnameAttrDesc": "(Opcional) El atributo en el servidor LDAP que será utilizado para poblar el nombre de los usuarios en Mattermost.",
   "admin.ldap.firstnameAttrEx": "Ej \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "Atributo del Nombre",
   "admin.ldap.idAttrDesc": "El atributo en el servidor LDAP que será utilizado para poblar el identificador único en Mattermost. Debe ser un atributo de LDAP que no cambie con el tiempo, como el nombre de usuario o el uid. Si el atributo del identificador cambia, se creará una nueva cuenta en Mattermost que no está asociada a la anterior. Este valor es utilizado para iniciar sesión en Mattermost en el campo \"Usuario LDAP\" en la página de inicio de sesión. Normalmente este atributo es el mismo que el campo “Atributo Usuario”. Si el equipo normalmente utiliza dominio\\usuario para iniciar sesión en otros servicios con LDAP, puedes elegir llenar este campo como dominio\\usuario para mantener consistencia entre los servicios.",
   "admin.ldap.idAttrEx": "Ej \"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "Atributo ID:  ",
-  "admin.ldap.lastnameAttrDesc": "El atributo en el servidor LDAP que será utilizado para poblar el apellido de los usuarios en Mattermost.",
+  "admin.ldap.lastnameAttrDesc": "(Opcional) El atributo en el servidor LDAP que será utilizado para poblar el apellido de los usuarios en Mattermost.",
   "admin.ldap.lastnameAttrEx": "Ej \"sn\"",
   "admin.ldap.lastnameAttrTitle": "Atributo Apellido:",
   "admin.ldap.loginNameDesc": "El texto que aparece en el campo de inicio de sesión en la página para iniciar sesión. Predeterminado a \"Nombre de usuario LDAP\".",
@@ -416,7 +419,7 @@
   "admin.ldap.maxPageSizeEx": "Ej \"2000\"",
   "admin.ldap.maxPageSizeHelpText": "El número máximo de usuarios que el servidor Mattermost solicitará al servidor LDAP a la vez. 0 es sin límites.",
   "admin.ldap.maxPageSizeTitle": "Tamaño Máximo de Página",
-  "admin.ldap.nicknameAttrDesc": "(Opcional) El atributo en el servidor LDAP que será utilizado para poblar el sobrenombre de los usuarios en Mattermos.",
+  "admin.ldap.nicknameAttrDesc": "(Opcional) El atributo en el servidor LDAP que será utilizado para poblar el sobrenombre de los usuarios en Mattermost.",
   "admin.ldap.nicknameAttrEx": "Ej \"sobrenombre\"",
   "admin.ldap.nicknameAttrTitle": "Atributo del Sobrenombre:",
   "admin.ldap.noLicense": "<h4 class=\"banner__heading\">Nota:</h4><p>LDAP es una característica de la edición enterprise. Tu licencia actual no soporta LDAP. Pincha <a href=\"http://mattermost.com\" target=\"_blank\">aquí</a> para obtener información y precios de las licencias enterprise.</p>",
@@ -429,13 +432,15 @@
   "admin.ldap.serverDesc": "El dominio o dirección IP del servidor LDAP.",
   "admin.ldap.serverEx": "Ej \"10.0.0.23\"",
   "admin.ldap.serverTitle": "Servidor LDAP:",
-  "admin.ldap.skipCertificateVerification": "Omitir la Verificación del Certificado",
+  "admin.ldap.skipCertificateVerification": "Omitir la Verificación del Certificado:",
   "admin.ldap.skipCertificateVerificationDesc": "Omite la verificación del certificado para las conexiones TLS o STARTTLS. No recomendado para ambientes de producción donde TLS es requerido. Utilizalo sólamente para pruebas.",
   "admin.ldap.syncFailure": "Error de Sincronización: {error}",
   "admin.ldap.syncIntervalHelpText": "La Sincronización LDAP actualiza la información de usuarios en Mattermost para reflejar las actualizaciones en el servidor LDAP. Por ejemplo, cuando un el nombre de usuario cambia en el servidor LDAP, el cambio es reflejado en Mattermost cuando se realiza la sincronización. Las cuentas eliminadas o deshabilitadas en el servidor LDAP tendrán sus cuentas en Mattermost como \"Inactiva\" y las sesiones revocadas. Mattermost realiza la sincronización en el intervalo de ingresado. Por ejemplo, si se introduce 60, Mattermost sincroniza cada 60 minutos.",
-  "admin.ldap.syncIntervalTitle": "Intervalo de Sincronización (minutos)",
+  "admin.ldap.syncIntervalTitle": "Intervalo de Sincronización (minutos):",
   "admin.ldap.syncNowHelpText": "Inicia una sincronización LDAP inmediatamente.",
   "admin.ldap.sync_button": "LDAP Sincronizar Ahora",
+  "admin.ldap.testFailure": "Falla de la Prueba LDAP: {error}",
+  "admin.ldap.testHelpText": "Comprueba si el servidor Mattermost puede conectar con el servidor LDAP especificado. Consulta el archivo de registro de mensajes de error para más detalles.",
   "admin.ldap.uernameAttrDesc": "El atributo en el servidor LDAP que se utilizará para poblar el nombre de usuario en Mattermost. Este puede ser igual al Attributo Id.",
   "admin.ldap.userFilterDisc": "(Opcional) Introduce un Filtro LDAP a utilizar para buscar los objetos de usuario. Sólo los usuarios seleccionados por la consulta será capaz de acceder a Mattermost. Para Active Directory, la consulta para filtrar a los usuarios con deshabilitados es (&(objectCategory=Persona)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "Ej. \"(objectClass=user)\"",
@@ -513,9 +518,9 @@
   "admin.password.requirementsDescription": "Los tipos de caracteres que se requiere para una contraseña válida.",
   "admin.password.symbol": "Al menos un símbolo (por ejemplo,\"~!@#$%^&*()\")",
   "admin.password.uppercase": "Al menos una letra en mayúscula",
-  "admin.privacy.showEmailDescription": "Cuando es falso, oculta la dirección de correo para otros usuarios en la interfaz de usuario, incluyendo a los dueños y administradores del grupo. Usado cuando el sistema es configurado para administrar grupos y donde algunos usuarios escogen mantener su información de contacto como privada.",
+  "admin.privacy.showEmailDescription": "Cuando es falso, oculta la dirección de correo para otros usuarios en la interfaz de usuario, incluyendo a los dueños y Administradores de Equipo. Usado cuando el sistema es configurado para administrar equipos donde algunos usuarios escogen mantener su información de contacto privada.",
   "admin.privacy.showEmailTitle": "Mostrar dirección de correo electrónico: ",
-  "admin.privacy.showFullNameDescription": "Cuando está asignado en falso, esconde el nombre completo de los usuarios para otros usuarios, incluyendo dueños de equipos y administradores de equipos. El nombre de usuario es mostrado en vez del nombre completo.",
+  "admin.privacy.showFullNameDescription": "Cuando es falso, esconde el nombre completo de los usuarios para otros usuarios, incluyendo dueños y Administradores de Equipos. El nombre de usuario es mostrado en vez del nombre completo.",
   "admin.privacy.showFullNameTitle": "Mostrar nombre completo: ",
   "admin.rate.enableLimiterDescription": "Cuando es verdadero, La APIs son reguladas a tasas especificadas a continuación.",
   "admin.rate.enableLimiterTitle": "Habilitar el limitador de velocidad: ",
@@ -558,7 +563,7 @@
   "admin.saml.enableTitle": "Habilitar el inicio de Sesión con SAML:",
   "admin.saml.encryptDescription": "Cuando es verdadero, Mattermost descifrará las Aserciones SAML cifrados con el Certificado Público del Proveedor de Servicio.",
   "admin.saml.encryptTitle": "Habilitar el Cifrado:",
-  "admin.saml.firstnameAttrDesc": "El atributo de la Aserción SAML que se utilizará para rellenar el nombre de los usuarios en Mattermost.",
+  "admin.saml.firstnameAttrDesc": "(Opcional) El atributo de la Aserción SAML que se utilizará para rellenar el nombre de los usuarios en Mattermost.",
   "admin.saml.firstnameAttrEx": "Ej \"FirstName\".",
   "admin.saml.firstnameAttrTitle": "Atributo del Nombre",
   "admin.saml.idpCertificateFileDesc": "El certificado de autentcación público expedido por el Proveedor de Identidad.",
@@ -570,7 +575,7 @@
   "admin.saml.idpUrlDesc": "El URL al cual Mattermost enviará las solicitudes de SAML para iniciar la secuencia de inicio de sesión.",
   "admin.saml.idpUrlEx": "Ej \"https://idp.example.org/SAML2/SSO/Login\"",
   "admin.saml.idpUrlTitle": "SAML SSO URL:",
-  "admin.saml.lastnameAttrDesc": "El atributo de la Aserción SAML que se utilizará para rellenar el apellido de los usuarios en Mattermost.",
+  "admin.saml.lastnameAttrDesc": "(Opcional) El atributo de la Aserción SAML que se utilizará para rellenar el apellido de los usuarios en Mattermost.",
   "admin.saml.lastnameAttrEx": "Ej \"LastName\"",
   "admin.saml.lastnameAttrTitle": "Atributo Apellido:",
   "admin.saml.localeAttrDesc": "(Opcional) El atributo de La Aserción SAML que se utilizará para rellenar el idioma de los usuarios en Mattermost.",
@@ -627,8 +632,8 @@
   "admin.service.googleDescription": "Establece esta clave para mostrar los títulos de los vídeos de YouTube incorporado en las previsualizaciones. Sin la clave, las previsualizaciones de YouTube igual serán creadas en base a los enlaces que aparecen en los mensajes o comentarios, pero no se mostrará el título de vídeo. Ve el <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Tutorial para Desarrolladores de Google</a> para ver las instrucciones sobre cómo obtener una clave.",
   "admin.service.googleExample": "Ej \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Llave del API de Google:",
-  "admin.service.iconDescription": "Cuando es verdadero, se le permitirá cambiar el icono del mensaje desde webhooks. Nota, en combinación con permitir el cambio de nombre de usuario, podría exponer a los usuarios a sufrir ataques de phishing.",
-  "admin.service.iconTitle": "Habilitar que los webhooks y comandos de barra reemplacen la imagen del icono de perfil:",
+  "admin.service.iconDescription": "Cuando es verdadero, los webhooks, comandos de barra y otras integraciones, tales como <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, podrán cambiar la imagen de perfil del mensaje que generan. Nota: Al combinar con el permitir a las integraciones reescribir nombres de usuario, puede que los usuarios sean capaces de realizar ataques de phishing tratando de hacerse pasar por otros usuarios.",
+  "admin.service.iconTitle": "Permitir a las integraciones reescribir imágenes de perfil:",
   "admin.service.insecureTlsDesc": "Cuando es verdadero, cualquier solicitud de salida por HTTPS será aceptada incluso si posee certificados no verificados o autofirmados. Por ejemplo, webhooks de salida a un servidor con un certificado TLS autofirmado, utilizando cualquier dominio, será permitido. Tenga en cuenta que esto hace que estas conexiones susceptibles a los ataques hombre-en-el-medio.",
   "admin.service.insecureTlsTitle": "Habilitar Conexiones de Salida Inseguras: ",
   "admin.service.integrationAdmin": "Restringir la creación de integraciones al Administradores de Sistema y Equipo: ",
@@ -642,8 +647,8 @@
   "admin.service.mobileSessionDaysDesc": "El número de días desde la última vez que un usuario ingreso sus credenciales para que la sesión del usuario expire. Luego de cambiar esta configuración, la nueva duración de la sesión tendrá efecto luego de la próxima vez que el usuario ingrese sus credenciales.",
   "admin.service.outWebhooksDesc": "Cuando es verdadero, los webhooks de salida serán permitidos. Revisa la <a href='http://docs.mattermost.com/developer/webhooks-outgoing.html' target='_blank'>documentación</a> para obtener más información.",
   "admin.service.outWebhooksTitle": "Habilitar Webhooks de Salida: ",
-  "admin.service.overrideDescription": "Cuando es verdadero, se le permitirá cambiar el nombre de usuario desde webhooks. Nota, en conjunto con cambio de icono, podría exponer a los usuarios a sufrir ataques de phishing.",
-  "admin.service.overrideTitle": "Habilitar que los webhooks y comandos de barra para reemplacen los nombres de usuario:",
+  "admin.service.overrideDescription": "Cuando es verdadero, los webhooks, comandos de barra y otras integraciones, tales como <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, podrán cambiar el nombre de usuario del mensaje que generan. Nota: Al combinar con el permitir a las integraciones reescribir imágenes de perfil, puede que los usuarios sean capaces de realizar ataques de phishing tratando de hacerse pasar por otros usuarios.",
+  "admin.service.overrideTitle": "Permitir a las integraciones reescribir nombres de usuario:",
   "admin.service.securityDesc": "Cuando es verdadero, Los Administradores del Sistema serán notificados por correo electrónico se han anunciado alertas de seguridad relevantes en las últimas 12 horas. Requiere que los correos estén habilitados.",
   "admin.service.securityTitle": "Habilitar Alertas de Seguridad: ",
   "admin.service.segmentDescription": "Segment.com es un servicio en línea que puede ser utilizado opcionalmente para el seguimiento detallado de las estadísticas del sistema. Puedes obtener una clave de registro para obtener una cuenta gratuita en Segment.com.",
@@ -684,14 +689,14 @@
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.images": "Imagenes",
   "admin.sidebar.integrations": "Integraciones",
-  "admin.sidebar.ldap": "LDAP",
+  "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Legal y Soporte",
   "admin.sidebar.license": "Edición y Licencia",
   "admin.sidebar.localization": "Idiomas",
   "admin.sidebar.logging": "Registros",
   "admin.sidebar.login": "Inicio de Sesión",
   "admin.sidebar.logs": "Registros",
-  "admin.sidebar.nativeAppLinks": "Enlaces de Aplicaciones Nativas",
+  "admin.sidebar.nativeAppLinks": "Enlaces de Mattermost App",
   "admin.sidebar.notifications": "Notificaciones",
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "OTROS",
@@ -1197,7 +1202,7 @@
   "get_post_link_modal.help": "En enlace de abajo permite a los usuarios autorizados a ver tu mensaje.",
   "get_post_link_modal.title": "Copiar enlace Permanente",
   "get_team_invite_link_modal.help": "Envía el siguiente enlace a tus compañeros para que se registren a este equipo. El enlace de invitación al equipo puede ser compartido con multiples compañeros y el mismo no cambiará a menos que sea regenerado en la Configuración del Equipo por un Administrador del Equipo.",
-  "get_team_invite_link_modal.helpDisabled": "La creación de usuario ha sido deshabilitada para tu equipo. Por favor solicita más detalles a tu administrador de equipo.",
+  "get_team_invite_link_modal.helpDisabled": "La creación de usuario ha sido desactivado para tu equipo. Por favor solicita más detalles a tu Administrador de Equipo.",
   "get_team_invite_link_modal.title": "Enlace de Invitación al Equipo",
   "help.attaching.downloading": "#### Descarga de Archivos\nDescargar un archivo adjunto haciendo clic en el icono de descarga junto a la miniatura del archivo o abriendo el archivo en vista previa y haciendo clic en **Descargar**.",
   "help.attaching.dragdrop": "#### Arrastrar y Soltar\nSubir un archivo o un conjunto de archivos arrastrando los archivos desde tu computadora en la barra lateral derecha o en el centro del panel. Arrastrar y soltar adjunta los archivos a los mensajes, a continuación, puede escribir un mensaje y pulse la tecla **RETORNO** para publicar.",
@@ -1308,6 +1313,7 @@
   "installed_integrations.creation": "Creado por {creator} el {createAt, date, full}",
   "installed_integrations.delete": "Eliminar",
   "installed_integrations.hideSecret": "Ocultar Clave Secreta",
+  "installed_integrations.regenSecret": "Regenerar Secreto",
   "installed_integrations.regenToken": "Regenerar Token",
   "installed_integrations.showSecret": "Mostrar Clave Secreta",
   "installed_integrations.token": "Token: {token}",
@@ -1366,8 +1372,8 @@
   "invite_member.addAnother": "Agregar otro",
   "invite_member.autoJoin": "Las personas invitadas se unirán automáticamente al canal <strong>{channel}</strong>.",
   "invite_member.cancel": "Cancelar",
-  "invite_member.content": "El envio de correos está actualmente desactivado para tu equipo, por lo que no puedes enviar invitaciones.",
-  "invite_member.disabled": "La creación de usuarios ha sido deshabilitada para tu equipo. Por favor consulta con un administrador de tu equipo.",
+  "invite_member.content": "El envío de correos electrónicos está actualmente desactivado para tu equipo, por lo que no puedes enviar invitaciones. Contacta a tu Administrador de Sistema para que active los correos electrónicos y el envío de invitaciones.",
+  "invite_member.disabled": "La creación de usuario ha sido desactivado para tu equipo. Por favor solicita más detalles a tu Administrador de Equipo.",
   "invite_member.emailError": "Por favor ingresa un correo electrónico válido",
   "invite_member.firstname": "Nombre",
   "invite_member.inviteLink": "Enlace de Invitación al Equipo",
@@ -1408,7 +1414,7 @@
   "login.noEmailUsername": "Por favor, introduzca su correo electrónico o nombre de usuario",
   "login.noEmailUsernameLdapUsername": "Por favor, introduzca su correo electrónico, nombre de usuario o {ldapUsername}",
   "login.noLdapUsername": "Por favor, introduzca su {ldapUsername}",
-  "login.noMethods": "No hay métodos de inicio de sesión configurados, por favor contacta a tu Administrador de Sistema.",
+  "login.noMethods": "No hay métodos de inicio de sesión habilitados, por favor contacta a tu Administrador de Sistema.",
   "login.noPassword": "Por favor ingresa tu contraseña.",
   "login.noUsername": "Por favor, introduzca su nombre de usuario",
   "login.noUsernameLdapUsername": "Por favor, introduzca su nombre de usuario o {ldapUsername}",
@@ -1468,7 +1474,7 @@
   "navbar_dropdown.leave": "Abandonar Equipo",
   "navbar_dropdown.logout": "Cerrar sesión",
   "navbar_dropdown.manageMembers": "Administrar Miembros",
-  "navbar_dropdown.nativeApps": "Descargar Aplicaciones Nativas",
+  "navbar_dropdown.nativeApps": "Descargar Apps de Mattermost",
   "navbar_dropdown.report": "Reportar un Problema",
   "navbar_dropdown.switchTeam": "Cambiar a {team}",
   "navbar_dropdown.switchTo": "Cambiar a ",
@@ -1589,19 +1595,19 @@
   "sidebar_right_menu.inviteNew": "Invitar Nuevo Miembro",
   "sidebar_right_menu.logout": "Cerrar sesión",
   "sidebar_right_menu.manageMembers": "Adminisrar Miembros",
-  "sidebar_right_menu.nativeApps": "Descargar Aplicación Nativa",
+  "sidebar_right_menu.nativeApps": "Descargar Apps de Mattermost",
   "sidebar_right_menu.recentMentions": "Menciones recientes",
   "sidebar_right_menu.report": "Reporta un Problema",
   "sidebar_right_menu.switch_team": "Seleccionar Equipo",
   "sidebar_right_menu.teamLink": "Enlace Invitación al Equipo",
   "sidebar_right_menu.teamSettings": "Configurar Equipo",
   "sidebar_right_menu.viewMembers": "Ver Miembros",
-  "signup.email": "Email and Password",
+  "signup.email": "Correo electrónico y Contraseña",
   "signup.gitlab": "GitLab Single-Sign-On",
-  "signup.google": "Google Account",
-  "signup.ldap": "LDAP Credentials",
+  "signup.google": "Cuenta de Google",
+  "signup.ldap": "Credenciales LDAP",
   "signup.office365": "Office 365",
-  "signup.title": "Create an account with:",
+  "signup.title": "Crea una cuenta con:",
   "signup_team.choose": "Tus equipos: ",
   "signup_team.createTeam": "O Crea un Equipo",
   "signup_team.disabled": "La creación de Equipos ha sido deshabilitada.",
@@ -1664,7 +1670,7 @@
   "team_export_tab.unable": " No se pudo exportar: {error}",
   "team_import_tab.failure": " Fallo al importar: ",
   "team_import_tab.import": "Importar",
-  "team_import_tab.importHelp": "<p>Para importar un equipo desde Slack dirigete a Slack > Team Settings > Import/Export Data > Export > Start Export. Slack no permite exportar archivos, imágenes, grupos privados o mensajes directos almacenados en Slack. Por ende, La importación desde Slack hacia Mattermost sólo soporta la importación de los mensajes de texto de los canales públicos de tu equipo.</p><p>La importación desde Slack hacia Mattermost está en fase \"Beta\". Los mensajes enviados por Bots en y las @menciones actualmente no son soportados.</p>",
+  "team_import_tab.importHelp": "<p>Para importar un equipo desde Slack dirígete a Slack > Import/Export Data > Export > Start Export. Slack no permite exportar archivos, imágenes, grupos privados o mensajes directos almacenados en Slack. Por ende, importar desde Slack hacia Mattermost sólo soporta los mensajes de texto de los canales públicos de tu equipo en Slack.</p><p>Importar desde Slack hacia Mattermost está en fase \"Beta\". Los mensajes de bots actualmente no son importados.</p>",
   "team_import_tab.importSlack": "Importar desde Slack (Beta)",
   "team_import_tab.importing": " Importando...",
   "team_import_tab.successful": " Importado con éxito: ",
@@ -1796,7 +1802,7 @@
   "user.settings.general.emailGitlabCantUpdate": "El inicio de sesión ocurre a través GitLab. El correo electrónico no puede ser actualizado. La dirección de correo electrónico utilizada para las notificaciones es {email}.",
   "user.settings.general.emailGoogleCantUpdate": "El inicio de sesión ocurre a través Google. El correo electrónico no puede ser actualizado. La dirección de correo electrónico utilizada para las notificaciones es {email}.",
   "user.settings.general.emailHelp1": "El correo electrónico es utilizado para iniciar sesión, recibir notificaciones y para restablecer la contraseña. Si se cambia el correo electrónico deberás verificarlo nuevamente.",
-  "user.settings.general.emailHelp2": "El correo ha sido deshabilitado por el administrador de sistemas. No llegarán correos de notificación hasta que se vuelva a habilitar.",
+  "user.settings.general.emailHelp2": "El correo ha sido desactivado por el Administrador de Sistema. No llegarán correos de notificación hasta que se vuelva a habilitar.",
   "user.settings.general.emailHelp3": "El correo electrónico es utilizado para iniciar sesión, recibir notificaciones y para restablecer la contraseña.",
   "user.settings.general.emailHelp4": "Un correo de verificación ha sido enviado a {email}.",
   "user.settings.general.emailLdapCantUpdate": "El inicio de sesión ocurre a través LDAP. El correo electrónico no puede ser actualizado. La dirección de correo electrónico utilizada para las notificaciones es {email}.",
@@ -1859,53 +1865,74 @@
   "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",
-  "user.settings.notifications.commentsAny": "Menciones en cualquier comentario en un hilo en el que hayas participado (Esto incluye tanto las menciones a tu mensaje padre como a cualquier comentario recibido luego de que hayas comentado un mensaje)",
-  "user.settings.notifications.commentsInfo": "Modo en que se activan las notificaciones en mensajes con hilo de comentarios en los cual participas.",
-  "user.settings.notifications.commentsNever": "No menciones en comentarios",
-  "user.settings.notifications.commentsRoot": "Mención de cualquier comentario en tus mensajes",
+  "user.settings.notifications.comments": "Notificaciones para respuestas",
+  "user.settings.notifications.commentsAny": "Activa notificaciones para mensajes en respuesta a los hilos de conversaciones que inicie o en los cuales participe",
+  "user.settings.notifications.commentsInfo": "Además de las notificaciones para las cuales eres mencionado(a), selecciona si quieres recibir notificaciones a las respuestas en los hilos de conversaciones.",
+  "user.settings.notifications.commentsNever": "No activar notificaciones de mensajes en respuesta hilos a menos que yo esté mencionado",
+  "user.settings.notifications.commentsRoot": "Activar notificaciones para mensajes en los hilos de conversación iniciados por mi",
   "user.settings.notifications.desktop": "Enviar notifiaciones de escritorio",
+  "user.settings.notifications.desktop.allFirefoxForever": "Para toda actividad, que se muestran de forma permanente",
+  "user.settings.notifications.desktop.allFirefoxTimed": "Para toda actividad, que se muestran por {seconds} segundos",
+  "user.settings.notifications.desktop.allNoSoundForever": "Para toda actividad, sin sonido, que se muestran de forma permanente",
+  "user.settings.notifications.desktop.allNoSoundTimed": "Para toda actividad, sin sonido, que se muestran por {seconds} segundos",
+  "user.settings.notifications.desktop.allSoundForever": "Para toda actividad, con sonido, que se muestran de forma permanente",
+  "user.settings.notifications.desktop.allSoundTimed": "Para toda actividad, con sonido, que se muestran por {seconds} segundos",
+  "user.settings.notifications.desktop.duration": "Duración de la notificación:",
+  "user.settings.notifications.desktop.durationInfo": "Determina el tiempo que las notificaciones de escritorio permanecerán en la pantalla.",
+  "user.settings.notifications.desktop.mentionsFirefoxForever": "Para las menciones y mensajes directos, que se muestran de forma permanente",
+  "user.settings.notifications.desktop.mentionsFirefoxTimed": "Para las menciones y mensajes directos, que se muestran por {seconds} segundos",
+  "user.settings.notifications.desktop.mentionsNoSoundForever": "Para las menciones y mensajes directos, sin sonido, que se muestran de forma permanente",
+  "user.settings.notifications.desktop.mentionsNoSoundTimed": "Para las menciones y mensajes directos, sin sonido, que se muestran por {seconds} segundos",
+  "user.settings.notifications.desktop.mentionsSoundForever": "Para las menciones y mensajes directos, con sonido, que se muestran de forma permanente",
+  "user.settings.notifications.desktop.mentionsSoundTimed": "Para las menciones y mensajes directos, con sonido, que se muestran por {seconds} segundos",
+  "user.settings.notifications.desktop.seconds": "{seconds} segundos",
+  "user.settings.notifications.desktop.sound": "Sonido de la notificación",
+  "user.settings.notifications.desktop.title": "Notificaciones de escritorio",
+  "user.settings.notifications.desktop.unlimited": "Ilimitada",
   "user.settings.notifications.desktopSounds": "Sonidos de notificación de escritorio",
-  "user.settings.notifications.emailBatchingInfo": "Las notificaciones son combinadas en un solo correo electrónico y es enviado una vez se cumpla la máxima frecuencia seleccionada aquí.",
-  "user.settings.notifications.emailInfo": "Las notificaciones por correo son enviadas para menciones y mensajes directos después de que estés fuera de línea o ausente de {siteName} por más de 5 minutos.",
-  "user.settings.notifications.emailNotifications": "Enviar notificaciones de correo electrónico",
+  "user.settings.notifications.emailBatchingInfo": "Las notificaciones recibidas durante el período de tiempo seleccionado se combinan y enviar en un solo correo electrónico.",
+  "user.settings.notifications.emailInfo": "El correo electrónico que se envía para notificaciones de menciones y mensajes directos cuando estás ausente o desconectado de {siteName} por más de 5 minutos.",
+  "user.settings.notifications.emailNotifications": "Notificaciones de correo",
   "user.settings.notifications.everyHour": "Cada hora",
   "user.settings.notifications.everyXMinutes": "Cada {count, plural, one {minuto} other {{count, number} minutos}}",
   "user.settings.notifications.header": "Notificaciones",
   "user.settings.notifications.immediately": "Inmediatamente",
-  "user.settings.notifications.info": "Las notificaciones de escritorio están disponibles en Firefox, Safari, Chrome, Internet Explorer, y Edge.",
+  "user.settings.notifications.info": "Las notificaciones de escritorio están disponibles en Firefox, Safari y Chrome.",
   "user.settings.notifications.never": "Nunca",
   "user.settings.notifications.noWords": "No hay palabras configuradas",
   "user.settings.notifications.off": "Apagado",
   "user.settings.notifications.on": "Encendido",
   "user.settings.notifications.onlyMentions": "Sólo para menciones y mensajes directos",
-  "user.settings.notifications.push": "Enviar notificaciones push móvil",
+  "user.settings.notifications.push": "Notificaciones push móvil",
   "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.sounds_info": "El sonido de las notificaciones está disponible en IE11, Edge, Safari y Chrome.",
   "user.settings.notifications.teamWide": "Menciones para todo el equipo \"@all\"",
   "user.settings.notifications.title": "Configuracón de Notificaciones",
   "user.settings.notifications.usernameMention": "Tu nombre de usuario mencionado \"@{username}\"",
   "user.settings.notifications.wordsTrigger": "Palabras que desencadenan menciones",
-  "user.settings.push_notification.allActivityAway": "For all activity when away or offline",
-  "user.settings.push_notification.allActivityOffline": "For all activity when offline",
-  "user.settings.push_notification.allActivityOnline": "For all activity when online, away or offline",
-  "user.settings.push_notification.away": "Away or offline",
-  "user.settings.push_notification.disabled": "Deshabilitado por el administrador del sistema",
+  "user.settings.push_notification.allActivityAway": "Para toda la actividad cuando esté ausente o desconectado",
+  "user.settings.push_notification.allActivityOffline": "Para toda la actividad cuando esté desconectado",
+  "user.settings.push_notification.allActivityOnline": "De toda la actividad cuando esté en línea, ausente o desconectado",
+  "user.settings.push_notification.away": "Ausente o desconectado",
+  "user.settings.push_notification.disabled": "Deshabilitado por el Administrador de Sistema",
   "user.settings.push_notification.disabled_long": "Las Notificaciones Push para dispositivos móviles han sido deshabilitadas por el Administrador del Sistema.",
   "user.settings.push_notification.info": "Se enviarán notificaciones a tu dispositivo móvil cuando haya actividad en Mattermost.",
   "user.settings.push_notification.off": "Apagado",
-  "user.settings.push_notification.offline": "Offline",
-  "user.settings.push_notification.online": "Online, away or offline",
-  "user.settings.push_notification.onlyMentionsAway": "For mentions and direct messages when away or offline",
-  "user.settings.push_notification.onlyMentionsOffline": "For mentions and direct messages when offline",
-  "user.settings.push_notification.onlyMentionsOnline": "For mentions and direct messages when online, away or offline",
-  "user.settings.push_notification.status_info": "Notification alerts are pushed to your mobile device depending on your online status.",
+  "user.settings.push_notification.offline": "Desconectado",
+  "user.settings.push_notification.online": "En línea, ausente o desconectado",
+  "user.settings.push_notification.onlyMentionsAway": "Para las menciones y mensajes directos cuando esté ausente o desconectado",
+  "user.settings.push_notification.onlyMentionsOffline": "Para las menciones y mensajes directos cuando esté desconectado",
+  "user.settings.push_notification.onlyMentionsOnline": "Para las menciones y mensajes directos cuando esté en línea, ausente o desconectado",
+  "user.settings.push_notification.send": "Enviar notificaciones push móvil",
+  "user.settings.push_notification.status": "Activa las notificaciones push cuando",
+  "user.settings.push_notification.status_info": "Las alertas de notificación sólo son enviadas a tu dispositivo móvil cuando tu estatus coincide con la selección anterior.",
   "user.settings.security.close": "Cerrar",
   "user.settings.security.currentPassword": "Contraseña Actual",
   "user.settings.security.currentPasswordError": "Por favor ingresa tu contraseña actual.",
+  "user.settings.security.deauthorize": "Desautorizar",
   "user.settings.security.emailPwd": "Correo electrónico y Contraseña",
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "Google",
@@ -1916,6 +1943,10 @@
   "user.settings.security.logoutActiveSessions": "Visualizar y cerrar las sesiones activas",
   "user.settings.security.method": "Método de inicio de sesión",
   "user.settings.security.newPassword": "Nueva Contraseña",
+  "user.settings.security.noApps": "No hay Aplicaciones OAuth 2.0 autorizadas.",
+  "user.settings.security.oauthApps": "Aplicaciones OAuth 2.0",
+  "user.settings.security.oauthAppsDescription": "Haz clic en 'Editar' para gestionar tus Aplicaciones OAuth 2.0",
+  "user.settings.security.oauthAppsHelp": "Aplicaciones actuán en su nombre para acceder a tus datos según los permisos que concedas.",
   "user.settings.security.office365": "Office 365",
   "user.settings.security.oneSignin": "Sólo puedes tener un método de inicio de sesión a la vez. El cambio del método de inicio de sesión te enviará un correo notificandote que el cambio se realizó con éxito.",
   "user.settings.security.password": "Contraseña",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index d574a7c29..c2542520c 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -102,7 +102,7 @@
   "add_oauth_app.description.help": "Description pour votre application OAuth 2.0.",
   "add_oauth_app.descriptionRequired": "La description pour votre application OAuth 2.0 est requise.",
   "add_oauth_app.doneHelp": "Your OAuth 2.0 application has been set up. Please use the following Client ID and Client Secret when requesting authorization for your application.",
-  "add_oauth_app.doneUrlHelp": "Please send data to the following URL.",
+  "add_oauth_app.doneUrlHelp": "The following are your authorized redirect URL(s).",
   "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.",
@@ -136,15 +136,16 @@
   "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.advance.cluster": "Haute disponibilité (Beta)",
   "admin.audits.reload": "Rafraîchir",
   "admin.audits.title": "Activité de l'utilisateur",
   "admin.authentication.email": "Authentification email",
   "admin.authentication.gitlab": "GitLab",
+  "admin.authentication.ldap": "AD/LDAP",
   "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.enableDescription": "Si activé, Mattermost autorise la connexion en utilisant SAML. Consultez la <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> pour en apprendre davantage sur la configuration de SAML pour Mattermost.",
   "admin.cluster.enableTitle": "Enable High Availability Mode:",
   "admin.cluster.interNodeListenAddressDesc": "The address the server will listen on for communicating with other servers.",
   "admin.cluster.interNodeListenAddressEx": "Exemple : \":8075\"",
@@ -198,6 +199,8 @@
   "admin.compliance_table.userId": "Demandé par",
   "admin.connectionSecurityNone": "Aucun",
   "admin.connectionSecurityNoneDescription": "Mattermost sera connecté via une connexion non sécurisée.",
+  "admin.connectionSecurityPlain": "PLAIN",
+  "admin.connectionSecurityPlainDescription": "Mattermost sera connecté via une connexion non sécurisée.",
   "admin.connectionSecurityStart": "Départ en mode ‘Transport Layer Security’",
   "admin.connectionSecurityStartDescription": "Prend une connexion non sécurisée existante  et tente de la mettre à niveau vers une connexion sécurisée en utilisant le mode TLS .",
   "admin.connectionSecurityTest": "test de connexion",
@@ -214,7 +217,7 @@
   "admin.customization.enableCustomEmojiTitle": "Activer les Emoji personnalisés :",
   "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.nativeAppLinks": "Mattermost App Links",
   "admin.customization.restrictCustomEmojiCreationAdmin": "Permet aux administrateurs système et d'équipe de créer des emoji personnalisés",
   "admin.customization.restrictCustomEmojiCreationAll": "Permettre à tout le monde de créer des Emoji personnalisés",
   "admin.customization.restrictCustomEmojiCreationDesc": "N'autoriser la création d'Emoji personnalisés qu'à certains utilisateurs.",
@@ -401,13 +404,13 @@
   "admin.ldap.emailAttrTitle": "Attribut \"adresse électronique\" :",
   "admin.ldap.enableDesc": "Si activé, Mattermost permet de s'authentifier avec le serveur LDAP",
   "admin.ldap.enableTitle": "Activer la connexion avec LDAP :",
-  "admin.ldap.firstnameAttrDesc": "Attribut du serveur LDAP utilisé pour le champ \"prénom\" des utilisateurs dans Mattermost.",
+  "admin.ldap.firstnameAttrDesc": "(Optionnel) Attribut du serveur LDAP utilisé pour le champ \"nom de famille\" des utilisateurs dans Mattermost.",
   "admin.ldap.firstnameAttrEx": "Exemple : \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "Attribut prénom",
   "admin.ldap.idAttrDesc": "Attribut du serveur LDAP utilisé comme identifiant unique d'utilisateur dans Mattermost. Cela doit être un attribut dont la valeur ne change pas, tel que le username ou un uid. Si cette valeur change dans l'annuaire LDAP, un nouveau compte Mattermost sera créé avec l'ancien utilisateur. Il s'agit de la valeur à saisir dans le champ \"Utilisateur LDAP\" de la page de connexion. Normalement cet attribut est le même que celui du \"nom d'utilisateur\" ci-dessus. Si votre équipe utilise domain\\username pour se connecter à d'autres services avec LDAP, vous pouvez utiliser domain\\username pour rester cohérent.",
   "admin.ldap.idAttrEx": "Exemple : \"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "Attribut id : ",
-  "admin.ldap.lastnameAttrDesc": "Attribut du serveur LDAP utilisé pour le champ \"nom de famille\" des utilisateurs dans Mattermost.",
+  "admin.ldap.lastnameAttrDesc": "(Optionnel) Attribut du serveur LDAP utilisé pour le champ \"nom de famille\" des utilisateurs dans Mattermost.",
   "admin.ldap.lastnameAttrEx": "Exemple : \"sn\"",
   "admin.ldap.lastnameAttrTitle": "Attribut \"nom de famille\" :",
   "admin.ldap.loginNameDesc": "L’espace texte réservé apparaît dans le champ de connexion sur la page de connexion. Par défaut \"LDAP Nom d'utilisateur\".",
@@ -436,6 +439,8 @@
   "admin.ldap.syncIntervalTitle": "Intervalle de synchronisation (en minutes)",
   "admin.ldap.syncNowHelpText": "Provoque une synchronisation LDAP immédiate.",
   "admin.ldap.sync_button": "Synchroniser maintenant l'annuaire LDAP",
+  "admin.ldap.testFailure": "LDAP Test Failure: {error}",
+  "admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the LDAP server specified. See log file for more detailed error messages.",
   "admin.ldap.uernameAttrDesc": "Attribut du serveur LDAP utilisé pour le champ \"nom d'utilisateur\" dans Mattermost. Utilisez de préférence le même champ que l'attribut \"identifiant d'utilisateur\".",
   "admin.ldap.userFilterDisc": "Entrez éventuellement un filtre LDAP à utiliser lors de la recherche d'objets utilisateur. Seuls les utilisateurs sélectionnés par la requête seront en mesure d'accéder à Mattermost . Pour Active Directory, la requête pour filtrer les utilisateurs désactivés est (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "Exemple : \"(objectClass=utilisateur)\"",
@@ -491,7 +496,7 @@
   "admin.oauth.off": "Ne pas autoriser la connexion à travers un fournisseur OAuth 2.0",
   "admin.oauth.office365": "Office 365 (Beta)",
   "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.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>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) :",
@@ -558,7 +563,7 @@
   "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 :",
-  "admin.saml.firstnameAttrDesc": "Attribut SAML utilisé pour le champ \"prénom\" des utilisateurs dans Mattermost.",
+  "admin.saml.firstnameAttrDesc": "(Optionnel) Attribut du serveur LDAP utilisé pour le champ \"surnom\" des utilisateurs dans Mattermost.",
   "admin.saml.firstnameAttrEx": "Exemple : \"FirstName\"",
   "admin.saml.firstnameAttrTitle": "Attribut prénom :",
   "admin.saml.idpCertificateFileDesc": "Le certificat public fourni par votre serveur d'authentification.",
@@ -570,7 +575,7 @@
   "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.",
+  "admin.saml.lastnameAttrDesc": "(Optionnel) Attribut SAML utilisé pour le champ \"langue\" des utilisateurs dans Mattermost.",
   "admin.saml.lastnameAttrEx": "Ex : \"LastName\"",
   "admin.saml.lastnameAttrTitle": "Attribut \"nom de famille\" :",
   "admin.saml.localeAttrDesc": "(Optionnel) Attribut SAML utilisé pour le champ \"langue\" des utilisateurs dans Mattermost.",
@@ -627,8 +632,8 @@
   "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.",
-  "admin.service.iconTitle": "Permettre aux webhooks et commandes slash de modifier l'image de profile :",
+  "admin.service.iconDescription": "When true, webhooks, slash commands and other integrations, such as <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, will be allowed to change the profile picture they post with. Note: Combined with allowing integrations to override usernames, users may be able to perform phishing attacks by attempting to impersonate other users.",
+  "admin.service.iconTitle": "Enable integrations to override profile picture icons:",
   "admin.service.insecureTlsDesc": "Si activé, toute requête sortante HTTPS acceptera les certificats non-vérifiés et auto-signés. Par exemple, les requêtes webhook sortantes avec un certificat TLS auto-signé, vers n'importe quel domaine, seront autorisées. Attention, cela rend votre serveur vulnérable aux attaques de type \"man in the middle\".",
   "admin.service.insecureTlsTitle": "Autoriser les connexions sortantes non-sécurisées : ",
   "admin.service.integrationAdmin": "Restreindre les intégrations aux administrateurs : ",
@@ -642,8 +647,8 @@
   "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 :",
+  "admin.service.overrideDescription": "When true, webhooks, slash commands and other integrations, such as <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, will be allowed to change the username they are posting as. Note: Combined with allowing integrations to override profile picture icons, users may be able to perform phishing attacks by attempting to impersonate other users.",
+  "admin.service.overrideTitle": "Enable integrations to override usernames:",
   "admin.service.securityDesc": "Si activé, les administrateurs système sont notifiés par courriel si une alerte de sécurité a été annoncée ces 12 dernières heures. La messagerie doit être activée.",
   "admin.service.securityTitle": "Activer les alertes de sécurité : ",
   "admin.service.segmentDescription": "Segment.com est un service en ligne qui peut éventuellement être utilisé pour le suivi des statistiques détaillées du système. Vous pouvez obtenir une clé de signature -up pour un compte gratuit à Segment.com.",
@@ -667,7 +672,7 @@
   "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.cluster": "Haute disponibilité (Beta)",
   "admin.sidebar.compliance": "Conformité",
   "admin.sidebar.configuration": "configuration",
   "admin.sidebar.connections": "Connexions",
@@ -684,14 +689,14 @@
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.images": "Images",
   "admin.sidebar.integrations": "Intégrations",
-  "admin.sidebar.ldap": "LDAP",
+  "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Mentions légales",
   "admin.sidebar.license": "Édition et licence",
   "admin.sidebar.localization": "Localisation",
   "admin.sidebar.logging": "Enregistrement",
   "admin.sidebar.login": "S’identifier",
   "admin.sidebar.logs": "Journaux",
-  "admin.sidebar.nativeAppLinks": "Liens vers les applications natives",
+  "admin.sidebar.nativeAppLinks": "Mattermost App Links",
   "admin.sidebar.notifications": "Notifications",
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "AUTRES",
@@ -1055,7 +1060,7 @@
   "create_comment.files": "Téléchargements en cours",
   "create_post.comment": "Commentaire",
   "create_post.post": "Article",
-  "create_post.shortcutsNotSupported": "Keyboard shortcuts are not supported on your device.",
+  "create_post.shortcutsNotSupported": "Les raccourcis clavier ne sont pas pris en charge sur votre appareil.",
   "create_post.tutorialTip": "<h4>Envoyer des messages</h4><p>Entrez votre message ici et tapez <strong>Entrée</strong> pour l'envoyer.</p><p>Cliquez sur le bouton <strong>pièce-jointe</strong> pour télécharger une image ou un fichier.</p>",
   "create_post.write": "Écrire un message...",
   "create_team.agreement": "En créant votre compte et en utilisant votre {siteName},  vous acceptez nos <a href='/static/help/terms.html'>Terms of Service</a> and <a href='/static/help/privacy.html'>Privacy Policy</a>. Si vous n’acceptez pas, vous ne pouvez utilisé votre {siteName}.",
@@ -1204,7 +1209,7 @@
   "help.attaching.icon": "#### Attachment Icon\nAlternatively, upload files by clicking the grey paperclip icon inside the message input box. This opens up your system file viewer where you can navigate to the desired files and then click **Open** to upload the files to the message input box. Optionally type a message and then press **ENTER** to post.",
   "help.attaching.limitations": "## File Size Limitations\nMattermost supports a maximum of five attached files per post, each with a maximum file size of 50Mb.",
   "help.attaching.methods": "## Attachment Methods\nAttach a file by drag and drop or by clicking the attachment icon in the message input box.",
-  "help.attaching.notSupported": "Document preview (Word, Excel, PPT) is not yet supported.",
+  "help.attaching.notSupported": "L'aperçu de document (Word, Excel, PPT) n'est pas encore pris en charge.",
   "help.attaching.pasting": "#### Pasting Images\nOn Chrome and Edge browsers, it is also possible to upload files by pasting them from the clipboard. This is not yet supported on other browsers.",
   "help.attaching.previewer": "## File Previewer\nMattermost has a built in file previewer that is used to view media, download files and share public links. Click the thumbnail of an attached file to open it in the file previewer.",
   "help.attaching.publicLinks": "#### Sharing Public Links\nPublic links allow you to share file attachments with people outside your Mattermost team. Open the file previewer by clicking on the thumbnail of an attachment, then click **Get Public Link**. This opens a dialog box with a link to copy. When the link is shared and opened by another user, the file will automatically download.",
@@ -1217,7 +1222,7 @@
   "help.commands.custom": "## Custom Commands\nCustom slash commands integrate with external applications. For example, a team might configure a custom slash command to check internal health records with `/patient joe smith` or check the weekly weather forcast in a city with `/weather toronto week`. Check with your System Admin or open the autocomplete list by typing `/` to determine if your team configured any custom slash commands.",
   "help.commands.custom2": "Custom slash commands are disabled by default and can be enabled by the System Admin in the **System Console** > **Integrations** > **Webhooks and Commands**. Learn about configuring custom slash commands on the [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
   "help.commands.intro": "Slash commands perform operations in Mattermost by typing into the text input box. Enter a `/` followed by a command and some arguments to perform actions.\n\nBuilt-in slash commands come with all Mattermost installations and custom slash commands are configurable to interact with external applications. Learn about configuring custom slash commands on the [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
-  "help.commands.title": "# Executing Commands\n___",
+  "help.commands.title": "Exécuter des commandes",
   "help.composing.deleting": "## Deleting a message\nDelete a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Delete**. System and Team Admins can delete any message on their system or team.",
   "help.composing.editing": "## Editing a Message\nEdit a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Edit**. After making modifications to the message text, press **ENTER** to save the modifications. Message edits do not trigger new @mention notifications, desktop notifications or notification sounds.",
   "help.composing.linking": "## Linking to a message\nThe **Permalink** feature creates a link to any message. Sharing this link with other users in the channel lets them view the linked message in the Message Archives. Users who are not a member of the channel where the message was posted cannot view the permalink. Get the permalink to any message by clicking the **[...]** icon next to the message text  > **Permalink** > **Copy Link**.",
@@ -1232,7 +1237,7 @@
   "help.formatting.codeBlock": "code block",
   "help.formatting.emojiExample": ":smile: :+1: :sheep:",
   "help.formatting.emojis": "## Emojis\n\nOpen the emoji autocomplete by typing `:`. A full list of emojis can be found [here](http://www.emoji-cheat-sheet.com/). It is also possible to create your own [Custom Emoji](http://docs.mattermost.com/help/settings/custom-emoji.html) if the emoji you want to use doesn't exist.",
-  "help.formatting.example": "Example:",
+  "help.formatting.example": "Exemple :",
   "help.formatting.githubTheme": "**GitHub Theme**",
   "help.formatting.headings": "## Headings\n\nMake a heading by typing # and a space before your title. For smaller headings, use more #’s.",
   "help.formatting.headings2": "Alternatively, you can underline the text using `===` or `---` to create headings.",
@@ -1243,35 +1248,35 @@
   "help.formatting.inline": "## In-line Code\n\nCreate in-line monospaced font by surrounding it with backticks.",
   "help.formatting.intro": "Markdown makes it easy to format messages. Type a message as you normally would, and use these rules to render it with special formatting.",
   "help.formatting.lines": "## Lines\n\nCreate a line by using three `*`, `_`, or `-`.",
-  "help.formatting.linkEx": "[Check out Mattermost!](https://about.mattermost.com/)",
+  "help.formatting.linkEx": "[Découvrez Mattermost!](https://about.mattermost.com/)",
   "help.formatting.links": "## Links\n\nCreate labeled links by putting the desired text in square brackets and the associated link in normal brackets.",
   "help.formatting.listExample": "* list item one\n* list item two\n    * item two sub-point')",
   "help.formatting.lists": "## Lists\n\nCreate a list by using `*` or `-` as bullets. Indent a bullet point by adding two spaces in front of it.",
   "help.formatting.monokaiTheme": "**Monokai Theme**",
-  "help.formatting.ordered": "Make it an ordered list by using numbers instead:",
+  "help.formatting.ordered": "Faire une liste ordonnée en utilisant des nombres à la place :",
   "help.formatting.orderedExample": "1. Item one\n2. Item two",
   "help.formatting.quotes": "## Block quotes\n\nCreate block quotes using `>`.",
   "help.formatting.quotesExample": "`> block quotes` renders as:",
   "help.formatting.quotesRender": "> block quotes",
-  "help.formatting.renders": "Renders as:",
+  "help.formatting.renders": "Rendu sous la forme :",
   "help.formatting.solirizedDarkTheme": "**Solarized Dark Theme**",
   "help.formatting.solirizedLightTheme": "**Solarized Light Theme**",
   "help.formatting.style": "## Text Style\n\nYou can use either `_` or `*` around a word to make it italic. Use two to make it bold.\n\n* `_italics_` renders as _italics_\n* `**bold**` renders as **bold**\n* `**_bold-italic_**` renders as **_bold-italics_**\n* `~~strikethrough~~` renders as ~~strikethrough~~",
-  "help.formatting.supportedSyntax": "Supported languages are:\n`as`, `applescript`, `osascript`, `scpt`, `bash`, `sh`, `zsh`, `clj`, `boot`, `cl2`, `cljc`, `cljs`, `cljs.hl`, `cljscm`, `cljx`, `hic`, `coffee`, `_coffee`, `cake`, `cjsx`, `cson`, `iced`, `cpp`, `c`, `cc`, `h`, `c++`, `h++`, `hpp`, `cs`, `csharp`, `css`, `d`, `di`, `dart`, `delphi`, `dpr`, `dfm`, `pas`, `pascal`, `freepascal`, `lazarus`, `lpr`, `lfm`, `diff`, `django`, `jinja`, `dockerfile`, `docker`, `erl`, `f90`, `f95`, `fsharp`, `fs`, `gcode`, `nc`, `go`, `groovy`, `handlebars`, `hbs`, `html.hbs`, `html.handlebars`, `hs`, `hx`, `java`, `jsp`, `js`, `jsx`, `json`, `jl`, `kt`, `ktm`, `kts`, `less`, `lisp`, `lua`, `mk`, `mak`, `md`, `mkdown`, `mkd`, `matlab`, `m`, `mm`, `objc`, `obj-c`, `ml`, `perl`, `pl`, `php`, `php3`, `php4`, `php5`, `php6`, `ps`, `ps1`, `pp`, `py`, `gyp`, `r`, `ruby`, `rb`, `gemspec`, `podspec`, `thor`, `irb`, `rs`, `scala`, `scm`, `sld`, `scss`, `st`, `sql`, `swift`, `tex`, `vbnet`, `vb`, `bas`, `vbs`, `v`, `veo`, `xml`, `html`, `xhtml`, `rss`, `atom`, `xsl`, `plist`, `yaml`",
+  "help.formatting.supportedSyntax": "Langues prises en charge sont:\n`as`, `applescript`, `osascript`, `scpt`, `bash`, `sh`, `zsh`, `clj`, `boot`, `cl2`, `cljc`, `cljs`, `cljs.hl`, `cljscm`, `cljx`, `hic`, `coffee`, `_coffee`, `cake`, `cjsx`, `cson`, `iced`, `cpp`, `c`, `cc`, `h`, `c++`, `h++`, `hpp`, `cs`, `csharp`, `css`, `d`, `di`, `dart`, `delphi`, `dpr`, `dfm`, `pas`, `pascal`, `freepascal`, `lazarus`, `lpr`, `lfm`, `diff`, `django`, `jinja`, `dockerfile`, `docker`, `erl`, `f90`, `f95`, `fsharp`, `fs`, `gcode`, `nc`, `go`, `groovy`, `handlebars`, `hbs`, `html.hbs`, `html.handlebars`, `hs`, `hx`, `java`, `jsp`, `js`, `jsx`, `json`, `jl`, `kt`, `ktm`, `kts`, `less`, `lisp`, `lua`, `mk`, `mak`, `md`, `mkdown`, `mkd`, `matlab`, `m`, `mm`, `objc`, `obj-c`, `ml`, `perl`, `pl`, `php`, `php3`, `php4`, `php5`, `php6`, `ps`, `ps1`, `pp`, `py`, `gyp`, `r`, `ruby`, `rb`, `gemspec`, `podspec`, `thor`, `irb`, `rs`, `scala`, `scm`, `sld`, `scss`, `st`, `sql`, `swift`, `tex`, `vbnet`, `vb`, `bas`, `vbs`, `v`, `veo`, `xml`, `html`, `xhtml`, `rss`, `atom`, `xsl`, `plist`, `yaml`",
   "help.formatting.syntax": "### Syntax Highlighting\n\nTo add syntax highlighting, type the language to be highlighted after the ``` at the beginning of the code block. Mattermost also offers four different code themes (GitHub, Solarized Dark, Solarized Light, Monokai) that can be changed in **Account Settings** > **Display** > **Theme** > **Custom Theme** > **Center Channel Styles**",
   "help.formatting.syntaxEx": "    package main\n    import \"fmt\"\n    func main() {\n        fmt.Println(\"Hello, 世界\")\n    }",
   "help.formatting.tableExample": "| Left-Aligned  | Center Aligned  | Right Aligned |\n| :------------ |:---------------:| -----:|\n| Left column 1 | this text       |  $100 |\n| Left column 2 | is              |   $10 |\n| Left column 3 | centered        |    $1 |",
   "help.formatting.tables": "## Tables\n\nCreate a table by placing a dashed line under the header row and separating the columns with a pipe `|`. (The columns don’t need to line up exactly for it to work). Choose how to align table columns by including colons `:` within the header row.",
   "help.formatting.title": "# Formatting Text\n_____",
-  "help.learnMore": "Learn more about:",
-  "help.link.attaching": "Attaching Files",
-  "help.link.commands": "Executing Commands",
+  "help.learnMore": "En savoir plus sur :",
+  "help.link.attaching": "Joindre des fichiers",
+  "help.link.commands": "Exécuter des commandes",
   "help.link.composing": "Composing Messages and Replies",
   "help.link.formatting": "Formatting Messages using Markdown",
-  "help.link.mentioning": "Mentioning Teammates",
+  "help.link.mentioning": "Mentionner les membres de l'équipe",
   "help.link.messaging": "Basic Messaging",
   "help.mentioning.channel": "#### @Channel\nYou can mention an entire channel by typing `@channel`. All members of the channel will receive a mention notification that behaves the same way as if the members had been mentioned personally.",
-  "help.mentioning.channelExample": "@channel great work on interviews this week. I think we found some excellent potential candidates!",
+  "help.mentioning.channelExample": "@canal bon travail sur les entretiens cette semaine. Je pense que nous avons trouvé quelques excellents candidats potentiels !",
   "help.mentioning.mentions": "## @Mentions\nUse @mentions to get the attention of specific team members.",
   "help.mentioning.recent": "## Recent Mentions\nClick `@` next to the search box to query for your most recent @mentions and words that trigger mentions. Click **Jump** next to a search result in the RHS to jump the center pane to the channel and location of the message with the mention.",
   "help.mentioning.title": "# Mentioning Teammates\n_____",
@@ -1308,6 +1313,7 @@
   "installed_integrations.creation": "Créé par {creator} le {createAt, date, full}",
   "installed_integrations.delete": "Supprimer",
   "installed_integrations.hideSecret": "Cacher le secret",
+  "installed_integrations.regenSecret": "Regenerate Secret",
   "installed_integrations.regenToken": "Re-générer le jeton",
   "installed_integrations.showSecret": "Afficher le secret",
   "installed_integrations.token": "Token : {token}",
@@ -1341,7 +1347,7 @@
   "integrations.add": "Ajouter",
   "integrations.command.description": "Les commandes Slash envoient des évènements à des intégrations extérieures",
   "integrations.command.title": "Commande Slash",
-  "integrations.done": "Aucun",
+  "integrations.done": "Effectué",
   "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",
@@ -1387,7 +1393,7 @@
   "ldap_signup.team_error": "Saisissez le nom de votre équipe",
   "leave_team_modal.desc": "You will be removed from all public channels and private groups.  If the team is private you will not be able to rejoin the team.  Are you sure?",
   "leave_team_modal.no": "Non",
-  "leave_team_modal.title": "Leave the team?",
+  "leave_team_modal.title": "Quitter l'équipe ?",
   "leave_team_modal.yes": "Oui",
   "loading_screen.loading": "Chargement",
   "login.changed": " Méthode de connexion changée",
@@ -1468,7 +1474,7 @@
   "navbar_dropdown.leave": "Quitter l'équipe",
   "navbar_dropdown.logout": "Se déconnecter",
   "navbar_dropdown.manageMembers": "Gérer les membres",
-  "navbar_dropdown.nativeApps": "Télécharger les applications natives",
+  "navbar_dropdown.nativeApps": "Download Mattermost Apps",
   "navbar_dropdown.report": "Signaler un problème",
   "navbar_dropdown.switchTeam": "Basculer sur {team}",
   "navbar_dropdown.switchTo": "Basculer vers ",
@@ -1490,7 +1496,7 @@
   "password_send.link": "<p>Un lien de réinitialisation de mot de passe a été envoyé à <b>{email}</b></p>",
   "password_send.reset": "Réinitialiser mon mot de passe",
   "password_send.title": "Réinitialisation mot de passe",
-  "pdf_preview.max_pages": "PDF previews only show the first five pages.",
+  "pdf_preview.max_pages": "Les aperçus PDF montrent uniquement les cinq premières pages.",
   "pending_post_actions.cancel": "Annuler",
   "pending_post_actions.retry": "Réessayer",
   "permalink.error.access": "Ce lien correspond à un message supprimé ou appartenant à un canal auquel vous n'avez pas accès.",
@@ -1589,7 +1595,7 @@
   "sidebar_right_menu.inviteNew": "Inviter un nouveau membre",
   "sidebar_right_menu.logout": "Se déconnecter",
   "sidebar_right_menu.manageMembers": "Gérer les membres",
-  "sidebar_right_menu.nativeApps": "Télécharger une application native",
+  "sidebar_right_menu.nativeApps": "Download Mattermost Apps",
   "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",
@@ -1598,10 +1604,10 @@
   "sidebar_right_menu.viewMembers": "Voir les membres",
   "signup.email": "Adresse électronique et mot de passe",
   "signup.gitlab": "GitLab Single-Sign-On",
-  "signup.google": "Google Account",
+  "signup.google": "Compte Google",
   "signup.ldap": "LDAP Credentials",
   "signup.office365": "Office 365",
-  "signup.title": "Create an account with:",
+  "signup.title": "Créer un compte avec :",
   "signup_team.choose": "Vos équipes : ",
   "signup_team.createTeam": "Ou créez une équipe",
   "signup_team.disabled": "Aucune méthode de création d'utilisateur n'est disponible. Veuillez contacter votre administrateur système pour obtenir un accès.",
@@ -1653,7 +1659,7 @@
   "suggestion.mention.here": "Notifier toutes les personnes connectées dans ce canal",
   "suggestion.mention.members": "Channel Members",
   "suggestion.mention.nonmembers": "Not in Channel",
-  "suggestion.mention.special": "Special Mentions",
+  "suggestion.mention.special": "Mentions spéciales",
   "suggestion.search.private": "Groupes privés",
   "suggestion.search.public": "Canaux publics",
   "team_export_tab.download": "Télécharger",
@@ -1859,21 +1865,39 @@
   "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": "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.comments": "Reply notifications",
+  "user.settings.notifications.commentsAny": "Trigger notifications on messages in reply threads that I start or participate in",
+  "user.settings.notifications.commentsInfo": "In addition to notifications for when you're mentioned, select if you would like to receive notifications on reply threads.",
+  "user.settings.notifications.commentsNever": "Do not trigger notifications on messages in reply threads unless I'm mentioned",
+  "user.settings.notifications.commentsRoot": "Trigger notifications on messages in threads that I start",
   "user.settings.notifications.desktop": "Envoyer des notifications sur le bureau",
+  "user.settings.notifications.desktop.allFirefoxForever": "For all activity, shown indefinitely",
+  "user.settings.notifications.desktop.allFirefoxTimed": "For all activity, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.allNoSoundForever": "For all activity, without sound, shown indefinitely",
+  "user.settings.notifications.desktop.allNoSoundTimed": "For all activity, without sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.allSoundForever": "For all activity, with sound, shown indefinitely",
+  "user.settings.notifications.desktop.allSoundTimed": "For all activity, with sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.duration": "Notification duration",
+  "user.settings.notifications.desktop.durationInfo": "Sets how long desktop notifications will remain on screen.",
+  "user.settings.notifications.desktop.mentionsFirefoxForever": "For mentions and direct messages, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsFirefoxTimed": "For mentions and direct messages, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.mentionsNoSoundForever": "For mentions and direct messages, without sound, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsNoSoundTimed": "For mentions and direct messages, without sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.mentionsSoundForever": "For mentions and direct messages, with sound, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsSoundTimed": "For mentions and direct messages, with sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.seconds": "{seconds} seconds",
+  "user.settings.notifications.desktop.sound": "Notification sound",
+  "user.settings.notifications.desktop.title": "Sons des notifications",
+  "user.settings.notifications.desktop.unlimited": "Unlimited",
   "user.settings.notifications.desktopSounds": "Sons des notifications",
-  "user.settings.notifications.emailBatchingInfo": "Notifications are combined into a single email and sent at the maximum frequency selected here.",
+  "user.settings.notifications.emailBatchingInfo": "Notifications received over the time period selected are combined and sent in a single email.",
   "user.settings.notifications.emailInfo": "Les notifications par courriel sont envoyées pour les mentions et les messages privés après que vous êtes hors-ligne plus de 60 secondes ou parti de {siteName} pendant plus de 5 minutes.",
-  "user.settings.notifications.emailNotifications": "Envoyer des notifications sur le bureau",
-  "user.settings.notifications.everyHour": "Every hour",
+  "user.settings.notifications.emailNotifications": "Notifications par courriel",
+  "user.settings.notifications.everyHour": "Toutes les heures",
   "user.settings.notifications.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
   "user.settings.notifications.header": "Notifications",
-  "user.settings.notifications.immediately": "Immediately",
-  "user.settings.notifications.info": "Les notifications sur le bureau sont disponibles avec Firefox, Safari, Chrome, Internet Explorer et Edge.",
+  "user.settings.notifications.immediately": "Immédiatement",
+  "user.settings.notifications.info": "Desktop notifications are available on Firefox, Safari, and Chrome.",
   "user.settings.notifications.never": "Jamais",
   "user.settings.notifications.noWords": "Aucun mot configuré",
   "user.settings.notifications.off": "Désactivé",
@@ -1884,28 +1908,31 @@
   "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.sounds_info": "Notification sounds are available on IE11, Edge, Safari and Chrome.",
   "user.settings.notifications.teamWide": "Mentions à toute l'équipe \"@all\"",
   "user.settings.notifications.title": "Paramètres de notification",
   "user.settings.notifications.usernameMention": "Votre nom d'utilisateur mentionné \"@{username}\"",
   "user.settings.notifications.wordsTrigger": "Mots qui déclenchent des mentions",
-  "user.settings.push_notification.allActivityAway": "For all activity when away or offline",
-  "user.settings.push_notification.allActivityOffline": "For all activity when offline",
-  "user.settings.push_notification.allActivityOnline": "For all activity when online, away or offline",
+  "user.settings.push_notification.allActivityAway": "Pour toutes les activités lorsque vous etes en déplacement ou hors ligne",
+  "user.settings.push_notification.allActivityOffline": "Pour toutes les activités lorsque vous etes en déplacement ou hors ligne",
+  "user.settings.push_notification.allActivityOnline": "Pour toutes les activités lorsque vous etes en déplacement ou hors ligne",
   "user.settings.push_notification.away": "Away or offline",
   "user.settings.push_notification.disabled": "Désactivé par l'administrateur système",
   "user.settings.push_notification.disabled_long": "Les notifications Push pour les appareils mobiles ont été désactivées par votre administrateur système .",
   "user.settings.push_notification.info": "Les alertes de notification sont envoyées à votre appareil mobile quand il y a  de l’activité dans Mattermost .",
   "user.settings.push_notification.off": "Désactivé",
-  "user.settings.push_notification.offline": "Offline",
+  "user.settings.push_notification.offline": "Hors ligne",
   "user.settings.push_notification.online": "Online, away or offline",
   "user.settings.push_notification.onlyMentionsAway": "For mentions and direct messages when away or offline",
   "user.settings.push_notification.onlyMentionsOffline": "For mentions and direct messages when offline",
   "user.settings.push_notification.onlyMentionsOnline": "For mentions and direct messages when online, away or offline",
-  "user.settings.push_notification.status_info": "Notification alerts are pushed to your mobile device depending on your online status.",
+  "user.settings.push_notification.send": "Notifications push mobile",
+  "user.settings.push_notification.status": "Trigger push notifications when",
+  "user.settings.push_notification.status_info": "Notification alerts are only pushed to your mobile device when your online status matches the selection above.",
   "user.settings.security.close": "Quitter",
   "user.settings.security.currentPassword": "Mot de passe actuel",
   "user.settings.security.currentPasswordError": "Veuillez saisir votre mot de passe actuel",
+  "user.settings.security.deauthorize": "Supprimer l'autorisation",
   "user.settings.security.emailPwd": "Adresse électronique et mot de passe",
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "Google",
@@ -1916,6 +1943,10 @@
   "user.settings.security.logoutActiveSessions": "Consulter et déconnecter les sessions actives",
   "user.settings.security.method": "Méthode de connexion",
   "user.settings.security.newPassword": "Nouveau mot de passe",
+  "user.settings.security.noApps": "No OAuth 2.0 Applications are authorized.",
+  "user.settings.security.oauthApps": "Applications OAuth 2.0",
+  "user.settings.security.oauthAppsDescription": "Cliquez sur \"Modifier\" pour gérer votre Application OAuth 2.0",
+  "user.settings.security.oauthAppsHelp": "Applications act on your behalf to access your data based on the permissions you grant them.",
   "user.settings.security.office365": "Office 365",
   "user.settings.security.oneSignin": "Vous ne pouvez avoir qu'une seule méthode de connexion à la fois. Changer la méthode de connexion provoquera l'envoi d'un courriel si le changement est réussi.",
   "user.settings.security.password": "Mot de passe",
@@ -1937,7 +1968,7 @@
   "user.settings.security.passwordErrorUppercaseSymbol": "Votre mot de passe doit contenir au moins {min} caractères et au moins une lettre majuscule et un symbole (parmi \"~!@#$%^&*()\").",
   "user.settings.security.passwordGitlabCantUpdate": "La connexion se produit à travers GitLab. Le mot de passe ne peut pas être mis à jour.",
   "user.settings.security.passwordLdapCantUpdate": "La connexion se produit via LDAP . Le mot de passe ne peut pas être mis à jour.",
-  "user.settings.security.passwordMatchError": "Les adresses électroniques que vous avez saisies ne correspondent pas.",
+  "user.settings.security.passwordMatchError": "Les nouveaux mots de passe que vous avez saisis ne correspondent pas.",
   "user.settings.security.passwordMinLength": "Longueur minimum invalide, impossible d'afficher l'aperçu.",
   "user.settings.security.retypePassword": "Saisissez le nouveau mot de passe",
   "user.settings.security.saml": "SAML",
diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json
index c82ad2bd5..e8193318b 100644
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -41,8 +41,8 @@
   "add_command.description": "説明",
   "add_command.description.help": "内向きのウェブフックについての説明です。",
   "add_command.displayName": "表示名",
-  "add_command.displayName.help": "最大64文字のスラッシュコマンドの表示名",
-  "add_command.doneHelp": "Your slash command has been set up. The following token will be sent in the outgoing payload. Please use it to verify the request came from your Mattermost team (see <a href=\"https://docs.mattermost.com/developer/slash-commands.html\">documentation</a> for further details).",
+  "add_command.displayName.help": "最大64文字のスラッシュコマンドの表示名です。",
+  "add_command.doneHelp": "あなたのスラッシュコマンドは既に設定されています。以下のトークンは外向きのペイロードに含まれて送信されます。このトークンは、あなたのMattermostチームからのリクエストだということを確認するために利用してください。 (詳細については<a href=\"https://docs.mattermost.com/developer/slash-commands.html\">説明文書</a>を参照してください)。",
   "add_command.iconUrl": "応答アイコン",
   "add_command.iconUrl.help": "(オプション) このスラッシュコマンドへの返信となる投稿のプロフィール画像を上書きする画像を選択します。最低128ピクセル×128ピクセルの大きさを持つ.pngまたは.jpgファイルのURLを指定してください。",
   "add_command.iconUrl.placeholder": "https://www.example.com/myicon.png",
@@ -91,7 +91,7 @@
   "add_incoming_webhook.description.help": "内向きのウェブフックについての説明です。",
   "add_incoming_webhook.displayName": "表示名",
   "add_incoming_webhook.displayName.help": "最大64文字の内向きのウェブフックの表示名です。",
-  "add_incoming_webhook.doneHelp": "Your incoming webhook has been set up. Please send data to the following URL (see <a href=\"https://docs.mattermost.com/developer/webhooks-incoming.html\">documentation</a> for further details).",
+  "add_incoming_webhook.doneHelp": "あなたの内向きのウェブフックは既に設定されています。以下のURLにデータを送信してください (詳細については<a href=\"https://docs.mattermost.com/developer/webhooks-incoming.html\">説明文書</a>を参照してください)。",
   "add_incoming_webhook.name": "名前",
   "add_incoming_webhook.save": "保存する",
   "add_incoming_webhook.url": "<b>URL</b>: {url}",
@@ -101,13 +101,13 @@
   "add_oauth_app.clientSecret": "<b>クライアント秘密情報</b>: {secret}",
   "add_oauth_app.description.help": "OAuth 2.0アプリケーションの説明です。",
   "add_oauth_app.descriptionRequired": "OAuth 2.0アプリケーションの説明は必須です。",
-  "add_oauth_app.doneHelp": "Your OAuth 2.0 application has been set up. Please use the following Client ID and Client Secret when requesting authorization for your application.",
-  "add_oauth_app.doneUrlHelp": "以下のURLにデータを送信してください。",
+  "add_oauth_app.doneHelp": "あなたのOAuth 2.0アプリケーションは既に設定されています。以下のクライアントIDとクライアント秘密情報は、あなたのアプリケーションへの認可がリクエストされた際に利用してください。",
+  "add_oauth_app.doneUrlHelp": "認証されたリダイレクトURLは以下の通りです。",
   "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.name.help": "最大64文字のOAuth 2.0アプリケーションの表示名です。",
   "add_oauth_app.nameRequired": "OAuth 2.0アプリケーションの名前は必須です。",
   "add_oauth_app.trusted.help": "有効な場合、OAuth 2.0アプリケーションはMattermostサーバによって信頼済みとみなされ、ユーザーに認可を要求しなくなります。無効な場合、ユーザーに認可を許可するか、もしくは拒否するかを確認するウィンドウを表示します。",
   "add_oauth_app.url": "<b>URL(s)</b>: {url}",
@@ -124,8 +124,8 @@
   "add_outgoing_webhook.description": "説明",
   "add_outgoing_webhook.description.help": "外向きのウェブフックについての説明",
   "add_outgoing_webhook.displayName": "表示名",
-  "add_outgoing_webhook.displayName.help": "最大64文字の外向きのウェブフックの表示名",
-  "add_outgoing_webhook.doneHelp": "Your outgoing webhook has been set up. The following token will be sent in the outgoing payload. Please use it to verify the request came from your Mattermost team (see <a href=\"https://docs.mattermost.com/developer/webhooks-outgoing.html\">documentation</a> for further details).",
+  "add_outgoing_webhook.displayName.help": "最大64文字の外向きのウェブフックの表示名です。",
+  "add_outgoing_webhook.doneHelp": "あなたの外向きのウェブフックは既に設定されています。以下のトークンは外向きのペイロードに含まれて送信されます。このトークンは、あなたのMattermostチームからのリクエストだということを確認するために利用してください (詳細については<a href=\"https://docs.mattermost.com/developer/webhooks-outgoing.html\">説明文書</a>を参照してください)。",
   "add_outgoing_webhook.name": "名前",
   "add_outgoing_webhook.save": "保存する",
   "add_outgoing_webhook.token": "<b>トークン</b>: {token}",
@@ -141,6 +141,7 @@
   "admin.audits.title": "ユーザーのアクティビティー",
   "admin.authentication.email": "電子メールアドレス認証",
   "admin.authentication.gitlab": "GitLab",
+  "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "注意:",
@@ -198,13 +199,15 @@
   "admin.compliance_table.userId": "これを必要としている項目",
   "admin.connectionSecurityNone": "なし",
   "admin.connectionSecurityNoneDescription": "Mattermostは安全でない接続で接続します。",
+  "admin.connectionSecurityPlain": "PLAIN",
+  "admin.connectionSecurityPlainDescription": "Mattermostは安全でない接続で接続し認証します。",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "既に安全でない接続が存在します。TLSを使った安全な接続にアップグレードしてください。",
   "admin.connectionSecurityTest": "接続のテスト",
   "admin.connectionSecurityTitle": "接続のセキュリティー:",
   "admin.connectionSecurityTls": "TLS",
   "admin.connectionSecurityTlsDescription": "Mattermostとあなたのサーバー間のコミュニケーションを暗号化します。",
-  "admin.customization.androidAppDownloadLinkDesc": "Androidアプリのダウンロードリンクを追加してください。モバイル用ウェブブラウザでサイトにアクセスしたユーザへ、アプリをダウンロードするか選択するページを表示します。空欄にした場合、そのページは表示されません。",
+  "admin.customization.androidAppDownloadLinkDesc": "Androidアプリのダウンロードリンクを追加してください。モバイル用ウェブブラウザーでサイトにアクセスしたユーザへ、アプリをダウンロードするか選択するページを表示します。空欄にした場合、そのページは表示されません。",
   "admin.customization.androidAppDownloadLinkTitle": "Androidアプリダウンロード用リンク:",
   "admin.customization.appDownloadLinkDesc": "Mattermostアプリのダウンロードページへのリンクを追加してください。リンクを追加すると \"Download Mattermost Apps\" のオプションがメインメニューに追加されるため、ユーザがダウンロードページを見つけることができます。空欄にした場合、メインメニューにオプションは追加されません。",
   "admin.customization.appDownloadLinkTitle": "Mattermostアプリダウンロードページリンク:",
@@ -212,9 +215,9 @@
   "admin.customization.customEmoji": "カスタム絵文字",
   "admin.customization.enableCustomEmojiDesc": "ユーザーがメッセージ中で使用するカスタム絵文字の作成を有効にします。有効にした場合、カスタム絵文字は、チームに切り替え、チャンネルのサイドバー3点マークをクリックして、「カスタム絵文字」を選択することで設定できます。",
   "admin.customization.enableCustomEmojiTitle": "カスタム絵文字を有効にする:",
-  "admin.customization.iosAppDownloadLinkDesc": "iOSアプリのダウンロードリンクを追加してください。モバイル用ウェブブラウザでサイトにアクセスしたユーザへ、アプリをダウンロードするか選択するページを表示します。空欄にした場合、そのページは表示されません。",
+  "admin.customization.iosAppDownloadLinkDesc": "iOSアプリのダウンロードリンクを追加してください。モバイル用ウェブブラウザーでサイトにアクセスしたユーザへ、アプリをダウンロードするか選択するページを表示します。空欄にした場合、そのページは表示されません。",
   "admin.customization.iosAppDownloadLinkTitle": "iOSアプリダウンロード用リンク:",
-  "admin.customization.nativeAppLinks": "ネイティブアプリ用リンク",
+  "admin.customization.nativeAppLinks": "Mattermost App Links",
   "admin.customization.restrictCustomEmojiCreationAdmin": "システム管理者とチーム管理者にカスタム絵文字を作成できるようにする",
   "admin.customization.restrictCustomEmojiCreationAll": "全員にカスタム絵文字を作成できるようにする",
   "admin.customization.restrictCustomEmojiCreationDesc": "特定のユーザーにカスタム絵文字の作成を限定します。",
@@ -401,13 +404,13 @@
   "admin.ldap.emailAttrTitle": "電子メール属性値:",
   "admin.ldap.enableDesc": "有効な場合、MattermostはログインにLDAPの使用を許可します",
   "admin.ldap.enableTitle": "LDAPでのログインを有効にする:",
-  "admin.ldap.firstnameAttrDesc": "Mattermostのユーザーの名前(ファーストネーム)を設定するために使用されるLDAPサーバーの属性値です。",
+  "admin.ldap.firstnameAttrDesc": "(オプション)Mattermostのユーザーの名前(ファーストネーム)を設定するために使用されるLDAPサーバーの属性値です。",
   "admin.ldap.firstnameAttrEx": "例: \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "名前(ファーストネーム)の属性値",
   "admin.ldap.idAttrDesc": "Mattermostで重複なくユーザーを認識するために使用されるLDAPの属性値です。LDAPのこの属性値は変更されないものあるべきであり、ユーザー名やユーザーIDを使用します。この項目が変更されると、新しいMattermostアカウントが古いアカウントとは独立して作成されます。この値は、Mattermostのログイン画面の「LDAPユーザー名」欄に入力します。通常、この属性値は、上の「ユーザー名属性値」欄と同じです。あなたのチームがdomain\\usernameの形式を他のサービスにLDAPを使ってログインするのに使用している場合には、サイト間の一貫性を維持するためこの項目にはdomain\\username形式を使ってください。",
   "admin.ldap.idAttrEx": "例: \"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "ID属性値: ",
-  "admin.ldap.lastnameAttrDesc": "Mattermostのユーザーの苗字(ラストネーム)を設定するために使用されるLDAPサーバーの属性値です。",
+  "admin.ldap.lastnameAttrDesc": "(オプション)Mattermostのユーザーの苗字(ラストネーム)を設定するために使用されるLDAPサーバーの属性値です。",
   "admin.ldap.lastnameAttrEx": "例: \"sn\"",
   "admin.ldap.lastnameAttrTitle": "苗字(ラストネーム)の属性値:",
   "admin.ldap.loginNameDesc": "ログインページのログイン欄に表示されるプレイスホルダーテキストを設定します。\"LDAP Username\"がデフォルトです。",
@@ -415,7 +418,7 @@
   "admin.ldap.loginNameTitle": "ログインフィールド名:",
   "admin.ldap.maxPageSizeEx": "例: \"2000\"",
   "admin.ldap.maxPageSizeHelpText": "MattermostサーバーがLDAPサーバーへ一度にリクエストする最大ユーザー数。0を指定した場合、制限しません。",
-  "admin.ldap.maxPageSizeTitle": "最大ページサイズ",
+  "admin.ldap.maxPageSizeTitle": "最大ページサイズ:",
   "admin.ldap.nicknameAttrDesc": "(オプション)Mattermostのユーザーの苗字(ラストネーム)を設定するために使用されるLDAPサーバーの属性値です。",
   "admin.ldap.nicknameAttrEx": "例: \"nickname'",
   "admin.ldap.nicknameAttrTitle": "ニックネームの属性値:",
@@ -429,13 +432,15 @@
   "admin.ldap.serverDesc": "LDAPサーバーのドメイン名またはIPアドレスです。",
   "admin.ldap.serverEx": "例: \"10.0.0.23\"",
   "admin.ldap.serverTitle": "LDAPサーバー:",
-  "admin.ldap.skipCertificateVerification": "証明書の検証をしない",
+  "admin.ldap.skipCertificateVerification": "証明書の検証をしない:",
   "admin.ldap.skipCertificateVerificationDesc": "TLSまたはSTARTTLSの証明書の検証ステップをスキップします。TLSが必要な本番環境では設定することは推奨されません。テスト用の設定です。",
   "admin.ldap.syncFailure": "同期の失敗: {error}",
   "admin.ldap.syncIntervalHelpText": "LDAPの同期は、LDAPサーバでの更新を反映するためにMattermostのユーザー情報を更新します。例えば、LDAPサーバー上でユーザーの名前が変更された場合、その変更はLDAPの同期が実行された時にMattermostへ反映されます。LDAPサーバ上で削除もしくは無効化されたアカウントは、Mattermost上で\"無効\"となり、そのアカウントのセッションは削除されます。Mattermostは入力された同期間隔で同期を実行します。例えば、60が入力された場合、Mattermostは60分ごとに同期を行います。",
-  "admin.ldap.syncIntervalTitle": "同期間隔(分)",
+  "admin.ldap.syncIntervalTitle": "同期間隔(分):",
   "admin.ldap.syncNowHelpText": "LDAP同期をすぐに実行します。",
   "admin.ldap.sync_button": "LDAP同期を今すぐ実行する",
+  "admin.ldap.testFailure": "LDAPのテストに失敗: {error}",
+  "admin.ldap.testHelpText": "Mattermostが指定されたLDAPサーバーに接続できるかをテストします。詳しいエラーメッセージは、ログファイルを参照してください。",
   "admin.ldap.uernameAttrDesc": "Mattermostのユーザー名を設定するために使用されるLDAPサーバーの属性値です。ID属性値と同じである場合があります。",
   "admin.ldap.userFilterDisc": "(オプション) ユーザーオブジェクトを検索する際のLDAPフィルターを入力できます。これを適用したクエリーで選ばれるユーザーのみがMattermostにアクセスできます。Active Directoryでは、無効化されているユーザーを排除するには、(&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2)))を設定してください。",
   "admin.ldap.userFilterEx": "例: \"(objectClass=user)\"",
@@ -513,9 +518,9 @@
   "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": "投稿頻度制限を有効にする: ",
@@ -558,7 +563,7 @@
   "admin.saml.enableTitle": "SAMLでのログインを有効にする:",
   "admin.saml.encryptDescription": "有効にした場合、Mattermostは、あなたのサービスプロバイダー公開証明書で暗号化されたSAMLアサーションを復号します。",
   "admin.saml.encryptTitle": "暗号化を有効にする:",
-  "admin.saml.firstnameAttrDesc": "Mattermostのユーザーの名前(ファーストネーム)を設定するために使用されるSAMLアサーションの属性値です。",
+  "admin.saml.firstnameAttrDesc": "(オプション) Mattermostのユーザーのニックネームを設定するために使用されるSAMLアサーションの属性値です。",
   "admin.saml.firstnameAttrEx": "例: \"FirstName\"",
   "admin.saml.firstnameAttrTitle": "名前(ファーストネーム)の属性値",
   "admin.saml.idpCertificateFileDesc": "認証プロバイダーによって発行された公開認証証明書です。",
@@ -570,7 +575,7 @@
   "admin.saml.idpUrlDesc": "ログインシーケンスを開始するSAMLリクエストを送るURLです。",
   "admin.saml.idpUrlEx": "例: \"https://idp.example.org/SAML2/SSO/Login\"",
   "admin.saml.idpUrlTitle": "SAMLシングルサインオンURL:",
-  "admin.saml.lastnameAttrDesc": "Mattermostのユーザーの苗字(ラストネーム)を設定するために使用されるSAMLアサーションの属性値です。",
+  "admin.saml.lastnameAttrDesc": "(オプション) Mattermostのユーザーの使用言語を設定するために使用されるSAMLアサーションの属性値です。",
   "admin.saml.lastnameAttrEx": "例: \"LastName\"",
   "admin.saml.lastnameAttrTitle": "苗字(ラストネーム)の属性値:",
   "admin.saml.localeAttrDesc": "(オプション) Mattermostのユーザーの使用言語を設定するために使用されるSAMLアサーションの属性値です。",
@@ -627,8 +632,8 @@
   "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": "有効な場合、ウェブフックとスラッシュコマンドによって投稿に紐付くアイコンを変更できるようにします。注意: ユーザー名の上書きと組み合わせることによって、フィッシング攻撃の危険性が生じる可能性があります。",
-  "admin.service.iconTitle": "プロフィールの画像アイコンを上書きするウェブフックとスラッシュコマンドを有効にする:",
+  "admin.service.iconDescription": "有効な場合、ウェブフックとスラッシュコマンド、その他の統合機能(<a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>など)が、投稿に付属したプロフィール画像を変更することを許可します。注意: 統合機能にユーザー名の変更も許可した場合、フィッシング攻撃を許してしまう可能性があります。",
+  "admin.service.iconTitle": "統合機能によるプロフィール画像アイコンの上書きを許可する:",
   "admin.service.insecureTlsDesc": "有効な場合、外向きのHTTPSリクエストは確認されていない、自己署名の証明書を受け入れます。例えば、自己署名TLS証明書を使ったサーバーへの外向きのウェブフックが全てのドメインで許可されます。注意: これによって、man-in-the-middle攻撃の危険性が生じます。",
   "admin.service.insecureTlsTitle": "安全ではない外向きの接続を有効にする: ",
   "admin.service.integrationAdmin": "統合機能を作成する権限を、チーム管理者とシステム管理者に限定する: ",
@@ -642,8 +647,8 @@
   "admin.service.mobileSessionDaysDesc": "ユーザーが最後に認証情報を入力した時から、そのユーザーのセッションが期限切れとなるまでの日数です。この設定を変更した後の新しいセッション維持期間は、次にユーザーが認証情報を入力してから有効になります。",
   "admin.service.outWebhooksDesc": "有効な場合、外向きのウェブフックが使用できます。詳しくは<a href='http://docs.mattermost.com/developer/webhooks-outgoing.html' target='_blank'>説明文書</a>を参照してください。",
   "admin.service.outWebhooksTitle": "外向きのウェブフックを有効にする: ",
-  "admin.service.overrideDescription": "有効な場合、ウェブフックとスラッシュコマンドによって投稿に紐付くユーザー名を変更できるようにします。注意: アイコンの上書きと組み合わせることによって、フィッシング攻撃の危険性が生じる可能性があります。",
-  "admin.service.overrideTitle": "ユーザー名を上書きするウェブフックとスラッシュコマンドを有効にする:",
+  "admin.service.overrideDescription": "有効な場合、ウェブフックとスラッシュコマンド、その他の統合機能(<a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>など)が、投稿に使用されたユーザー名を変更することを許可します。注意: 統合機能にプロフィール画像の変更も許可した場合、フィッシング攻撃を許してしまう可能性があります。",
+  "admin.service.overrideTitle": "統合機能によるユーザー名の上書きを許可する:",
   "admin.service.securityDesc": "有効な場合、システム管理者は関係のあるセキュリティー修正が発生した場合、12時間以内に電子メールでお知らせを受信できます。電子メールが有効になっている必要があります。",
   "admin.service.securityTitle": "セキュリティー通知を有効にする: ",
   "admin.service.segmentDescription": "システムの詳細な利用状況を追跡するオンラインサービスであるSegment.comを利用することができます。Segment.comに無料で利用登録し、キーを入手してください。",
@@ -684,14 +689,14 @@
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.images": "画像",
   "admin.sidebar.integrations": "統合機能",
-  "admin.sidebar.ldap": "LDAP",
+  "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "法的事項とサポート",
   "admin.sidebar.license": "Editionとライセンス",
   "admin.sidebar.localization": "言語",
   "admin.sidebar.logging": "ログ",
   "admin.sidebar.login": "ログイン",
   "admin.sidebar.logs": "ログ",
-  "admin.sidebar.nativeAppLinks": "ネイティブアプリ用リンク",
+  "admin.sidebar.nativeAppLinks": "Mattermost App Links",
   "admin.sidebar.notifications": "通知",
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "その他",
@@ -1056,7 +1061,7 @@
   "create_post.comment": "コメント",
   "create_post.post": "投稿",
   "create_post.shortcutsNotSupported": "このデバイスではキーボードショートカットはサポートされていません。",
-  "create_post.tutorialTip": "<h4>メッセージを送信しています</h4><p>ここのメッセージを書き、<strong>Enter</strong>を押すことで投稿します。</p><p><strong>添付</strong>ボタンを押すことで画像やファイルをアップロードします。</p>",
+  "create_post.tutorialTip": "<h4>メッセージを送信する</h4><p>ここにメッセージを書き、<strong>Enter</strong>を押すことで投稿します。</p><p><strong>添付</strong>ボタンを押すことで画像やファイルをアップロードします。</p>",
   "create_post.write": "メッセージを書き込んでいます…",
   "create_team.agreement": "アカウントを作成し{siteName}を利用する前に<a href='/static/help/terms.html'>使用条件</a>と<a href='/static/help/privacy.html'>プライバシーポリシー</a>に同意してください。同意できない場合は{siteName}は使用できません。",
   "create_team.display_name.back": "前のステップに戻る",
@@ -1137,7 +1142,7 @@
   "error.not_found.message": "あなたがアクセスしようしたページは存在しません",
   "error.not_found.title": "ページが見つかりません",
   "error.not_supported.message": "プライベートブラウジングはサポートされていません",
-  "error.not_supported.title": "ブラウザはサポートされていません",
+  "error.not_supported.title": "ブラウザーはサポートされていません",
   "error_bar.expired": "エンタープライズライセンスは期限が切れました。期限切れの日から15日以内にライセンスを更新してください。問い合わせはcommercial@mattermost.comまでお願いします。",
   "error_bar.expiring": "エンタープライズライセンスは{date}に期限が切れます。ライセンスを更新するには、commercial@mattermost.comに問い合わせてください。",
   "error_bar.past_grace": "エンタープライズライセンスの期限が切れました。システム管理者に詳細を問い合わせてください。",
@@ -1187,7 +1192,7 @@
   "get_app.androidHeader": "Androidアプリへ移行するとMattermostは最高の働きをします",
   "get_app.continue": "続ける",
   "get_app.continueWithBrowser": "Or {link}",
-  "get_app.continueWithBrowserLink": "ブラウザで続ける",
+  "get_app.continueWithBrowserLink": "ブラウザーで続ける",
   "get_app.iosHeader": "iPhoneアプリへ移行するとMattermostは最高の働きをします",
   "get_app.mattermostInc": "Mattermost, Inc",
   "get_app.openMattermost": "Mattermostを開く",
@@ -1199,93 +1204,93 @@
   "get_team_invite_link_modal.help": "チームメイトに以下のリンクを送ることで、このチームサイトへの利用登録をしてもらえます。チーム招待リンクは、チーム管理者が再生成しない限り、複数のチームメイトで共有して使うことができます。",
   "get_team_invite_link_modal.helpDisabled": "あなたのチームではユーザー作成は無効になっています。チーム管理者に詳細を問い合わせてください。",
   "get_team_invite_link_modal.title": "チーム招待リンク",
-  "help.attaching.downloading": "#### Downloading Files\nDownload an attached file by clicking the download icon next to the file thumbnail or by opening the file previewer and clicking **Download**.",
-  "help.attaching.dragdrop": "#### Drag and Drop\nUpload a file or selection of files by dragging the files from your computer into the RHS or center pane. Dragging and dropping attaches the files to the message input box, then you can optionally type a message and press **ENTER** to post.",
-  "help.attaching.icon": "#### Attachment Icon\nAlternatively, upload files by clicking the grey paperclip icon inside the message input box. This opens up your system file viewer where you can navigate to the desired files and then click **Open** to upload the files to the message input box. Optionally type a message and then press **ENTER** to post.",
-  "help.attaching.limitations": "## File Size Limitations\nMattermost supports a maximum of five attached files per post, each with a maximum file size of 50Mb.",
-  "help.attaching.methods": "## Attachment Methods\nAttach a file by drag and drop or by clicking the attachment icon in the message input box.",
-  "help.attaching.notSupported": "Document preview (Word, Excel, PPT) is not yet supported.",
-  "help.attaching.pasting": "#### Pasting Images\nOn Chrome and Edge browsers, it is also possible to upload files by pasting them from the clipboard. This is not yet supported on other browsers.",
-  "help.attaching.previewer": "## File Previewer\nMattermost has a built in file previewer that is used to view media, download files and share public links. Click the thumbnail of an attached file to open it in the file previewer.",
-  "help.attaching.publicLinks": "#### Sharing Public Links\nPublic links allow you to share file attachments with people outside your Mattermost team. Open the file previewer by clicking on the thumbnail of an attachment, then click **Get Public Link**. This opens a dialog box with a link to copy. When the link is shared and opened by another user, the file will automatically download.",
-  "help.attaching.publicLinks2": "If **Get Public Link** is not visible in the file previewer and you prefer the feature enabled, you can request that your System Admin enable the feature from the System Console under **Security** > **Public Links**.",
-  "help.attaching.supported": "#### Supported Media Types\nIf you are trying to preview a media type that is not supported, the file previewer will open a standard media attachment icon. Supported media formats depend heavily on your browser and operating system, but the following formats are supported by Mattermost on most browsers:",
-  "help.attaching.supportedList": "- Images: BMP, GIF, JPG, JPEG, PNG\n- Video: MP4\n- Audio: MP3, M4A\n- Documents: PDF",
-  "help.attaching.title": "# Attaching Files\n_____",
-  "help.commands.builtin": "## Built-in Commands\nThe following slash commands are available on all Mattermost installations:",
-  "help.commands.builtin2": "Begin by typing `/` and a list of slash command options appears above the text input box. The autocomplete suggestions help by providing a format example in black text and a short description of the slash command in grey text.",
-  "help.commands.custom": "## Custom Commands\nCustom slash commands integrate with external applications. For example, a team might configure a custom slash command to check internal health records with `/patient joe smith` or check the weekly weather forcast in a city with `/weather toronto week`. Check with your System Admin or open the autocomplete list by typing `/` to determine if your team configured any custom slash commands.",
-  "help.commands.custom2": "Custom slash commands are disabled by default and can be enabled by the System Admin in the **System Console** > **Integrations** > **Webhooks and Commands**. Learn about configuring custom slash commands on the [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
-  "help.commands.intro": "Slash commands perform operations in Mattermost by typing into the text input box. Enter a `/` followed by a command and some arguments to perform actions.\n\nBuilt-in slash commands come with all Mattermost installations and custom slash commands are configurable to interact with external applications. Learn about configuring custom slash commands on the [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
-  "help.commands.title": "# Executing Commands\n___",
-  "help.composing.deleting": "## Deleting a message\nDelete a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Delete**. System and Team Admins can delete any message on their system or team.",
-  "help.composing.editing": "## Editing a Message\nEdit a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Edit**. After making modifications to the message text, press **ENTER** to save the modifications. Message edits do not trigger new @mention notifications, desktop notifications or notification sounds.",
-  "help.composing.linking": "## Linking to a message\nThe **Permalink** feature creates a link to any message. Sharing this link with other users in the channel lets them view the linked message in the Message Archives. Users who are not a member of the channel where the message was posted cannot view the permalink. Get the permalink to any message by clicking the **[...]** icon next to the message text  > **Permalink** > **Copy Link**.",
-  "help.composing.posting": "## Posting a Message\nWrite a message by typing into the text input box, then press **ENTER** to send it. Use **Shift + ENTER** to create a new line without sending a message. To send messages by pressing **Ctrl+Enter** go to **Main Menu > Account Settings > Send messages on Ctrl + Enter**.",
-  "help.composing.posts": "#### Posts\nPosts can be considered parent messages. They are the messages that often start a thread of replies. Posts are composed and sent from the text input box at the bottom of the center pane.",
-  "help.composing.replies": "#### Replies\nReply to a message by clicking the reply icon next to any message text. This action opens the right-hand-side (RHS) where you can see the message thread, then compose and send your reply. Replies are indented slightly in the center pane to indicate that they are child messages of a parent post.\n\nWhen composing a reply in the right-hand side, click the expand/collapse icon with two arrows at the top of the sidebar to make things easier to read.",
-  "help.composing.title": "# Sending Messages\n_____",
-  "help.composing.types": "## Message Types\nReply to posts to keep conversations organized in threads.",
-  "help.formatting.checklist": "Make a task list by including square brackets:",
-  "help.formatting.checklistExample": "- [ ] Item one\n- [ ] Item two\n- [x] Completed item",
-  "help.formatting.code": "## Code Block\n\nCreate a code block by indenting each line by four spaces, or by placing ``` on the line above and below your code.",
-  "help.formatting.codeBlock": "code block",
+  "help.attaching.downloading": "#### ファイルのダウンロード\nサムネイルの隣にあるアイコンをクリックするか、ファイルのプレビューを開いて**ダウンロード**をクリックすることで添付ファイルをダウンロードできます。",
+  "help.attaching.dragdrop": "#### ドラッグアンドドロップ\nあなたのコンピューターから右側部分、もしくは中央部分にファイルをドラッグすることで、選択したファイルをアップロードできます。ドラッグアンドドロップすることでファイルはメッセージ入力ボックスに添付され、追加でメッセージを入力することもでき、**ENTER**を押すと投稿されます。",
+  "help.attaching.icon": "#### 添付アイコン\nもう一つの方法として、メッセージ入力ボックスにある灰色のクリップのアイコンをクリックすることでファイルをアップロードできます。アイコンをクリックするとアップロードしたいファイルを選ぶためのシステムファイルビューワーが開き、**開く**をクリックすることでメッセージ入力ボックスにファイルをアップロードします。追加でメッセージを入力することもでき、**ENTER**を押すと投稿されます。",
+  "help.attaching.limitations": "## ファイルサイズ制限\nMattermostは投稿ごとに最大5つの添付ファイル、それぞれの最大ファイルサイズ50MBまでをサポートしています。",
+  "help.attaching.methods": "## 添付方法\nドラッグアンドドロップするかメッセージ入力ボックスの添付アイコンをクリックすることでファイルを添付できます。",
+  "help.attaching.notSupported": "文書のプレビュー(Word、Excel、PPT)はまだサポートされていません。",
+  "help.attaching.pasting": "#### 画像の貼り付け\nChrome、Edgeではクリップボードからの貼り付けによりファイルをアップロードすることもできます。これは他のブラウザーではまだサポートされていません。",
+  "help.attaching.previewer": "## ファイルプレビュー\nMattermostはメディアの閲覧やファイルのダウンロード、公開リンクを共有するための内蔵ファイルプレビュー画面があります。ファイルプレビュー画面を開くには添付したファイルのサムネイルをクリックしてください。",
+  "help.attaching.publicLinks": "#### 公開リンクの共有\n公開リンクは、あなたのMattermostチームの外側にいる人に添付ファイルを共有することを可能にします。添付ファイルのサムネイルをクリックしてファイルプレビュー画面を開き、**公開リンクを取得する**をクリックしてください。リンクをコピーするためのダイアログボックスが開きます。リンクが共有され、別のユーザーによって開かれた場合、ファイルは自動的にダウンロードされます。",
+  "help.attaching.publicLinks2": "ファイルプレビュー画面に**公開リンクを取得する**が無く、あなたがその機能を有効にしたい場合、システム管理者にシステムコンソールの**セキュリティー** > **公開リンク**から機能を有効にするよう依頼してください。",
+  "help.attaching.supported": "#### サポートされているメディアタイプ\nサポートされていないメディアタイプをプレビューしようとした場合、ファイルプレビュー画面は標準的なメディア添付アイコンを開きます。サポートされているメディア形式はブラウザーとOSに大きく依存していますが、以下の形式はほとんどのブラウザー上のMattermostでサポートされています:",
+  "help.attaching.supportedList": "- 画像: BMP、GIF、JPG、JPEG、PNG\n- ビデオ: MP4\n- 音声: MP3、M4A\n- 文書: PDF",
+  "help.attaching.title": "# ファイルを添付する\n_____",
+  "help.commands.builtin": "## 内蔵コマンド\n以下のスラッシュコマンドはすべてのMattermostで利用できます:",
+  "help.commands.builtin2": "最初に`/`を入力するとスラッシュコマンドのリストがテキスト入力ボックスの上に表示されます。自動補完の提案では黒字での入力例と灰字での短い説明が表示されます。",
+  "help.commands.custom": "## カスタムコマンド\nカスタムスラッシュコマンドは外部のアプリケーションを統合します。例えば、あるチームでは、健康記録を`/patient joe smith`でチェックしたり、ある都市の週間天気予報を`/weather toronto week`でチェックするためのカスタムスラッシュコマンドを設定しています。システム管理者に聞くか、`/`を入力して自動補完リストを開いて、あなたのチームがどんなカスタムコマンドをを設定しているか確認してみてください。",
+  "help.commands.custom2": "カスタムスラッシュコマンドはデフォルトでは無効化されており、システム管理者によって**システムコンソール** > **統合機能** > **ウェブフックとコマンド**から有効化できます。カスタムスラッシュコマンドの設定については[開発者向けスラッシュコマンド説明文書](http://docs.mattermost.com/developer/slash-commands.html)を参照してください。",
+  "help.commands.intro": "スラッシュコマンドはテキスト入力ボックスへ入力することでMattermost内で処理を実行します。処理を実行するために、`/`に続いてコマンドといくつかの引数を入力してください。\n\n内蔵スラッシュコマンドはすべてのMattermostに搭載されておりカスタムスラッシュコマンドは外部アプリケーションとやり取りするよう設定できます。カスタムスラッシュコマンドの設定については[開発者向けスラッシュコマンド説明文書](http://docs.mattermost.com/developer/slash-commands.html)を参照してください。",
+  "help.commands.title": "# コマンドを実行する\n___",
+  "help.composing.deleting": "## メッセージの削除\nあなたが書いたメッセージの隣にある**[...]**アイコンをクリックし、**削除**をクリックすることでメッセージを削除できます。システム管理者とチーム管理者は彼らのシステムやチーム内のどんなメッセージでも削除できます。",
+  "help.composing.editing": "## メッセージの編集\nあなたが書いたメッセージの隣にある**[...]**アイコンをクリックし、**編集**をクリックすることでメッセージを編集できます。メッセージテキストへの修正をした後、**ENTER**を押すと修正を保存します。メッセージの編集は新規に@mention通知やデスクトップ通知、通知音をトリガーしません。",
+  "help.composing.linking": "## メッセージへのリンク\n**パーマリンク**機能はメッセージへのリンクを生成します。このリンクをチャンネル内の他のユーザーに共有することで、メッセージアーカイブ内のリンクされたメッセージを見せることができます。メッセージが投稿されたチャンネルのメンバーでないユーザーはパーマリンクを見ることができません。メッセージの隣にある**[...]**アイコン > **パーマリンク** > **リンクをコピーする**からパーマリンクを取得できます。",
+  "help.composing.posting": "## メッセージの投稿\nテキスト入力ボックスへの入力によりメッセージを書き、**ENTER**を押すとメッセージを送信します。メッセージを送信せずに改行するには**Shift + ENTER**を使用してください。**Ctrl + Enter**でメッセージを送信するには**メインメニュー > アカウント設定 > Ctrl + Enterでメッセージを投稿する**から設定してください。",
+  "help.composing.posts": "#### 投稿\n投稿は親となるメッセージと考えることができます。たびたび返信によるスレッドの始まりとなるメッセージです。投稿は、中央下部にあるテキスト入力ボックスから作成し、送信することができます。",
+  "help.composing.replies": "#### 返信\nメッセージテキストの隣の返信アイコンをクリックすることでメッセージへの返信ができます。このアクションでメッセージスレッドを確認できる画面右部を開き、あなたの返信を作成し、送信することができます。返信は元の投稿の子メッセージであることを示すために画面中央部ではわずかにインデントされます。\n\n画面右部で返信を作成する際に、サイドバー上部の二つの矢印で表された展開/折り畳みアイコンをクリックすることで読みやすくなります。",
+  "help.composing.title": "# メッセージを送信する\n_____",
+  "help.composing.types": "## メッセージのタイプ\n元のスレッドの会話として返信します。",
+  "help.formatting.checklist": "角括弧で囲うことでタスクリストを作成する:",
+  "help.formatting.checklistExample": "- [ ] 項目1\n- [ ] 項目2\n- [x] 完了した項目",
+  "help.formatting.code": "## コードブロックk\n\nそれぞれの行を4つのスペースでインデントするか、コードの上下の行に```を書くことでコードブロックを作成できます。",
+  "help.formatting.codeBlock": "コードブロック",
   "help.formatting.emojiExample": ":smile: :+1: :sheep:",
-  "help.formatting.emojis": "## Emojis\n\nOpen the emoji autocomplete by typing `:`. A full list of emojis can be found [here](http://www.emoji-cheat-sheet.com/). It is also possible to create your own [Custom Emoji](http://docs.mattermost.com/help/settings/custom-emoji.html) if the emoji you want to use doesn't exist.",
-  "help.formatting.example": "Example:",
-  "help.formatting.githubTheme": "**GitHub Theme**",
-  "help.formatting.headings": "## Headings\n\nMake a heading by typing # and a space before your title. For smaller headings, use more #’s.",
-  "help.formatting.headings2": "Alternatively, you can underline the text using `===` or `---` to create headings.",
-  "help.formatting.headings2Example": "Large Heading\n-------------",
-  "help.formatting.headingsExample": "## Large Heading\n### Smaller Heading\n#### Even Smaller Heading",
-  "help.formatting.images": "## In-line Images\n\nCreate in-line images using an `!` followed by the alt text in square brackets and the link in normal brackets. Add hover text by placing it in quotes after the link.",
-  "help.formatting.imagesExample": "![alt text](link \"hover text\")\n\nand\n\n[![Build Status](https://travis-ci.org/mattermost/platform.svg?branch=master)](https://travis-ci.org/mattermost/platform) [![Github](https://assets-cdn.github.com/favicon.ico)](https://github.com/mattermost/platform)",
-  "help.formatting.inline": "## In-line Code\n\nCreate in-line monospaced font by surrounding it with backticks.",
-  "help.formatting.intro": "Markdown makes it easy to format messages. Type a message as you normally would, and use these rules to render it with special formatting.",
-  "help.formatting.lines": "## Lines\n\nCreate a line by using three `*`, `_`, or `-`.",
-  "help.formatting.linkEx": "[Check out Mattermost!](https://about.mattermost.com/)",
-  "help.formatting.links": "## Links\n\nCreate labeled links by putting the desired text in square brackets and the associated link in normal brackets.",
-  "help.formatting.listExample": "* list item one\n* list item two\n    * item two sub-point')",
-  "help.formatting.lists": "## Lists\n\nCreate a list by using `*` or `-` as bullets. Indent a bullet point by adding two spaces in front of it.",
-  "help.formatting.monokaiTheme": "**Monokai Theme**",
-  "help.formatting.ordered": "Make it an ordered list by using numbers instead:",
-  "help.formatting.orderedExample": "1. Item one\n2. Item two",
-  "help.formatting.quotes": "## Block quotes\n\nCreate block quotes using `>`.",
-  "help.formatting.quotesExample": "`> block quotes` renders as:",
-  "help.formatting.quotesRender": "> block quotes",
-  "help.formatting.renders": "Renders as:",
+  "help.formatting.emojis": "## 絵文字\n\n`:`を入力することで絵文字自動補完を開くことができます。全絵文字のリストは [こちら](http://www.emoji-cheat-sheet.com/)で見ることができます。使いたい絵文字が無い場合、あなた自身の[カスタム絵文字](http://docs.mattermost.com/help/settings/custom-emoji.html)を作成することができます。",
+  "help.formatting.example": "例:",
+  "help.formatting.githubTheme": "**GitHubテーマ**",
+  "help.formatting.headings": "## 見出し\n\nタイトルの前に # とスペースを入力することで見出しを作成できます。#の数を増やすほど見出しが小さくなります。",
+  "help.formatting.headings2": "別の方法として、見出しを作成するために`===` や `---` を使ってテキストに下線を引くやり方もあります。",
+  "help.formatting.headings2Example": "大きな見出し\n-------------",
+  "help.formatting.headingsExample": "## 大きな見出し\n### 小さな見出し\n#### さらに小さな見出し",
+  "help.formatting.images": "## インライン画像\n\n`!`に続いて角括弧で囲んだ代替テキストと括弧で囲んだリンクを使用することでインライン画像を作成できます。リンクの後に引用符で囲んだテキストを書くことでホバーテキストを追加できます。",
+  "help.formatting.imagesExample": "![代替テキスト](リンク \"ホバーテキスト\")\n\nと\n\n[![ビルド状況](https://travis-ci.org/mattermost/platform.svg?branch=master)](https://travis-ci.org/mattermost/platform) [![Github](https://assets-cdn.github.com/favicon.ico)](https://github.com/mattermost/platform)",
+  "help.formatting.inline": "## インラインコード\n\nテキストをバッククォートで囲むとインライン等幅フォントを作成できます。",
+  "help.formatting.intro": "Markdownを使うとメッセージの書式を簡単に設定することができます。通常通りメッセージを入力し、特別なフォーマットで表示するためにはこれらのルールを使用してください。",
+  "help.formatting.lines": "## ライン\n\n`*`か`_`か`-`を３つ使用することでラインを引くことができます。",
+  "help.formatting.linkEx": "[Mattermostをチェックしてください!](https://about.mattermost.com/)",
+  "help.formatting.links": "## リンク\n\n角括弧で囲んだテキストと括弧で囲んだ関連するリンクを書くことでラベル付けされたリンクを作成できます。",
+  "help.formatting.listExample": "* リスト項目1\n* リスト項目2\n    * 項目2の下位",
+  "help.formatting.lists": "## リスト\n\n`*`か`-`を使用して箇条書きすることでリストを作成できます。これらの記号の前に2つのスペースを追加することでインデントすることができます。",
+  "help.formatting.monokaiTheme": "**Monokaiテーマ**",
+  "help.formatting.ordered": "代わりに数字を使用することで順序付きリストにできます:",
+  "help.formatting.orderedExample": "1. 項目1\n2. 項目2",
+  "help.formatting.quotes": "## ブロック引用\n\n`>`を使用することでブロック引用を作成できます。",
+  "help.formatting.quotesExample": "`> ブロック引用` はこのように表示されます:",
+  "help.formatting.quotesRender": "> ブロック引用",
+  "help.formatting.renders": "このように表示されます:",
   "help.formatting.solirizedDarkTheme": "**Solarized Dark Theme**",
   "help.formatting.solirizedLightTheme": "**Solarized Light Theme**",
-  "help.formatting.style": "## Text Style\n\nYou can use either `_` or `*` around a word to make it italic. Use two to make it bold.\n\n* `_italics_` renders as _italics_\n* `**bold**` renders as **bold**\n* `**_bold-italic_**` renders as **_bold-italics_**\n* `~~strikethrough~~` renders as ~~strikethrough~~",
-  "help.formatting.supportedSyntax": "Supported languages are:\n`as`, `applescript`, `osascript`, `scpt`, `bash`, `sh`, `zsh`, `clj`, `boot`, `cl2`, `cljc`, `cljs`, `cljs.hl`, `cljscm`, `cljx`, `hic`, `coffee`, `_coffee`, `cake`, `cjsx`, `cson`, `iced`, `cpp`, `c`, `cc`, `h`, `c++`, `h++`, `hpp`, `cs`, `csharp`, `css`, `d`, `di`, `dart`, `delphi`, `dpr`, `dfm`, `pas`, `pascal`, `freepascal`, `lazarus`, `lpr`, `lfm`, `diff`, `django`, `jinja`, `dockerfile`, `docker`, `erl`, `f90`, `f95`, `fsharp`, `fs`, `gcode`, `nc`, `go`, `groovy`, `handlebars`, `hbs`, `html.hbs`, `html.handlebars`, `hs`, `hx`, `java`, `jsp`, `js`, `jsx`, `json`, `jl`, `kt`, `ktm`, `kts`, `less`, `lisp`, `lua`, `mk`, `mak`, `md`, `mkdown`, `mkd`, `matlab`, `m`, `mm`, `objc`, `obj-c`, `ml`, `perl`, `pl`, `php`, `php3`, `php4`, `php5`, `php6`, `ps`, `ps1`, `pp`, `py`, `gyp`, `r`, `ruby`, `rb`, `gemspec`, `podspec`, `thor`, `irb`, `rs`, `scala`, `scm`, `sld`, `scss`, `st`, `sql`, `swift`, `tex`, `vbnet`, `vb`, `bas`, `vbs`, `v`, `veo`, `xml`, `html`, `xhtml`, `rss`, `atom`, `xsl`, `plist`, `yaml`",
-  "help.formatting.syntax": "### Syntax Highlighting\n\nTo add syntax highlighting, type the language to be highlighted after the ``` at the beginning of the code block. Mattermost also offers four different code themes (GitHub, Solarized Dark, Solarized Light, Monokai) that can be changed in **Account Settings** > **Display** > **Theme** > **Custom Theme** > **Center Channel Styles**",
+  "help.formatting.style": "## テキストスタイル\n\n文字をイタリック体にするには`_`か`*`のどちらかで囲んでください。 この記号を二つ使用するとボールド体になります。\n\n* `_イタリック_` は _イタリック_ のように表示されます\n* `**ボールド**` は **ボールド** のように表示されます\n* `**_ボールド-イタリック_**` は **_ボールド-イタリック_** のように表示されます\n* `~~打ち消し線~~` は ~~打ち消し線~~ のように表示されます",
+  "help.formatting.supportedSyntax": "サポートされている言語:\n`as`, `applescript`, `osascript`, `scpt`, `bash`, `sh`, `zsh`, `clj`, `boot`, `cl2`, `cljc`, `cljs`, `cljs.hl`, `cljscm`, `cljx`, `hic`, `coffee`, `_coffee`, `cake`, `cjsx`, `cson`, `iced`, `cpp`, `c`, `cc`, `h`, `c++`, `h++`, `hpp`, `cs`, `csharp`, `css`, `d`, `di`, `dart`, `delphi`, `dpr`, `dfm`, `pas`, `pascal`, `freepascal`, `lazarus`, `lpr`, `lfm`, `diff`, `django`, `jinja`, `dockerfile`, `docker`, `erl`, `f90`, `f95`, `fsharp`, `fs`, `gcode`, `nc`, `go`, `groovy`, `handlebars`, `hbs`, `html.hbs`, `html.handlebars`, `hs`, `hx`, `java`, `jsp`, `js`, `jsx`, `json`, `jl`, `kt`, `ktm`, `kts`, `less`, `lisp`, `lua`, `mk`, `mak`, `md`, `mkdown`, `mkd`, `matlab`, `m`, `mm`, `objc`, `obj-c`, `ml`, `perl`, `pl`, `php`, `php3`, `php4`, `php5`, `php6`, `ps`, `ps1`, `pp`, `py`, `gyp`, `r`, `ruby`, `rb`, `gemspec`, `podspec`, `thor`, `irb`, `rs`, `scala`, `scm`, `sld`, `scss`, `st`, `sql`, `swift`, `tex`, `vbnet`, `vb`, `bas`, `vbs`, `v`, `veo`, `xml`, `html`, `xhtml`, `rss`, `atom`, `xsl`, `plist`, `yaml`",
+  "help.formatting.syntax": "### シンタックスハイライト\n\nシンタックスハイライトを追加するためには、コードブロックの初めの ``` の後にハイライトしたい言語を入力します。Mattermostは4つの異なるコードテーマ(GitHub、Solarized Dark、Solarized Light、Monokai)を提供しており、**アカウント設定** > **表示** > **テーマ** > **カスタムテーマ** > **中央チャンネルのスタイル** で変更できます。",
   "help.formatting.syntaxEx": "    package main\n    import \"fmt\"\n    func main() {\n        fmt.Println(\"Hello, 世界\")\n    }",
-  "help.formatting.tableExample": "| Left-Aligned  | Center Aligned  | Right Aligned |\n| :------------ |:---------------:| -----:|\n| Left column 1 | this text       |  $100 |\n| Left column 2 | is              |   $10 |\n| Left column 3 | centered        |    $1 |",
-  "help.formatting.tables": "## Tables\n\nCreate a table by placing a dashed line under the header row and separating the columns with a pipe `|`. (The columns don’t need to line up exactly for it to work). Choose how to align table columns by including colons `:` within the header row.",
-  "help.formatting.title": "# Formatting Text\n_____",
-  "help.learnMore": "Learn more about:",
-  "help.link.attaching": "Attaching Files",
-  "help.link.commands": "Executing Commands",
-  "help.link.composing": "Composing Messages and Replies",
-  "help.link.formatting": "Formatting Messages using Markdown",
-  "help.link.mentioning": "Mentioning Teammates",
-  "help.link.messaging": "Basic Messaging",
-  "help.mentioning.channel": "#### @Channel\nYou can mention an entire channel by typing `@channel`. All members of the channel will receive a mention notification that behaves the same way as if the members had been mentioned personally.",
-  "help.mentioning.channelExample": "@channel great work on interviews this week. I think we found some excellent potential candidates!",
-  "help.mentioning.mentions": "## @Mentions\nUse @mentions to get the attention of specific team members.",
-  "help.mentioning.recent": "## Recent Mentions\nClick `@` next to the search box to query for your most recent @mentions and words that trigger mentions. Click **Jump** next to a search result in the RHS to jump the center pane to the channel and location of the message with the mention.",
-  "help.mentioning.title": "# Mentioning Teammates\n_____",
-  "help.mentioning.triggers": "## Words That Trigger Mentions\nIn addition to being notified by @username and @channel, you can customize words that trigger mention notifications in **Account Settings** > **Notifications** > **Words that trigger mentions**. By default, you will receive mention notifications on your first name, and you can add more words by typing them into the input box separated by commas. This is useful if you want to be notified of all posts on certain topics, for example, “interviewing” or “marketing”.",
-  "help.mentioning.username": "#### @Username\nYou can mention a teammate by using the `@` symbol plus their username to send them a mention notification.\n\nType `@` to bring up a list of team members who can be mentioned. To filter the list, type the first few letters of any username, first name, last name, or nickname. The **Up** and **Down** arrow keys can then be used to scroll through entries in the list, and pressing **ENTER** will select which user to mention. Once selected, the username will automatically replace the full name or nickname.\nThe following example sends a special mention notification to **alice** that alerts her of the channel and message where she has been mentioned. If **alice** is away from Mattermost and has [email notifications](http://docs.mattermost.com/help/getting-started/configuring-notifications.html#email-notifications) turned on, then she will receive an email alert of her mention along with the message text.",
-  "help.mentioning.usernameCont": "If the user you mentioned does not belong to the channel, a System Message will be posted to let you know. This is a temporary message only seen by the person who triggered it. To add the mentioned user to the channel, go to the dropdown menu beside the channel name and select **Add Members**.",
-  "help.mentioning.usernameExample": "@alice how did your interview go with the new candidate?",
-  "help.messaging.attach": "**Attach files** by dragging and dropping into Mattermost or clicking the attachment icon in the text input box.",
-  "help.messaging.emoji": "**Quickly add emoji** by typing \":\", which will open an emoji autocomplete. If the existing emoji don't cover what you want to express, you can also create your own [Custom Emoji](http://docs.mattermost.com/help/settings/custom-emoji.html).",
-  "help.messaging.format": "**Format your messages** using Markdown that supports text styling, headings, links, emoticons, code blocks, block quotes, tables, lists and in-line images.",
-  "help.messaging.notify": "**Notify teammates** when they are needed by typing `@username`.",
-  "help.messaging.reply": "**Reply to messages** by clicking the reply arrow next to the message text.",
-  "help.messaging.title": "# Messaging Basics\n_____",
-  "help.messaging.write": "**Write messages** using the text input box at the bottom of Mattermost. Press **ENTER** to send a message. Use **Shift+ENTER** to create a new line without sending a message.",
+  "help.formatting.tableExample": "| 左寄せ     | 中央寄せ        | 右寄せ |\n| :--------- |:-------------:|   -----:|\n| 左カラム1 | このテキスト |  $100 |\n| 左カラム2 | は                |    $10 |\n| 左カラム3 | 中央寄せです |      $1 |",
+  "help.formatting.tables": "## テーブル\n\nヘッダー行の下に破線を書き、列をパイプ`|`で区切ることでテーブルを作成できます。(列の位置を正確に並べる必要はありません)。ヘッダー行の中にコロン`:`を含めることでテーブルの列の整列方法を選択できます。",
+  "help.formatting.title": "# テキストの書式設定\n_____",
+  "help.learnMore": "もっと詳しく知るには:",
+  "help.link.attaching": "ファイルを添付する",
+  "help.link.commands": "コマンドを実行する",
+  "help.link.composing": "メッセージと返信を書く",
+  "help.link.formatting": "メッセージをMarkdownで書式設定する",
+  "help.link.mentioning": "チームメイトについての投稿を作成する",
+  "help.link.messaging": "基本的なメッセージを作成する",
+  "help.mentioning.channel": "#### @チャンネル\n`@チャンネル`を入力することでチャンネル全体への投稿をすることができます。チャンネルの全てのメンバーは個人的に投稿されたのと同じように通知を受け取ります。",
+  "help.mentioning.channelExample": "@チャンネル 今週の面接の成果。素晴らしい志望者が何人かいたよ!",
+  "help.mentioning.mentions": "## @Mention\n特定のチームメンバーの注意を惹きたい場合は@mentionを使用してください。",
+  "help.mentioning.recent": "## 最近のあなたについての投稿\n最も最近のあなたについての投稿を検索するためには検索ボックスの隣の`@`をクリックしてください。画面右部の検索結果**ジャンプする**をクリックすると、その投稿のメッセージのチャンネルと場所にジャンプします。",
+  "help.mentioning.title": "# チームメイトについての投稿を作成する\n_____",
+  "help.mentioning.triggers": "## 誰かについての投稿となる単語\n@ユーザー名 と @チャンネル による通知に加え、**アカウント設定** > **通知** > **誰かについての投稿となる単語**で通知のトリガーとなる単語をカスタマイズできます。デフォルトでは名前(ファーストネーム)での通知を受け取ることができますが、入力ボックスにカンマ区切りで通知を受ける単語を追加できます。これは「面接」や「マーケティング」などの特定の話題に関する全ての投稿の通知を受けたい場合に役立ちます。",
+  "help.mentioning.username": "#### @ユーザー名\nチームメイトへの投稿通知を送るためにユーザー名に加えて記号`@`を使うことで彼らについての投稿をすることができます。\n\n投稿するチームメンバーのリストを表示するには`@`を入力してください。リストをフィルターするには、ユーザー名か名前(ファーストネーム)か苗字(ラストネーム)かニックネームどれかの最初の数文字を入力してください。**↑**と**↓**キーでリスト全体をスクロールすることができ、**ENTER**を押すと投稿対象のユーザーを選択できます。一度選択されると、ユーザー名は自動的にフルネームかニックネームに置き換わります。\n以下の例では**alice**へチャンネルとメッセージが通知される特別な投稿通知を送信します。もし**alice**がMattermostから離れていて、かつ[電子メール通知](http://docs.mattermost.com/help/getting-started/configuring-notifications.html#email-notifications)をオンにしていた場合、彼女はメッセージテキストが添えられた電子メール通知を受け取ることになります。",
+  "help.mentioning.usernameCont": "あなたが投稿対象としたユーザーがチャンネルに属していなかった場合、それを知らせるシステムメッセージが投稿されます。これはそのメッセージのトリガーとなった人だけに見える一時的なメッセージです。投稿対象のユーザーをチャンネルに追加するには、チャンネル名のドロップダウンメニューから**メンバーを追加する**を選択します。",
+  "help.mentioning.usernameExample": "@alice 君の面接の新しい志望者はどうだった?",
+  "help.messaging.attach": "**ファイルを添付する** Mattermostへのドラッグアンドドロップするか、テキスト入力ボックスの添付アイコンをクリックします。",
+  "help.messaging.emoji": "**手軽に絵文字を追加** \":\"を入力して絵文字自動補完リストを開きます。今ある絵文字にあなたが表現したいものが無かった場合、[カスタム絵文字](http://docs.mattermost.com/help/settings/custom-emoji.html)を作成することもできます。",
+  "help.messaging.format": "**メッセージの書式設定** テキストのスタイリングや見出し、リンク、顔文字、コードブロック、引用、テーブル、リスト、インライン画像をサポートするMarkdownを使用します。",
+  "help.messaging.notify": "**チームメイトへの通知** 必要な時に`@username`を入力します。",
+  "help.messaging.reply": "**メッセージへの返信** メッセージの隣にある返信の矢印をクリックします。",
+  "help.messaging.title": "# 基本的なメッセージを作成する\n_____",
+  "help.messaging.write": "**メッセージを書く** Mattermostの画面下部のテキスト入力ボックスを使います。**ENTER**を押すとメッセージが送信されます。**Shift+ENTER**を使うとメッセージを送ることなく改行することができます。",
   "installed_command.header": "スラッシュコマンド",
   "installed_commands.add": "スラッシュコマンドを追加する",
   "installed_commands.empty": "スラッシュコマンドは作成されていません",
@@ -1308,6 +1313,7 @@
   "installed_integrations.creation": "{creator}により{createAt, date, full}に作成されました",
   "installed_integrations.delete": "削除",
   "installed_integrations.hideSecret": "秘密情報を隠す",
+  "installed_integrations.regenSecret": "秘密情報を再生成する",
   "installed_integrations.regenToken": "トークンを再生成する",
   "installed_integrations.showSecret": "秘密情報を表示する",
   "installed_integrations.token": "トークン: {token}",
@@ -1468,7 +1474,7 @@
   "navbar_dropdown.leave": "チームを脱退する",
   "navbar_dropdown.logout": "ログアウト",
   "navbar_dropdown.manageMembers": "メンバーを管理する",
-  "navbar_dropdown.nativeApps": "アプリをダウンロード",
+  "navbar_dropdown.nativeApps": "Download Mattermost Apps",
   "navbar_dropdown.report": "問題を報告する",
   "navbar_dropdown.switchTeam": "{team}に切り替える",
   "navbar_dropdown.switchTo": "切り替え先: ",
@@ -1490,7 +1496,7 @@
   "password_send.link": "<p>パスワード初期化リンクが<b>{email}</b>に送信されました</p>",
   "password_send.reset": "自分のパスワードを初期化する",
   "password_send.title": "パスワードの初期化",
-  "pdf_preview.max_pages": "PDF previews only show the first five pages.",
+  "pdf_preview.max_pages": "PDFプレビュー画面は最初の5ページのみを表示します。",
   "pending_post_actions.cancel": "キャンセル",
   "pending_post_actions.retry": "再試行",
   "permalink.error.access": "削除されたメッセージまたはアクセス権限のないチャンネルへのパーマリンクです。",
@@ -1589,7 +1595,7 @@
   "sidebar_right_menu.inviteNew": "新しいメンバーを招待",
   "sidebar_right_menu.logout": "ログアウト",
   "sidebar_right_menu.manageMembers": "メンバーを管理する",
-  "sidebar_right_menu.nativeApps": "ネイティブアプリをダウンロードする",
+  "sidebar_right_menu.nativeApps": "Download Mattermost Apps",
   "sidebar_right_menu.recentMentions": "最近のあなたについての投稿",
   "sidebar_right_menu.report": "問題を報告する",
   "sidebar_right_menu.switch_team": "チームを切り替える",
@@ -1597,11 +1603,11 @@
   "sidebar_right_menu.teamSettings": "チームの設定",
   "sidebar_right_menu.viewMembers": "メンバーを見る",
   "signup.email": "電子メールアドレスとパスワード",
-  "signup.gitlab": "GitLab Single-Sign-On",
-  "signup.google": "Google Account",
-  "signup.ldap": "LDAP Credentials",
+  "signup.gitlab": "GitLabシングルサインオン",
+  "signup.google": "Googleアカウント",
+  "signup.ldap": "LDAP認証情報",
   "signup.office365": "Office 365",
-  "signup.title": "Create an account with:",
+  "signup.title": "アカウントを作成する:",
   "signup_team.choose": "あなたの所属チーム: ",
   "signup_team.createTeam": "またはチームを作成する",
   "signup_team.disabled": "チーム作成機能は無効化されています。使用するにはシステム管理者に連絡してください。",
@@ -1652,8 +1658,8 @@
   "suggestion.mention.channel": "チャンネルの全員に通知します。",
   "suggestion.mention.here": "チャンネル内のオンラインな全員へ通知します",
   "suggestion.mention.members": "チャンネルのメンバー",
-  "suggestion.mention.nonmembers": "Not in Channel",
-  "suggestion.mention.special": "Special Mentions",
+  "suggestion.mention.nonmembers": "チャンネルにいません",
+  "suggestion.mention.special": "特殊な誰かについての投稿",
   "suggestion.search.private": "非公開グループ",
   "suggestion.search.public": "公開チャンネル",
   "team_export_tab.download": "ダウンロードする",
@@ -1664,7 +1670,7 @@
   "team_export_tab.unable": " エクスポートできません: {error}",
   "team_import_tab.failure": " インポート失敗: ",
   "team_import_tab.import": "インポートする",
-  "team_import_tab.importHelp": "<p>Slackのチームをインポートするには、Slackに行き、Team Settings > Import/Export Data > Export > Start Exportを実行してください。Slackではファイル、画像、プライベートグループ、ダイレクトメッセージをエクスポートすることはできません</p><p>MattermostへのSlackのインポート機能は「ベータ版」です。Slack botの投稿はまだインポートできません。Slackの@mentionsは現在はサポートされていません。</p>",
+  "team_import_tab.importHelp": "<p>Slackのチームをインポートするには、Slackに行き、Team Settings > Import/Export Data > Export > Start Exportを実行してください。Slackではファイル、画像、プライベートグループ、ダイレクトメッセージをエクスポートすることはできません</p><p>MattermostへのSlackのインポート機能は「ベータ版」です。Slack botの投稿はまだインポートできません。</p>",
   "team_import_tab.importSlack": "Slackからインポート(ベータ版)",
   "team_import_tab.importing": " インポートしています…",
   "team_import_tab.successful": " インポートに成功しました: ",
@@ -1719,8 +1725,8 @@
   "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}}が有効化されました",
   "user.settings.advance.formattingDesc": "有効化された場合、投稿は、リンクを作成したり、絵文字を表示したり、テキストに書式を設定したり、改行したりされます。デフォルトではこの設定は有効化されています。この設定を変更した場合には、ページを再読み込みしてください。",
   "user.settings.advance.formattingTitle": "投稿の書式設定",
-  "user.settings.advance.joinLeaveDesc": "When \"On\", System Messages saying a user has joined or left a channel will be visible. When \"Off\", the System Messages about joining or leaving a channel will be hidden. A message will still show up when you are added to a channel, so you can receive a notification.",
-  "user.settings.advance.joinLeaveTitle": "Enable Join/Leave Messages",
+  "user.settings.advance.joinLeaveDesc": "\"On\"の場合、ユーザーがチャンネルへ参加・脱退したことを通知するシステムメッセージが見えるようになります。\"Off\"の場合、チャンネルへ参加・脱退したことについてのシステムメッセージは見えなくなります。メッセージはあなたがチャンネルへ追加されたときに現れるため、あなたは通知を受け取ることができます。",
+  "user.settings.advance.joinLeaveTitle": "参加/脱退メッセージを有効にする",
   "user.settings.advance.markdown_preview": "メッセージ入力ボックスでMarkdownプレビューオプションを表示する",
   "user.settings.advance.off": "オフ",
   "user.settings.advance.on": "オン",
@@ -1765,7 +1771,7 @@
   "user.settings.display.fixedWidthCentered": "固定幅、中央寄せ",
   "user.settings.display.fontDesc": "Mattermostユーザーインターフェイスで使うフォントを選択してください。",
   "user.settings.display.fontTitle": "表示フォント",
-  "user.settings.display.fullScreen": "全幅",
+  "user.settings.display.fullScreen": "最大幅",
   "user.settings.display.language": "言語",
   "user.settings.display.messageDisplayClean": "標準",
   "user.settings.display.messageDisplayCleanDes": "見やすく読みやすくします。",
@@ -1796,7 +1802,7 @@
   "user.settings.general.emailGitlabCantUpdate": "GitLabからログインしました。電子メールアドレスは更新できません。通知に使われる電子メールアドレスは{email}です。",
   "user.settings.general.emailGoogleCantUpdate": "Googleからログインしました。電子メールアドレスは更新できません。通知に使われる電子メールアドレスは{email}です。",
   "user.settings.general.emailHelp1": "電子メールアドレスがサインイン、通知、パスワード初期化に使用されます。電子メールアドレスを変更した場合には、確認が必要です。",
-  "user.settings.general.emailHelp2": "電子メールアドレスはシステム管理者によって無効になっています。有効にされるまで通知電子メールは送信されません。",
+  "user.settings.general.emailHelp2": "電子メールはシステム管理者によって無効にされています。有効にされるまで通知電子メールは送信されません。",
   "user.settings.general.emailHelp3": "電子メールアドレスがサインイン、通知、パスワード初期化に使用されます。",
   "user.settings.general.emailHelp4": "{email}に電子メールアドレスの確認用電子メールが送信されました。",
   "user.settings.general.emailLdapCantUpdate": "LDAPでログインしました。電子メールアドレスは更新できません。通知に使われる電子メールアドレスは{email}です。",
@@ -1807,7 +1813,7 @@
   "user.settings.general.emptyName": "フルネームを追加するには「編集する」をクリックしてください",
   "user.settings.general.emptyNickname": "ニックネームを追加するには「編集する」をクリックしてください",
   "user.settings.general.field_handled_externally": "この欄はあなたのログインプロバイダーで使用されます。変更したい場合、ログインプロバイダーに通じて変更してください。",
-  "user.settings.general.firstName": "名(ファーストネーム)",
+  "user.settings.general.firstName": "名前(ファーストネーム)",
   "user.settings.general.fullName": "フルネーム",
   "user.settings.general.imageTooLarge": "プロフィール画像をアップロードできません。大き過ぎます。",
   "user.settings.general.imageUpdated": "画像は{date}に更新されました",
@@ -1859,53 +1865,74 @@
   "user.settings.notifications.allActivity": "全てのアクティビティーについて",
   "user.settings.notifications.channelWide": "チャンネル全体についての「@channel」、「@all」",
   "user.settings.notifications.close": "閉じる",
-  "user.settings.notifications.comments": "コメントスレッド通知",
-  "user.settings.notifications.commentsAny": "あなたが参加しているスレッドの全てのコメントを通知 (元となるあなたの投稿や、あなたがコメントした後に投稿されたコメントも含みます)",
-  "user.settings.notifications.commentsInfo": "あなたが参加しているコメントスレッド内の投稿に関する通知のトリガーとなるモードです。",
-  "user.settings.notifications.commentsNever": "コメントを通知しない",
-  "user.settings.notifications.commentsRoot": "あなたの投稿についての全てのコメントを通知する",
+  "user.settings.notifications.comments": "返信通知",
+  "user.settings.notifications.commentsAny": "開始もしくは参加した返信スレッドへのメッセージについて通知をトリガーします",
+  "user.settings.notifications.commentsInfo": "あなたについての投稿がされた時の通知に加えて、返信スレッドについての通知を受け取るかどうかを選択してください。",
+  "user.settings.notifications.commentsNever": "Do not trigger notifications on messages in reply threads unless I'm mentioned",
+  "user.settings.notifications.commentsRoot": "あなたが開始したスレッドへのメッセージについて通知をトリガーします",
   "user.settings.notifications.desktop": "デスクトップ通知を送る",
+  "user.settings.notifications.desktop.allFirefoxForever": "全てのアクティビティーについて無期限に表示します",
+  "user.settings.notifications.desktop.allFirefoxTimed": "全てのアクティビティーについて{seconds}秒間表示します",
+  "user.settings.notifications.desktop.allNoSoundForever": "全てのアクティビティーについて、通知音無しで無期限に表示します",
+  "user.settings.notifications.desktop.allNoSoundTimed": "全てのアクティビティーについて、通知音無しで{seconds}秒間表示します",
+  "user.settings.notifications.desktop.allSoundForever": "全てのアクティビティーについて、通知音有りで無期限に表示します",
+  "user.settings.notifications.desktop.allSoundTimed": "全てのアクティビティーについて、通知音有りで{seconds}秒間表示します",
+  "user.settings.notifications.desktop.duration": "通知持続時間",
+  "user.settings.notifications.desktop.durationInfo": "デスクトップ通知がスクリーン上に何秒間表示されるかを設定します。",
+  "user.settings.notifications.desktop.mentionsFirefoxForever": "あなたについての投稿とダイレクトメッセージについて無期限に表示します",
+  "user.settings.notifications.desktop.mentionsFirefoxTimed": "あなたについての投稿とダイレクトメッセージについて{seconds}秒間表示します",
+  "user.settings.notifications.desktop.mentionsNoSoundForever": "あなたについての投稿とダイレクトメッセージについて、通知音無しで無期限に表示します",
+  "user.settings.notifications.desktop.mentionsNoSoundTimed": "あなたについての投稿とダイレクトメッセージについて、通知音無しで{seconds}秒間表示します",
+  "user.settings.notifications.desktop.mentionsSoundForever": "あなたについての投稿とダイレクトメッセージについて、通知音有りで無期限に表示します",
+  "user.settings.notifications.desktop.mentionsSoundTimed": "あなたについての投稿とダイレクトメッセージについて、通知音有りで{seconds}秒間表示します",
+  "user.settings.notifications.desktop.seconds": "{seconds}秒",
+  "user.settings.notifications.desktop.sound": "通知音",
+  "user.settings.notifications.desktop.title": "デスクトップ通知",
+  "user.settings.notifications.desktop.unlimited": "無期限",
   "user.settings.notifications.desktopSounds": "デスクトップ通知音",
-  "user.settings.notifications.emailBatchingInfo": "通知は一通の電子メールにまとめられ、ここで選択した最長の頻度で送信されます。",
-  "user.settings.notifications.emailInfo": "あなたについての投稿とダイレクトメッセージに関して、電子メール通知を送ります。60秒以上オフラインであるか{siteName}から5分間以上離れている場合に送ります。",
-  "user.settings.notifications.emailNotifications": "電子メール通知を送信する",
+  "user.settings.notifications.emailBatchingInfo": "選択された時間内に受信された通知は、まとめられ1通の電子メールで送信されます。",
+  "user.settings.notifications.emailInfo": "あなたについての投稿とダイレクトメッセージに関して、電子メール通知を送ります。{siteName}から5分間以上離れている場合に送ります。",
+  "user.settings.notifications.emailNotifications": "電子メール通知",
   "user.settings.notifications.everyHour": "1時間毎",
-  "user.settings.notifications.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
+  "user.settings.notifications.everyXMinutes": "{count, plural, one {minute} other {{count, number} minutes}}ごと",
   "user.settings.notifications.header": "通知",
   "user.settings.notifications.immediately": "すぐに",
-  "user.settings.notifications.info": "デスクトップ通知は、Firefox、Safari、Chrome、Internet Explorer、Edgeで利用可能です。",
+  "user.settings.notifications.info": "デスクトップ通知はFirefox、Safari、Chromeで利用可能です。",
   "user.settings.notifications.never": "通知しない",
   "user.settings.notifications.noWords": "設定された単語はありません",
   "user.settings.notifications.off": "オフ",
   "user.settings.notifications.on": "オン",
   "user.settings.notifications.onlyMentions": "あなたについての投稿とダイレクトメッセージに関してのみ",
-  "user.settings.notifications.push": "モバイルプッシュ通知を送信する",
+  "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、Internet Explorer、Edgeで利用可能です。",
+  "user.settings.notifications.sounds_info": "通知音はIE11、Egde、Safari、Chromeで利用可能です。",
   "user.settings.notifications.teamWide": "チーム全体についての「@all」",
   "user.settings.notifications.title": "通知の設定",
   "user.settings.notifications.usernameMention": "あなたのユーザー名についての「@{username}」",
   "user.settings.notifications.wordsTrigger": "誰かについての投稿となる単語",
-  "user.settings.push_notification.allActivityAway": "For all activity when away or offline",
-  "user.settings.push_notification.allActivityOffline": "For all activity when offline",
-  "user.settings.push_notification.allActivityOnline": "For all activity when online, away or offline",
-  "user.settings.push_notification.away": "Away or offline",
+  "user.settings.push_notification.allActivityAway": "離席中もしくはオフライン時の全てのアクティビティーについて",
+  "user.settings.push_notification.allActivityOffline": "オフライン時の全てのアクティビティーについて",
+  "user.settings.push_notification.allActivityOnline": "オンライン、離席中もしくはオフライン時の全てのアクティビティーについて",
+  "user.settings.push_notification.away": "離席中もしくはオフライン",
   "user.settings.push_notification.disabled": "管理者によって無効化されています",
   "user.settings.push_notification.disabled_long": "モバイル端末向けのプッシュ通知は管理者によって無効化されています",
   "user.settings.push_notification.info": "Mattermostにアクティビティーがあると、あなたのモバイル端末に通知がプッシュされます。",
   "user.settings.push_notification.off": "オフ",
-  "user.settings.push_notification.offline": "Offline",
-  "user.settings.push_notification.online": "Online, away or offline",
-  "user.settings.push_notification.onlyMentionsAway": "For mentions and direct messages when away or offline",
-  "user.settings.push_notification.onlyMentionsOffline": "For mentions and direct messages when offline",
-  "user.settings.push_notification.onlyMentionsOnline": "For mentions and direct messages when online, away or offline",
-  "user.settings.push_notification.status_info": "Notification alerts are pushed to your mobile device depending on your online status.",
+  "user.settings.push_notification.offline": "オフライン",
+  "user.settings.push_notification.online": "オンライン、離席中もしくはオフライン",
+  "user.settings.push_notification.onlyMentionsAway": "離席中もしくはオフライン時のあなたについての投稿とダイレクトメッセージについて",
+  "user.settings.push_notification.onlyMentionsOffline": "オフライン時のあなたについての投稿とダイレクトメッセージについて",
+  "user.settings.push_notification.onlyMentionsOnline": "オンライン、離席中もしくはオフライン時のあなたについての投稿とダイレクトメッセージについて",
+  "user.settings.push_notification.send": "モバイルプッシュ通知を送信する",
+  "user.settings.push_notification.status": "プッシュ通知をトリガーする場合",
+  "user.settings.push_notification.status_info": "上で選択したオンラインステータスに合致する場合のみ、通知アラートをあなたのモバイルデバイスに送信します。",
   "user.settings.security.close": "閉じる",
   "user.settings.security.currentPassword": "現在のパスワード",
   "user.settings.security.currentPasswordError": "現在のパスワードを入力してください。",
+  "user.settings.security.deauthorize": "認証解除",
   "user.settings.security.emailPwd": "電子メールアドレスとパスワード",
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "Google",
@@ -1916,6 +1943,10 @@
   "user.settings.security.logoutActiveSessions": "アクティブなセッションを見てログアウトする",
   "user.settings.security.method": "サインイン方法",
   "user.settings.security.newPassword": "新しいパスワード",
+  "user.settings.security.noApps": "認証済みのOAuth 2.0アプリケーションはありません。",
+  "user.settings.security.oauthApps": "OAuth 2.0アプリケーション",
+  "user.settings.security.oauthAppsDescription": "OAuth 2.0アプリケーションを管理するには`編集する`をクリックしてください",
+  "user.settings.security.oauthAppsHelp": "アプリケーションは、あなたが承認した権限に基づいてデータへアクセスするように動作します。",
   "user.settings.security.office365": "Office 365",
   "user.settings.security.oneSignin": "一度に一つのサインイン方法のみが選択可能です。サインイン方法を変更すると、変更完了時に電子メールで通知が送られます。",
   "user.settings.security.password": "パスワード",
diff --git a/webapp/i18n/ko.json b/webapp/i18n/ko.json
index 05726deab..1fd729c29 100644
--- a/webapp/i18n/ko.json
+++ b/webapp/i18n/ko.json
@@ -102,7 +102,7 @@
   "add_oauth_app.description.help": "Description for your OAuth 2.0 application.",
   "add_oauth_app.descriptionRequired": "Description for the OAuth 2.0 application is required.",
   "add_oauth_app.doneHelp": "Your OAuth 2.0 application has been set up. Please use the following Client ID and Client Secret when requesting authorization for your application.",
-  "add_oauth_app.doneUrlHelp": "Please send data to the following URL.",
+  "add_oauth_app.doneUrlHelp": "The following are your authorized redirect URL(s).",
   "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.",
@@ -141,6 +141,7 @@
   "admin.audits.title": "User Activity Logs",
   "admin.authentication.email": "Email Auth",
   "admin.authentication.gitlab": "GitLab",
+  "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "Note:",
@@ -198,6 +199,8 @@
   "admin.compliance_table.userId": "Requested By",
   "admin.connectionSecurityNone": "None",
   "admin.connectionSecurityNoneDescription": "Mattermost will connect over an unsecure connection.",
+  "admin.connectionSecurityPlain": "PLAIN",
+  "admin.connectionSecurityPlainDescription": "Mattermost will connect over an unsecure connection.",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "Takes an existing insecure connection and attempts to upgrade it to a secure connection using TLS.",
   "admin.connectionSecurityTest": "연결 테스트",
@@ -214,7 +217,7 @@
   "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 앱 다운로드 링크:",
-  "admin.customization.nativeAppLinks": "네이티브 앱 링크",
+  "admin.customization.nativeAppLinks": "Mattermost App Links",
   "admin.customization.restrictCustomEmojiCreationAdmin": "Allow System and Team Admins to create custom emoji",
   "admin.customization.restrictCustomEmojiCreationAll": "Allow everyone to create custom emoji",
   "admin.customization.restrictCustomEmojiCreationDesc": "Restrict the creation of custom emoji to certain users.",
@@ -401,13 +404,13 @@
   "admin.ldap.emailAttrTitle": "Email Attribute:",
   "admin.ldap.enableDesc": "When true, Mattermost allows login using LDAP",
   "admin.ldap.enableTitle": "Enable sign-in with LDAP:",
-  "admin.ldap.firstnameAttrDesc": "The attribute in the LDAP server that will be used to populate the first name of users in Mattermost.",
+  "admin.ldap.firstnameAttrDesc": "(Optional) The attribute in the LDAP server that will be used to populate the nickname of users in Mattermost.",
   "admin.ldap.firstnameAttrEx": "Ex \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "First Name Attribute",
   "admin.ldap.idAttrDesc": "The attribute in the LDAP server that will be used as a unique identifier in Mattermost. It should be an LDAP attribute with a value that does not change, such as username or uid. If a user’s ID Attribute changes, it will create a new Mattermost account unassociated with their old one. This is the value used to log in to Mattermost in the \"LDAP Username\" field on the sign in page. Normally this attribute is the same as the “Username Attribute” field above. If your team typically uses domain\\username to sign in to other services with LDAP, you may choose to put domain\\username in this field to maintain consistency between sites.",
   "admin.ldap.idAttrEx": "Ex \"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "ID Attribute: ",
-  "admin.ldap.lastnameAttrDesc": "The attribute in the LDAP server that will be used to populate the last name of users in Mattermost.",
+  "admin.ldap.lastnameAttrDesc": "(Optional) The attribute in the LDAP server that will be used to populate the nickname of users in Mattermost.",
   "admin.ldap.lastnameAttrEx": "Ex \"sn\"",
   "admin.ldap.lastnameAttrTitle": "Last Name Attribute:",
   "admin.ldap.loginNameDesc": "The placeholder text that appears in the login field on the login page. Defaults to \"LDAP Username\".",
@@ -436,6 +439,8 @@
   "admin.ldap.syncIntervalTitle": "Synchronization Interval (minutes)",
   "admin.ldap.syncNowHelpText": "Initiates an LDAP synchronization immediately.",
   "admin.ldap.sync_button": "LDAP Synchronize Now",
+  "admin.ldap.testFailure": "LDAP Test Failure: {error}",
+  "admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the LDAP server specified. See log file for more detailed error messages.",
   "admin.ldap.uernameAttrDesc": "The attribute in the LDAP server that will be used to populate the username field in Mattermost. This may be the same as the ID Attribute.",
   "admin.ldap.userFilterDisc": "(Optional) Enter an LDAP Filter to use when searching for user objects. Only the users selected by the query will be able to access Mattermost. For Active Directory, the query to filter out disabled users is (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "Ex. \"(objectClass=user)\"",
@@ -558,7 +563,7 @@
   "admin.saml.enableTitle": "Enable Login With SAML:",
   "admin.saml.encryptDescription": "When true, Mattermost will decrypt SAML Assertions encrypted with your Service Provider Public Certificate.",
   "admin.saml.encryptTitle": "Enable Encryption:",
-  "admin.saml.firstnameAttrDesc": "The attribute in the SAML Assertion that will be used to populate the first name of users in Mattermost.",
+  "admin.saml.firstnameAttrDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the nickname of users in Mattermost.",
   "admin.saml.firstnameAttrEx": "Ex \"FirstName\"",
   "admin.saml.firstnameAttrTitle": "First Name Attribute:",
   "admin.saml.idpCertificateFileDesc": "The public authentication certificate issued by your Identity Provider.",
@@ -570,7 +575,7 @@
   "admin.saml.idpUrlDesc": "The URL where Mattermost sends a SAML request to start login sequence.",
   "admin.saml.idpUrlEx": "Ex \"https://idp.example.org/SAML2/SSO/Login\"",
   "admin.saml.idpUrlTitle": "SAML SSO URL:",
-  "admin.saml.lastnameAttrDesc": "The attribute in the SAML Assertion that will be used to populate the last name of users in Mattermost.",
+  "admin.saml.lastnameAttrDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the language of users in Mattermost.",
   "admin.saml.lastnameAttrEx": "Ex \"LastName\"",
   "admin.saml.lastnameAttrTitle": "Last Name Attribute:",
   "admin.saml.localeAttrDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the language of users in Mattermost.",
@@ -627,8 +632,8 @@
   "admin.service.googleDescription": "Set this key to enable the display of titles for embedded YouTube video previews. Without the key, YouTube previews will still be created based on hyperlinks appearing in messages or comments but they will not show the video title. View a <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> for instructions on how to obtain a key.",
   "admin.service.googleExample": "Ex \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Google API Key:",
-  "admin.service.iconDescription": "true로 설정하면, webhook이나 슬래시 명령어가 메시지를 보낼 때 아이콘을 변경할 수 있게 됩니다. 주의사항: 사용자 이름 변경과 함께 허용하면 피싱 공격의 위험이 있습니다.",
-  "admin.service.iconTitle": "Enable webhooks and slash commands to override profile picture icons:",
+  "admin.service.iconDescription": "When true, webhooks, slash commands and other integrations, such as <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, will be allowed to change the profile picture they post with. Note: Combined with allowing integrations to override usernames, users may be able to perform phishing attacks by attempting to impersonate other users.",
+  "admin.service.iconTitle": "Enable integrations to override profile picture icons:",
   "admin.service.insecureTlsDesc": "true로 설정하면 Mattermost에서 밖으로 나가는 어떤 HTTPS 요청에 대해서도 인증서 검사를 하지 않습니다. 예를 들어, self-signed TLS 인증서를 아무 도메인 이름에 대해 설정하더라도 HTTPS 통신을 진행합니다. 이 설정을 켤 때는 MITM 공격에 주의하세요.",
   "admin.service.insecureTlsTitle": "Enable Insecure Outgoing Connections: ",
   "admin.service.integrationAdmin": "Restrict creating integrations to Team and System Admins: ",
@@ -642,8 +647,8 @@
   "admin.service.mobileSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
   "admin.service.outWebhooksDesc": "When true, outgoing webhooks will be allowed. See <a href='http://docs.mattermost.com/developer/webhooks-outgoing.html' target='_blank'>documentation</a> to learn more.",
   "admin.service.outWebhooksTitle": "Outgoing webhook 허용: ",
-  "admin.service.overrideDescription": "true로 설정하면, webhook과 슬래시 명령어가 메세지를 보낼 때 사용자 이름을 변경할 수 있게 됩니다. 주의사항: 아이콘 변경과 함께 허용하면 피싱 공격의 위험이 있습니다.",
-  "admin.service.overrideTitle": "Enable webhooks and slash commands to override usernames:",
+  "admin.service.overrideDescription": "When true, webhooks, slash commands and other integrations, such as <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, will be allowed to change the username they are posting as. Note: Combined with allowing integrations to override profile picture icons, users may be able to perform phishing attacks by attempting to impersonate other users.",
+  "admin.service.overrideTitle": "Enable integrations to override usernames:",
   "admin.service.securityDesc": "When true, System Administrators are notified by email if a relevant security fix alert has been announced in the last 12 hours. Requires email to be enabled.",
   "admin.service.securityTitle": "Enable Security Alerts: ",
   "admin.service.segmentDescription": "Segment.com is an online service that can be optionally used to track detailed system statistics. You can obtain a key by signing-up for a free account at Segment.com.",
@@ -684,14 +689,14 @@
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.images": "이미지",
   "admin.sidebar.integrations": "통합",
-  "admin.sidebar.ldap": "LDAP",
+  "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "지원",
   "admin.sidebar.license": "Edition and License",
   "admin.sidebar.localization": "지역화",
   "admin.sidebar.logging": "로그",
   "admin.sidebar.login": "로그인",
   "admin.sidebar.logs": "서버 로그 보기",
-  "admin.sidebar.nativeAppLinks": "네이티브 앱 링크",
+  "admin.sidebar.nativeAppLinks": "Mattermost App Links",
   "admin.sidebar.notifications": "알림",
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "기타",
@@ -1308,6 +1313,7 @@
   "installed_integrations.creation": "Created by {creator} on {createAt, date, full}",
   "installed_integrations.delete": "삭제",
   "installed_integrations.hideSecret": "Hide Secret",
+  "installed_integrations.regenSecret": "Regenerate Secret",
   "installed_integrations.regenToken": "토큰 재생성하기",
   "installed_integrations.showSecret": "Show Secret",
   "installed_integrations.token": "토큰: {token}",
@@ -1408,7 +1414,7 @@
   "login.noEmailUsername": "이메일 또는 사용자명을 입력하세요.",
   "login.noEmailUsernameLdapUsername": "이메일, 사용자명 또는 {ldapUsername}을 입력하세요.",
   "login.noLdapUsername": "{ldapUsername}을 입력하세요.",
-  "login.noMethods": "No sign in methods are enabled. Please contact your System Administrator.",
+  "login.noMethods": "No sign-in methods are enabled. Please contact your System Administrator.",
   "login.noPassword": "비밀번호를 입력하세요.",
   "login.noUsername": "사용자명을 입력하세요.",
   "login.noUsernameLdapUsername": "사용자명 또는 {ldapUsername}을 입력하세요.",
@@ -1468,7 +1474,7 @@
   "navbar_dropdown.leave": "팀 떠나기",
   "navbar_dropdown.logout": "로그아웃",
   "navbar_dropdown.manageMembers": "회원 관리하기",
-  "navbar_dropdown.nativeApps": "네이티브 앱 다운로드",
+  "navbar_dropdown.nativeApps": "Download Mattermost Apps",
   "navbar_dropdown.report": "문제 보고",
   "navbar_dropdown.switchTeam": "{team}(으)로 돌아가기",
   "navbar_dropdown.switchTo": "팀 변경: ",
@@ -1589,7 +1595,7 @@
   "sidebar_right_menu.inviteNew": "회원 초대하기",
   "sidebar_right_menu.logout": "로그아웃",
   "sidebar_right_menu.manageMembers": "회원 관리하기",
-  "sidebar_right_menu.nativeApps": "네이티브 앱 다운로드",
+  "sidebar_right_menu.nativeApps": "Download Mattermost Apps",
   "sidebar_right_menu.recentMentions": "최근 멘션",
   "sidebar_right_menu.report": "문제 보고",
   "sidebar_right_menu.switch_team": "팀 선택",
@@ -1859,21 +1865,39 @@
   "user.settings.notifications.allActivity": "모든 활동",
   "user.settings.notifications.channelWide": "채널 전체 멘션 \"@channel\", \"@all\"",
   "user.settings.notifications.close": "닫기",
-  "user.settings.notifications.comments": "답글 활동 알림",
-  "user.settings.notifications.commentsAny": "내가 참여한 모든 글의 답글에 대한 알림 받기",
-  "user.settings.notifications.commentsInfo": "내가 참여한 글의 답글에 대한 알림을 설정합니다.",
-  "user.settings.notifications.commentsNever": "답글에 대한 알림을 받지 않기",
-  "user.settings.notifications.commentsRoot": "내 글의 모든 답글에 대한 알림 받기",
+  "user.settings.notifications.comments": "Reply notifications",
+  "user.settings.notifications.commentsAny": "Trigger notifications on messages in reply threads that I start or participate in",
+  "user.settings.notifications.commentsInfo": "In addition to notifications for when you're mentioned, select if you would like to receive notifications on reply threads.",
+  "user.settings.notifications.commentsNever": "Do not trigger notifications on messages in reply threads unless I'm mentioned",
+  "user.settings.notifications.commentsRoot": "Trigger notifications on messages in threads that I start",
   "user.settings.notifications.desktop": "데스크탑 알림 받기",
+  "user.settings.notifications.desktop.allFirefoxForever": "For all activity, shown indefinitely",
+  "user.settings.notifications.desktop.allFirefoxTimed": "For all activity, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.allNoSoundForever": "For all activity, without sound, shown indefinitely",
+  "user.settings.notifications.desktop.allNoSoundTimed": "For all activity, without sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.allSoundForever": "For all activity, with sound, shown indefinitely",
+  "user.settings.notifications.desktop.allSoundTimed": "For all activity, with sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.duration": "Notification duration",
+  "user.settings.notifications.desktop.durationInfo": "Sets how long desktop notifications will remain on screen.",
+  "user.settings.notifications.desktop.mentionsFirefoxForever": "For mentions and direct messages, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsFirefoxTimed": "For mentions and direct messages, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.mentionsNoSoundForever": "For mentions and direct messages, without sound, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsNoSoundTimed": "For mentions and direct messages, without sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.mentionsSoundForever": "For mentions and direct messages, with sound, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsSoundTimed": "For mentions and direct messages, with sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.seconds": "{seconds} seconds",
+  "user.settings.notifications.desktop.sound": "Notification sound",
+  "user.settings.notifications.desktop.title": "데스크탑 알림 소리",
+  "user.settings.notifications.desktop.unlimited": "Unlimited",
   "user.settings.notifications.desktopSounds": "데스크탑 알림 소리",
-  "user.settings.notifications.emailBatchingInfo": "Notifications are combined into a single email and sent at the maximum frequency selected here.",
+  "user.settings.notifications.emailBatchingInfo": "Notifications received over the time period selected are combined and sent in a single email.",
   "user.settings.notifications.emailInfo": "Email notifications are sent for mentions and direct messages after you’ve been offline for more than 60 seconds or away from {siteName} for more than 5 minutes.",
-  "user.settings.notifications.emailNotifications": "데스크탑 알림 받기",
+  "user.settings.notifications.emailNotifications": "이메일 알림",
   "user.settings.notifications.everyHour": "Every hour",
   "user.settings.notifications.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
   "user.settings.notifications.header": "알림",
   "user.settings.notifications.immediately": "Immediately",
-  "user.settings.notifications.info": "데스크탑 알림은 Firefox, Safari, Chrome, Internet Explorer, Edge 에서 사용이 가능합니다.",
+  "user.settings.notifications.info": "Desktop notifications are available on Firefox, Safari, and Chrome.",
   "user.settings.notifications.never": "알림을 받지 않기",
   "user.settings.notifications.noWords": "설정한 단어가 없습니다",
   "user.settings.notifications.off": "끄기",
@@ -1884,7 +1908,7 @@
   "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.sounds_info": "Notification sounds are available on IE11, Edge, Safari and Chrome.",
   "user.settings.notifications.teamWide": "팀 전체 멘션 \"@all\"",
   "user.settings.notifications.title": "알림 설정",
   "user.settings.notifications.usernameMention": "내 사용자명을 멘션 \"@{username}\"",
@@ -1902,10 +1926,13 @@
   "user.settings.push_notification.onlyMentionsAway": "For mentions and direct messages when away or offline",
   "user.settings.push_notification.onlyMentionsOffline": "For mentions and direct messages when offline",
   "user.settings.push_notification.onlyMentionsOnline": "For mentions and direct messages when online, away or offline",
-  "user.settings.push_notification.status_info": "Notification alerts are pushed to your mobile device depending on your online status.",
+  "user.settings.push_notification.send": "모바일 푸시 알림",
+  "user.settings.push_notification.status": "Trigger push notifications when",
+  "user.settings.push_notification.status_info": "Notification alerts are only pushed to your mobile device when your online status matches the selection above.",
   "user.settings.security.close": "닫기",
   "user.settings.security.currentPassword": "현재 비밀번호",
   "user.settings.security.currentPasswordError": "현재 비밀번호를 입력해주세요",
+  "user.settings.security.deauthorize": "Deauthorize",
   "user.settings.security.emailPwd": "이메일과 비밀번호",
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "Google",
@@ -1916,6 +1943,10 @@
   "user.settings.security.logoutActiveSessions": "활성화 된 세션 보기/로그아웃 하기",
   "user.settings.security.method": "Sign-in Method",
   "user.settings.security.newPassword": "새로운 비밀번호",
+  "user.settings.security.noApps": "No OAuth 2.0 Applications are authorized.",
+  "user.settings.security.oauthApps": "OAuth 2.0 Applications",
+  "user.settings.security.oauthAppsDescription": "Click 'Edit' to manage your OAuth 2.0 Applications",
+  "user.settings.security.oauthAppsHelp": "Applications act on your behalf to access your data based on the permissions you grant them.",
   "user.settings.security.office365": "Office 365",
   "user.settings.security.oneSignin": "You may only have one sign-in method at a time. Switching sign-in method will send an email notifying you if the change was successful.",
   "user.settings.security.password": "비밀번호",
diff --git a/webapp/i18n/nl.json b/webapp/i18n/nl.json
index 3a54efeea..f44403e08 100644
--- a/webapp/i18n/nl.json
+++ b/webapp/i18n/nl.json
@@ -102,7 +102,7 @@
   "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.doneHelp": "Your OAuth 2.0 application has been set up. Please use the following Client ID and Client Secret when requesting authorization for your application.",
-  "add_oauth_app.doneUrlHelp": "Stuur data naar de volgende URL.",
+  "add_oauth_app.doneUrlHelp": "The following are your authorized redirect URL(s).",
   "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. ",
@@ -141,6 +141,7 @@
   "admin.audits.title": "Gebruiker activiteits logs",
   "admin.authentication.email": "Email authenticatie",
   "admin.authentication.gitlab": "GitLab",
+  "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "Opmerking:",
@@ -198,6 +199,8 @@
   "admin.compliance_table.userId": "Aangevraagd door",
   "admin.connectionSecurityNone": "Geen",
   "admin.connectionSecurityNoneDescription": "Mattermost gebruikt een onbeveilgde verbinding.",
+  "admin.connectionSecurityPlain": "PLAIN",
+  "admin.connectionSecurityPlainDescription": "Mattermost gebruikt een onbeveilgde verbinding.",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "Gebruik een bestaand onveilige verbinding en probeerd deze te upgraden naar beveiligde verbinding door middel van TLS.",
   "admin.connectionSecurityTest": "Verbinding testen",
@@ -214,7 +217,7 @@
   "admin.customization.enableCustomEmojiTitle": "Aangepaste emoji inschakelen:",
   "admin.customization.iosAppDownloadLinkDesc": "Voeg een link toe naar de iOs app. Gebruikers die via een mobiele webbrowser de site bezoeken zullen een pagina krijgen met de optie om de app te downloaden. Laat dit veld leeg om deze pagina niet weer te geven. ",
   "admin.customization.iosAppDownloadLinkTitle": "iOS App Download Link:",
-  "admin.customization.nativeAppLinks": "Native App Links",
+  "admin.customization.nativeAppLinks": "Mattermost App Links",
   "admin.customization.restrictCustomEmojiCreationAdmin": "Sta Systeem en Team beheerders toe om aangepaste emojis te maken",
   "admin.customization.restrictCustomEmojiCreationAll": "Iedereen toestaan aangepaste emoji te maken",
   "admin.customization.restrictCustomEmojiCreationDesc": "Aanmaken van emoji beperken tot specifieke gebruikers.",
@@ -401,13 +404,13 @@
   "admin.ldap.emailAttrTitle": "Email attribuut:",
   "admin.ldap.enableDesc": "Wanneer 'waar', kunt u in Mattermost inloggen met behulp van LDAP",
   "admin.ldap.enableTitle": "Inschakelen van inloggen met LDAP:",
-  "admin.ldap.firstnameAttrDesc": "Het attribuut in the LDAP-server dat wordt gebruikt voor het vullen van de voornaam van de gebruikers in Mattermost.",
+  "admin.ldap.firstnameAttrDesc": "(Optioneel) Het attribuut in the LDAP-server dat wordt gebruikt voor het vullen van de bijnaam van de gebruikers in Mattermost.",
   "admin.ldap.firstnameAttrEx": "Bijv. \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "Voornaam attribuut",
   "admin.ldap.idAttrDesc": "Het attribuut in de LDAP server dat zal worden gebruikt als unieke identificatie sleutel in Mattermost. Het zou een LDAP attribuut moeten zijn wat niet veranderd, zoals 'username' of 'uid'. Als het 'ID' attribuut van een gebruiker veranderd, zal een nieuw Mattermost account worden gemaakt en dat is niet verbonden met het oude account. Dit is de waarde wat gebruikt wordt om in te loggen in het \"LDAP Username\" veld op de inlog pagina. Normaal is dit attribuut hetzelfde als het \"Username Attribuut\" hierboven. Als jouw team normaal inlogt met 'domain\\username', kies je waarschijnlijk 'domain\\username' in dit veld.",
   "admin.ldap.idAttrEx": "Bijv. \"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "ID Attribuut: ",
-  "admin.ldap.lastnameAttrDesc": "Het attribuut in the LDAP-server dat wordt gebruikt voor het invullen van de achternaam van de gebruikers in Mattermost.",
+  "admin.ldap.lastnameAttrDesc": "(Optioneel) Het attribuut in the LDAP-server dat wordt gebruikt voor het vullen van de bijnaam van de gebruikers in Mattermost.",
   "admin.ldap.lastnameAttrEx": "Bijv. \"sn\"",
   "admin.ldap.lastnameAttrTitle": "Achternaam attribuut:",
   "admin.ldap.loginNameDesc": "De tijdelijke tekst die wordt weergegeven in het veld 'login' op de login pagina. Standaard ingesteld op \"LDAP-Gebruikersnaam\".",
@@ -436,6 +439,8 @@
   "admin.ldap.syncIntervalTitle": "Synchronisatie-Interval (in minuten)",
   "admin.ldap.syncNowHelpText": "Initieer een LDAP synchronisatie meteen.",
   "admin.ldap.sync_button": "Synchroniseer LDAP Nu",
+  "admin.ldap.testFailure": "LDAP Test Failure: {error}",
+  "admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the LDAP server specified. See log file for more detailed error messages.",
   "admin.ldap.uernameAttrDesc": "Het attribuut in the LDAP-server dat wordt gebruikt voor het vullen van het veld gebruikersnaam in Mattermost. Dit kan hetzelfde zijn als het ID-attribuut.",
   "admin.ldap.userFilterDisc": "Voer eventueel een LDAP filter in om te gebruiken bij het zoeken naar de gebruiker objecten. Alleen de gebruikers geselecteerd door deze query zullen in staat zijn om toegang te krijgen tot Mattermost. Voor Active Directory is de query om gebruikers te filteren (&(objectCategory=Persoon)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "Bijv. \"(objectClass=user)\"",
@@ -558,7 +563,7 @@
   "admin.saml.enableTitle": "Inschakelen van inloggen met SAML:",
   "admin.saml.encryptDescription": "Mattermost zal SAML Assertions decoderen met jouw Publiekelijk Service Provider Certificaat.",
   "admin.saml.encryptTitle": "Inschakelen van Versleuteling: ",
-  "admin.saml.firstnameAttrDesc": "Het attribuut in the SAML-server dat wordt gebruikt voor het vullen van de voornaam van de gebruikers in Mattermost.",
+  "admin.saml.firstnameAttrDesc": "(Optioneel) Het attribuut in the SAML-server dat wordt gebruikt voor het vullen van de bijnaam van de gebruikers in Mattermost.",
   "admin.saml.firstnameAttrEx": "Bv. \"Voornaam\"",
   "admin.saml.firstnameAttrTitle": "Voornaam attribuut:",
   "admin.saml.idpCertificateFileDesc": "Het publieke authenticatie certificaat gebruikt door uw Identity Provider.",
@@ -570,7 +575,7 @@
   "admin.saml.idpUrlDesc": "De URL waar Mattermost een login poging start met een SAML request.",
   "admin.saml.idpUrlEx": "Bijvoorbeeld: \"https://idp.example.org/SAML2/SSO/Login\"",
   "admin.saml.idpUrlTitle": "SAML SSO URL:",
-  "admin.saml.lastnameAttrDesc": "Het attribuut in the SAML-server dat wordt gebruikt voor het invullen van de achternaam van de gebruikers in Mattermost.",
+  "admin.saml.lastnameAttrDesc": "(Optioneel) Het attribuut in the SAM:-server dat wordt gebruikt voor het vullen van de taal van de gebruikers in Mattermost.",
   "admin.saml.lastnameAttrEx": "BV. \"Achternaam\"",
   "admin.saml.lastnameAttrTitle": "Achternaam Attribuut:",
   "admin.saml.localeAttrDesc": "(Optioneel) Het attribuut in the SAM:-server dat wordt gebruikt voor het vullen van de taal van de gebruikers in Mattermost.",
@@ -627,8 +632,8 @@
   "admin.service.googleDescription": "Zet deze sleutel om de titel van ingevoegde Youtube video's te tonen. Zonder deze sleutel zullen Youtube previews nog steeds gemaakt worden op basis van links die in berichten en reacties worden geplaatst, maar er word geen titel getoond. Bekijken een <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> voor instructies over hoe deze sleutel te krijgen.",
   "admin.service.googleExample": "B.v. \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Google API Sleutel:",
-  "admin.service.iconDescription": "Wanneer dit aanstaat, webhooks en slash commando's kunnen worden gebruikt om het icoon van het bericht te veranderen. Let op, in combinatie met toestaan van gebruikersnaam overschrijven, zal dit gebruikers kunnen beschadigen met Phishing aanvallen.",
-  "admin.service.iconTitle": "Sta webhooks en slash commands toe om profielafbeeldingsiconen aan te passen",
+  "admin.service.iconDescription": "When true, webhooks, slash commands and other integrations, such as <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, will be allowed to change the profile picture they post with. Note: Combined with allowing integrations to override usernames, users may be able to perform phishing attacks by attempting to impersonate other users.",
+  "admin.service.iconTitle": "Enable integrations to override profile picture icons:",
   "admin.service.insecureTlsDesc": "Wanneer dit aanstaat, alle uitgaande HTTPS verzoeken zullen ongeverifieerde en self-signed certificaten accepteren. Bijvoorbeeld, uitgaande webhooks naar een server met een self-signed TLS certificaat, gebruik makend van een willekeurig domein, zullen worden toegestaan. Let op, dit maakt deze verbindingen vatbaar voor man-in-the-middle aanvallen.",
   "admin.service.insecureTlsTitle": "Schakel onbeveiligde uitgaande verbindingen in: ",
   "admin.service.integrationAdmin": "Beperkt het  maken van nieuwe integraties tot Team- en Systeembeheerders",
@@ -642,8 +647,8 @@
   "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. ",
-  "admin.service.overrideTitle": "Aanzetten van webshooks en slash commando's om gebruikersnamen te overschrijven:",
+  "admin.service.overrideDescription": "When true, webhooks, slash commands and other integrations, such as <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, will be allowed to change the username they are posting as. Note: Combined with allowing integrations to override profile picture icons, users may be able to perform phishing attacks by attempting to impersonate other users.",
+  "admin.service.overrideTitle": "Enable integrations to override usernames:",
   "admin.service.securityDesc": "Wanneer ingeschakeld, worden systeembeheerders per e-mail verwittigd wanneer er een relevante security fix alert is aangekondigd in de laatste 12 uur. Vereist dat e-mail is ingeschakeld.",
   "admin.service.securityTitle": "Schakel beveiligings alarmen in: ",
   "admin.service.segmentDescription": "Segment.com is een optionele online service voor systeem diagnostiek. Een key is verkrijgbaar door middel van een gratis registratie bij Segment.com",
@@ -653,7 +658,7 @@
   "admin.service.sessionCacheDesc": "Het aantal minuten dat een sessie in het geheugen wordt gecached.",
   "admin.service.sessionDaysEx": "B.v. \"30\"",
   "admin.service.siteURL": "Site URL:",
-  "admin.service.siteURLDescription": "De URL, inclusief poort nummer en protocol, waarvandaan Mattermost gebruikers toegang zullen hebben. Laat dit leeg om automatisch te configureren op basis van inkomend verkeer.",
+  "admin.service.siteURLDescription": "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. ",
@@ -684,14 +689,14 @@
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.images": "Afbeeldingen",
   "admin.sidebar.integrations": "Integraties",
-  "admin.sidebar.ldap": "LDAP",
+  "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Wettelijk en Ondersteuning",
   "admin.sidebar.license": "Editie en Licentie",
   "admin.sidebar.localization": "Lokalisatie",
   "admin.sidebar.logging": "Loggen",
   "admin.sidebar.login": "Login",
   "admin.sidebar.logs": "Logs",
-  "admin.sidebar.nativeAppLinks": "Native App Links ",
+  "admin.sidebar.nativeAppLinks": "Mattermost App Links",
   "admin.sidebar.notifications": "Meldingen",
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "ANDERE",
@@ -1210,7 +1215,7 @@
   "help.attaching.publicLinks": "#### Sharing Public Links\nPublic links allow you to share file attachments with people outside your Mattermost team. Open the file previewer by clicking on the thumbnail of an attachment, then click **Get Public Link**. This opens a dialog box with a link to copy. When the link is shared and opened by another user, the file will automatically download.",
   "help.attaching.publicLinks2": "If **Get Public Link** is not visible in the file previewer and you prefer the feature enabled, you can request that your System Admin enable the feature from the System Console under **Security** > **Public Links**.",
   "help.attaching.supported": "#### Supported Media Types\nIf you are trying to preview a media type that is not supported, the file previewer will open a standard media attachment icon. Supported media formats depend heavily on your browser and operating system, but the following formats are supported by Mattermost on most browsers:",
-  "help.attaching.supportedList": "- Images: BMP, GIF, JPG, JPEG, PNG\n- Video: MP4\n- Audio: MP3, M4A\n- Documents: PDF",
+  "help.attaching.supportedList": "- Afbeeldingen: BMP, GIF, JPG, JPEG, PNG\n- Video: MP4\n- Audio: MP3, M4A\n- Documenten: PDF",
   "help.attaching.title": "# Attaching Files\n_____",
   "help.commands.builtin": "## Built-in Commands\nThe following slash commands are available on all Mattermost installations:",
   "help.commands.builtin2": "Begin by typing `/` and a list of slash command options appears above the text input box. The autocomplete suggestions help by providing a format example in black text and a short description of the slash command in grey text.",
@@ -1308,6 +1313,7 @@
   "installed_integrations.creation": "Gemaakt door {creator} op {createAt, date, full}",
   "installed_integrations.delete": "Verwijderen",
   "installed_integrations.hideSecret": "Verberg Secret",
+  "installed_integrations.regenSecret": "Regenerate Secret",
   "installed_integrations.regenToken": "Token opnieuw genereren",
   "installed_integrations.showSecret": "Toon Secret",
   "installed_integrations.token": "Token: {token}",
@@ -1468,7 +1474,7 @@
   "navbar_dropdown.leave": "Team verlaten",
   "navbar_dropdown.logout": "Afmelden",
   "navbar_dropdown.manageMembers": "Leden beheren",
-  "navbar_dropdown.nativeApps": "Download Native Apps",
+  "navbar_dropdown.nativeApps": "Download Mattermost Apps",
   "navbar_dropdown.report": "Een probleem melden",
   "navbar_dropdown.switchTeam": "Schakel naar {team}",
   "navbar_dropdown.switchTo": "Omschakelen naar ",
@@ -1589,7 +1595,7 @@
   "sidebar_right_menu.inviteNew": "Nodig een nieuw lid uit...",
   "sidebar_right_menu.logout": "Afmelden",
   "sidebar_right_menu.manageMembers": "Leden beheren",
-  "sidebar_right_menu.nativeApps": "Download Native App",
+  "sidebar_right_menu.nativeApps": "Download Mattermost Apps",
   "sidebar_right_menu.recentMentions": "Recente vermeldingen",
   "sidebar_right_menu.report": "Een probleem melden",
   "sidebar_right_menu.switch_team": "Team Selectie",
@@ -1859,32 +1865,50 @@
   "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",
-  "user.settings.notifications.commentsAny": "Vermeld alle reacties in een draad waar je in mee deed (Dit zal ook vermeldingen op jouw hoofdbericht zijn en iedere reactie die je hebt geplaatst op een bericht)",
-  "user.settings.notifications.commentsInfo": "Wijze van notificaties op berichten in reactie draden waar je aan mee deed. ",
-  "user.settings.notifications.commentsNever": "Geen vermelding bij reacties",
-  "user.settings.notifications.commentsRoot": "Vermeld alle reacties op jouw bericht",
+  "user.settings.notifications.comments": "Reply notifications",
+  "user.settings.notifications.commentsAny": "Trigger notifications on messages in reply threads that I start or participate in",
+  "user.settings.notifications.commentsInfo": "In addition to notifications for when you're mentioned, select if you would like to receive notifications on reply threads.",
+  "user.settings.notifications.commentsNever": "Do not trigger notifications on messages in reply threads unless I'm mentioned",
+  "user.settings.notifications.commentsRoot": "Trigger notifications on messages in threads that I start",
   "user.settings.notifications.desktop": "Verstuur desktop meldingen",
+  "user.settings.notifications.desktop.allFirefoxForever": "For all activity, shown indefinitely",
+  "user.settings.notifications.desktop.allFirefoxTimed": "For all activity, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.allNoSoundForever": "For all activity, without sound, shown indefinitely",
+  "user.settings.notifications.desktop.allNoSoundTimed": "For all activity, without sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.allSoundForever": "For all activity, with sound, shown indefinitely",
+  "user.settings.notifications.desktop.allSoundTimed": "For all activity, with sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.duration": "Notification duration",
+  "user.settings.notifications.desktop.durationInfo": "Sets how long desktop notifications will remain on screen.",
+  "user.settings.notifications.desktop.mentionsFirefoxForever": "For mentions and direct messages, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsFirefoxTimed": "For mentions and direct messages, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.mentionsNoSoundForever": "For mentions and direct messages, without sound, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsNoSoundTimed": "For mentions and direct messages, without sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.mentionsSoundForever": "For mentions and direct messages, with sound, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsSoundTimed": "For mentions and direct messages, with sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.seconds": "{seconds} seconds",
+  "user.settings.notifications.desktop.sound": "Notification sound",
+  "user.settings.notifications.desktop.title": "Desktop meldings-geluid",
+  "user.settings.notifications.desktop.unlimited": "Unlimited",
   "user.settings.notifications.desktopSounds": "Desktop meldings-geluid",
-  "user.settings.notifications.emailBatchingInfo": "Notifications are combined into a single email and sent at the maximum frequency selected here.",
+  "user.settings.notifications.emailBatchingInfo": "Notifications received over the time period selected are combined and sent in a single email.",
   "user.settings.notifications.emailInfo": "E-mailmeldingen worden verzonden voor vermeldingen en rechtstreekse berichten nadat u bent offline bent voor meer dan 60 seconden of weg van {siteName} voor meer dan 5 minuten.",
-  "user.settings.notifications.emailNotifications": "Stuur desktop meldingen",
+  "user.settings.notifications.emailNotifications": "E-mail meldingen",
   "user.settings.notifications.everyHour": "Elk uur",
   "user.settings.notifications.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
   "user.settings.notifications.header": "Meldingen",
   "user.settings.notifications.immediately": "Onmiddellijk",
-  "user.settings.notifications.info": "Desktop meldingen zijn beschikbaar op Firefox, Safari, Chrome, Internet Explorer, en de Edge.",
+  "user.settings.notifications.info": "Desktop notifications are available on Firefox, Safari, and Chrome.",
   "user.settings.notifications.never": "Nooit",
   "user.settings.notifications.noWords": "Geen woorden geconfigureerd",
   "user.settings.notifications.off": "Uit",
   "user.settings.notifications.on": "Aan",
   "user.settings.notifications.onlyMentions": "Enkele voor vermeldingen en privé berichten",
-  "user.settings.notifications.push": "Stuur mobiele push meldingen",
+  "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.sounds_info": "Notification sounds are available on IE11, Edge, Safari and Chrome.",
   "user.settings.notifications.teamWide": "Team-vermeldingen \"@all\"",
   "user.settings.notifications.title": "Meldings-instellingen",
   "user.settings.notifications.usernameMention": "Uw gebruikersnaam vermeld \"@{username}\"",
@@ -1902,10 +1926,13 @@
   "user.settings.push_notification.onlyMentionsAway": "For mentions and direct messages when away or offline",
   "user.settings.push_notification.onlyMentionsOffline": "For mentions and direct messages when offline",
   "user.settings.push_notification.onlyMentionsOnline": "For mentions and direct messages when online, away or offline",
-  "user.settings.push_notification.status_info": "Notification alerts are pushed to your mobile device depending on your online status.",
+  "user.settings.push_notification.send": "Stuur mobiele push meldingen",
+  "user.settings.push_notification.status": "Trigger push notifications when",
+  "user.settings.push_notification.status_info": "Notification alerts are only pushed to your mobile device when your online status matches the selection above.",
   "user.settings.security.close": "Afsluiten",
   "user.settings.security.currentPassword": "Huidig wachtwoord",
   "user.settings.security.currentPasswordError": "Voer uw huidige wachtwoord in",
+  "user.settings.security.deauthorize": "Deauthorize",
   "user.settings.security.emailPwd": "E-mail en wachtwoord",
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "Google",
@@ -1916,6 +1943,10 @@
   "user.settings.security.logoutActiveSessions": "Bekijk en uitloggen huidige sessies",
   "user.settings.security.method": "Inlog methode",
   "user.settings.security.newPassword": "Nieuw wachtwoord",
+  "user.settings.security.noApps": "No OAuth 2.0 Applications are authorized.",
+  "user.settings.security.oauthApps": "OAuth 2.0 Applicaties",
+  "user.settings.security.oauthAppsDescription": "Click 'Edit' to manage your OAuth 2.0 Applications",
+  "user.settings.security.oauthAppsHelp": "Applications act on your behalf to access your data based on the permissions you grant them.",
   "user.settings.security.office365": "Office 365",
   "user.settings.security.oneSignin": "Je mag maar 1 inlogmethode tegelijkertijd gebruiken. Verander van inlogmethode zal je een email sturen of de verandering succesvol was.",
   "user.settings.security.password": "Wachtwoord",
diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json
index 3113f53cd..148eef0be 100644
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -42,7 +42,7 @@
   "add_command.description.help": "Descrição do seu webhook de entrada.",
   "add_command.displayName": "Nome de Exibição",
   "add_command.displayName.help": "Nome de exibição para seu comando slash contendo até 64 caracteres.",
-  "add_command.doneHelp": "Your slash command has been set up. The following token will be sent in the outgoing payload. Please use it to verify the request came from your Mattermost team (see <a href=\"https://docs.mattermost.com/developer/slash-commands.html\">documentation</a> for further details).",
+  "add_command.doneHelp": "Seu comando slash foi definido. O seguinte token será enviado com a mensagem de saída. Por favor, usá-lo para verificar o pedido vindo da sua equipe Mattermost (veja <a href=\"https://docs.mattermost.com/developer/slash-commands.html\">documentação</a> para mais detalhes).",
   "add_command.iconUrl": "Ícone de Resposta",
   "add_command.iconUrl.help": "(Opcional) Escolha uma imagem do perfil para substituir as respostas dos posts deste comando slash. Digite a URL de um arquivo .png ou .jpg com pelo menos 128 pixels por 128 pixels.",
   "add_command.iconUrl.placeholder": "https://www.example.com/myicon.png",
@@ -91,18 +91,18 @@
   "add_incoming_webhook.description.help": "Descrição do seu webhook de entrada.",
   "add_incoming_webhook.displayName": "Nome de Exibição",
   "add_incoming_webhook.displayName.help": "Nome de exibição para seu webhook de entrada contendo até 64 caracteres.",
-  "add_incoming_webhook.doneHelp": "Your incoming webhook has been set up. Please send data to the following URL (see <a href=\"https://docs.mattermost.com/developer/webhooks-incoming.html\">documentation</a> for further details).",
+  "add_incoming_webhook.doneHelp": "Seu webhook de entrada foi definido. Por favor envie dados para a URL seguinte (veja <a href=\"https://docs.mattermost.com/developer/webhooks-incoming.html\">documentação</a> para mais detalhes).",
   "add_incoming_webhook.name": "Nome",
   "add_incoming_webhook.save": "Salvar",
   "add_incoming_webhook.url": "<b>URL</b>: {url}",
   "add_oauth_app.callbackUrls.help": "Os URIs de redirecionamento para o qual o serviço irá redirecionar os usuários depois de aceitar ou negar a autorização de sua aplicação, e que irá lidar com códigos de autorização ou tokens de acesso. Deve ser uma URL válida e começar com http:// ou https://.",
   "add_oauth_app.callbackUrlsRequired": "Uma ou mais URLs callback são necessárias",
-  "add_oauth_app.clientId": "<b>Client ID</b>: {id}",
-  "add_oauth_app.clientSecret": "<b>Client Secret</b>: {secret}",
+  "add_oauth_app.clientId": "<b>ID Cliente</b>: {id}",
+  "add_oauth_app.clientSecret": "<b>Cliente Chave Secreta</b>: {secret}",
   "add_oauth_app.description.help": "Descrição para sua aplicação OAuth 2.0.",
   "add_oauth_app.descriptionRequired": "Descrição para a aplicação OAuth 2.0 é obrigatória.",
-  "add_oauth_app.doneHelp": "Your OAuth 2.0 application has been set up. Please use the following Client ID and Client Secret when requesting authorization for your application.",
-  "add_oauth_app.doneUrlHelp": "Please send data to the following URL.",
+  "add_oauth_app.doneHelp": "Sua aplicação OAuth 2.0 foi configurada. Por favor use o seguinte ID Cliente e Chave Secreta Cliente ao solicitar a autorização para a sua aplicação.",
+  "add_oauth_app.doneUrlHelp": "A seguir estão as URL(s) de redirecionamento autorizadas.",
   "add_oauth_app.header": "Adicionar",
   "add_oauth_app.homepage.help": "A URL para a página inicial da aplicação OAuth 2.0. Certifique-se de usar HTTP ou HTTPS em sua URL dependendo da sua configuração do servidor.",
   "add_oauth_app.homepageRequired": "Página Inicial para a aplicação OAuth 2.0 é obrigatória.",
@@ -110,7 +110,7 @@
   "add_oauth_app.name.help": "Nome de exibição para sua aplicação OAuth 2.0 contendo até 64 caracteres.",
   "add_oauth_app.nameRequired": "Nome para a aplicação OAuth 2.0 é obrigatória.",
   "add_oauth_app.trusted.help": "Quando verdadeiro, a aplicação OAuth 2.0 é considerado confiável pelo servidor Mattermost e não requer que o usuário aceite a autorização. Quando falso, uma janela adicional será exibida, solicitando ao usuário para aceitar ou negar a autorização.",
-  "add_oauth_app.url": "<b>URL(s)</b>: {url}",
+  "add_oauth_app.url": "<b>URL</b>: {url}",
   "add_outgoing_webhook.callbackUrls": "URLs Callback (Uma Por Linha)",
   "add_outgoing_webhook.callbackUrls.help": "A URL que as mensagens serão enviadas.",
   "add_outgoing_webhook.callbackUrlsRequired": "Uma ou mais URLs callback são necessárias",
@@ -125,7 +125,7 @@
   "add_outgoing_webhook.description.help": "Descrição do seu webhook de saída.",
   "add_outgoing_webhook.displayName": "Nome de Exibição",
   "add_outgoing_webhook.displayName.help": "Nome de exibição para seu webhook de saída contendo até 64 caracteres.",
-  "add_outgoing_webhook.doneHelp": "Your outgoing webhook has been set up. The following token will be sent in the outgoing payload. Please use it to verify the request came from your Mattermost team (see <a href=\"https://docs.mattermost.com/developer/webhooks-outgoing.html\">documentation</a> for further details).",
+  "add_outgoing_webhook.doneHelp": "Seu webhook de saída foi definido. O seguinte token será enviado com a mensagem de saída. Por favor, usá-lo para verificar o pedido vindo da sua equipe Mattermost (veja <a href=\"https://docs.mattermost.com/developer/webhooks-outgoing.html\">documentação</a> para mais detalhes).",
   "add_outgoing_webhook.name": "Nome",
   "add_outgoing_webhook.save": "Salvar",
   "add_outgoing_webhook.token": "<b>Token</b>: {token}",
@@ -141,6 +141,7 @@
   "admin.audits.title": "Atividade de Usuário",
   "admin.authentication.email": "Autenticação Email",
   "admin.authentication.gitlab": "GitLab",
+  "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "Nota:",
@@ -198,6 +199,8 @@
   "admin.compliance_table.userId": "Solicitado Por",
   "admin.connectionSecurityNone": "Nenhum",
   "admin.connectionSecurityNoneDescription": "Mattermost irá conectar usando uma conexão insegura.",
+  "admin.connectionSecurityPlain": "PLAIN",
+  "admin.connectionSecurityPlainDescription": "Mattermost irá conectar e autenticar usando uma conexão insegura.",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "Obtém uma conexão insegura existente e tenta atualizá-la para uma conexão segura usando TLS.",
   "admin.connectionSecurityTest": "Testar Conexão",
@@ -214,7 +217,7 @@
   "admin.customization.enableCustomEmojiTitle": "Ativar Emoji Personalizado:",
   "admin.customization.iosAppDownloadLinkDesc": "Adiciona um link para download do app iOS. Usuários que acessarem o site em um navegador móvel serão perguntados com uma página dando a opção para download do app. Deixe este campo em branco para evitar que a página apareça.",
   "admin.customization.iosAppDownloadLinkTitle": "App iOS Link para Download:",
-  "admin.customization.nativeAppLinks": "Links para App Nativos",
+  "admin.customization.nativeAppLinks": "Mattermost App Links",
   "admin.customization.restrictCustomEmojiCreationAdmin": "Habilitar criação de emoji personalizados para Administradores de Sistemas e de Times ",
   "admin.customization.restrictCustomEmojiCreationAll": "Permitir que todos possam criar emoji personalizados",
   "admin.customization.restrictCustomEmojiCreationDesc": "Restringir a criação de emoji personalizado para determinados usuários.",
@@ -234,10 +237,10 @@
   "admin.email.easHelp": "Leia mais sobre compilar e publicar seu próprio aplicativo móvel em <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target=\"_blank\">Enterprise App Store</a>.",
   "admin.email.emailFail": "Conexão falhou: {error}",
   "admin.email.emailSuccess": "Nenhum erro foram relatados durante o envio de um e-mail.  Por favor verifique a sua caixa de entrada para se certificar.",
-  "admin.email.enableEmailBatching.clusterEnabled": "Email batching cannot be enabled when High Availability mode is enabled.",
-  "admin.email.enableEmailBatching.siteURL": "Email batching cannot be enabled unless the SiteURL is configured in <b>Configuration > SiteURL</b>.",
-  "admin.email.enableEmailBatchingDesc": "When true, users can have email notifications for multiple direct messages and mentions combined into a single email, configurable in <b>Account Settings > Notifications</b>.",
-  "admin.email.enableEmailBatchingTitle": "Enable Email Batching:",
+  "admin.email.enableEmailBatching.clusterEnabled": "Email em lote não pode ser ativado quando modo de Alta Disponibilidade está ativo.",
+  "admin.email.enableEmailBatching.siteURL": "Email em lote não pode ser ativo a menos que o SiteURL estiver configurado em <b>Configurações > SiteURL</b>.",
+  "admin.email.enableEmailBatchingDesc": "Quando verdadeiro, os usuários podem ter notificações de e-mail para várias mensagens diretas e menções combinados em um único e-mail, configurável em <b>Configurações de Conta > Notificações</b>.",
+  "admin.email.enableEmailBatchingTitle": "Ativar Email em Lote:",
   "admin.email.fullPushNotification": "Enviar trecho de mensagem",
   "admin.email.genericPushNotification": "Enviar descrição genérica com nomes do usuário e canal",
   "admin.email.inviteSaltDescription": "Salt de 32-caracteres adicionados a assinatura de convites por e-mail. Aleatoriamente gerados na instalação. Click \"Re-Gerar\" para criar um novo salt.",
@@ -401,13 +404,13 @@
   "admin.ldap.emailAttrTitle": "Atributo de E-mail:",
   "admin.ldap.enableDesc": "Quando verdadeiro, Mattermost permite login utilizando LDAP",
   "admin.ldap.enableTitle": "Ativar login with LDAP:",
-  "admin.ldap.firstnameAttrDesc": "O atributo no servidor LDAP será usado para preencher o primeiro nome dos usuários no Mattermost.",
+  "admin.ldap.firstnameAttrDesc": "(Opcional) O atributo no servidor LDAP que será usado para preencher o primeiro nome dos usuários no Mattermost.",
   "admin.ldap.firstnameAttrEx": "Ex \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "Primeiro Nome do Atributo",
   "admin.ldap.idAttrDesc": "O atributo no servidor LDAP que vai ser utilizado como um identificador único no Mattermost. Ele deve ser um atributo LDAP com um valor que não muda, como nome de usuário ou uid. Se atributo Id do usuário mudar, isto irá criar uma nova conta Mattermost não associada com a sua antiga. Este é o valor utilizado para efetuar login no Mattermost no campo \"Nome de usuário LDAP\" na página de login. Normalmente, este atributo é o mesmo que o campo “Atributo Nome de Usuário” acima. Se sua equipe usa tipicamente de domínio\\nome de usuário para fazer login em outros serviços com LDAP, você pode optar por colocar domínio\\nome de usuário neste campo para manter a consistência entre os sites.",
   "admin.ldap.idAttrEx": "Ex \"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "Atributo ID: ",
-  "admin.ldap.lastnameAttrDesc": "O atributo no servidor LDAP será usado para preencher o último nome dos usuários no Mattermost.",
+  "admin.ldap.lastnameAttrDesc": "(Opcional) O atributo no servidor LDAP que será usado para preencher o sobrenome dos usuários no Mattermost.",
   "admin.ldap.lastnameAttrEx": "Ex \"sn\"",
   "admin.ldap.lastnameAttrTitle": "Atributo Último Nome:",
   "admin.ldap.loginNameDesc": "O texto placeholder que aparece no campo de login na página de login. O padrão é \"Usuário LDAP\".",
@@ -415,7 +418,7 @@
   "admin.ldap.loginNameTitle": "Nome do Campo Login:",
   "admin.ldap.maxPageSizeEx": "Ex \"2000\"",
   "admin.ldap.maxPageSizeHelpText": "O número máximo de usuários que servidor Mattermost irá solicitar ao servidor LDAP ao mesmo tempo. 0 é ilimitado.",
-  "admin.ldap.maxPageSizeTitle": "Tamanho Máximo da Página",
+  "admin.ldap.maxPageSizeTitle": "Tamanho Máximo da Página:",
   "admin.ldap.nicknameAttrDesc": "(Opcional) O atributo no servidor LDAP que será usado para preencher o apelido dos usuários no Mattermost.",
   "admin.ldap.nicknameAttrEx": "Ex \"nickname\"",
   "admin.ldap.nicknameAttrTitle": "Atributo Apelido:",
@@ -429,13 +432,15 @@
   "admin.ldap.serverDesc": "O domínio ou o endereço IP do servidor LDAP.",
   "admin.ldap.serverEx": "Ex \"10.0.0.23\"",
   "admin.ldap.serverTitle": "Servidor LDAP:",
-  "admin.ldap.skipCertificateVerification": "Pular a Verificação do Certificado",
+  "admin.ldap.skipCertificateVerification": "Pular a Verificação do Certificado:",
   "admin.ldap.skipCertificateVerificationDesc": "Pula a etapa de verificação do certificado para conexões TLS ou STARTTLS. Não recomentado para ambientes de produção onde TLS é necessário. Apenas para teste.",
   "admin.ldap.syncFailure": "Falha de Sincronização: {error}",
   "admin.ldap.syncIntervalHelpText": "Sincronização LDAP atualiza as informações do usuário Mattermost para refletir atualizações no servidor LDAP. Por exemplo, quando o nome de um usuário muda no servidor LDAP, a mudança atualiza o Mattermost quando a sincronização é executada. Contas removidas ou desativas no servidor LDAP tem suas contas definidas como “Inativa” e suas sessões revogadas. Mattermos executa a sincronização no intervalo digitado. Por exemplo, se 60 for digitado, Mattermost irá sincronizar a cada 60 minutos.",
-  "admin.ldap.syncIntervalTitle": "Intervalo de sincronização (minutos)",
+  "admin.ldap.syncIntervalTitle": "Intervalo de sincronização (minutos):",
   "admin.ldap.syncNowHelpText": "Iniciar uma sincronização LDAP imediatamente.",
   "admin.ldap.sync_button": "Sincronizar LDAP Agora",
+  "admin.ldap.testFailure": "Falha Teste LDAP: {error}",
+  "admin.ldap.testHelpText": "Testa se o servidor Mattermost pode conectar ao servidor LDAP especificado. Veja o log para as mensagens de erros mais detalhadas.",
   "admin.ldap.uernameAttrDesc": "O atributo no servidor LDAP que será usado para preencher o campo nome de usuário no Mattermost. Este pode ser o mesmo que o Atributo ID.",
   "admin.ldap.userFilterDisc": "(Opcional), insira um filtro LDAP para usar ao procurar por objetos de usuário. Somente os usuários selecionados pela consulta serão capazes de acessar o Mattermost. Para o Active Directory, a consulta para filtrar os usuários desativados é (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "Ex. \"(objectClass=user)\"",
@@ -513,9 +518,9 @@
   "admin.password.requirementsDescription": "Tipos de caracteres necessários em uma senha válida.",
   "admin.password.symbol": "Pelo menos um símbolo (ex. \"~!@#$%^&*()\")",
   "admin.password.uppercase": "Pelo menos uma letra maiuscula",
-  "admin.privacy.showEmailDescription": "Quando falso, esconde endereço de e-mail dos outros usuários na interface do usuário, incluindo donos da equipe e administradores da equipe. Usado quando o sistema está configurado para gerenciar equipes onde alguns usuários optam por manter suas informações de contato privado.",
+  "admin.privacy.showEmailDescription": "Quando falso, esconde endereço de e-mail dos outros usuários na interface do usuário, incluindo donos da equipe e Administradores de Equipe. Usado quando o sistema está configurado para gerenciar equipes onde alguns usuários optam por manter suas informações de contato privado.",
   "admin.privacy.showEmailTitle": "Mostrar Endereços de Email: ",
-  "admin.privacy.showFullNameDescription": "Quando falso, oculta o nome completo dos usuários dos outros usuários, incluindo donos de equipe e administradores de equipe. Nome de usuário é mostrado no lugar do nome completo.",
+  "admin.privacy.showFullNameDescription": "Quando falso, oculta o nome completo dos usuários dos outros usuários, incluindo donos de equipe e Administradores de Equipe. Nome de usuário é mostrado no lugar do nome completo.",
   "admin.privacy.showFullNameTitle": "Mostrar Nome Completo: ",
   "admin.rate.enableLimiterDescription": "Quando verdadeiro, as APIs são estranguladas para as taxas especificadas abaixo.",
   "admin.rate.enableLimiterTitle": "Ativar Rate Limiting: ",
@@ -558,7 +563,7 @@
   "admin.saml.enableTitle": "Ativar Login With SAML:",
   "admin.saml.encryptDescription": "Quando verdadeiro, Mattermost irá descriptografar SAML Assertions criptografados com o seu Provedor de Serviços de Certificado Público.",
   "admin.saml.encryptTitle": "Ativar Criptografia:",
-  "admin.saml.firstnameAttrDesc": "O atributo no SAML Assertion que será usado para preencher o primeiro nome dos usuários no Mattermost.",
+  "admin.saml.firstnameAttrDesc": "(Opcional) O atributo em SAML Assertion que será usado para preencher o apelido dos usuários no Mattermost.",
   "admin.saml.firstnameAttrEx": "Ex \"FirstName\"",
   "admin.saml.firstnameAttrTitle": "Primeiro Nome Atributo:",
   "admin.saml.idpCertificateFileDesc": "O certificado de autenticação pública emitida pelo seu Provedor de Identidade.",
@@ -570,7 +575,7 @@
   "admin.saml.idpUrlDesc": "A URL onde o Mattermost envia a requisição SAML para iniciar a sequencia de login.",
   "admin.saml.idpUrlEx": "Ex \"https://idp.example.org/SAML2/SSO/Login\"",
   "admin.saml.idpUrlTitle": "SAML SSO URL:",
-  "admin.saml.lastnameAttrDesc": "O atributo em SAML Assertion que será usado para preencher o último nome dos usuários no Mattermost.",
+  "admin.saml.lastnameAttrDesc": "(Opcional) O atributo em SAML Assertion que será usado para preencher o idioma dos usuários no Mattermost.",
   "admin.saml.lastnameAttrEx": "Ex \"LastName\"",
   "admin.saml.lastnameAttrTitle": "Atributo Último Nome:",
   "admin.saml.localeAttrDesc": "(Opcional) O atributo em SAML Assertion que será usado para preencher o idioma dos usuários no Mattermost.",
@@ -627,8 +632,8 @@
   "admin.service.googleDescription": "Defina esta chave para permitir a exibição de títulos para pré-visualizações de vídeo do YouTube embutidos. Sem a chave, pré-visualizações do YouTube ainda serão criadas com base em hiperlinks que aparecem nas mensagens ou comentários, mas eles não vão mostrar o título do vídeo. Veja o <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> para instruções sobre como obter uma chave.",
   "admin.service.googleExample": "Ex \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Google API Key:",
-  "admin.service.iconDescription": "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.",
-  "admin.service.iconTitle": "Permitir webhooks e comandos slash substituam ícones de perfil:",
+  "admin.service.iconDescription": "Quando verdadeiro, webhooks, comandos slash e outras integrações, como <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, terão permissão para mudar a foto do perfil dos posts. Nota: Combinado com a permissão de integrações para substituir nomes de usuários, os usuários podem ser capazes de realizar ataques de phishing ao tentar passar por outros usuários.",
+  "admin.service.iconTitle": "Permitir que integrações sobrescreva o imagem do perfil:",
   "admin.service.insecureTlsDesc": "Quando verdadeiro, quaisquer pedidos de HTTPS de saída vão aceitar certificados não verificados ou auto-assinados. Por exemplo, webhooks de saída para um servidor com um certificado TLS auto-assinado, usando qualquer domínio, serão permitidos. Note-se que isso faz com que essas conexões sejam suscetíveis a ataques man-in-the-middle.",
   "admin.service.insecureTlsTitle": "Ativar Conexões de Saída Inseguras: ",
   "admin.service.integrationAdmin": "Restringir a criação de integrações para Administradores de Sistema e Equipe: ",
@@ -642,8 +647,8 @@
   "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.",
-  "admin.service.overrideTitle": "Permitir webhook e comandos slash substituam usuários:",
+  "admin.service.overrideDescription": "Quando verdadeiro, webhooks, comandos slash e outras integrações, como <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, terão permissão para mudar o nome do usuário dos posts. Nota: Combinado com a permissão de integrações para substituir foto do perfil, os usuários podem ser capazes de realizar ataques de phishing ao tentar passar por outros usuários.",
+  "admin.service.overrideTitle": "Permitir que integrações sobrescrevam o nome do usuário:",
   "admin.service.securityDesc": "Quando verdadeiro, os Administradores de Sistema são notificados por e-mail se uma relevante correção de segurança foi anunciado nos últimos 12 horas. Requer o e-mail para ser ativado.",
   "admin.service.securityTitle": "Ativar Alertas de Segurança: ",
   "admin.service.segmentDescription": "Segment.com é um serviço online que pode opcionalmente ser usado para rastrear detalhes das estatísticas do sistema. Você pode obter uma chave criando uma conta gratuita em Segment.com.",
@@ -684,14 +689,14 @@
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.images": "Imagens",
   "admin.sidebar.integrations": "Integrações",
-  "admin.sidebar.ldap": "LDAP",
+  "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "Legal e Suporte",
   "admin.sidebar.license": "Edição e Licença",
   "admin.sidebar.localization": "Regionalização",
   "admin.sidebar.logging": "Acesso",
   "admin.sidebar.login": "Login",
   "admin.sidebar.logs": "Logs",
-  "admin.sidebar.nativeAppLinks": "Links para App Nativos",
+  "admin.sidebar.nativeAppLinks": "Mattermost App Links",
   "admin.sidebar.notifications": "Notificações",
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "OUTROS",
@@ -1199,93 +1204,93 @@
   "get_team_invite_link_modal.help": "Enviar o link abaixo para sua equipe de trabalho para que eles se inscrevam no site da sua equipe. O Link de Convite de Equipe como ele não muda pode ser compartilhado com várias pessoas ao menos que seja re-gerado em Configurações de Equipe pelo Administrador de Equipe.",
   "get_team_invite_link_modal.helpDisabled": "Criação de usuários está desabilitada para sua equipe. Por favor peça ao administrador de equipe por detalhes.",
   "get_team_invite_link_modal.title": "Link para Convite de Equipe",
-  "help.attaching.downloading": "#### Downloading Files\nDownload an attached file by clicking the download icon next to the file thumbnail or by opening the file previewer and clicking **Download**.",
-  "help.attaching.dragdrop": "#### Drag and Drop\nUpload a file or selection of files by dragging the files from your computer into the RHS or center pane. Dragging and dropping attaches the files to the message input box, then you can optionally type a message and press **ENTER** to post.",
-  "help.attaching.icon": "#### Attachment Icon\nAlternatively, upload files by clicking the grey paperclip icon inside the message input box. This opens up your system file viewer where you can navigate to the desired files and then click **Open** to upload the files to the message input box. Optionally type a message and then press **ENTER** to post.",
-  "help.attaching.limitations": "## File Size Limitations\nMattermost supports a maximum of five attached files per post, each with a maximum file size of 50Mb.",
-  "help.attaching.methods": "## Attachment Methods\nAttach a file by drag and drop or by clicking the attachment icon in the message input box.",
-  "help.attaching.notSupported": "Document preview (Word, Excel, PPT) is not yet supported.",
-  "help.attaching.pasting": "#### Pasting Images\nOn Chrome and Edge browsers, it is also possible to upload files by pasting them from the clipboard. This is not yet supported on other browsers.",
-  "help.attaching.previewer": "## File Previewer\nMattermost has a built in file previewer that is used to view media, download files and share public links. Click the thumbnail of an attached file to open it in the file previewer.",
-  "help.attaching.publicLinks": "#### Sharing Public Links\nPublic links allow you to share file attachments with people outside your Mattermost team. Open the file previewer by clicking on the thumbnail of an attachment, then click **Get Public Link**. This opens a dialog box with a link to copy. When the link is shared and opened by another user, the file will automatically download.",
-  "help.attaching.publicLinks2": "If **Get Public Link** is not visible in the file previewer and you prefer the feature enabled, you can request that your System Admin enable the feature from the System Console under **Security** > **Public Links**.",
-  "help.attaching.supported": "#### Supported Media Types\nIf you are trying to preview a media type that is not supported, the file previewer will open a standard media attachment icon. Supported media formats depend heavily on your browser and operating system, but the following formats are supported by Mattermost on most browsers:",
-  "help.attaching.supportedList": "- Images: BMP, GIF, JPG, JPEG, PNG\n- Video: MP4\n- Audio: MP3, M4A\n- Documents: PDF",
-  "help.attaching.title": "# Attaching Files\n_____",
-  "help.commands.builtin": "## Built-in Commands\nThe following slash commands are available on all Mattermost installations:",
-  "help.commands.builtin2": "Begin by typing `/` and a list of slash command options appears above the text input box. The autocomplete suggestions help by providing a format example in black text and a short description of the slash command in grey text.",
-  "help.commands.custom": "## Custom Commands\nCustom slash commands integrate with external applications. For example, a team might configure a custom slash command to check internal health records with `/patient joe smith` or check the weekly weather forcast in a city with `/weather toronto week`. Check with your System Admin or open the autocomplete list by typing `/` to determine if your team configured any custom slash commands.",
-  "help.commands.custom2": "Custom slash commands are disabled by default and can be enabled by the System Admin in the **System Console** > **Integrations** > **Webhooks and Commands**. Learn about configuring custom slash commands on the [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
-  "help.commands.intro": "Slash commands perform operations in Mattermost by typing into the text input box. Enter a `/` followed by a command and some arguments to perform actions.\n\nBuilt-in slash commands come with all Mattermost installations and custom slash commands are configurable to interact with external applications. Learn about configuring custom slash commands on the [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
-  "help.commands.title": "# Executing Commands\n___",
-  "help.composing.deleting": "## Deleting a message\nDelete a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Delete**. System and Team Admins can delete any message on their system or team.",
-  "help.composing.editing": "## Editing a Message\nEdit a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Edit**. After making modifications to the message text, press **ENTER** to save the modifications. Message edits do not trigger new @mention notifications, desktop notifications or notification sounds.",
-  "help.composing.linking": "## Linking to a message\nThe **Permalink** feature creates a link to any message. Sharing this link with other users in the channel lets them view the linked message in the Message Archives. Users who are not a member of the channel where the message was posted cannot view the permalink. Get the permalink to any message by clicking the **[...]** icon next to the message text  > **Permalink** > **Copy Link**.",
-  "help.composing.posting": "## Posting a Message\nWrite a message by typing into the text input box, then press **ENTER** to send it. Use **Shift + ENTER** to create a new line without sending a message. To send messages by pressing **Ctrl+Enter** go to **Main Menu > Account Settings > Send messages on Ctrl + Enter**.",
-  "help.composing.posts": "#### Posts\nPosts can be considered parent messages. They are the messages that often start a thread of replies. Posts are composed and sent from the text input box at the bottom of the center pane.",
-  "help.composing.replies": "#### Replies\nReply to a message by clicking the reply icon next to any message text. This action opens the right-hand-side (RHS) where you can see the message thread, then compose and send your reply. Replies are indented slightly in the center pane to indicate that they are child messages of a parent post.\n\nWhen composing a reply in the right-hand side, click the expand/collapse icon with two arrows at the top of the sidebar to make things easier to read.",
-  "help.composing.title": "# Sending Messages\n_____",
-  "help.composing.types": "## Message Types\nReply to posts to keep conversations organized in threads.",
-  "help.formatting.checklist": "Make a task list by including square brackets:",
-  "help.formatting.checklistExample": "- [ ] Item one\n- [ ] Item two\n- [x] Completed item",
-  "help.formatting.code": "## Code Block\n\nCreate a code block by indenting each line by four spaces, or by placing ``` on the line above and below your code.",
-  "help.formatting.codeBlock": "code block",
+  "help.attaching.downloading": "#### Download Arquivos\nFazer download de um arquivo anexado clicando no ícone de download ao lado da miniatura de arquivos ou abrindo o visualizador de arquivos e clicando em **Download**.",
+  "help.attaching.dragdrop": "#### Arrastar e Soltar\nEnvie um arquivo ou uma seleção de arquivos arrastando-os do seu computador para barra lateral direita ou painel central. Arrastando e soltando anexos para a caixa de entrada de mensagem, então você pode, opcionalmente, digitar uma mensagem e pressionar **ENTER** para postar.",
+  "help.attaching.icon": "#### Ícone de Anexo\nComo alternativa, fazer upload de arquivos clicando no ícone de clipe cinza dentro da caixa de entrada de mensagem. Isso abre o seu visualizador de arquivos do sistema, onde você pode navegar até os arquivos desejados e clique em **Abrir** para enviar os arquivos para a caixa de entrada de mensagens. Opcionalmente, digite uma mensagem e em seguida, pressione **ENTER** para postar.",
+  "help.attaching.limitations": "## Limitação Tamanho de Arquivo\nMattermost suporta um máximo de cinco arquivos anexados por postagem, cada um com tamanho máximo de 50Mb.",
+  "help.attaching.methods": "## Métodos de Anexar\nAnexe um arquivo arrastando e soltando ou clicando no ícone de anexar na caixa de entrada de mensagem.",
+  "help.attaching.notSupported": "Visualização de documentos (Word, Excel, PPT) não é ainda suportado.",
+  "help.attaching.pasting": "#### Colando Imagens\nNos navegadores Chrome e Edge isto é também possível para enviar arquivos colando eles a partir da área de transferência. Isto ainda não é suportado nos outros navegadores.",
+  "help.attaching.previewer": "## Visualização de Arquivo\nMattermost tem um visualizador de arquivos nativo que é usado para ver a mídia, fazer download e compartilhar links públicos. Clique na miniatura do arquivo anexado para abrir o visualizador de arquivos.",
+  "help.attaching.publicLinks": "#### Compartilhar Links Públicos\nLinks públicos permitem que você compartilhe arquivos anexados com pessoas fora da sua equipe Mattermost. Abra o visualizador de arquivo clicando na miniatura do anexo, então clique **Obter Link Público**. Isto abrirá um caixa de dialogo com um link para copiar. Quando o link for compartilhado e aberto por outro usuário, será feito download automaticamente do arquivo.",
+  "help.attaching.publicLinks2": "Se **Obter Link Público** não estiver visível no visualizador de arquivo e você prefere este recurso ativo, você pode solicitar que o Administrador do Sistema ative o recurso no Console do Sistema em **Segurança** > **Links Públicos**.",
+  "help.attaching.supported": "#### Tipos de Mídia Suportados\nSe você está tentando visualizar um tipo de mídia que não é suportado, o visualizador de arquivos vai abrir um ícone de anexo de mídia padrão. Formatos de mídia suportados dependem fortemente de seu navegador e sistema operacional, mas os seguintes formatos são suportados pelo Mattermost na maioria dos navegadores:",
+  "help.attaching.supportedList": "- Imagens: BMP, GIF, JPG, JPEG, PNG\n- Vídeo: MP4\n- Audio: MP3, M4A\n- Documentos: PDF",
+  "help.attaching.title": "# Anexando Arquivos\n_____",
+  "help.commands.builtin": "## Comandos Nativos\nOs seguintes comandos slash estão disponíveis em todas as instalações Mattermost:",
+  "help.commands.builtin2": "Comece digitando `/` e uma lista de opções de comando slash aparece acima da caixa de entrada de texto. As sugestões de preenchimento automático ajudam fornecendo um exemplo no texto preto e uma breve descrição do comando slash no texto cinza.",
+  "help.commands.custom": "## Comandos Personalizados\nComandos slash personalizados se integram com aplicações externas. Por exemplo, uma equipe pode configurar um comando slash personalizado para verificar os registros de saúde internos com `/paciente joe smith` ou verificar o clima semanal em uma cidade com `/tempo toronto semana`. Verifique com o Administrador de Sistema ou abra a lista de preenchimento automático digitando `/` para verificar se a sua equipe configurou algum comando slash personalizado.",
+  "help.commands.custom2": "Comandos slash personalizados estão desativados por padrão e podem ser ativados pelo Administrador do Sistema em **Console do Sistema** > **Integrações** > **Webhooks e Comandos**. Leia sobre como configurar comando slash personalizado em [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
+  "help.commands.intro": "Comandos slash executam operações no Mattermost digitando na caixa de entrada de texto. Digite `/` seguido por um comando e alguns argumentos para executar ações.\n\nComandos slash nativos vêm com todas as instalações Mattermost e comandos slash personalizado são configurados para interagir com aplicações externas. Saiba mais sobre a configuração de comandos slash personalizados em [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
+  "help.commands.title": "# Executando Comandos\n___",
+  "help.composing.deleting": "## Deletando uma mensagem\nDelete uma mensagem clicando no ícone **[...]** ao lado do texto da mensagem que você escreveu, em seguida, clique em **Deletar**. Administrador de Sistema e de Equipe podem excluir qualquer mensagem em seu sistema ou equipe.",
+  "help.composing.editing": "## Edição de Mensagem\nEditar uma mensagem clicando no ícone **[...]** ao lado o texto da mensagem que você compôs, em seguida, clique em **Editar**. Depois de fazer modificações no texto da mensagem, pressione **ENTER** para salvar as modificações. Edições mensagem não desencadeiam novas notificações de @menção, notificações de área de trabalho ou sons de notificação.",
+  "help.composing.linking": "## Link para uma mensagem\nO recurso **Permalink** cria um link para qualquer mensagem. Compartilhar este link com outros usuários no canal lhes permite visualizar a mensagem lincada no Arquivos de Mensagem. Os usuários que não são membros do canal onde a mensagem foi postada não podem ver o permalink. Obter o permalink de qualquer mensagem, clicando no ícone **[...]** ao lado do texto da mensagem  > **Permalink** > **Copiar Link**.",
+  "help.composing.posting": "## Postando uma Mensagem\nEscreva uma mensagem, digitando na caixa de entrada de texto, em seguida, pressione **ENTER** para enviá-la. Use **Shift + ENTER** para criar uma nova linha sem enviar uma mensagem. Para enviar mensagens pressionando **Ctrl+Enter** vá para **Menu Principal > Configurações de Conta > Enviar mensagens em Ctrl + Enter**.",
+  "help.composing.posts": "#### Posts\nPosts podem ser consideradas as mensagens principais. Eles são as mensagens que, muitas vezes iniciam uma discussão com respostas. Posts são criados e enviados a partir da caixa de entrada de texto na parte inferior do painel central.",
+  "help.composing.replies": "#### Respostas\nResponda a uma mensagem clicando no ícone de resposta ao lado de qualquer texto da mensagem. Esta ação abre a barra lateral direita, onde você pode ver as mensagens relacionadas, e escrever e enviar sua resposta. As respostas são recuada ligeiramente no painel central para indicar que eles são mensagens filha de um post pai.\n\nAo compor uma resposta no lado direito, clique no ícone de expandir/fechar com duas setas na parte superior da barra lateral para tornar as coisas mais fáceis de ler.",
+  "help.composing.title": "# Enviando Mensagens\n_____",
+  "help.composing.types": "## Tipos de Mensagem\nResponda a postagem para manter a conversa organizada em tópicos.",
+  "help.formatting.checklist": "Faça uma lista de tarefas, incluindo colchetes:",
+  "help.formatting.checklistExample": "- [ ] Item um\n- [ ] Item dois\n- [x] Item concluído",
+  "help.formatting.code": "## Bloco de Código\n\nCriar um bloco de código pelo recuo cada linha por quatro espaços, ou colocando ``` na linha acima e abaixo de seu código.",
+  "help.formatting.codeBlock": "bloco de código",
   "help.formatting.emojiExample": ":smile: :+1: :sheep:",
-  "help.formatting.emojis": "## Emojis\n\nOpen the emoji autocomplete by typing `:`. A full list of emojis can be found [here](http://www.emoji-cheat-sheet.com/). It is also possible to create your own [Custom Emoji](http://docs.mattermost.com/help/settings/custom-emoji.html) if the emoji you want to use doesn't exist.",
-  "help.formatting.example": "Example:",
-  "help.formatting.githubTheme": "**GitHub Theme**",
-  "help.formatting.headings": "## Headings\n\nMake a heading by typing # and a space before your title. For smaller headings, use more #’s.",
-  "help.formatting.headings2": "Alternatively, you can underline the text using `===` or `---` to create headings.",
-  "help.formatting.headings2Example": "Large Heading\n-------------",
-  "help.formatting.headingsExample": "## Large Heading\n### Smaller Heading\n#### Even Smaller Heading",
-  "help.formatting.images": "## In-line Images\n\nCreate in-line images using an `!` followed by the alt text in square brackets and the link in normal brackets. Add hover text by placing it in quotes after the link.",
-  "help.formatting.imagesExample": "![alt text](link \"hover text\")\n\nand\n\n[![Build Status](https://travis-ci.org/mattermost/platform.svg?branch=master)](https://travis-ci.org/mattermost/platform) [![Github](https://assets-cdn.github.com/favicon.ico)](https://github.com/mattermost/platform)",
-  "help.formatting.inline": "## In-line Code\n\nCreate in-line monospaced font by surrounding it with backticks.",
-  "help.formatting.intro": "Markdown makes it easy to format messages. Type a message as you normally would, and use these rules to render it with special formatting.",
-  "help.formatting.lines": "## Lines\n\nCreate a line by using three `*`, `_`, or `-`.",
-  "help.formatting.linkEx": "[Check out Mattermost!](https://about.mattermost.com/)",
-  "help.formatting.links": "## Links\n\nCreate labeled links by putting the desired text in square brackets and the associated link in normal brackets.",
-  "help.formatting.listExample": "* list item one\n* list item two\n    * item two sub-point')",
-  "help.formatting.lists": "## Lists\n\nCreate a list by using `*` or `-` as bullets. Indent a bullet point by adding two spaces in front of it.",
-  "help.formatting.monokaiTheme": "**Monokai Theme**",
-  "help.formatting.ordered": "Make it an ordered list by using numbers instead:",
-  "help.formatting.orderedExample": "1. Item one\n2. Item two",
-  "help.formatting.quotes": "## Block quotes\n\nCreate block quotes using `>`.",
-  "help.formatting.quotesExample": "`> block quotes` renders as:",
-  "help.formatting.quotesRender": "> block quotes",
-  "help.formatting.renders": "Renders as:",
-  "help.formatting.solirizedDarkTheme": "**Solarized Dark Theme**",
-  "help.formatting.solirizedLightTheme": "**Solarized Light Theme**",
-  "help.formatting.style": "## Text Style\n\nYou can use either `_` or `*` around a word to make it italic. Use two to make it bold.\n\n* `_italics_` renders as _italics_\n* `**bold**` renders as **bold**\n* `**_bold-italic_**` renders as **_bold-italics_**\n* `~~strikethrough~~` renders as ~~strikethrough~~",
-  "help.formatting.supportedSyntax": "Supported languages are:\n`as`, `applescript`, `osascript`, `scpt`, `bash`, `sh`, `zsh`, `clj`, `boot`, `cl2`, `cljc`, `cljs`, `cljs.hl`, `cljscm`, `cljx`, `hic`, `coffee`, `_coffee`, `cake`, `cjsx`, `cson`, `iced`, `cpp`, `c`, `cc`, `h`, `c++`, `h++`, `hpp`, `cs`, `csharp`, `css`, `d`, `di`, `dart`, `delphi`, `dpr`, `dfm`, `pas`, `pascal`, `freepascal`, `lazarus`, `lpr`, `lfm`, `diff`, `django`, `jinja`, `dockerfile`, `docker`, `erl`, `f90`, `f95`, `fsharp`, `fs`, `gcode`, `nc`, `go`, `groovy`, `handlebars`, `hbs`, `html.hbs`, `html.handlebars`, `hs`, `hx`, `java`, `jsp`, `js`, `jsx`, `json`, `jl`, `kt`, `ktm`, `kts`, `less`, `lisp`, `lua`, `mk`, `mak`, `md`, `mkdown`, `mkd`, `matlab`, `m`, `mm`, `objc`, `obj-c`, `ml`, `perl`, `pl`, `php`, `php3`, `php4`, `php5`, `php6`, `ps`, `ps1`, `pp`, `py`, `gyp`, `r`, `ruby`, `rb`, `gemspec`, `podspec`, `thor`, `irb`, `rs`, `scala`, `scm`, `sld`, `scss`, `st`, `sql`, `swift`, `tex`, `vbnet`, `vb`, `bas`, `vbs`, `v`, `veo`, `xml`, `html`, `xhtml`, `rss`, `atom`, `xsl`, `plist`, `yaml`",
-  "help.formatting.syntax": "### Syntax Highlighting\n\nTo add syntax highlighting, type the language to be highlighted after the ``` at the beginning of the code block. Mattermost also offers four different code themes (GitHub, Solarized Dark, Solarized Light, Monokai) that can be changed in **Account Settings** > **Display** > **Theme** > **Custom Theme** > **Center Channel Styles**",
+  "help.formatting.emojis": "## Emojis\n\nAbra o preenchimento automático de emoji digitando `:`. A lista completa de emojis pode ser encontrada [aqui](http://www.emoji-cheat-sheet.com/). Também é possível criar seu próprio [Emoji Personalizado](http://docs.mattermost.com/help/settings/custom-emoji.html) se o emoji que pretende utilizar não existir.",
+  "help.formatting.example": "Exemplo:",
+  "help.formatting.githubTheme": "**Tema GitHub**",
+  "help.formatting.headings": "## Títulos\n\nFaça um título digitando # e um espaço antes de seu título. Para subtítulos usar mais #.",
+  "help.formatting.headings2": "Alternativamente, você pode sublinhar o texto usando `===` ou `---` para criar títulos.",
+  "help.formatting.headings2Example": "Cabeçalho Largo\n-------------",
+  "help.formatting.headingsExample": "## Cabeçalho Largo\n### Cabeçalho Menor\n#### Cabeçalho Ainda Menor",
+  "help.formatting.images": "## Imagens na Linha\n\nCrie imagens na linha usando `!` seguido do texto para imagem entre colchetes e o link entre parenteses. Adicione texto suspenso, colocando-o entre aspas após o link.",
+  "help.formatting.imagesExample": "![alt texto](link \"texto suspenso\")\n\ne\n\n[![Status Compilação](https://travis-ci.org/mattermost/platform.svg?branch=master)](https://travis-ci.org/mattermost/platform) [![Github](https://assets-cdn.github.com/favicon.ico)](https://github.com/mattermost/platform)",
+  "help.formatting.inline": "## Código na Linha\n\nCrie fonte monoespaçada na linha cercando o com acentos graves.",
+  "help.formatting.intro": "Markdown torna fácil formatar mensagens. Digite uma mensagem como faria normalmente, e use essas regras para deixa-lá com formatação especial.",
+  "help.formatting.lines": "## Linhas\n\nCrie uma linha usando três `*`, `_`, ou `-`.",
+  "help.formatting.linkEx": "[Confira Mattermost!](https://about.mattermost.com/)",
+  "help.formatting.links": "## Links\n\nCrie texto para links colocando o texto desejado entre colchetes e o link associado entre parênteses.",
+  "help.formatting.listExample": "* lista item um\n* lista item dois\n    * item dois sub-item')",
+  "help.formatting.lists": "## Listas\n\nCrie uma lista usando `*` ou `-` como marcadores. Recue um marcador adicionando dois espaços em frente.",
+  "help.formatting.monokaiTheme": "**Tema Monokai**",
+  "help.formatting.ordered": "Faça uma lista ordenada usando números:",
+  "help.formatting.orderedExample": "1. Item um\n2. Item dois",
+  "help.formatting.quotes": "## Citar Bloco\n\nCrie um bloco citado usando `>`.",
+  "help.formatting.quotesExample": "`> citar bloco` formata como:",
+  "help.formatting.quotesRender": "> citar bloco",
+  "help.formatting.renders": "Formata como:",
+  "help.formatting.solirizedDarkTheme": "**Tema Solarized Dark**",
+  "help.formatting.solirizedLightTheme": "**Tema Solarized Light**",
+  "help.formatting.style": "## Estilo do Texto\n\nVocê pode usar `_` ou `*` em volta de uma palavra para deixar itálico. Use dois para deixar negrito.\n\n* `_itálico_` formata _itálico_\n* `**negrito**` formata **negrito**\n* `**_negrito-itálico_**` formata **_negrito-itálico_**\n* `~~tachado~~` formata ~~tachado~~",
+  "help.formatting.supportedSyntax": "As linguagens suportadas são:\n`as`, `applescript`, `osascript`, `scpt`, `bash`, `sh`, `zsh`, `clj`, `boot`, `cl2`, `cljc`, `cljs`, `cljs.hl`, `cljscm`, `cljx`, `hic`, `coffee`, `_coffee`, `cake`, `cjsx`, `cson`, `iced`, `cpp`, `c`, `cc`, `h`, `c++`, `h++`, `hpp`, `cs`, `csharp`, `css`, `d`, `di`, `dart`, `delphi`, `dpr`, `dfm`, `pas`, `pascal`, `freepascal`, `lazarus`, `lpr`, `lfm`, `diff`, `django`, `jinja`, `dockerfile`, `docker`, `erl`, `f90`, `f95`, `fsharp`, `fs`, `gcode`, `nc`, `go`, `groovy`, `handlebars`, `hbs`, `html.hbs`, `html.handlebars`, `hs`, `hx`, `java`, `jsp`, `js`, `jsx`, `json`, `jl`, `kt`, `ktm`, `kts`, `less`, `lisp`, `lua`, `mk`, `mak`, `md`, `mkdown`, `mkd`, `matlab`, `m`, `mm`, `objc`, `obj-c`, `ml`, `perl`, `pl`, `php`, `php3`, `php4`, `php5`, `php6`, `ps`, `ps1`, `pp`, `py`, `gyp`, `r`, `ruby`, `rb`, `gemspec`, `podspec`, `thor`, `irb`, `rs`, `scala`, `scm`, `sld`, `scss`, `st`, `sql`, `swift`, `tex`, `vbnet`, `vb`, `bas`, `vbs`, `v`, `veo`, `xml`, `html`, `xhtml`, `rss`, `atom`, `xsl`, `plist`, `yaml`",
+  "help.formatting.syntax": "### Destaque de Sintaxe\n\nPara adicionar destaque de sintaxe, digite o idioma a ser destacado após  ``` no início do bloco de código. Mattermost também oferece quatro diferentes temas de código (GitHub, Solarized Dark, Solarized Light, Monokai) que podem ser alterados em **Configurações de Conta** > **Exibir** > **Tema** > **Tema Personalizado** > **Estilos Canal Central**",
   "help.formatting.syntaxEx": "    package main\n    import \"fmt\"\n    func main() {\n        fmt.Println(\"Hello, 世界\")\n    }",
-  "help.formatting.tableExample": "| Left-Aligned  | Center Aligned  | Right Aligned |\n| :------------ |:---------------:| -----:|\n| Left column 1 | this text       |  $100 |\n| Left column 2 | is              |   $10 |\n| Left column 3 | centered        |    $1 |",
-  "help.formatting.tables": "## Tables\n\nCreate a table by placing a dashed line under the header row and separating the columns with a pipe `|`. (The columns don’t need to line up exactly for it to work). Choose how to align table columns by including colons `:` within the header row.",
-  "help.formatting.title": "# Formatting Text\n_____",
-  "help.learnMore": "Learn more about:",
-  "help.link.attaching": "Attaching Files",
-  "help.link.commands": "Executing Commands",
-  "help.link.composing": "Composing Messages and Replies",
-  "help.link.formatting": "Formatting Messages using Markdown",
-  "help.link.mentioning": "Mentioning Teammates",
-  "help.link.messaging": "Basic Messaging",
-  "help.mentioning.channel": "#### @Channel\nYou can mention an entire channel by typing `@channel`. All members of the channel will receive a mention notification that behaves the same way as if the members had been mentioned personally.",
-  "help.mentioning.channelExample": "@channel great work on interviews this week. I think we found some excellent potential candidates!",
-  "help.mentioning.mentions": "## @Mentions\nUse @mentions to get the attention of specific team members.",
-  "help.mentioning.recent": "## Recent Mentions\nClick `@` next to the search box to query for your most recent @mentions and words that trigger mentions. Click **Jump** next to a search result in the RHS to jump the center pane to the channel and location of the message with the mention.",
-  "help.mentioning.title": "# Mentioning Teammates\n_____",
-  "help.mentioning.triggers": "## Words That Trigger Mentions\nIn addition to being notified by @username and @channel, you can customize words that trigger mention notifications in **Account Settings** > **Notifications** > **Words that trigger mentions**. By default, you will receive mention notifications on your first name, and you can add more words by typing them into the input box separated by commas. This is useful if you want to be notified of all posts on certain topics, for example, “interviewing” or “marketing”.",
-  "help.mentioning.username": "#### @Username\nYou can mention a teammate by using the `@` symbol plus their username to send them a mention notification.\n\nType `@` to bring up a list of team members who can be mentioned. To filter the list, type the first few letters of any username, first name, last name, or nickname. The **Up** and **Down** arrow keys can then be used to scroll through entries in the list, and pressing **ENTER** will select which user to mention. Once selected, the username will automatically replace the full name or nickname.\nThe following example sends a special mention notification to **alice** that alerts her of the channel and message where she has been mentioned. If **alice** is away from Mattermost and has [email notifications](http://docs.mattermost.com/help/getting-started/configuring-notifications.html#email-notifications) turned on, then she will receive an email alert of her mention along with the message text.",
-  "help.mentioning.usernameCont": "If the user you mentioned does not belong to the channel, a System Message will be posted to let you know. This is a temporary message only seen by the person who triggered it. To add the mentioned user to the channel, go to the dropdown menu beside the channel name and select **Add Members**.",
-  "help.mentioning.usernameExample": "@alice how did your interview go with the new candidate?",
-  "help.messaging.attach": "**Attach files** by dragging and dropping into Mattermost or clicking the attachment icon in the text input box.",
-  "help.messaging.emoji": "**Quickly add emoji** by typing \":\", which will open an emoji autocomplete. If the existing emoji don't cover what you want to express, you can also create your own [Custom Emoji](http://docs.mattermost.com/help/settings/custom-emoji.html).",
-  "help.messaging.format": "**Format your messages** using Markdown that supports text styling, headings, links, emoticons, code blocks, block quotes, tables, lists and in-line images.",
-  "help.messaging.notify": "**Notify teammates** when they are needed by typing `@username`.",
-  "help.messaging.reply": "**Reply to messages** by clicking the reply arrow next to the message text.",
-  "help.messaging.title": "# Messaging Basics\n_____",
-  "help.messaging.write": "**Write messages** using the text input box at the bottom of Mattermost. Press **ENTER** to send a message. Use **Shift+ENTER** to create a new line without sending a message.",
+  "help.formatting.tableExample": "| Alinhado a Esquerda  | Centralizado  | Alinhado a Direita |\n| :------------ |:---------------:| -----:|\n| Coluna Esquerda 1 | este texto       |  $100 |\n| Coluna Esquerda 2 | é              |   $10 |\n| Coluna Esquerda 3 | centralizado    |    $1 |",
+  "help.formatting.tables": "## Tabelas\n\nCrie uma tabela, colocando uma linha tracejada abaixo da linha de cabeçalho e separando as colunas com o carácter `|`. (As colunas não precisam se alinhar exatamente para que ele funcione). Escolha como alinhar colunas da tabela incluindo dois-pontos `:` dentro da linha de cabeçalho.",
+  "help.formatting.title": "# Formatando Texto\n_____",
+  "help.learnMore": "Leai mais sobre:",
+  "help.link.attaching": "Anexando Arquivos",
+  "help.link.commands": "Executando Comandos",
+  "help.link.composing": "Compondo Mensagens e Respostas",
+  "help.link.formatting": "Formatando Mensagens usando Markdown",
+  "help.link.mentioning": "Mencionando Colegas de Equipe",
+  "help.link.messaging": "Mensagens Básicas",
+  "help.mentioning.channel": "#### @Canal\nVocê pode mencionar um canal todo digitando `@channel`. Todos os membros do canal irão receber uma menção de notificação da mesma forma que se os membros tivessem sido mencionados pessoalmente.",
+  "help.mentioning.channelExample": "@channel grande trabalho nas entrevistas está semana. Eu acho que nós encontramos alguns excelentes potenciais candidatos!",
+  "help.mentioning.mentions": "## @Menções\nUse @menção para chamar atenção de um membro específico da equipe.",
+  "help.mentioning.recent": "## Menções Recentes\nClique `@` ao lado da caixa de pesquisa para consultar suas @menções recentes e palavras que disparam menções. Clique **Pular** ao lado do resultado da busca na barra lateral direita para pular ao painel central do canal no local da mensagem com a menção.",
+  "help.mentioning.title": "# Mencionando Colegas de Equipe\n_____",
+  "help.mentioning.triggers": "## Palavras Que Disparam Menções\nAlém de ter sido notificada por @usuário e @channel, você pode personalizar as palavras que desencadeiam notificações de menção em **Configurações de Conta** > **Notificações** > **Palavras que desencadeiam menções**. Por padrão você receberá notificações de menção em seu nome, e você pode adicionar mais palavras, escrevendo-as na caixa de entrada separados por vírgulas. Isso é útil se você quiser ser notificado de todas as mensagens sobre determinados temas, por exemplo, \"entrevista\" ou \"marketing\".",
+  "help.mentioning.username": "#### @Usuário\nVocê pode mencionar um colega de equipe usando o símbolo '@' mais seu nome de usuário para enviar uma notificação menção.\n\nDigite `@` para abrir uma lista de membros da equipe que podem ser mencionados. Para filtrar a lista, digite as primeiras letras de qualquer nome de usuário, nome, sobrenome ou apelido. As teclas de seta **Cima** e **Baixo** podem então ser usada para percorrer as entradas na lista, e pressione **ENTER** para selecionar qual o usuário a mencionar. Uma vez selecionado, o nome de usuário irá substituir automaticamente o nome completo ou apelido.\nO exemplo a seguir envia uma notificação menção especial a **alice** que a alerta do canal e mensagem onde ela foi mencionada. Se **alice** está ausente do Mattermost e tem ativo [notificações de e-mail](http://docs.mattermost.com/help/getting-started/configuring-notifications.html#email-notifications), então ela vai receber um alerta de e-mail de sua menção juntamente com o texto da mensagem.",
+  "help.mentioning.usernameCont": "Se o usuário que você mencionou não pertence ao canal, uma mensagem do sistema será enviada para informá-lo. Esta é uma mensagem temporária visto apenas pela pessoa que desencadeou. Para adicionar o usuário mencionado para o canal, vá para o menu suspenso ao lado do nome do canal e selecione **Adicionar Membros**.",
+  "help.mentioning.usernameExample": "@alice como foi sua entrevista como é o novo candidato?",
+  "help.messaging.attach": "**Anexar arquivos** arrastando e soltando no Mattermost ou clicando no ícone anexo na caixa de entrada. ",
+  "help.messaging.emoji": "**Rapidamente adicione emoji** digitando \":\", que irá abrir uma lista de emoji. Se os emojis existentes não cobrem o que você quer expressar, você pode também criar seu próprio [Emoji Personalizado](http://docs.mattermost.com/help/settings/custom-emoji.html).",
+  "help.messaging.format": "**Formate suas mensagens** usando Markdown que suporta o estilo do texto, títulos, links, emojis, blocos de código, citar bloco, tabelas, listas e imagens na linha.",
+  "help.messaging.notify": "**Notificar colegas de equipe** quando eles são necessários digitando `@usuário`",
+  "help.messaging.reply": "**Responder a mensagens** clicando na seta de resposta ao lado do texto da mensagem.",
+  "help.messaging.title": "# Mensagens Básico\n_____",
+  "help.messaging.write": "**Escreva mensagens** usando a caixa de texto na parte inferior do Mattermost. Pressione **ENTER** para enviar a mensagem. Use **Shift+ENTER** para criar uma nova linha sem enviar a mensagem.",
   "installed_command.header": "Comandos Slash",
   "installed_commands.add": "Adicionar Comando Slash",
   "installed_commands.empty": "Nenhum comando encotrado",
@@ -1308,6 +1313,7 @@
   "installed_integrations.creation": "Criado por {creator} em {createAt, date, full}",
   "installed_integrations.delete": "Deletar",
   "installed_integrations.hideSecret": "Ocultar Segredo",
+  "installed_integrations.regenSecret": "Gerar Novamente Chave Secreta",
   "installed_integrations.regenToken": "Re-gerar Token",
   "installed_integrations.showSecret": "Mostrar Segredo",
   "installed_integrations.token": "Token: {token}",
@@ -1341,7 +1347,7 @@
   "integrations.add": "Adicionar",
   "integrations.command.description": "Comandos slash envia evento para integrações externas",
   "integrations.command.title": "Comando Slash",
-  "integrations.done": "Nenhum",
+  "integrations.done": "Feito",
   "integrations.header": "Integrações",
   "integrations.incomingWebhook.description": "Webhooks de entrada permite que integrações externas envie mensagens",
   "integrations.incomingWebhook.title": "Webhooks Entrada",
@@ -1366,8 +1372,8 @@
   "invite_member.addAnother": "Adicionar outro",
   "invite_member.autoJoin": "Pessoas convidadas a participar automaticamente do canal <strong>{channel}</strong>.",
   "invite_member.cancel": "Cancelar",
-  "invite_member.content": "E-mail está desativado para a sua equipe, e emails de convites não podem ser enviados. Contate o seu administrador do sistema para ativar e-mail e convites por e-mail.",
-  "invite_member.disabled": "Criação de usuários está desabilitada para sua equipe. Por favor peça ao administrador de equipe por detalhes.",
+  "invite_member.content": "E-mail está desativado para a sua equipe, e emails de convites não podem ser enviados. Contate o seu Administrador do Sistema para ativar e-mail e convites por e-mail.",
+  "invite_member.disabled": "Criação de usuários está desabilitada para sua equipe. Por favor peça ao Administrador de Equipe por detalhes.",
   "invite_member.emailError": "Por favor entre um endereço de e-mail válido",
   "invite_member.firstname": "Primeiro nome",
   "invite_member.inviteLink": "Link para Convite de Equipe",
@@ -1375,7 +1381,7 @@
   "invite_member.modalButton": "Sim, Descartar",
   "invite_member.modalMessage": "Você tem convites não enviados, você tem certeza que quer descartar eles?",
   "invite_member.modalTitle": "Descartar Convites?",
-  "invite_member.newMember": "Convidar Membros da Equipe",
+  "invite_member.newMember": "Convidar Para Equipe",
   "invite_member.send": "Enviar Convite",
   "invite_member.send2": "Enviar Convites",
   "invite_member.sending": " Enviando",
@@ -1385,9 +1391,9 @@
   "ldap_signup.length_error": "O nome deve ser de 3 ou mais caracteres até um máximo de 15",
   "ldap_signup.teamName": "Entre o nome da nova equipe",
   "ldap_signup.team_error": "Por favor entre o nome da equipe",
-  "leave_team_modal.desc": "You will be removed from all public channels and private groups.  If the team is private you will not be able to rejoin the team.  Are you sure?",
+  "leave_team_modal.desc": "Você será removido de todos os canais públicos e grupos privados.  Se a equipe é privada você não será capaz de se juntar à equipe.  Você tem certeza?",
   "leave_team_modal.no": "Não",
-  "leave_team_modal.title": "Leave the team?",
+  "leave_team_modal.title": "Deixar a equipe?",
   "leave_team_modal.yes": "Sim",
   "loading_screen.loading": "Carregando",
   "login.changed": " Método de login alterada com sucesso",
@@ -1408,7 +1414,7 @@
   "login.noEmailUsername": "Por favor digite seu email ou usuário",
   "login.noEmailUsernameLdapUsername": "Por favor digite seu email, usuário ou {ldapUsername}",
   "login.noLdapUsername": "Por favor digite seu {ldapUsername}",
-  "login.noMethods": "Nenhum método de inscrição configurado, por favor contate seu administrador do sistema.",
+  "login.noMethods": "Nenhum método de login configurado. Por favor contate seu Administrador do Sistema.",
   "login.noPassword": "Por favor digite a sua senha",
   "login.noUsername": "Por favor digite seu usuário",
   "login.noUsernameLdapUsername": "Por favor digite seu usuário ou {ldapUsername}",
@@ -1464,15 +1470,15 @@
   "navbar_dropdown.emoji": "Emoji Personalizado",
   "navbar_dropdown.help": "Ajuda",
   "navbar_dropdown.integrations": "Integrações",
-  "navbar_dropdown.inviteMember": "Convidar Membros da Equipe",
+  "navbar_dropdown.inviteMember": "Convidar Para Equipe",
   "navbar_dropdown.leave": "Sair da Equipe",
   "navbar_dropdown.logout": "Logout",
   "navbar_dropdown.manageMembers": "Gerenciar Membros",
-  "navbar_dropdown.nativeApps": "Download Apps Nativos",
+  "navbar_dropdown.nativeApps": "Download Mattermost Apps",
   "navbar_dropdown.report": "Relatar um Problema",
   "navbar_dropdown.switchTeam": "Mudar para {team}",
   "navbar_dropdown.switchTo": "Mudar para ",
-  "navbar_dropdown.teamLink": "Obter Link para Convite de Equipe",
+  "navbar_dropdown.teamLink": "Obter Link Convite de Equipe",
   "navbar_dropdown.teamSettings": "Configurações da Equipe",
   "navbar_dropdown.viewMembers": "Ver Membros",
   "notification.dm": "Mensagem Direta",
@@ -1490,7 +1496,7 @@
   "password_send.link": "<p>Um link para resetar senha foi enviado para <b>{email}</b></p>",
   "password_send.reset": "Resetar minha senha",
   "password_send.title": "Resetar Senha",
-  "pdf_preview.max_pages": "PDF previews only show the first five pages.",
+  "pdf_preview.max_pages": "Visualização de PDF somente mostra as cinco primeiras páginas.",
   "pending_post_actions.cancel": "Cancelar",
   "pending_post_actions.retry": "Tentar novamente",
   "permalink.error.access": "O permalink pertence a uma mensagem deletada ou a um canal o qual você não tem acesso.",
@@ -1581,27 +1587,27 @@
   "sidebar.tutorialScreen3": "<h4>Criando e participando de Canais</h4><p>Clique em <strong>\"Mais...\"</strong> para criar um novo canal ou participar de um já existente.</p><p>Você também pode criar um novo canal ou grupo privado ao clicar em <strong>no símbolo \"+\"</strong> ao lado do canal ou grupo privado no cabeçalho.</p>",
   "sidebar.unreadAbove": "Post(s) não lidos acima",
   "sidebar.unreadBelow": "Post(s) não lidos abaixo",
-  "sidebar_header.tutorial": "<h4>Menu Principal</h4><p>O <strong>Menu Principal</strong> é onde você pode <strong>Convidar 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_header.tutorial": "<h4>Menu Principal</h4><p>O <strong>Menu Principal</strong> é onde você pode <strong>Convidar Para Equipe</strong>, acessar sua <strong>Definição de Conta</strong> e ajustar o seu <strong>Tema de Cores</strong>.</p><p>Administradores de equipe podem também acessar suas <strong>Configurações de Equipe</strong> a partir deste menu.</p><p>Administradores de Sistema vão encontrar em <strong>Console do Sistema</strong> opções para administrar todo o sistema.</p>",
   "sidebar_right_menu.accountSettings": "Definições de Conta",
   "sidebar_right_menu.console": "Console do Sistema",
   "sidebar_right_menu.flagged": "Posts Marcados",
   "sidebar_right_menu.help": "Ajuda",
-  "sidebar_right_menu.inviteNew": "Convidar Membros para Equipe",
+  "sidebar_right_menu.inviteNew": "Convidar Para Equipe",
   "sidebar_right_menu.logout": "Logout",
   "sidebar_right_menu.manageMembers": "Gerenciar Membros",
-  "sidebar_right_menu.nativeApps": "Download App Nativo",
+  "sidebar_right_menu.nativeApps": "Download Mattermost Apps",
   "sidebar_right_menu.recentMentions": "Menções Recentes",
   "sidebar_right_menu.report": "Relatar um Problema",
   "sidebar_right_menu.switch_team": "Selecionar Equipe",
-  "sidebar_right_menu.teamLink": "Obter Link para Convite de Equipe",
+  "sidebar_right_menu.teamLink": "Obter Link Convite de Equipe",
   "sidebar_right_menu.teamSettings": "Configurações da Equipe",
   "sidebar_right_menu.viewMembers": "Ver Membros",
   "signup.email": "Email e Senha",
   "signup.gitlab": "GitLab Single-Sign-On",
-  "signup.google": "Google Account",
-  "signup.ldap": "LDAP Credentials",
+  "signup.google": "Conta Google",
+  "signup.ldap": "Credenciais LDAP",
   "signup.office365": "Office 365",
-  "signup.title": "Create an account with:",
+  "signup.title": "Criar uma conta com:",
   "signup_team.choose": "Suas equipes: ",
   "signup_team.createTeam": "Ou Criar uma Equipe",
   "signup_team.disabled": "A criação de equipe foi desativada.  Por favor, entre em contato com um administrador para o acesso.",
@@ -1650,7 +1656,7 @@
   "sso_signup.team_error": "Por favor entre o nome da equipe",
   "suggestion.mention.all": "Notifique a todos no canal, use {townsquare} para notificar toda a equipe",
   "suggestion.mention.channel": "Notifica todos no canal",
-  "suggestion.mention.here": "Notifica todos online no canal",
+  "suggestion.mention.here": "Notifica todos os conectados ao canal",
   "suggestion.mention.members": "Membros do Canal",
   "suggestion.mention.nonmembers": "Não no Canal",
   "suggestion.mention.special": "Menções Especiais",
@@ -1664,7 +1670,7 @@
   "team_export_tab.unable": " Não foi possível exportar: {error}",
   "team_import_tab.failure": " Falha na importação: ",
   "team_import_tab.import": "Importar",
-  "team_import_tab.importHelp": "<p>Para importar uma equipe do Slack, vá para a Slack > Definições de Equipe > Importar/Exportar Dados > Exportar > Iniciar Exportação. Slack não permite que você exporte arquivos, imagens, grupos privados ou as mensagens diretas armazenadas no Slack. Portanto, Importação Slack para Mattermost só suporta a importação de mensagens de texto dos canais públicos da sua equipe Slack.</p><p>O Importação Slack para Mattermost está em 'Beta'. Slack bot posts ainda não pode ser importado e Slack @mentions não são suportados no momento.</p>",
+  "team_import_tab.importHelp": "<p>Para importar uma equipe do Slack, vá para a Slack > Definições de Equipe > Importar/Exportar Dados > Exportar > Iniciar Exportação. Slack não permite que você exporte arquivos, imagens, grupos privados ou as mensagens diretas armazenadas no Slack. Portanto, Importação Slack para Mattermost só suporta a importação de mensagens de texto dos canais públicos da sua equipe Slack.</p><p>A Importação Slack para Mattermost está em 'Beta'. Mensagens do Slack bot ainda não podem ser importadas.</p>",
   "team_import_tab.importSlack": "Importar do Slack (Beta)",
   "team_import_tab.importing": " Importando...",
   "team_import_tab.successful": " Importado com sucesso: ",
@@ -1703,7 +1709,7 @@
   "tutorial_intro.mobileApps": "Instalar os aplicativos {link} para fácil acesso e notificações em movimento.",
   "tutorial_intro.mobileAppsLinkText": "PC, Mac, iOS e Android",
   "tutorial_intro.next": "Próximo",
-  "tutorial_intro.screenOne": "<h3>Bem vindo ao:</h3><h1>Mattermost</h1><p>Sua equipe de comunicação em um só lugar, pesquisas instantâneas disponível em qualquer lugar</p><p>Mantenha sua equipe conectada para ajudá-los a conseguir o que mais importa.</p>",
+  "tutorial_intro.screenOne": "<h3>Bem vindo ao:</h3><h1>Mattermost</h1><p>Toda comunicação da sua equipe em um só lugar, pesquisas instantâneas disponível em qualquer lugar</p><p>Mantenha sua equipe conectada para ajudá-los a conseguir o que mais importa.</p>",
   "tutorial_intro.screenTwo": "<h3>Como Mattermost funciona:</h3><p>A comunicação acontece em canais de discussão pública, grupos privados e mensagens diretas.</p><p>Tudo é arquivado e pesquisável a partir de qualquer desktop, laptop ou telefone com suporte a web.</p>",
   "tutorial_intro.skip": "Pular o tutorial",
   "tutorial_intro.support": "Precisa de alguma coisa, envie um e-mail para nós no ",
@@ -1719,8 +1725,8 @@
   "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Recurso} other {Recursos}} Ativado",
   "user.settings.advance.formattingDesc": "Se ativado, posts serão formatados para criar links, exibir emoji, estilo de texto e adicionar quebra de linhas. Por padrão é definido como ativado. Mudando está configuração será necessário recarregar a página.",
   "user.settings.advance.formattingTitle": "Ativar Formatação de Post",
-  "user.settings.advance.joinLeaveDesc": "When \"On\", System Messages saying a user has joined or left a channel will be visible. When \"Off\", the System Messages about joining or leaving a channel will be hidden. A message will still show up when you are added to a channel, so you can receive a notification.",
-  "user.settings.advance.joinLeaveTitle": "Enable Join/Leave Messages",
+  "user.settings.advance.joinLeaveDesc": "Quando \"On\", Mensagens do Sistema dizendo que um usuário entrou ou saiu de um canal será visível. Quando \"Off\", as Mensagens do Sistema sobre entrar ou sair de um canal serão ocultados. A mensagem ainda vai aparecer quando são adicionados a um canal, para que você possa receber uma notificação.",
+  "user.settings.advance.joinLeaveTitle": "Ativar Mensagens Juntar/Deixar",
   "user.settings.advance.markdown_preview": "Mostrar opção pré-visualização markdown na caixa de entrada de mensagens",
   "user.settings.advance.off": "Desligado",
   "user.settings.advance.on": "On",
@@ -1745,7 +1751,7 @@
   "user.settings.custom_theme.mentionHighlightBg": "Fundo Menção Realçar",
   "user.settings.custom_theme.mentionHighlightLink": "Menção Realçar Link",
   "user.settings.custom_theme.newMessageSeparator": "Novo Separador de Mensagem",
-  "user.settings.custom_theme.onlineIndicator": "Indicador Online",
+  "user.settings.custom_theme.onlineIndicator": "Indicador Conectado",
   "user.settings.custom_theme.sidebarBg": "Fundo Barra lateral",
   "user.settings.custom_theme.sidebarHeaderBg": "Fundo Barra latera Cabeçalho",
   "user.settings.custom_theme.sidebarHeaderTextColor": "Barra lateral Texto",
@@ -1796,7 +1802,7 @@
   "user.settings.general.emailGitlabCantUpdate": "Login ocorre através do GitLab. Email não pode ser atualizado. Endereço de email utilizado para notificações é {email}.",
   "user.settings.general.emailGoogleCantUpdate": "Login ocorre através do Google. Email não pode ser atualizado. Endereço de email utilizado para notificações é {email}.",
   "user.settings.general.emailHelp1": "Email é usado para login, notificações, e redefinição de senha. Requer verificação de email se alterado.",
-  "user.settings.general.emailHelp2": "Email foi desativado pelo seu administrador de sistema. Nenhuma notificação por email será enviada até isto ser habilitado.",
+  "user.settings.general.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}.",
@@ -1851,7 +1857,7 @@
   "user.settings.modal.confirmBtns": "Sim, Descartar",
   "user.settings.modal.confirmMsg": "Você tem alterações não salvas, você tem certeza que quer descartar elas?",
   "user.settings.modal.confirmTitle": "Descartar alterações?",
-  "user.settings.modal.display": "Exibir",
+  "user.settings.modal.display": "Exibição",
   "user.settings.modal.general": "Geral",
   "user.settings.modal.notifications": "Notificações",
   "user.settings.modal.security": "Segurança",
@@ -1859,21 +1865,39 @@
   "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",
-  "user.settings.notifications.commentsAny": "Mencione quaisquer comentários em um tópico que você participou (Isto incluirá tanto menções ao seu post principal e quaisquer comentários depois que você comentou em um post)",
-  "user.settings.notifications.commentsInfo": "Modo de desencadear notificações para postagens em tópicos que você participou.",
-  "user.settings.notifications.commentsNever": "Sem menções para os comentários",
-  "user.settings.notifications.commentsRoot": "Menção de quaisquer comentários em seu post",
+  "user.settings.notifications.comments": "Responder notificações",
+  "user.settings.notifications.commentsAny": "Dispara notificações de mensagens em resposta a tópicos que eu iniciei ou participo",
+  "user.settings.notifications.commentsInfo": "Além de notificações para quando você for mencionado, selecione se você gostaria de receber notificações sobre respostas de tópicos.",
+  "user.settings.notifications.commentsNever": "Do not trigger notifications on messages in reply threads unless I'm mentioned",
+  "user.settings.notifications.commentsRoot": "Dispara notificações de mensagens em tópicos que eu iniciei",
   "user.settings.notifications.desktop": "Enviar notificações de desktop",
+  "user.settings.notifications.desktop.allFirefoxForever": "Para toda atividade, mostrada indefinidamente",
+  "user.settings.notifications.desktop.allFirefoxTimed": "Para toda atividade, mostrada por {seconds} segundos",
+  "user.settings.notifications.desktop.allNoSoundForever": "Para toda atividade, sem som, mostrada indefinidamente",
+  "user.settings.notifications.desktop.allNoSoundTimed": "Para toda atividade, sem som, mostrada por {seconds} segundos",
+  "user.settings.notifications.desktop.allSoundForever": "Para toda atividade, com som, mostrada indefinidamente",
+  "user.settings.notifications.desktop.allSoundTimed": "Para toda atividade, sem som, mostrada por {seconds} segundos",
+  "user.settings.notifications.desktop.duration": "Duração da notificação",
+  "user.settings.notifications.desktop.durationInfo": "Define quanto tempo a notificação no desktop permanece na tela.",
+  "user.settings.notifications.desktop.mentionsFirefoxForever": "Para menções e mensagens diretas, mostrada indefinidamente",
+  "user.settings.notifications.desktop.mentionsFirefoxTimed": "Para menções e mensagens diretas, mostradas por {seconds} segundos",
+  "user.settings.notifications.desktop.mentionsNoSoundForever": "Para menções e mensagens diretas, sem som, mostrada indefinidamente",
+  "user.settings.notifications.desktop.mentionsNoSoundTimed": "Para menções e mensagens diretas, sem som, mostradas por {seconds} segundos",
+  "user.settings.notifications.desktop.mentionsSoundForever": "Para menções e mensagens diretas, com som, mostrada indefinidamente",
+  "user.settings.notifications.desktop.mentionsSoundTimed": "Para menções e mensagens diretas, com som, mostrada por {seconds} segundos",
+  "user.settings.notifications.desktop.seconds": "{seconds} segundos",
+  "user.settings.notifications.desktop.sound": "Som da notificação",
+  "user.settings.notifications.desktop.title": "Notificação no Desktop",
+  "user.settings.notifications.desktop.unlimited": "Ilimitado",
   "user.settings.notifications.desktopSounds": "Som de notificação no Desktop",
-  "user.settings.notifications.emailBatchingInfo": "Notifications are combined into a single email and sent at the maximum frequency selected here.",
-  "user.settings.notifications.emailInfo": "Notificações de e-mail são enviadas por menções e mensagens diretas, depois de ter ficado offline por mais de 60 segundos ou longe do {siteName} por mais de 5 minutos.",
-  "user.settings.notifications.emailNotifications": "Enviar notificações de desktop",
-  "user.settings.notifications.everyHour": "Every hour",
-  "user.settings.notifications.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
+  "user.settings.notifications.emailBatchingInfo": "Notificações recebidas dentro do período de tempo selecionado são combinadas e enviadas em um único email.",
+  "user.settings.notifications.emailInfo": "Notificações de e-mail são enviadas por menções e mensagens diretas, quando você está desconectado ou ausente do {siteName} por mais de 5 minutos.",
+  "user.settings.notifications.emailNotifications": "Notificações por email",
+  "user.settings.notifications.everyHour": "Cara hora",
+  "user.settings.notifications.everyXMinutes": "Cada {count, plural, one {minuto} other {{count, number} minutos}}",
   "user.settings.notifications.header": "Notificações",
-  "user.settings.notifications.immediately": "Immediately",
-  "user.settings.notifications.info": "Notificações na área de trabalho estão disponíveis no Firefox, Safari, Chrome, Internet Explorer, e Edge.",
+  "user.settings.notifications.immediately": "Imediatamente",
+  "user.settings.notifications.info": "Notificações no desktop estão disponíveis no Firefox, Safari e Chrome.",
   "user.settings.notifications.never": "Nunca",
   "user.settings.notifications.noWords": "Nenhuma palavra configurada",
   "user.settings.notifications.off": "Desligado",
@@ -1884,28 +1908,31 @@
   "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.sounds_info": "Sons para notificações está disponível no IE11, Edge, Safari e Chrome.",
   "user.settings.notifications.teamWide": "Mencionar toda a equipe \"@all\"",
   "user.settings.notifications.title": "Configurações de Notificação",
   "user.settings.notifications.usernameMention": "Seu usuário mencionado \"@{username}\"",
   "user.settings.notifications.wordsTrigger": "Palavras que desencadeiam menções",
-  "user.settings.push_notification.allActivityAway": "For all activity when away or offline",
-  "user.settings.push_notification.allActivityOffline": "For all activity when offline",
-  "user.settings.push_notification.allActivityOnline": "For all activity when online, away or offline",
-  "user.settings.push_notification.away": "Away or offline",
-  "user.settings.push_notification.disabled": "Desativado pelo administrador do sistema",
+  "user.settings.push_notification.allActivityAway": "Para toda atividade quando ausente ou desconectado",
+  "user.settings.push_notification.allActivityOffline": "Para toda atividade quando desconectado",
+  "user.settings.push_notification.allActivityOnline": "Para toda atividade quando conectado, ausente ou desconectado",
+  "user.settings.push_notification.away": "Ausente ou desconectado",
+  "user.settings.push_notification.disabled": "Desativado pelo Administrador do Sistema",
   "user.settings.push_notification.disabled_long": "Notificações push para dispositivos móveis foram desativados pelo Administrador do Sistema.",
   "user.settings.push_notification.info": "Alertas de notificação são enviados para o seu dispositivo móvel quando há atividade no Mattermost.",
   "user.settings.push_notification.off": "Desligado",
-  "user.settings.push_notification.offline": "Offline",
-  "user.settings.push_notification.online": "Online, away or offline",
-  "user.settings.push_notification.onlyMentionsAway": "For mentions and direct messages when away or offline",
-  "user.settings.push_notification.onlyMentionsOffline": "For mentions and direct messages when offline",
-  "user.settings.push_notification.onlyMentionsOnline": "For mentions and direct messages when online, away or offline",
-  "user.settings.push_notification.status_info": "Notification alerts are pushed to your mobile device depending on your online status.",
+  "user.settings.push_notification.offline": "Desconectado",
+  "user.settings.push_notification.online": "Conectado, ausente ou desconectado",
+  "user.settings.push_notification.onlyMentionsAway": "Para menções e mensagens diretas quando ausente ou desconectado",
+  "user.settings.push_notification.onlyMentionsOffline": "Para menções e mensagens diretas quando desconectado",
+  "user.settings.push_notification.onlyMentionsOnline": "Para menções e mensagens diretas quando conectado, ausente ou desconectado",
+  "user.settings.push_notification.send": "Enviar notificações push móvel",
+  "user.settings.push_notification.status": "Disparar notificações push quando",
+  "user.settings.push_notification.status_info": "Alertas de notificação só são enviados para o seu dispositivo móvel quando seu status conectado corresponder à seleção acima.",
   "user.settings.security.close": "Fechar",
   "user.settings.security.currentPassword": "Senha Atual",
   "user.settings.security.currentPasswordError": "Por favor entre sua senha atual.",
+  "user.settings.security.deauthorize": "Desautorize",
   "user.settings.security.emailPwd": "Email e Senha",
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "Google",
@@ -1916,6 +1943,10 @@
   "user.settings.security.logoutActiveSessions": "Ver e fazer Logout das Sessões Ativas",
   "user.settings.security.method": "Método de Login",
   "user.settings.security.newPassword": "Nova Senha",
+  "user.settings.security.noApps": "Nenhuma Aplicação OAuth 2.0 está autorizada.",
+  "user.settings.security.oauthApps": "Aplicativos OAuth 2.0",
+  "user.settings.security.oauthAppsDescription": "Clique 'Editar' para gerenciar sua Aplicação OAuth 2.0",
+  "user.settings.security.oauthAppsHelp": "Aplicações atuam em seu nome para acessar seus dados com base nas permissões que você conceder.",
   "user.settings.security.office365": "Office 365",
   "user.settings.security.oneSignin": "Você pode ter somente um método de login por vez. Trocando o método de login será enviado um email de notificação se você alterar com sucesso.",
   "user.settings.security.password": "Senha",
diff --git a/webapp/i18n/zh_CN.json b/webapp/i18n/zh_CN.json
index e0188b360..dbaeb13b3 100644
--- a/webapp/i18n/zh_CN.json
+++ b/webapp/i18n/zh_CN.json
@@ -1,9 +1,9 @@
 {
   "about.close": "关闭",
-  "about.copyright": "版权 2016 Mattermost, Inc. 版权所有",
+  "about.copyright": "版权所有 2016 Mattermost, Inc. 保留所有权利",
   "about.database": "数据库：",
   "about.date": "创建日期：",
-  "about.enterpriseEditionLearn": "了解更多企业版本",
+  "about.enterpriseEditionLearn": "了解更多关于企业版：",
   "about.enterpriseEditionSt": "位于防火墙后的现代通讯方式。",
   "about.enterpriseEditione1": "企业版本",
   "about.hash": "构建哈希：",
@@ -29,9 +29,9 @@
   "activity_log_modal.android": "安卓",
   "activity_log_modal.androidNativeApp": "Android本地App",
   "activity_log_modal.iphoneNativeApp": "iPhone本地App",
-  "add_command.autocomplete": "自动完成：",
+  "add_command.autocomplete": "自动完成",
   "add_command.autocomplete.help": "(可选) 在自动完成列表显示斜杠命令。",
-  "add_command.autocompleteDescription": "自动补全描述",
+  "add_command.autocompleteDescription": "自动完成描述",
   "add_command.autocompleteDescription.help": "(可选) 在自动补全列表中显示斜杠命令的简述。",
   "add_command.autocompleteDescription.placeholder": "例如: 返回关于病人记录的搜索结果",
   "add_command.autocompleteHint": "自动完成提示",
@@ -39,7 +39,7 @@
   "add_command.autocompleteHint.placeholder": "例如: [患者姓名]",
   "add_command.cancel": "取消",
   "add_command.description": "描述",
-  "add_command.description.help": "传入webhook的简述。",
+  "add_command.description.help": "传入 webhook 的简述。",
   "add_command.displayName": "显示名称",
   "add_command.displayName.help": "您的斜杠命令显示名，最多64字。",
   "add_command.doneHelp": "您的斜杠命令已设定。以下令牌将包含在传出负载。请用这来验证请求是否来自您的Mattermost团队（详见<a href=\"https://docs.mattermost.com/developer/slash-commands.html\">文档</a>）。",
@@ -57,11 +57,11 @@
   "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": "触发器单词不能包含空格",
-  "add_command.triggerRequired": "需要一个触发字",
+  "add_command.trigger.placeholder": "命令触发关键字，例如 \"hello\"",
+  "add_command.triggerInvalidLength": "触发器关键词必须包含 {min} 至 {max} 个字",
+  "add_command.triggerInvalidSlash": "触发器关键词不能以 / 开头",
+  "add_command.triggerInvalidSpace": "触发器关键词不能包含空格",
+  "add_command.triggerRequired": "需要一个触发关键词",
   "add_command.url": "请求URL",
   "add_command.url.help": "接收HTTP POST或GET斜杠命令运行时事件请求的回调URL。",
   "add_command.url.placeholder": "必须以http://或https://开始",
@@ -85,8 +85,8 @@
   "add_emoji.save": "保存",
   "add_incoming_webhook.cancel": "取消",
   "add_incoming_webhook.channel": "频道",
-  "add_incoming_webhook.channel.help": "接收webhook的公开频道或私有组。您必须属于该私有组才能设定webhook。",
-  "add_incoming_webhook.channelRequired": "需要一个合法的频道",
+  "add_incoming_webhook.channel.help": "接收 webhook 的公开频道或私有组。您必须属于该私有组才能设定webhook。",
+  "add_incoming_webhook.channelRequired": "需要是有效的频道",
   "add_incoming_webhook.description": "描述",
   "add_incoming_webhook.description.help": "传入webhook的简述。",
   "add_incoming_webhook.displayName": "显示名称",
@@ -102,7 +102,7 @@
   "add_oauth_app.description.help": "您的 OAuth 2.0 应用描述。",
   "add_oauth_app.descriptionRequired": "OAuth 2.0 应用描述为必填。",
   "add_oauth_app.doneHelp": "您的OAuth 2.0应用已设定。请在给您的应用请求授权时使用以下客户端ID和客户端秘密。",
-  "add_oauth_app.doneUrlHelp": "请发送数据到以下网址。",
+  "add_oauth_app.doneUrlHelp": "以下是您许可的重指向网址。",
   "add_oauth_app.header": "添加",
   "add_oauth_app.homepage.help": "OAuth 2.0 应用首页网址。请您确认有根据服务器设置使用 HTTP 或 HTTPS 网址。",
   "add_oauth_app.homepageRequired": "OAuth 2.0 应用首页网址为必填。",
@@ -116,7 +116,7 @@
   "add_outgoing_webhook.callbackUrlsRequired": "需要一个或多个回调URL",
   "add_outgoing_webhook.cancel": "取消",
   "add_outgoing_webhook.channel": "频道",
-  "add_outgoing_webhook.channel.help": "接收webhook的公开频道。如果至少有一个触发关键字设定时此项为可选。",
+  "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 数据。",
@@ -130,8 +130,8 @@
   "add_outgoing_webhook.save": "保存",
   "add_outgoing_webhook.token": "<b>令牌</b>：{token}",
   "add_outgoing_webhook.triggerWords": "触发词（一行一个）",
-  "add_outgoing_webhook.triggerWords.help": "以特定关键字的信息将触发传出webhook。如果有选择频道此项则为可选。",
-  "add_outgoing_webhook.triggerWordsOrChannelRequired": "需要一个有效的频道或一个触发字列表",
+  "add_outgoing_webhook.triggerWords.help": "以设定关键字开头的信息将触发传出webhook。如果有选择频道此项则为可选。",
+  "add_outgoing_webhook.triggerWordsOrChannelRequired": "需要一个有效的频道或一个触发关键字列表",
   "add_outgoing_webhook.triggerWordsTriggerWhen": "触发时机",
   "add_outgoing_webhook.triggerWordsTriggerWhen.help": "选择何时触发传出webhook：信息第一个词符合触发关键字或时以触发关键字开头。",
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "第一个完全符合触发关键字",
@@ -141,6 +141,7 @@
   "admin.audits.title": "用户活动日志",
   "admin.authentication.email": "邮件验证",
   "admin.authentication.gitlab": "GitLab",
+  "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "注释：",
@@ -152,7 +153,7 @@
   "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.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",
@@ -176,18 +177,18 @@
   "admin.compliance.title": "合规性设置",
   "admin.compliance.true": "是",
   "admin.compliance_reports.desc": "职位名称",
-  "admin.compliance_reports.desc_placeholder": "譬如\"Audit 445 for HR\"",
+  "admin.compliance_reports.desc_placeholder": "例如 \"Audit 445 for HR\"",
   "admin.compliance_reports.emails": "电子邮件：",
-  "admin.compliance_reports.emails_placeholder": "例如“bill@example.com，bob@example.com”",
+  "admin.compliance_reports.emails_placeholder": "例如 \"bill@example.com，bob@example.com\"",
   "admin.compliance_reports.from": "来自：",
-  "admin.compliance_reports.from_placeholder": "例如“2016-03-11”",
+  "admin.compliance_reports.from_placeholder": "例如 \"2016-03-11\"",
   "admin.compliance_reports.keywords": "关键字：",
-  "admin.compliance_reports.keywords_placeholder": "譬如\"shorting stock\"",
+  "admin.compliance_reports.keywords_placeholder": "例如 \"shorting stock\"",
   "admin.compliance_reports.reload": "重新载入任务报告",
   "admin.compliance_reports.run": "守规报告",
   "admin.compliance_reports.title": "合规性报告",
   "admin.compliance_reports.to": "To：",
-  "admin.compliance_reports.to_placeholder": "例如“2016-03-15”",
+  "admin.compliance_reports.to_placeholder": "例如 \"2016-03-15\"",
   "admin.compliance_table.desc": "描述",
   "admin.compliance_table.download": "下载",
   "admin.compliance_table.params": "参数",
@@ -198,6 +199,8 @@
   "admin.compliance_table.userId": "被...要求",
   "admin.connectionSecurityNone": "无",
   "admin.connectionSecurityNoneDescription": "Mattermost将创建一个不安全的连接。",
+  "admin.connectionSecurityPlain": "PLAIN",
+  "admin.connectionSecurityPlainDescription": "Mattermost 将会连接并验证一个不安全的连接。",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "将一现有不安全的连接尝试使用TLS升级值一个安全的连接。",
   "admin.connectionSecurityTest": "测试连接",
@@ -210,11 +213,11 @@
   "admin.customization.appDownloadLinkTitle": "Mattermost 应用下载页面网址：",
   "admin.customization.customBrand": "自定义品牌",
   "admin.customization.customEmoji": "自定义表情",
-  "admin.customization.enableCustomEmojiDesc": "允许用户能够创建在消息中使用自定义的表情符号。启用后，自定义的表情符号的设置可以通过切换团队，并在侧边栏单击频道上面的三个点，来选择“自定义绘文字”进行访问。",
+  "admin.customization.enableCustomEmojiDesc": "允许用户创建在消息中使用的自定义表情符。启用后，自定义的表情符的设置方式为：切换到一个团队，在侧边栏单击频道上面的三个点，然后选择“自定义表情符”。",
   "admin.customization.enableCustomEmojiTitle": "启用自定义表情：",
   "admin.customization.iosAppDownloadLinkDesc": "添加iOS应用下载链接。用移动设备访问的用户将看到应用下载提示页面。此栏留空将不显示。",
   "admin.customization.iosAppDownloadLinkTitle": "iOS应用下载网址：",
-  "admin.customization.nativeAppLinks": "原生应用网址",
+  "admin.customization.nativeAppLinks": "Mattermost App Links",
   "admin.customization.restrictCustomEmojiCreationAdmin": "允许系统和团队管理员创建表情符号",
   "admin.customization.restrictCustomEmojiCreationAll": "允许每个人可以创建自定义表情",
   "admin.customization.restrictCustomEmojiCreationDesc": "限制某些用户创建自定义表情符号。",
@@ -233,16 +236,16 @@
   "admin.email.connectionSecurityTest": "测试连接",
   "admin.email.easHelp": "了解更多关于编译和部署您自己的移动应用程序从一个<a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target=\"_blank\">Enterprise App Store</a>。",
   "admin.email.emailFail": "连接失败: {error}",
-  "admin.email.emailSuccess": "发送电子邮件时没有错误的报告.  请务必检查您的收件箱.",
+  "admin.email.emailSuccess": "发送电子邮件时没有发生错误。请检查您的收件箱并确认。",
   "admin.email.enableEmailBatching.clusterEnabled": "批量电子邮件无法在高可用性下开启。",
   "admin.email.enableEmailBatching.siteURL": "<b>设置 > 站点网址</b>中的站点网址配置后才能开启批量电子邮件。",
-  "admin.email.enableEmailBatchingDesc": "当设为是时，用户可以将多条私信和提到合并到一条电子邮件通知，可在<b>帐号设置 > 通知</b>里设定。",
+  "admin.email.enableEmailBatchingDesc": "当设为是时，用户可以将多条私信和提及合并到一条电子邮件通知，可在<b>帐号设置 > 通知</b>里设定。",
   "admin.email.enableEmailBatchingTitle": "开启批量电子邮件：",
   "admin.email.fullPushNotification": "发送完整的消息片段",
-  "admin.email.genericPushNotification": "发送包含用户名称和频道名称的一般描述",
+  "admin.email.genericPushNotification": "发送包含用户名称和频道名称的一般性描述",
   "admin.email.inviteSaltDescription": "32字符的盐值用于签署电子邮件邀请。安装时随机生成。点击 \"重新生成\" 生成新的盐值。",
-  "admin.email.inviteSaltExample": "Ex \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
-  "admin.email.inviteSaltTitle": "电子邮件邀盐值：",
+  "admin.email.inviteSaltExample": "例如 \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
+  "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应用程序",
@@ -256,12 +259,12 @@
   "admin.email.notificationEmailTitle": "通知邮件地址：",
   "admin.email.notificationOrganization": "通知页脚地址：",
   "admin.email.notificationOrganizationDescription": "从mattermost电子邮件通知显示组织机构名称和地址，如“©ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\"。如果字段为空，则将不显示该组织的名称和地址。",
-  "admin.email.notificationsDescription": "通常在产品中设置为是,Mattermost尝试方式邮件通知. 开发人员可以将此字段设置为假以跳过电子邮件安装程序以加快开发速度.<br />置此为是的删除预览模式横幅 (设置后需要注销和重新登录).",
+  "admin.email.notificationsDescription": "通常在正式环境中设置为是。当设为是时，Mattermost 将尝试发送电子邮件通知。开发人员可以设置为否以跳过电子邮件设置来加快开发速度。<br />置此为是时将删除预览模式横幅 (设置后需要注销后重新登录才生效)。",
   "admin.email.notificationsTitle": "启用发送邮件通知：",
   "admin.email.passwordSaltDescription": "32字盐值用来签署重置密码邮件。由安装时随机生成。点击 \"重新生成\" 生成新的盐。",
-  "admin.email.passwordSaltExample": "Ex \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
+  "admin.email.passwordSaltExample": "例如 \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "密码重设盐值：",
-  "admin.email.pushContentDesc": "选择“发送用户名称和频道名称的通用描述”提供通用信息的推送通知，包括用户名称和频道名称但没有来自信息文本的具体细节。<br /><br />选择“发送完整的信息片段”，发送来自消息触发通知的详细摘录，可能包括发送信息中的保密信息。如果您的推送通知服务在您的防火墙之外，强烈建议此选项仅用于“https”协议加密连接。",
+  "admin.email.pushContentDesc": "选择“发送包含用户名称和频道名称的一般性描述”提供一般性的推送通知，包括用户名称和频道名称，但不包含具体信息内容。<br /><br />选择“发送完整的信息片段”，则推送详细的消息摘要，可能包括发送信息中的敏感数据。如果您的推送通知服务在防火墙之外，强烈建议此选项仅在使用 \"https\"加密连接协议时启用。",
   "admin.email.pushContentTitle": "推送通知内容：",
   "admin.email.pushDesc": "通常在正式环境中设置为是。当设为是时，Mattermost尝试给iOS和安卓从推送通知服务器发送通知。",
   "admin.email.pushOff": "不发送推送通知",
@@ -294,7 +297,7 @@
   "admin.files.storage": "储存",
   "admin.general.configuration": "配置",
   "admin.general.localization": "本地化",
-  "admin.general.localization.availableLocalesDescription": "设置用户在帐号设置可用的语言（留空将可用所有语言）。如果您手动添加新语言，必须在保存钱先添加<strong>默认客户端语言</strong>。<br /><br />想要帮忙防疫吗？加入<a href='http://translate.mattermost.com/' target='_blank'>Mattermost 翻译服务器</a>。",
+  "admin.general.localization.availableLocalesDescription": "设置用户在帐号设置可用的语言（留空将可用所有语言）。如果您手动添加新语言，必须在保存钱先添加<strong>默认客户端语言</strong>。<br /><br />想要帮忙翻译吗？加入<a href='http://translate.mattermost.com/' target='_blank'>Mattermost 翻译服务器</a>。",
   "admin.general.localization.availableLocalesTitle": "可用的语言：",
   "admin.general.localization.clientLocaleDescription": "新创建的用户以及未登入的用户的默认语言。",
   "admin.general.localization.clientLocaleTitle": "默认客户端语言：",
@@ -305,9 +308,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": "启用发送团队邀请的使用者：",
@@ -389,25 +392,25 @@
   "admin.image.thumbWidthTitle": "附件缩略图宽度：",
   "admin.integrations.custom": "自定义集成",
   "admin.integrations.external": "外部服务",
-  "admin.ldap.baseDesc": "BaseDN可以使Mattermost在LADP树中搜索用户时可以按位置区分名称.",
+  "admin.ldap.baseDesc": "Base DN 是 Mattermost 在 LADP 树中搜索用户开始的专有名称路径。",
   "admin.ldap.baseEx": "例如：\"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "BaseDN：",
   "admin.ldap.bindPwdDesc": "\"绑定用户名\"的密码。",
   "admin.ldap.bindPwdTitle": "绑定密码：",
-  "admin.ldap.bindUserDesc": "用户名使用LDAP搜索.通常在Mattermost创建用户时使用.通过BASEDN字段指定LADP树可读数据的限制.",
+  "admin.ldap.bindUserDesc": "用来 LDAP 搜索的用户名。通常用一个专门给 Mattermost 使用的帐号。此帐号应该只有访问 BaseDN 栏指定 LADP 树只读权限。",
   "admin.ldap.bindUserTitle": "绑定用户名：",
   "admin.ldap.emailAttrDesc": "LDAP服务器中属性用于填充Mattermost用户电子邮箱地址属性。",
   "admin.ldap.emailAttrEx": "前“邮件”或“用户主名称”",
   "admin.ldap.emailAttrTitle": "电子邮箱属性：",
   "admin.ldap.enableDesc": "当设置为是时,Mattermost允许LADP登录",
   "admin.ldap.enableTitle": "开启LDAP登入：",
-  "admin.ldap.firstnameAttrDesc": "LDAP服务器中属性用于填充Mattermost用户名字属性。",
+  "admin.ldap.firstnameAttrDesc": "（可选）LDAP 服务器属性用于填充 Mattermost 用户名子。",
   "admin.ldap.firstnameAttrEx": "例如\"givenName\"",
   "admin.ldap.firstnameAttrTitle": "姓属性",
   "admin.ldap.idAttrDesc": "此属性在LADP服务器作为Mattermost中一个被用于做唯一标识符值。它将不可被修改，类似用户名或者用户ID。如果一个用户的ID属性被修改，它将创建一个新的Mattermost账户并且与之前的用户无关。它被用于在Mattermost登录时“LDAP用户名”字段在登录页面。一般该属性字段与上面的“用户名属性”字段相同。如果你的团队通常使用 域名\\用户名 登录到其他LDAP服务，你可以选择在本栏使用 域名\\用户名 以跟其他站点保持一致。",
   "admin.ldap.idAttrEx": "例如\"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "ID属性：",
-  "admin.ldap.lastnameAttrDesc": "LDAP服务器中属性用于填充Mattermost用户姓氏属性。",
+  "admin.ldap.lastnameAttrDesc": "（可选）LDAP 服务器属性用于填充 Mattermost 用户姓氏。",
   "admin.ldap.lastnameAttrEx": "例如\"sn\"",
   "admin.ldap.lastnameAttrTitle": "姓氏属性：",
   "admin.ldap.loginNameDesc": "出现在登录页面登录框的占位符文本，默认为“LDAP用户名”。",
@@ -415,7 +418,7 @@
   "admin.ldap.loginNameTitle": "域名登录：",
   "admin.ldap.maxPageSizeEx": "例如\"2000\"",
   "admin.ldap.maxPageSizeHelpText": "Mattermost 向 LDAP 服务器请求使用者资料时单次最多的数量。0表示无上限。",
-  "admin.ldap.maxPageSizeTitle": "最大页面大小",
+  "admin.ldap.maxPageSizeTitle": "最大页面大小：",
   "admin.ldap.nicknameAttrDesc": "（可选）在 LDAP 服务器将用于填充 Mattermost 用户名的属性。",
   "admin.ldap.nicknameAttrEx": "例如：\"昵称\"",
   "admin.ldap.nicknameAttrTitle": "昵称：",
@@ -429,13 +432,15 @@
   "admin.ldap.serverDesc": "LDAP服务器的域名或IP地址。",
   "admin.ldap.serverEx": "Ex\"10.0.0.23\"",
   "admin.ldap.serverTitle": "LDAP服务器：",
-  "admin.ldap.skipCertificateVerification": "跳过证书验证",
+  "admin.ldap.skipCertificateVerification": "跳过证书验证：",
   "admin.ldap.skipCertificateVerificationDesc": "跳过TLS或STARTTLS连接的证书验证。不建议用在需要TLS的正式环境下。仅限测试。",
   "admin.ldap.syncFailure": "同步失败：{error}",
   "admin.ldap.syncIntervalHelpText": "LDAP的同步机制会将Mattermost中的用户信息同步以反映在LDAP服务器上进行的更新。例如，当LDAP服务器上一个用户姓名更改时，这一改变将在Mattermost同步执行。在LDAP 服务器中删除或禁用账户时将他们的Mattermost 账号设置为\"停用\"并且已撤走会话。Mattermost会按照一定的时间频率定期进行同步。例如， 如果设置为60，那么会在每60分钟进行同步。",
-  "admin.ldap.syncIntervalTitle": "同步间隔（分钟）",
+  "admin.ldap.syncIntervalTitle": "同步间隔（分钟）：",
   "admin.ldap.syncNowHelpText": "立即启动一个LDAP同步。",
   "admin.ldap.sync_button": "开始LDAP同步",
+  "admin.ldap.testFailure": "LDAP 测试失败：{error}",
+  "admin.ldap.testHelpText": "测试 Mattermost 服务器是否能连接到指定的 LDAP 服务器。详细错误信息请见日志文件。",
   "admin.ldap.uernameAttrDesc": "LDAP服务器中属性用于填充Mattermost用户名属性。这可以和ID属性一致。",
   "admin.ldap.userFilterDisc": "(可选) 输入个LDAP筛选器用在搜索用户对象。只有被查询条件选中的用户才能访问Mattermost。对于活动目录，过滤禁用用户的查询是(&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2)))。",
   "admin.ldap.userFilterEx": "例如 \"(objectClass=user)\"",
@@ -452,13 +457,13 @@
   "admin.license.title": "版本和许可证",
   "admin.license.type": "授权：",
   "admin.license.upload": "上传",
-  "admin.license.uploadDesc": "在Mattermost企业版本上传一个许可证key来升级服务器.<ahref=\"http: //mattermost.com\"target=\"_blank\">在线访问我们</a>了解企业版的好处或购买一个关键.",
+  "admin.license.uploadDesc": "上传许可证来升级 Mattermost 至企业版本。<a href=\"http://mattermost.com\" target=\"_blank\">访问我们</a>了解企业版的好处或购买许可证。",
   "admin.license.uploading": "上传许可证...",
-  "admin.log.consoleDescription": "通常在产品中设置为否.开发人员应该设置为是来根据控制台日志级别打印日志信息到控制台.如果设置为是，服务器将消息写入到标准输出流.",
+  "admin.log.consoleDescription": "通常在正式环境中设置为是。开发人员应该设置为是来根据控制台日志级别显示日志信息到控制台。如果设置为是，服务器将消息写入到标准输出流 (stdout)。",
   "admin.log.consoleTitle": "日志输出到控制台：",
   "admin.log.enableWebhookDebugging": "启用Webhook调试：",
   "admin.log.enableWebhookDebuggingDescription": "您可以设置为false来禁用所有传入的webhook请求主体的调试日志记录。",
-  "admin.log.fileDescription": "在产品中通常设置为是.当设置为是时,日志文件写入下面指定日志文件位置的字段.",
+  "admin.log.fileDescription": "通常在正式环境中设置为是。当设置为是时，日志文件写入到下面指定日志文件位置。",
   "admin.log.fileLevelDescription": "此设置确定日志事件写入到控制台的级别详情.ERROR: 只输出错误信息.INFO: 输出错误消息和在启动和初始化的信息.DEBUG: 打印开发者调试问题的细节.",
   "admin.log.fileLevelTitle": "文件日志级别：",
   "admin.log.fileTitle": "日志输出到文件：",
@@ -506,14 +511,14 @@
   "admin.password.lowercase": "至少有一个小写字母",
   "admin.password.minimumLength": "最小密码长度：",
   "admin.password.minimumLengthDescription": "有效密码字符的长度必须是大于或等于{min}且小于或等于{max}的整数。",
-  "admin.password.minimumLengthExample": "例如\"5\"",
+  "admin.password.minimumLengthExample": "例如 \"5\"",
   "admin.password.number": "至少有一个数字",
   "admin.password.preview": "错误消息预览",
   "admin.password.requirements": "密码要求：",
   "admin.password.requirementsDescription": "有效的密码所需的字符类型。",
   "admin.password.symbol": "至少有一个符号 (例如：\"~!@#$%^&*()\")",
   "admin.password.uppercase": "至少有一个大写字母",
-  "admin.privacy.showEmailDescription": "当设置为否,在其他用户的用户界面隐藏自己的电子邮件地址, 包括团队拥有者和团队管理员.通常用于当系统为管理团队的一些用户选择保持他们的私人联系信息.",
+  "admin.privacy.showEmailDescription": "当设置为否时，在其他用户的用户界面隐藏自己的电子邮件地址，包括团队拥有者和团队管理员。用于当团队里一些用户选择保持他们的私人联系信息。",
   "admin.privacy.showEmailTitle": "显示电子邮箱地址：",
   "admin.privacy.showFullNameDescription": "当设置为否时，用户看不到他人的全名，包括团队拥有者和团队管理员。全名显示的地方将被用户名替代。",
   "admin.privacy.showFullNameTitle": "显示全名：",
@@ -558,7 +563,7 @@
   "admin.saml.enableTitle": "开启SAML登入：",
   "admin.saml.encryptDescription": "当设置为是时，Mattermost 将会使用您的服务提供商证书来解密SAML断言。",
   "admin.saml.encryptTitle": "开启加密：",
-  "admin.saml.firstnameAttrDesc": "使用SAML断言中的属性做为Mattermost中用户的名字。",
+  "admin.saml.firstnameAttrDesc": "(可选)使用SAML断言中的属性做为Mattermost中用户的昵称。",
   "admin.saml.firstnameAttrEx": "如 \"FirstName\"",
   "admin.saml.firstnameAttrTitle": "名字属性：",
   "admin.saml.idpCertificateFileDesc": "由可信任的身份认证系统提供商所提供的证书公钥",
@@ -570,7 +575,7 @@
   "admin.saml.idpUrlDesc": "Mattermost发送SAML登入启动初始网址。",
   "admin.saml.idpUrlEx": "如 \"https://idp.example.org/SAML2/SSO/Login\"",
   "admin.saml.idpUrlTitle": "SAML SSO 网址：",
-  "admin.saml.lastnameAttrDesc": "使用SAML断言中的属性做为Mattermost中用户的姓氏。",
+  "admin.saml.lastnameAttrDesc": "(可选)使用SAML断言中的属性做为Mattermost中用户的语言。",
   "admin.saml.lastnameAttrEx": "如 \"LastName\"",
   "admin.saml.lastnameAttrTitle": "姓氏属性：",
   "admin.saml.localeAttrDesc": "(可选)使用SAML断言中的属性做为Mattermost中用户的语言。",
@@ -583,7 +588,7 @@
   "admin.saml.nicknameAttrEx": "例如：\"昵称\"",
   "admin.saml.nicknameAttrTitle": "昵称属性：",
   "admin.saml.privateKeyFileFileDesc": "用于解析从身份认证商中返回的SAML数据的私钥",
-  "admin.saml.privateKeyFileFileRemoveDesc": "移除用于解析从身份认证商中返回的SAML数据的私钥.",
+  "admin.saml.privateKeyFileFileRemoveDesc": "移除用于解析从身份认证商中返回的SAML数据的私钥。",
   "admin.saml.privateKeyFileTitle": "服务提供商密钥：",
   "admin.saml.publicCertificateFileDesc": "当Mattermost是服务提供商时，用来生成从服务提供者到身份提供者产生的SAML请求使用的证书。",
   "admin.saml.publicCertificateFileRemoveDesc": "当Mattermost是服务提供商时，删除用来生成从服务提供者到身份提供者产生的SAML请求使用的证书。",
@@ -618,40 +623,40 @@
   "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请求，使用“*”，或者将其保留为空禁用请求。",
   "admin.service.corsEx": "http://example.com",
   "admin.service.corsTitle": "允许来自以下跨源请求网址：",
   "admin.service.developerDesc": "开启时，Javascript错误将显示在页面顶端红条里。不推荐在正式环境使用。",
   "admin.service.developerTitle": "开启开发者模式：",
   "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.googleExample": "例如 \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Google API 钥匙：",
-  "admin.service.iconDescription": "当设置为是时，webhooks和斜杠命令将允许改变贴文的图标。注意：结合允许用户名覆盖将可能导致用户受到络钓鱼攻击。",
-  "admin.service.iconTitle": "允许webhooks和斜杠命令覆盖个人头像图标：",
-  "admin.service.insecureTlsDesc": "当设置为是,一些外部的HTTPS请求将不需要验证,自签名证书.例如,对外webhooks签名TLS认证服务器,使用任何领域,将被允许.注意,这使得这些连接容易受到中间人攻击.",
+  "admin.service.iconDescription": "当设为是时，webhooks、斜杠命令以及其他整合比如 <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a> 会允许修改发出信息的头像。注意：和允许整合覆盖用户名配合将可能造成用户被钓鱼攻击。",
+  "admin.service.iconTitle": "允许整合覆盖头像：",
+  "admin.service.insecureTlsDesc": "当设为是时，所有对外的 HTTPS 请求将接受未验证，自签名的证书。例如，对外 webhooks 到任意域名用自签名 TLS 证书的服务器将被允许。注意，这会使得这些连接产生中间人攻击危险。",
   "admin.service.insecureTlsTitle": "启用不安全的对外连接：",
   "admin.service.integrationAdmin": "限制仅团队和系统管理员可以建整合：",
   "admin.service.integrationAdminDesc": "当设为是时，用户创建的集成只能由管理员创建。",
   "admin.service.listenAddress": "监听地址：",
   "admin.service.listenDescription": "绑定和监听地址。输入 \": 8065\" 将绑定所有接口或者您可以选择 \"127.0.0.1: 8065\" 只监听本地。修改这个设置需要重启服务器才能生效。",
-  "admin.service.listenExample": "例如\": 8065\"",
+  "admin.service.listenExample": "例如 \":8065\"",
   "admin.service.mfaDesc": "如果正确，用户将被提供对其账户添加多重因素身份验证的选项。他们需要一部智能手机和一个像Google Authenticator一样的身份验证器应用程序。",
-  "admin.service.mfaTitle": "启用多因素身份验证：",
+  "admin.service.mfaTitle": "启用多重身份验证：",
   "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和斜杠命令将允许改变贴文的用户名。注意：结合允许图标覆盖将可能导致用户受到络钓鱼攻击。",
-  "admin.service.overrideTitle": "允许 webhooks 以及斜杠命令覆盖用户名：",
-  "admin.service.securityDesc": "当设置为是,通过电子邮件通知系统管理员,如果相关安全修复警报已经宣布在过去12小时。需要启用电子邮件.",
-  "admin.service.securityTitle": "启用安全警报: ",
+  "admin.service.outWebhooksTitle": "启用对外 Webhooks：",
+  "admin.service.overrideDescription": "当设为是时，webhooks、斜杠命令以及其他整合比如 <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a> 会允许修改发出信息的用户名。注意：和允许整合覆盖头像配合将可能造成用户被钓鱼攻击。",
+  "admin.service.overrideTitle": "允许整合覆盖用户名：",
+  "admin.service.securityDesc": "当设置为是时，如果在过去12小时内有发布安全修正将会发送通知给系统管理员。需要启用电子邮件。",
+  "admin.service.securityTitle": "启用安全警报：",
   "admin.service.segmentDescription": "Segment.com是个可选详细跟踪系统统计的在线服务。您可以在Segment.com注册个免费帐号获取钥匙。",
   "admin.service.segmentExample": "例如\"g3fgGOXJAQ43QV7rAh6iwQCkV4cA1Gs\"",
   "admin.service.segmentTitle": "Segment 写入钥匙：",
   "admin.service.sessionCache": "会话缓存（分钟）：",
   "admin.service.sessionCacheDesc": "会话在内存缓存的分钟数。",
-  "admin.service.sessionDaysEx": "Ex\"30\"",
+  "admin.service.sessionDaysEx": "例如 \"30\"",
   "admin.service.siteURL": "站点网址：",
   "admin.service.siteURLDescription": "用户访问Mattermost的包含端口和协议的网址。留空将自动根据访问请求设定。",
   "admin.service.siteURLExample": "如 \"https://mattermost.example.com:1234\"",
@@ -662,7 +667,7 @@
   "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.service.webhooksTitle": "启用传出的 Webhooks：",
   "admin.sidebar.addTeamSidebar": "从侧边栏菜单添加团队",
   "admin.sidebar.advanced": "高级",
   "admin.sidebar.audits": "合规性与审计",
@@ -684,14 +689,14 @@
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.images": "图像",
   "admin.sidebar.integrations": "集成",
-  "admin.sidebar.ldap": "LDAP",
+  "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "法律和支持",
   "admin.sidebar.license": "版本和许可证",
   "admin.sidebar.localization": "本地化",
   "admin.sidebar.logging": "日志",
   "admin.sidebar.login": "登录",
   "admin.sidebar.logs": "日志",
-  "admin.sidebar.nativeAppLinks": "原生应用网址",
+  "admin.sidebar.nativeAppLinks": "Mattermost App Links",
   "admin.sidebar.notifications": "通知",
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "其他",
@@ -720,27 +725,27 @@
   "admin.sql.dataSource": "数据源：",
   "admin.sql.driverName": "驱动名：",
   "admin.sql.keyDescription": "32位盐值字符用于加密和解密数据库敏感字段。",
-  "admin.sql.keyExample": "例如\"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
+  "admin.sql.keyExample": "例如 \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.sql.keyTitle": "储存加密密钥：",
   "admin.sql.maxConnectionsDescription": "数据库最大闲置连接数。",
-  "admin.sql.maxConnectionsExample": "例如\"10\"",
+  "admin.sql.maxConnectionsExample": "例如 \"10\"",
   "admin.sql.maxConnectionsTitle": "最大空闲连接数：",
   "admin.sql.maxOpenDescription": "数据库最大连接数。",
-  "admin.sql.maxOpenExample": "例如\"10\"",
+  "admin.sql.maxOpenExample": "例如 \"10\"",
   "admin.sql.maxOpenTitle": "最大的开放连接: ",
   "admin.sql.noteDescription": "修改这段属性需要重启服务器才能生效。",
   "admin.sql.noteTitle": "注释：",
-  "admin.sql.replicas": "数据源副本: ",
+  "admin.sql.replicas": "数据源副本：",
   "admin.sql.traceDescription": "(开发模式) 当设为是时，SQL 语句会被写入到日志。",
   "admin.sql.traceTitle": "追踪：",
   "admin.sql.warning": "警告：重新生成盐值可能导致一些列在数据库中返回空。",
-  "admin.support.aboutDesc": "该链接有关于Mattermost部署的很多内容,例如你的组织的内容和受众群体.默认是Mattermost信息页面.",
+  "admin.support.aboutDesc": "连接到关于 Mattermost 部署的很多内容的页面，例如您的组织的用途和受众群体。默认是 Mattermost 信息页面。",
   "admin.support.aboutTitle": "关于链接：",
   "admin.support.emailHelp": "显示在邮件通知和教学上让最终用户提问支持的电子邮件地址。",
   "admin.support.emailTitle": "支持邮箱：",
-  "admin.support.helpDesc": "该链接是团队网站主菜单帮助文档.除非你的组织创建自己的文档通常不需要去修改它.",
+  "admin.support.helpDesc": "团队主菜单的帮助文档链接。除非您的组织有创建自己的文档，否则通常不需要去修改它。",
   "admin.support.helpTitle": "帮助链接：",
-  "admin.support.noteDescription": "如果连接到一个外部站点，URLs应该以http://或https://开头。",
+  "admin.support.noteDescription": "如果连接到一个外部站点，网址应该以 http:// 或https:// 开头。",
   "admin.support.noteTitle": "注释：",
   "admin.support.privacyDesc": "为桌面用户和移动设备用户提供隐私策略的链接.如果是空值将隐藏该项来显示通知.",
   "admin.support.privacyTitle": "隐私策略链接：",
@@ -748,64 +753,64 @@
   "admin.support.problemTitle": "报告问题链接：",
   "admin.support.termsDesc": "用户使用您的在线服务的条款链接。默认情况下，此链接指向 \"Mattermost 使用条款 (最终用户)\" 解释Mattermost软件提供给最终用户的条款。如果您修改默认链接来添加您自己的服务条款，您的新条款必须包含链接到默认条款让用户知道Mattermost软件的最终用户条款。",
   "admin.support.termsTitle": "服务条款链接：",
-  "admin.system_analytics.activeUsers": "有发问的正常用户",
+  "admin.system_analytics.activeUsers": "有发信息的活跃用户",
   "admin.system_analytics.title": "系统",
-  "admin.system_analytics.totalPosts": "帖子总数",
+  "admin.system_analytics.totalPosts": "信息总数",
   "admin.team.brandDesc": "启用自定义形象，以在登录页上显示一张自选图片，以及一些已经设定好的文本。",
   "admin.team.brandDescriptionExample": "所有团队的通讯一站式解决，随时随地可访问和搜索",
   "admin.team.brandDescriptionHelp": "登录页面和界面所示服务描述。",
   "admin.team.brandDescriptionTitle": "站点描述",
-  "admin.team.brandImageTitle": "自定义形象图片：",
-  "admin.team.brandTextDescription": "您希望出现的自定义形象Markdown-formatted文档在您的登录界面自定义形象图片下方。",
-  "admin.team.brandTextTitle": "自定义形象文本：",
-  "admin.team.brandTitle": "启用自定义形象：",
+  "admin.team.brandImageTitle": "自定义品牌图片：",
+  "admin.team.brandTextDescription": "您希望的自定义品牌Markdown格式文字将显示在您的登录界面自定义品牌图片下方。",
+  "admin.team.brandTextTitle": "自定义品牌文本：",
+  "admin.team.brandTitle": "启用自定义品牌：",
   "admin.team.chooseImage": "选择新图像：",
-  "admin.team.dirDesc": "当设置为是,团队按照团队目录配置，主页显示创建一个新的团队团队按照团队目录配置.",
-  "admin.team.dirTitle": "开启团队目录: ",
+  "admin.team.dirDesc": "当设置为是时，设置为显示在团队目录里的团队会在主页显示并替代创建新的团队的位置。",
+  "admin.team.dirTitle": "启用团队目录：",
   "admin.team.maxUsersDescription": "每个团队最多用户数，包括启用的和停用的用户。",
-  "admin.team.maxUsersExample": "例如\"25\"",
+  "admin.team.maxUsersExample": "例如 \"25\"",
   "admin.team.maxUsersTitle": "每个团队最多用户数：",
-  "admin.team.noBrandImage": "无上传的形象图片",
+  "admin.team.noBrandImage": "无上传的品牌图片",
   "admin.team.openServerDescription": "设为是时，任何人可以无需邀请在本服务器上注册帐号。",
   "admin.team.openServerTitle": "启用开放服务器：",
-  "admin.team.restrictDescription": "团队和用户帐户只能创建从一个特定的域(例如: mattermost.org)或逗号分隔列表域(例如: corp.mattermost.com,mattermost.org).",
+  "admin.team.restrictDescription": "团队和用户帐户只能从一个特定的域创建(例如: \"mattermost.org\")或逗号分隔域列表(例如: \"corp.mattermost.com, mattermost.org\")。",
   "admin.team.restrictDirectMessage": "允许用户私信的频道：",
   "admin.team.restrictDirectMessageDesc": "'任何Mattermost服务器上的用户'让用户对任何用户发起直接通讯频道，就算他们不在同一个团队。'任何团队成员'限制用户只能对同一团队开启直接通讯频道。",
-  "admin.team.restrictExample": "例如\"corp.mattermost.com,mattermost.org\"",
-  "admin.team.restrictNameDesc": "当设置为是,你不能创建一个团队名称保留字如www,admin,support,test,channel,等",
+  "admin.team.restrictExample": "例如 \"corp.mattermost.com, mattermost.org\"",
+  "admin.team.restrictNameDesc": "当设置为是时，你不能以保留字如 www,admin,support,test,channel 等创建团队",
   "admin.team.restrictNameTitle": "限制团队名称：",
   "admin.team.restrictTitle": "只允许特定电子邮件域名创建帐号：",
   "admin.team.restrict_direct_message_any": "在Mattermost服务器上的任何用户",
   "admin.team.restrict_direct_message_team": "任何团队成员",
   "admin.team.siteNameDescription": "登录画面和界面所显示的服务名称。",
-  "admin.team.siteNameExample": "例如\"Mattermost\"",
+  "admin.team.siteNameExample": "例如 \"Mattermost\"",
   "admin.team.siteNameTitle": "网站名称：",
-  "admin.team.teamCreationDescription": "当设为否，只有系统管理能创建团队。",
+  "admin.team.teamCreationDescription": "当设为否时，只有系统管理能创建团队。",
   "admin.team.teamCreationTitle": "开启创建团队：",
   "admin.team.upload": "上传",
   "admin.team.uploadDesc": "登录界面添加一张自定义图片定制您的用户体验。<a href='http://docs.mattermost.com/administration/config-settings.html#custom-branding' target='_blank'>docs.mattermost.com/administration/config-settings.html#custom-branding</a>中查看例子。",
   "admin.team.uploaded": "已上传！",
-  "admin.team.uploading": "正在上传...",
-  "admin.team.userCreationDescription": "当设置为否,创建帐户被禁用.创建账户按钮时显示错误信息.",
+  "admin.team.uploading": "上传中...",
+  "admin.team.userCreationDescription": "当设置为否时，创建帐户功能被禁用。点击创建账户按钮时会显示错误信息。",
   "admin.team.userCreationTitle": "开启帐号创建：",
   "admin.team_analytics.activeUsers": "有发文的正常用户",
-  "admin.team_analytics.totalPosts": "帖子总数",
+  "admin.team_analytics.totalPosts": "信息总数",
   "admin.true": "是",
   "admin.userList.title": "用户 {team}",
   "admin.userList.title2": "用户{team} ({count})",
-  "admin.user_item.authServiceEmail": "， <strong>登入形式：</strong> 电子邮件",
-  "admin.user_item.authServiceNotEmail": "， <strong>登入形式：</strong> {service}",
-  "admin.user_item.confirmDemoteDescription": "如果你从系统管理角色降级,没有另一个用户有系统管理员权限,你需要重新指定一个系统管理员通过一个终端访问Mattermost服务器并运行以下命令.",
+  "admin.user_item.authServiceEmail": "， <strong>登入方式：</strong> 电子邮件",
+  "admin.user_item.authServiceNotEmail": "， <strong>登入方式：</strong> {service}",
+  "admin.user_item.confirmDemoteDescription": "如果您从系统管理角色降级且没有另一个用户拥有系统管理员权限，您则需要通过终端访问 Mattermost 服务器并运行以下命令以重新指定一个系统管理员。",
   "admin.user_item.confirmDemoteRoleTitle": "确认从系统管理角色降级",
   "admin.user_item.confirmDemotion": "确认降级",
   "admin.user_item.confirmDemotionCmd": "platform-assign_role-team_name=\"yourteam\"-email=\"name@yourcompany.com\"-role=\"system_admin\"",
   "admin.user_item.emailTitle": "<strong>电子邮件：</strong> {email}",
   "admin.user_item.inactive": "停用",
-  "admin.user_item.makeActive": "设置活跃",
-  "admin.user_item.makeInactive": "设置为停用状态",
-  "admin.user_item.makeMember": "设置成员",
-  "admin.user_item.makeSysAdmin": "设置系统管理员",
-  "admin.user_item.makeTeamAdmin": "设置团队管理员",
+  "admin.user_item.makeActive": "设置为启用",
+  "admin.user_item.makeInactive": "设置为停用",
+  "admin.user_item.makeMember": "设置为成员",
+  "admin.user_item.makeSysAdmin": "设置为系统管理员",
+  "admin.user_item.makeTeamAdmin": "设置为团队管理员",
   "admin.user_item.member": "成员",
   "admin.user_item.mfaNo": ", <strong>多重验证</strong>：否",
   "admin.user_item.mfaYes": ", <strong>多重验证</strong>：是",
@@ -837,8 +842,8 @@
   "analytics.system.totalCommands": "命令总数",
   "analytics.system.totalFilePosts": "有文件的发文",
   "analytics.system.totalHashtagPosts": "有标签的发文",
-  "analytics.system.totalIncomingWebhooks": "引入Webhooks",
-  "analytics.system.totalOutgoingWebhooks": "对外Webhooks",
+  "analytics.system.totalIncomingWebhooks": "传入 Webhooks",
+  "analytics.system.totalOutgoingWebhooks": "传出 Webhooks",
   "analytics.system.totalPosts": "全部发文",
   "analytics.system.totalSessions": "会话总数",
   "analytics.system.totalTeams": "团队总数",
@@ -850,7 +855,7 @@
   "analytics.team.recentActive": "最近活跃用户",
   "analytics.team.recentUsers": "最近活跃用户",
   "analytics.team.title": "{team}的团队统计数据",
-  "analytics.team.totalPosts": "发文总数",
+  "analytics.team.totalPosts": "信息总数",
   "analytics.team.totalUsers": "用户总数",
   "audit_table.accountActive": "账户激活",
   "audit_table.accountInactive": "停用帐号",
@@ -865,28 +870,28 @@
   "audit_table.attemptedWebhookCreate": "试图创建一个webhook",
   "audit_table.attemptedWebhookDelete": "试图删除webhook",
   "audit_table.by": "由 {username}",
-  "audit_table.byAdmin": "管理员",
-  "audit_table.channelCreated": "创建 {channelName} 团队/组",
-  "audit_table.channelDeleted": "删除频道/组{url}",
-  "audit_table.establishedDM": "建立了一个私聊频道 {username}",
-  "audit_table.failedExpiredLicenseAdd": "由于新的许可证已过期或尚未启动，无法添加新的许可证。",
+  "audit_table.byAdmin": "由管理员",
+  "audit_table.channelCreated": "创建了 {channelName} 频道/组",
+  "audit_table.channelDeleted": "删除了网址为 {url} 的频道/组",
+  "audit_table.establishedDM": "与 {username} 建立了一个私聊频道",
+  "audit_table.failedExpiredLicenseAdd": "许可证由于已过期或未开始而无法添加",
   "audit_table.failedInvalidLicenseAdd": "无法添加无效的许可证",
   "audit_table.failedLogin": "登录尝试失败",
   "audit_table.failedOAuthAccess": "允许新OAuth服务访问失败-重定向URL不匹配以前注册的回调",
   "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": "(登录尝试)",
-  "audit_table.loginFailure": "(登录失败)",
+  "audit_table.loginAttempt": " (登录尝试)",
+  "audit_table.loginFailure": " (登录失败)",
   "audit_table.logout": "注销你的账户",
   "audit_table.member": "成员",
-  "audit_table.nameUpdated": "更新{channelName}频道/组名称",
+  "audit_table.nameUpdated": "更新了 {channelName} 频道/组名称",
   "audit_table.oauthTokenFailed": "获取OAuth令牌 - {token}",
-  "audit_table.revokedAll": "撤销所有当前会话的团队",
-  "audit_table.sentEmail": "发送邮件到{email}重置您的密码",
+  "audit_table.revokedAll": "撤销团队所有当前会话",
+  "audit_table.sentEmail": "已发送电子邮件到 {email} 以重置您的密码",
   "audit_table.session": "会话ID",
   "audit_table.sessionRevoked": "ID {sessionId} 的会话被撤销",
   "audit_table.successfullLicenseAdd": "成功添加新的许可证",
@@ -902,57 +907,57 @@
   "audit_table.updateGlobalNotifications": "更新全局通知设置",
   "audit_table.updatePicture": "更新你的个人资料照片",
   "audit_table.updatedRol": "更新用户角色为",
-  "audit_table.userAdded": "添加{username}到{channelName}频道/组",
+  "audit_table.userAdded": "已添加 {username} 到 {channelName}频道/组",
   "audit_table.userId": "用户ID",
-  "audit_table.userRemoved": "从 {channelName} 频道/组删除 {username}",
+  "audit_table.userRemoved": "已从 {channelName} 频道/组删除 {username}",
   "audit_table.verified": "您的电子邮件地址验证成功",
   "authorize.access": "允许<strong>{appName}</strong>访问？",
   "authorize.allow": "允许",
   "authorize.app": "应用<strong>{appName}</strong>想要能访问和修改您的基本资料。",
-  "authorize.deny": "否认",
+  "authorize.deny": "拒绝",
   "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.commands": "斜杠命令",
   "backstage_sidebar.integrations.incoming_webhooks": "引入Webhooks",
   "backstage_sidebar.integrations.oauthApps": "OAuth 2.0 应用",
   "backstage_sidebar.integrations.outgoing_webhooks": "对外Webhooks",
   "center_panel.recent": "点击这里跳转到最近的消息。",
   "chanel_header.addMembers": "添加成员",
   "change_url.close": "关闭",
-  "change_url.endWithLetter": "必须以字母或数字结束",
-  "change_url.invalidUrl": "无效的",
+  "change_url.endWithLetter": "必须以字母或数字结尾",
+  "change_url.invalidUrl": "无效的网址",
   "change_url.longer": "必须超过两个字符",
-  "change_url.noUnderscore": "不能包含两个连续下划线。",
+  "change_url.noUnderscore": "不能包含两个连续的下划线。",
   "change_url.startWithLetter": "必须以字母或数字开始",
-  "channel_flow.alreadyExist": "频道URL已经存在",
+  "channel_flow.alreadyExist": "已存在使用该 URL 的频道",
   "channel_flow.changeUrlDescription": "某些字符不允许出现在url中，可能被删除。",
   "channel_flow.changeUrlTitle": "修改{term}URL",
   "channel_flow.channel": "频道",
-  "channel_flow.create": "创建{term}",
-  "channel_flow.group": "组",
+  "channel_flow.create": "创建 {term}",
+  "channel_flow.group": "群组",
   "channel_flow.handleTooShort": "频道网址必须为至少2个小写英文数字字符",
   "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.group": "群组",
   "channel_header.leave": "离开{term}",
   "channel_header.manageMembers": "成员管理",
   "channel_header.notificationPreferences": "消息通知设置",
-  "channel_header.recentMentions": "最近提到",
+  "channel_header.recentMentions": "最近提及",
   "channel_header.rename": "重命名{term}...",
-  "channel_header.setHeader": "设置{term}标语中...",
-  "channel_header.setPurpose": "设置{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.name": "名称：",
   "channel_info.notFound": "没有发现频道",
   "channel_info.purpose": "用途：",
   "channel_info.url": "URL：",
@@ -960,8 +965,8 @@
   "channel_invite.addNewMembers": "添加新成员到",
   "channel_invite.close": "关闭",
   "channel_loader.connection_error": "您的网络连接似乎出现一个问题。",
-  "channel_loader.posted": "发布",
-  "channel_loader.socketError": "请检查连接,Mattermost访问不成功.如果问题仍然存在,请管理员检查WebSocket端口.",
+  "channel_loader.posted": "已发布",
+  "channel_loader.socketError": "请检查连接，无法连接到 Mattermost。如果问题持续存在，请管理员检查 WebSocket 端口。",
   "channel_loader.someone": "有人",
   "channel_loader.something": "新事物",
   "channel_loader.unknown_error": "我们从服务器上接收到一个异常状态码。",
@@ -970,30 +975,30 @@
   "channel_loader.wrote": "写到：",
   "channel_members_modal.addNew": "添加新成员",
   "channel_members_modal.close": "关闭",
-  "channel_members_modal.remove": "移除（删除）",
+  "channel_members_modal.remove": "移除",
   "channel_memebers_modal.members": "成员",
   "channel_modal.cancel": "取消",
   "channel_modal.channel": "频道",
   "channel_modal.createNew": "创建新",
-  "channel_modal.descriptionHelp": "描述{term}如何使用.",
+  "channel_modal.descriptionHelp": "描述{term}如何被使用。",
   "channel_modal.displayNameError": "此栏必须填写",
   "channel_modal.edit": "编辑",
-  "channel_modal.group": "组",
-  "channel_modal.header": "标语",
-  "channel_modal.headerHelp": "设定在 {term} 标语里在 {term} 旁边的文字。举例，输入常见链接 [链接标题](http://example.com)。",
-  "channel_modal.modalTitle": "新",
-  "channel_modal.name": "名",
+  "channel_modal.group": "群组",
+  "channel_modal.header": "标题",
+  "channel_modal.headerHelp": "设定在 {term} 标题里在 {term} 旁边的文字。举例，输入常见链接 [链接标题](http://example.com)。",
+  "channel_modal.modalTitle": "新建",
+  "channel_modal.name": "名子",
   "channel_modal.nameEx": "如: \"错误\"，\"营销\"，\"客户支持\"",
   "channel_modal.optional": "(可选)",
-  "channel_modal.privateGroup1": "创建一个具有限制成员资格的新的私人组。",
-  "channel_modal.privateGroup2": "创建一个私人组",
+  "channel_modal.privateGroup1": "创建一个具有限制成员资格的私人组。",
+  "channel_modal.privateGroup2": "创建一个私有组",
   "channel_modal.publicChannel1": "创建一个公共频道",
   "channel_modal.publicChannel2": "创建一个任何人都能加入的新公共频道。",
   "channel_modal.purpose": "用途",
   "channel_notifications.allActivity": "所有操作",
   "channel_notifications.allUnread": "所有未读消息",
   "channel_notifications.globalDefault": "默认全局（{notifyLevel}）",
-  "channel_notifications.markUnread": "标记频道未读",
+  "channel_notifications.markUnread": "标记频道为未读",
   "channel_notifications.never": "从不",
   "channel_notifications.onlyMentions": "仅对提及",
   "channel_notifications.override": "选择一个“默认”以外的选项将会重写全局通知设置。桌面通知在Firefox、Safari和Chrome中有效。",
@@ -1002,7 +1007,7 @@
   "channel_notifications.unreadInfo": "有未读消息时，侧边栏的频道名称粗体显示。只有当您被提及时选择“仅对提及”会加粗频道名称。",
   "channel_select.placeholder": "--- 选择一个频道 ---",
   "channel_switch_modal.dm": "（私信）",
-  "channel_switch_modal.help": "输入频道名。↑↓用来浏览，TAB选择，↵用来确认，ESC用来取消",
+  "channel_switch_modal.help": "输入频道名。↑↓浏览，TAB选择，↵确认，ESC取消",
   "channel_switch_modal.not_found": "无匹配项。",
   "channel_switch_modal.submit": "切换",
   "channel_switch_modal.title": "切换频道",
@@ -1016,22 +1021,22 @@
   "claim.email_to_ldap.pwd": "密码",
   "claim.email_to_ldap.pwdError": "请输入您的密码。",
   "claim.email_to_ldap.ssoNote": "您必须已经拥有一个有效的LDAP账户",
-  "claim.email_to_ldap.ssoType": "当您的账户有要求时,你只能通过LDAP才能登陆",
-  "claim.email_to_ldap.switchTo": "切换LDAP账户",
-  "claim.email_to_ldap.title": "切换邮箱/密码账号到LDAP",
+  "claim.email_to_ldap.ssoType": "领取您的帐号后，您只能通过 LDAP 登陆",
+  "claim.email_to_ldap.switchTo": "切换帐号到 LDAP",
+  "claim.email_to_ldap.title": "切换邮箱/密码账号到 LDAP",
   "claim.email_to_oauth.enterPwd": "输入你的{site}账户密码",
   "claim.email_to_oauth.pwd": "密码",
   "claim.email_to_oauth.pwdError": "请输入您的密码。",
   "claim.email_to_oauth.ssoNote": "您必须已经拥有一个有效的{type}账户",
-  "claim.email_to_oauth.ssoType": "当您的账户有要求时,你只能通过{type}SSO才能登陆",
-  "claim.email_to_oauth.switchTo": "切换账户到{uiType}",
-  "claim.email_to_oauth.title": "切换邮箱/密码账号到{uiType}",
+  "claim.email_to_oauth.ssoType": "领取您的帐号后，您只能通过 {type} SSO 登陆",
+  "claim.email_to_oauth.switchTo": "切换账户到 {uiType}",
+  "claim.email_to_oauth.title": "切换邮箱/密码账号到 {uiType}",
   "claim.ldap_to_email.confirm": "确认密码",
   "claim.ldap_to_email.email": "您将使用电子邮件{email}登录",
-  "claim.ldap_to_email.enterLdapPwd": "输入你的{site} 電郵 {ldapPassword}",
-  "claim.ldap_to_email.enterPwd": "输入你的新账户密码",
-  "claim.ldap_to_email.ldapPasswordError": "请输入您的LDAP密码。",
-  "claim.ldap_to_email.ldapPwd": "LDAP密码",
+  "claim.ldap_to_email.enterLdapPwd": "输入 {site} 电子邮件帐号的 {ldapPassword}",
+  "claim.ldap_to_email.enterPwd": "输入您的新电子邮件帐号密码",
+  "claim.ldap_to_email.ldapPasswordError": "请输入您的 LDAP 密码。",
+  "claim.ldap_to_email.ldapPwd": "LDAP 密码",
   "claim.ldap_to_email.pwd": "密码",
   "claim.ldap_to_email.pwdError": "请输入您的密码。",
   "claim.ldap_to_email.pwdNotMatch": "密码不匹配。",
@@ -1083,7 +1088,7 @@
   "delete_channel.channel": "频道",
   "delete_channel.confirm": "确认删除频道",
   "delete_channel.del": "删除",
-  "delete_channel.group": "组",
+  "delete_channel.group": "群组",
   "delete_channel.question": "您确认要删除{display_name}{term}？",
   "delete_post.cancel": "取消",
   "delete_post.comment": "评论",
@@ -1091,24 +1096,24 @@
   "delete_post.del": "删除",
   "delete_post.post": "发布",
   "delete_post.question": "您确认要删除{term}？",
-  "delete_post.warning": "这个帖子有{count}评论。",
+  "delete_post.warning": "这个信息有{count}条评论。",
   "edit_channel_header_modal.cancel": "取消",
-  "edit_channel_header_modal.description": "编辑在频道标语里显示在频道名称旁的文本。",
-  "edit_channel_header_modal.error": "这频道标语太长，请输入一个简短的",
+  "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_purpose_modal.body": "描述如何使用这个{type}。此文本出现在“更多”菜单频道列表中，帮助他人决定是否加入。",
+  "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": "频道",
-  "edit_channel_purpose_modal.error": "此频道用途描述过长,请输入一个较短的",
-  "edit_channel_purpose_modal.group": "组",
+  "edit_channel_purpose_modal.error": "频道用途过长,请长话短说",
+  "edit_channel_purpose_modal.group": "群组",
   "edit_channel_purpose_modal.save": "保存",
-  "edit_channel_purpose_modal.title1": "编辑目的",
-  "edit_channel_purpose_modal.title2": "编辑目的",
+  "edit_channel_purpose_modal.title1": "编辑用途",
+  "edit_channel_purpose_modal.title2": "编辑用途",
   "edit_post.cancel": "取消",
   "edit_post.edit": "编辑{title}",
-  "edit_post.editPost": "编辑帖子...",
+  "edit_post.editPost": "编辑信息...",
   "edit_post.save": "保存",
   "email_signup.address": "电子邮件地址",
   "email_signup.createTeam": "创建团队",
@@ -1147,33 +1152,33 @@
   "file_info_preview.type": "文件类型",
   "file_upload.fileAbove": "文件超过{max}MB不能被上传：{filename}",
   "file_upload.filesAbove": "文件超过{max}MB不能被上传：{filenames}",
-  "file_upload.limited": "最大上传文件数限制{count}.请使用其他帖子上传更多文件.",
+  "file_upload.limited": "最大上传文件数限制为 {count}。请使用新信息来上传更多文件。",
   "file_upload.pasted": "图片已粘贴至",
   "filtered_user_list.any_team": "所有用户",
-  "filtered_user_list.count": "{count}位成员",
-  "filtered_user_list.countTotal": "{count} 位，共{total}位成员",
+  "filtered_user_list.count": "{count} 位成员",
+  "filtered_user_list.countTotal": "{count} 位，共 {total} 位成员",
   "filtered_user_list.member": "成员",
   "filtered_user_list.search": "搜索成员",
   "filtered_user_list.show": "过滤器：",
   "filtered_user_list.team_only": "本团队成员",
   "find_team.email": "电子邮件",
-  "find_team.findDescription": "发送电子邮件到团队的每一个成员.",
+  "find_team.findDescription": "已发送一份电子邮件含有所有您是成员的团队的链接。",
   "find_team.findTitle": "找到您的团队",
   "find_team.getLinks": "获取一封电子邮件，通过链接您可到任何所在的团队。",
   "find_team.placeholder": "you@domain.com",
   "find_team.send": "发送",
   "find_team.submitError": "请输入一个有效的电子邮件地址",
-  "flag_post.flag": "标志复查",
-  "flag_post.unflag": "取消标志",
+  "flag_post.flag": "标记以跟进",
+  "flag_post.unflag": "取消标记",
   "general_tab.chooseName": "请选择一个新的名称为你的团队",
   "general_tab.codeDesc": "点击 \"编辑\" 重新生成邀请码。",
   "general_tab.codeLongDesc": "邀请码用来在主菜单里使用<strong>获取团队邀请链接</strong>所产生的团队邀请链接中的一部分。重新生成一个新的团队邀请链接将使之前的链接无效。",
   "general_tab.codeTitle": "邀请码",
-  "general_tab.dirDisabled": "团队目录已被禁用.请联系系统管理员,在系统控制台中国的团队设置中启用团队目录.",
+  "general_tab.dirDisabled": "团队目录已被禁用。请联系系统管理员到系统控制台中启用团队目录。",
   "general_tab.dirOff": "此系统的团队目录已关闭。",
-  "general_tab.includeDirDesc": "包括这个团队将显示团队的团队名称的目录部分主页,并提供一个链接到登陆页面.",
+  "general_tab.includeDirDesc": "包含此团队将在首页的团队目录里显示该团队名，并提供一个链接到登陆页面。",
   "general_tab.includeDirTitle": "团队目录中已包括这个团队",
-  "general_tab.no": "不",
+  "general_tab.no": "否",
   "general_tab.openInviteDesc": "允许时，此团队的链接将会显示在首页让任何有帐号的用户可以加入此团队。",
   "general_tab.openInviteTitle": "允许任何在本服务器上的用户加入此团队",
   "general_tab.regenerate": "重新生成",
@@ -1194,10 +1199,10 @@
   "get_link.clipboard": " 链接复制到剪贴板。",
   "get_link.close": "关闭",
   "get_link.copy": "复制链接",
-  "get_post_link_modal.help": "下方的链接允许授权用户查看您的帖子。",
-  "get_post_link_modal.title": "复制超链接",
+  "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": "团队邀请链接",
   "help.attaching.downloading": "#### 下载文件\n点击文件预览图旁边的下载图标或者打开文件预览后点击**下载**。",
   "help.attaching.dragdrop": "#### 拖放\n从电脑拖动一个或多个文件到右侧栏或中间栏上传文件。拖放文件到消息输入框，你页可以附加消息并按**回车**发送。",
@@ -1214,16 +1219,16 @@
   "help.attaching.title": "# 附件\n_____",
   "help.commands.builtin": "## 自带命令\n以下是Mattermost自带的斜杠命令：",
   "help.commands.builtin2": "在开始输入 `/` 时将会在输入框上方显示斜杠命令列表。此自动完成建议列表将以黑色字体显示例子以及灰色字体显示说明。",
-  "help.commands.custom": "## Custom Commands\nCustom slash commands integrate with external applications. For example, a team might configure a custom slash command to check internal health records with `/patient joe smith` or check the weekly weather forcast in a city with `/weather toronto week`. Check with your System Admin or open the autocomplete list by typing `/` to determine if your team configured any custom slash commands.",
-  "help.commands.custom2": "Custom slash commands are disabled by default and can be enabled by the System Admin in the **System Console** > **Integrations** > **Webhooks and Commands**. Learn about configuring custom slash commands on the [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
-  "help.commands.intro": "Slash commands perform operations in Mattermost by typing into the text input box. Enter a `/` followed by a command and some arguments to perform actions.\n\nBuilt-in slash commands come with all Mattermost installations and custom slash commands are configurable to interact with external applications. Learn about configuring custom slash commands on the [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
+  "help.commands.custom": "## 自定义命令\n自定义斜杠命令于外部应用整合。比如，一个团队可以设定自定义斜杠命令检查内部健康资料 `/patient joe smith` 或检查一城市的天气周报 `/weather toronto week`。向系统管理员确认或输入 `/` 打开自动完成列表确认您的团队是否有设置任何自定义斜杠命令。",
+  "help.commands.custom2": "自定义斜杠命令是默认关闭的，系统管理员可以在 **系统控制台** > **整合** > **Webhooks 与命令** 中开启。了解更多设置自定义斜杠命令到 [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html)。",
+  "help.commands.intro": "斜杠命令可以在 Mattermost 里的文本输入框内进行操作。输入 `/`  紧接着命令以及一些参数进行操作。\n\n自带的斜杠指令在所有Mattermost可以使用并且自定义斜杠命令可以用来设定与外部应用互动。了解更多设置自定义斜杠命令到 [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html)。",
   "help.commands.title": "# 执行命令\n___",
   "help.composing.deleting": "## 删除消息\n点击您在自己发送的消息中想删除的消息旁的 **[...]** 文字图标，然后点击 **删除**。系统或团队管理员可以删除任何在系统或团队中的消息。",
   "help.composing.editing": "## 修改消息\n点击您在自己发送的消息中想删除的消息旁的 **[...]** 文字图标，然后点击 **修改**。在修改消息内容后，按 **回车** 以保存改动。消息内容不触发新的 @mention 通知，桌面通知或通知声音。",
-  "help.composing.linking": "## Linking to a message\nThe **Permalink** feature creates a link to any message. Sharing this link with other users in the channel lets them view the linked message in the Message Archives. Users who are not a member of the channel where the message was posted cannot view the permalink. Get the permalink to any message by clicking the **[...]** icon next to the message text  > **Permalink** > **Copy Link**.",
-  "help.composing.posting": "## Posting a Message\nWrite a message by typing into the text input box, then press **ENTER** to send it. Use **Shift + ENTER** to create a new line without sending a message. To send messages by pressing **Ctrl+Enter** go to **Main Menu > Account Settings > Send messages on Ctrl + Enter**.",
-  "help.composing.posts": "#### Posts\nPosts can be considered parent messages. They are the messages that often start a thread of replies. Posts are composed and sent from the text input box at the bottom of the center pane.",
-  "help.composing.replies": "#### Replies\nReply to a message by clicking the reply icon next to any message text. This action opens the right-hand-side (RHS) where you can see the message thread, then compose and send your reply. Replies are indented slightly in the center pane to indicate that they are child messages of a parent post.\n\nWhen composing a reply in the right-hand side, click the expand/collapse icon with two arrows at the top of the sidebar to make things easier to read.",
+  "help.composing.linking": "## 消息链接\n**永久链接** 功能可以给任何消息创建链接。共享此链接给此频道的其他用户让他们直接访问消息归档里的消息。不在此频道的成员无法看永久链接。点任何消息旁边 **[...]** 图标 > **永久链接** > **复制链接** 来获取链接。",
+  "help.composing.posting": "## 发布消息\n在文字输入框里打入消息，然后按 **回车** 发送。用 **Shift + 回车** 将在不发送消息下换行。如果想使用 **Ctrl+回车** 发信息，请到 **主菜单 > 帐号设定 > 用 Ctrl + Enter 发消息**。",
+  "help.composing.posts": "#### 发文\n发文被视为母消息。它们通常时回复串的开头。发文是从中间面板下方的输入框发送。",
+  "help.composing.replies": "#### 回复\n点击任意消息旁的回复图标来回复该消息。此操作将打开显示消息串的右边栏，然后您可以编写并发送您的回复。回复会有少许的缩进来标识它们时回复母消息的子消息。\n\n当在右边栏编写回复时，在上方点击展开/合并图标以便更容易阅读。",
   "help.composing.title": "# 发送信息\n_____",
   "help.composing.types": "## 消息类型\n回复发文以串整理对话。",
   "help.formatting.checklist": "用半形方括号创建个任务列表：",
@@ -1231,61 +1236,61 @@
   "help.formatting.code": "## 代码块\n\n用四个空格缩进每行，或在代码上下方放上 ``` 创建代码块。",
   "help.formatting.codeBlock": "代码块",
   "help.formatting.emojiExample": ":smile: :+1: :sheep:",
-  "help.formatting.emojis": "## Emojis\n\nOpen the emoji autocomplete by typing `:`. A full list of emojis can be found [here](http://www.emoji-cheat-sheet.com/). It is also possible to create your own [Custom Emoji](http://docs.mattermost.com/help/settings/custom-emoji.html) if the emoji you want to use doesn't exist.",
+  "help.formatting.emojis": "## 表情符\n\n输入 `:` 打开表情符自动完成。完整的表情符列表在[这里](http://www.emoji-cheat-sheet.com/)。您页可以创建您自己的[自定义表情符](http://docs.mattermost.com/help/settings/custom-emoji.html)如果您想用的表情符不存在。",
   "help.formatting.example": "示例：",
   "help.formatting.githubTheme": "**GitHub 主题风格**",
-  "help.formatting.headings": "## Headings\n\nMake a heading by typing # and a space before your title. For smaller headings, use more #’s.",
-  "help.formatting.headings2": "Alternatively, you can underline the text using `===` or `---` to create headings.",
-  "help.formatting.headings2Example": "Large Heading\n-------------",
+  "help.formatting.headings": "## 标题\n\n在标题前输入#和一个空格创建标题。用更多 # 创建子标题。",
+  "help.formatting.headings2": "另外，您可以在文字下一行用 `===` 或 `---` 来创建标题。",
+  "help.formatting.headings2Example": "大标题\n-------------",
   "help.formatting.headingsExample": "## 大标题\n### 小标题\n#### 更加小标题",
-  "help.formatting.images": "## In-line Images\n\nCreate in-line images using an `!` followed by the alt text in square brackets and the link in normal brackets. Add hover text by placing it in quotes after the link.",
-  "help.formatting.imagesExample": "![alt text](link \"hover text\")\n\nand\n\n[![Build Status](https://travis-ci.org/mattermost/platform.svg?branch=master)](https://travis-ci.org/mattermost/platform) [![Github](https://assets-cdn.github.com/favicon.ico)](https://github.com/mattermost/platform)",
-  "help.formatting.inline": "## In-line Code\n\nCreate in-line monospaced font by surrounding it with backticks.",
-  "help.formatting.intro": "Markdown makes it easy to format messages. Type a message as you normally would, and use these rules to render it with special formatting.",
-  "help.formatting.lines": "## 线\n\n用三个 `*`, `_` 或 `-` 创建一条分界线。",
+  "help.formatting.images": "## 内嵌图片\n\n在 `!` 后面加方括号里带替代文字以及括号里带链接以创建内嵌图片。在链接后用带双引号的文字以添加悬浮文字。",
+  "help.formatting.imagesExample": "![替代文字](链接 \"悬浮文字\")\n\n以及\n\n[![Build Status](https://travis-ci.org/mattermost/platform.svg?branch=master)](https://travis-ci.org/mattermost/platform) [![Github](https://assets-cdn.github.com/favicon.ico)](https://github.com/mattermost/platform)",
+  "help.formatting.inline": "## 嵌入代码\n\n用反引号包围文字创建等宽文字。",
+  "help.formatting.intro": "Markdown能轻松改变消息格式。您如常输入消息，然后用以下规则给予指定的格式。",
+  "help.formatting.lines": "## 分界线\n\n用三个 `*`, `_` 或 `-` 创建一条分界线。",
   "help.formatting.linkEx": "[来看下Mattermost!](https://about.mattermost.com/)",
   "help.formatting.links": "## 链接\n\n将想显示的文字放进方括号和对应的链接到括号。",
-  "help.formatting.listExample": "* 列表项一\n* 列表项二\n    * 列表项二子项') + '\n```",
+  "help.formatting.listExample": "* 列表项一\n* 列表项二\n    * 列表项二子项",
   "help.formatting.lists": "## 列表\n\n用 `*` 或 `-` 创建项目。在前面添加两个空格以缩进项目。",
-  "help.formatting.monokaiTheme": "**Monoka主题风格**",
-  "help.formatting.ordered": "Make it an ordered list by using numbers instead:",
+  "help.formatting.monokaiTheme": "**Monoka 主题风格**",
+  "help.formatting.ordered": "用数字表示有序列表：",
   "help.formatting.orderedExample": "1. 第一项\n2. 第二项",
   "help.formatting.quotes": "## 块引用\n\n用 `>` 创建块引用。",
   "help.formatting.quotesExample": "`> 块引用` 显示为：",
   "help.formatting.quotesRender": "> 块引用",
-  "help.formatting.renders": "渲染为：",
+  "help.formatting.renders": "显示为：",
   "help.formatting.solirizedDarkTheme": "**Solarized Dark 主题风格**",
   "help.formatting.solirizedLightTheme": "**Solarized Light 主题风格**",
   "help.formatting.style": "## 文字风格\n\n您可以用 `_` 或 `*` 包围一个词来让它变斜体。用两个则是粗体。\n\n* `_斜体_` 显示为 _斜体_\n* `**粗体**` 显示为 **粗体**\n* `**_粗斜体_**` 显示为 **_粗斜体_**\n* `~~删除线~~` 显示为 ~~删除线~~",
   "help.formatting.supportedSyntax": "支持的语言：\n`as`, `applescript`, `osascript`, `scpt`, `bash`, `sh`, `zsh`, `clj`, `boot`, `cl2`, `cljc`, `cljs`, `cljs.hl`, `cljscm`, `cljx`, `hic`, `coffee`, `_coffee`, `cake`, `cjsx`, `cson`, `iced`, `cpp`, `c`, `cc`, `h`, `c++`, `h++`, `hpp`, `cs`, `csharp`, `css`, `d`, `di`, `dart`, `delphi`, `dpr`, `dfm`, `pas`, `pascal`, `freepascal`, `lazarus`, `lpr`, `lfm`, `diff`, `django`, `jinja`, `dockerfile`, `docker`, `erl`, `f90`, `f95`, `fsharp`, `fs`, `gcode`, `nc`, `go`, `groovy`, `handlebars`, `hbs`, `html.hbs`, `html.handlebars`, `hs`, `hx`, `java`, `jsp`, `js`, `jsx`, `json`, `jl`, `kt`, `ktm`, `kts`, `less`, `lisp`, `lua`, `mk`, `mak`, `md`, `mkdown`, `mkd`, `matlab`, `m`, `mm`, `objc`, `obj-c`, `ml`, `perl`, `pl`, `php`, `php3`, `php4`, `php5`, `php6`, `ps`, `ps1`, `pp`, `py`, `gyp`, `r`, `ruby`, `rb`, `gemspec`, `podspec`, `thor`, `irb`, `rs`, `scala`, `scm`, `sld`, `scss`, `st`, `sql`, `swift`, `tex`, `vbnet`, `vb`, `bas`, `vbs`, `v`, `veo`, `xml`, `html`, `xhtml`, `rss`, `atom`, `xsl`, `plist`, `yaml`",
-  "help.formatting.syntax": "### Syntax Highlighting\n\nTo add syntax highlighting, type the language to be highlighted after the ``` at the beginning of the code block. Mattermost also offers four different code themes (GitHub, Solarized Dark, Solarized Light, Monokai) that can be changed in **Account Settings** > **Display** > **Theme** > **Custom Theme** > **Center Channel Styles**",
+  "help.formatting.syntax": "### 语法高亮\n\n在代码块开头 ``` 之后输入想高亮的语言以开启高亮。Mattermost 同时提供四种代码风格 (GitHub, Solarized Dark, Solarized Light, Monokai) 可以在 **帐号设定** > **显示** > **主题** > **自定义主题** > **中央频道样式** 里修改",
   "help.formatting.syntaxEx": "    package main\n    import \"fmt\"\n    func main() {\n        fmt.Println(\"Hello, 世界\")\n    }",
-  "help.formatting.tableExample": "| 靠左对齐 | 置中对齐 | 靠右对齐 |\n| :------------ |:---------------:| -----:|\n| 左列 1 | 此文字 |   $100 |\n| 左列 2 | 是        |    $10 |\n| 左列 3 | 居中的 |     $1 |",
-  "help.formatting.tables": "## Tables\n\nCreate a table by placing a dashed line under the header row and separating the columns with a pipe `|`. (The columns don’t need to line up exactly for it to work). Choose how to align table columns by including colons `:` within the header row.",
+  "help.formatting.tableExample": "| 靠左对齐 | 置中对齐 | 靠右对齐 |\n| :------ |:-------:| --------:|\n| 左列 1  | 此文字   |     $100 |\n| 左列 2  | 是       |      $10 |\n| 左列 3  | 居中的   |       $1 |",
+  "help.formatting.tables": "## 表格\n\n在标题下行放一个虚线并用竖线 `|` 分割列来建立表格(列不需要精准对齐)。在标题里用冒号 `:` 来设定列对齐。",
   "help.formatting.title": "# 文字格式\n_____",
   "help.learnMore": "了解更多：",
   "help.link.attaching": "附加文件",
   "help.link.commands": "执行命令",
   "help.link.composing": "编写消息和回复",
   "help.link.formatting": "用Markdown排版消息",
-  "help.link.mentioning": "Mentioning Teammates",
+  "help.link.mentioning": "提及团友",
   "help.link.messaging": "基本消息",
-  "help.mentioning.channel": "#### @Channel\nYou can mention an entire channel by typing `@channel`. All members of the channel will receive a mention notification that behaves the same way as if the members had been mentioned personally.",
-  "help.mentioning.channelExample": "@channel great work on interviews this week. I think we found some excellent potential candidates!",
-  "help.mentioning.mentions": "## @Mentions\nUse @mentions to get the attention of specific team members.",
-  "help.mentioning.recent": "## Recent Mentions\nClick `@` next to the search box to query for your most recent @mentions and words that trigger mentions. Click **Jump** next to a search result in the RHS to jump the center pane to the channel and location of the message with the mention.",
-  "help.mentioning.title": "# 提到团友\n_____",
-  "help.mentioning.triggers": "## Words That Trigger Mentions\nIn addition to being notified by @username and @channel, you can customize words that trigger mention notifications in **Account Settings** > **Notifications** > **Words that trigger mentions**. By default, you will receive mention notifications on your first name, and you can add more words by typing them into the input box separated by commas. This is useful if you want to be notified of all posts on certain topics, for example, “interviewing” or “marketing”.",
-  "help.mentioning.username": "#### @Username\nYou can mention a teammate by using the `@` symbol plus their username to send them a mention notification.\n\nType `@` to bring up a list of team members who can be mentioned. To filter the list, type the first few letters of any username, first name, last name, or nickname. The **Up** and **Down** arrow keys can then be used to scroll through entries in the list, and pressing **ENTER** will select which user to mention. Once selected, the username will automatically replace the full name or nickname.\nThe following example sends a special mention notification to **alice** that alerts her of the channel and message where she has been mentioned. If **alice** is away from Mattermost and has [email notifications](http://docs.mattermost.com/help/getting-started/configuring-notifications.html#email-notifications) turned on, then she will receive an email alert of her mention along with the message text.",
-  "help.mentioning.usernameCont": "If the user you mentioned does not belong to the channel, a System Message will be posted to let you know. This is a temporary message only seen by the person who triggered it. To add the mentioned user to the channel, go to the dropdown menu beside the channel name and select **Add Members**.",
+  "help.mentioning.channel": "#### @频道\n您可以输入 `@channel` 来提及整个频道。所有频道成员将和单独被提及一样收到提及通知。",
+  "help.mentioning.channelExample": "@channel 这周的面试做得很好。我觉得我们找到了些非常有潜力的候选人！",
+  "help.mentioning.mentions": "## @提及\n用 @提及 来引起特定团队成员的注意。",
+  "help.mentioning.recent": "## 最近提及\n点击搜索栏旁边的 `@` 以查询您最近的 @提及 以及触发提及的词。点击右边栏搜索结果旁的 **跳转** 将中间栏跳转到提及的频道和消息的位置。",
+  "help.mentioning.title": "# 提及团友\n_____",
+  "help.mentioning.triggers": "## 触发提及的词\n除了被 @用户名 和 @频道 通知意外，您可以在 **帐号设定** > **通知** > **触发提及的词** 自定义被触发提及通知的词。默认情况下，您会收到您名字的通知，但您可以添加用逗号分开的触发词。这在您想要在收到特定主题的通知时很有帮助，比如，\"面试\" 或 \"市场\"。",
+  "help.mentioning.username": "#### @用户名\n您可以用 `@` 符号紧接着他们的用户名来发送提及通知给他们。\n\n输入 `@` 来打开可以被提及的团队成员。输入用户名，名字，姓氏，或昵称开头几个字来过滤列表。用 **上** 和 **下** 方向键可以从列表中选择项目，然后用 **回车** 确认选择。一旦选中，全名或昵称将自动被代替为用户名。\n以下例子将发送特殊提及通知给 **alice** 告诉她被提及到的频道和消息内容。如果 **alice** 在 Mattermost 为离开并且开启[电子邮件通知](http://docs.mattermost.com/help/getting-started/configuring-notifications.html#email-notifications)，那么她会收到带有提及和消息的电子邮件通知。",
+  "help.mentioning.usernameCont": "如果您提及的用户不属于这频道，系统会发信息告知您。这只是个临时的信息且只有触发的人看见。如想添加提及的用户到频道，点击频道名旁的下拉菜单中的 **添加成员**。",
   "help.mentioning.usernameExample": "@alice 新候选人的面试怎么样？",
   "help.messaging.attach": "用拖放或点击消息输入框里的附件图标以**附上文件**。",
-  "help.messaging.emoji": "**Quickly add emoji** by typing \":\", which will open an emoji autocomplete. If the existing emoji don't cover what you want to express, you can also create your own [Custom Emoji](http://docs.mattermost.com/help/settings/custom-emoji.html).",
-  "help.messaging.format": "**Format your messages** using Markdown that supports text styling, headings, links, emoticons, code blocks, block quotes, tables, lists and in-line images.",
-  "help.messaging.notify": "**Notify teammates** when they are needed by typing `@username`.",
-  "help.messaging.reply": "**Reply to messages** by clicking the reply arrow next to the message text.",
+  "help.messaging.emoji": "输入 \":\" 打开表情符自动完成以 **快速添加表情符**。如果现有的表情符不够，您也可以创建您自己的[自定义表情符](http://docs.mattermost.com/help/settings/custom-emoji.html)。",
+  "help.messaging.format": "使用 Markdown 来 **格式您的消息**，它支持文字样式，标题，链接，表情符，代码块，块引用，表格，列表和内嵌图片。",
+  "help.messaging.notify": "**通知团友** 当他们需要时输入 `@用户名`。",
+  "help.messaging.reply": "点击消息文字旁的的回复图标来**回复消息**。",
   "help.messaging.title": "# 消息基础\n_____",
-  "help.messaging.write": "**Write messages** using the text input box at the bottom of Mattermost. Press **ENTER** to send a message. Use **Shift+ENTER** to create a new line without sending a message.",
+  "help.messaging.write": "用 Mattermost 底部的文字输入框 **编写消息**。按 **回车** 来发送消息。用 **SHIFT+回车** 以不发消息情况下换行。",
   "installed_command.header": "斜杠命令",
   "installed_commands.add": "添加斜杠命令",
   "installed_commands.empty": "未找到命令",
@@ -1308,6 +1313,7 @@
   "installed_integrations.creation": "{creator}在{createAt, date, full}中创建",
   "installed_integrations.delete": "删除",
   "installed_integrations.hideSecret": "隐藏密码",
+  "installed_integrations.regenSecret": "重生成盐",
   "installed_integrations.regenToken": "重新生成Token",
   "installed_integrations.showSecret": "显示密码",
   "installed_integrations.token": "令牌：{token}",
@@ -1329,7 +1335,7 @@
   "installed_oauth_apps.save": "保存",
   "installed_oauth_apps.search": "搜索 OAuth 2.0 应用",
   "installed_oauth_apps.trusted": "是受信任",
-  "installed_oauth_apps.trusted.no": "不",
+  "installed_oauth_apps.trusted.no": "否",
   "installed_oauth_apps.trusted.yes": "是",
   "installed_outgoing_webhooks.add": "添加对外Webhooks",
   "installed_outgoing_webhooks.empty": "没找到传出webhooks",
@@ -1349,31 +1355,31 @@
   "integrations.oauthApps.title": "OAuth 2.0 应用",
   "integrations.outgoingWebhook.description": "传出的网络挂接允许外部集成接收和响应信息",
   "integrations.outgoingWebhook.title": "引出Webhook",
-  "intro_messages.DM": "这是您和{teammate}私信记录的开始。<br/>此区域外的人不能看到这里共享的私信和文件。",
+  "intro_messages.DM": "这是您和{teammate}私信记录的开端。<br/>此区域外的人不能看到这里共享的私信和文件。",
   "intro_messages.anyMember": " 任何成员可以加入和查看这个频道。",
-  "intro_messages.beginning": "{name} 的开始",
+  "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.group": "私密小组",
+  "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.offTopic": "<h4 class=\"channel-intro__title\">{display_name}的开始</h4><p class=\"channel-intro__content\">这是{display_name}的开始,一个用于非工作的频道.<br/></p>",
+  "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.teammate": "这是你与组员私信记录的开始.此区外的人是看不到这里展示的私信和文件.",
+  "intro_messages.setHeader": "设置标题",
+  "intro_messages.teammate": "这是您与此团队成员私信记录的开端。在这里的直接消息和文件共享除了在此的人外无法看到。",
   "invite_member.addAnother": "添加另一个",
   "invite_member.autoJoin": "被邀请人将自动加入频道<strong>{channel}</strong>。",
   "invite_member.cancel": "取消",
-  "invite_member.content": "您团队的电子邮件目前已被禁用,不能发送电子邮件邀请。请联系您的系统管理员启用电子邮件和邮件邀请。",
-  "invite_member.disabled": "创建用户已禁用。详情请联系您的团队管理员。",
+  "invite_member.content": "您团队的电子邮件目前已被禁用，不能发送电子邮件邀请。请联系您的系统管理员启用电子邮件和邮件邀请。",
+  "invite_member.disabled": "您的团队已禁止创建用户。详情请联系您的团队管理员。",
   "invite_member.emailError": "请输入一个有效的电子邮件地址",
-  "invite_member.firstname": "姓",
+  "invite_member.firstname": "名字",
   "invite_member.inviteLink": "团队邀请链接",
-  "invite_member.lastname": "名字",
+  "invite_member.lastname": "姓氏",
   "invite_member.modalButton": "是的,抛弃",
-  "invite_member.modalMessage": "你有未寄出的邀请函,你确定你想要抛弃他们吗?",
+  "invite_member.modalMessage": "你有未寄出的邀请函，您确定你想要放弃它们吗？",
   "invite_member.modalTitle": "丢弃邀请？",
   "invite_member.newMember": "邀请新成员",
   "invite_member.send": "发送邀请",
@@ -1389,7 +1395,7 @@
   "leave_team_modal.no": "否",
   "leave_team_modal.title": "退出团队？",
   "leave_team_modal.yes": "是",
-  "loading_screen.loading": "加载",
+  "loading_screen.loading": "加载中",
   "login.changed": "登录方式修改成功",
   "login.create": "现在创建一个",
   "login.createTeam": "创建一个新的团队",
@@ -1436,7 +1442,7 @@
   "more_channels.create": "创建新频道",
   "more_channels.createClick": "点击'创建新频道'创建一个新的频道",
   "more_channels.join": "加入",
-  "more_channels.noMore": "没有更多频道加入",
+  "more_channels.noMore": "没有更多可加入的频道",
   "more_channels.title": "更多频道",
   "more_direct_channels.close": "关闭",
   "more_direct_channels.message": "消息",
@@ -1449,11 +1455,11 @@
   "navbar.delete": "删除频道...",
   "navbar.leave": "离开频道",
   "navbar.manageMembers": "成员管理",
-  "navbar.noHeader": "没有频道标语。{newline}{link}去添加。",
+  "navbar.noHeader": "没有频道标题。{newline}{link}去添加。",
   "navbar.preferences": "通知偏好",
   "navbar.rename": "重命名频道...",
-  "navbar.setHeader": "设置频道标语...",
-  "navbar.setPurpose": "设置频道的目的...",
+  "navbar.setHeader": "设置频道标题...",
+  "navbar.setPurpose": "设置频道的用途...",
   "navbar.toggle1": "切换侧边栏",
   "navbar.toggle2": "切换侧边栏",
   "navbar.viewInfo": "查看信息",
@@ -1468,7 +1474,7 @@
   "navbar_dropdown.leave": "离开团队",
   "navbar_dropdown.logout": "注销",
   "navbar_dropdown.manageMembers": "成员管理",
-  "navbar_dropdown.nativeApps": "下载原生应用",
+  "navbar_dropdown.nativeApps": "Download Mattermost Apps",
   "navbar_dropdown.report": "报告问题",
   "navbar_dropdown.switchTeam": "切换到{team}",
   "navbar_dropdown.switchTo": "切换到",
@@ -1506,11 +1512,11 @@
   "post_focus_view.beginning": "开始频道归档",
   "post_info.del": "删除",
   "post_info.edit": "编辑",
-  "post_info.mobile.flag": "标志",
-  "post_info.mobile.unflag": "取消标志",
-  "post_info.permalink": "超链接",
+  "post_info.mobile.flag": "标记",
+  "post_info.mobile.unflag": "取消标记",
+  "post_info.permalink": "永久链接",
   "post_info.reply": "回复",
-  "posts_view.loadMore": "载入更多的消息",
+  "posts_view.loadMore": "载入更多消息",
   "posts_view.newMsg": "新消息",
   "removed_channel.channelName": "频道",
   "removed_channel.from": "删除从",
@@ -1521,7 +1527,7 @@
   "rename_channel.defaultError": "-不能改变默认频道",
   "rename_channel.displayName": "显示名称",
   "rename_channel.displayNameHolder": "输入显示名",
-  "rename_channel.handle": "处理",
+  "rename_channel.handle": "识别名",
   "rename_channel.handleHolder": "小写字母数字#39;只有",
   "rename_channel.lowercase": "必须小写字母数字字符",
   "rename_channel.maxLength": "这个字段必须少于22个字符",
@@ -1531,10 +1537,10 @@
   "rhs_comment.comment": "评论",
   "rhs_comment.del": "删除",
   "rhs_comment.edit": "编辑",
-  "rhs_comment.mobile.flag": "标志",
-  "rhs_comment.mobile.unflag": "取消标志",
+  "rhs_comment.mobile.flag": "标记",
+  "rhs_comment.mobile.unflag": "取消标记",
   "rhs_comment.permalink": "永久链接",
-  "rhs_header.backToFlaggedTooltip": "回到已标志的贴",
+  "rhs_header.backToFlaggedTooltip": "回到已标记的信息",
   "rhs_header.backToResultsTooltip": "回到搜索结果",
   "rhs_header.closeSidebarTooltip": "关闭侧栏",
   "rhs_header.details": "消息详情",
@@ -1543,20 +1549,20 @@
   "rhs_root.del": "删除",
   "rhs_root.direct": "私信",
   "rhs_root.edit": "编辑",
-  "rhs_root.mobile.flag": "标志",
-  "rhs_root.mobile.unflag": "取消标志",
+  "rhs_root.mobile.flag": "标记",
+  "rhs_root.mobile.unflag": "取消标记",
   "rhs_root.permalink": "永久链接",
   "search_bar.cancel": "取消",
   "search_bar.search": "搜索",
-  "search_bar.usage": "<h4>搜索选项</h4><ul><li><span>使用</span><b>“引号”</b><span>搜索词组</span></li><li><span>使用</span><b>来自</b>的<span>查找来自特定用户和</span><b>的帖子，</b><span>中的查找特定频道的帖子</span></li></ul>",
+  "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_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>",
+  "search_item.jump": "跳转",
+  "search_results.because": "<ul><li>如果您需搜索一个部分词组（例如搜索 \"rea\"，查找 \"reach\" 或 \"reaction\"），请在结尾附上 *。</li><li>由于搜索结果的数量限制，双字母的搜索和 \"this\"，\"a\" 及 \"is\" 等常用词不会出现在搜索结果中。</li></ul>",
   "search_results.noResults": "没任何结果。重试？",
-  "search_results.usage": "<ul><li>使用<b>“引号”</b>搜索短语</li><li>使用<b>来自：</b>查找来自特定用户的帖子；使用<b>在：</b>查找在特定频道中的帖子</li></ul>",
+  "search_results.usage": "<ul><li>使用<b>\"双引号\"</b>搜索词组</li><li>使用<b>from：</b>查找来自特定用户的信息；使用<b>in：</b>查找特定频道中的信息</li></ul>",
   "setting_item_max.cancel": "取消",
   "setting_item_max.save": "保存",
   "setting_item_min.edit": "编辑",
@@ -1574,34 +1580,34 @@
   "sidebar.more": "更多",
   "sidebar.moreElips": "更多...",
   "sidebar.otherMembers": "此团队之外",
-  "sidebar.pg": "私人组",
+  "sidebar.pg": "私有组",
   "sidebar.removeList": "从列表删除",
   "sidebar.tutorialScreen1": "<h4>频道</h4><p><strong>频道</strong>组织不同主题的会话。他们对您所在团队的每一个人开放。针对单人发送私人消息使用<strong>私信</strong>针对多人使用<strong>私人组</strong>。</p>",
   "sidebar.tutorialScreen2": "<h4>“{townsquare}”和“{offtopic}”频道</h4><p>这里启用了两个公共频道: </p><p><strong>公共频道</strong>是一个团队范围内沟通的地方。团队中的每一个人都是这个频道的一个成员。</p><p><strong>闲聊频道</strong>是一个娱乐幽默与工作无关的频道。您和您的团队可以决定创建其他频道。</p>",
   "sidebar.tutorialScreen3": "<h4>创建和加入频道</h4><p>点击<strong>“更多...”</strong>创建一个新频道或加入一个现有频道。</p><p>您还可以通过点击频道或私人组旁的<strong>“+”符号</strong>，创建一个新频道或私人组。</p>",
-  "sidebar.unreadAbove": "未读帖子以上",
-  "sidebar.unreadBelow": "未读帖子以下",
+  "sidebar.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.flagged": "已标记的信息",
   "sidebar_right_menu.help": "帮助",
   "sidebar_right_menu.inviteNew": "邀请新成员",
   "sidebar_right_menu.logout": "注销",
   "sidebar_right_menu.manageMembers": "成员管理",
-  "sidebar_right_menu.nativeApps": "下载原生应用",
-  "sidebar_right_menu.recentMentions": "最近提到",
+  "sidebar_right_menu.nativeApps": "Download Mattermost Apps",
+  "sidebar_right_menu.recentMentions": "最近提及",
   "sidebar_right_menu.report": "报告问题",
   "sidebar_right_menu.switch_team": "团队选择",
   "sidebar_right_menu.teamLink": "获取团队邀请链接",
   "sidebar_right_menu.teamSettings": "团队设置",
   "sidebar_right_menu.viewMembers": "查看成员",
-  "signup.email": "邮箱和密码",
-  "signup.gitlab": "GitLab Single-Sign-On",
-  "signup.google": "Google Account",
-  "signup.ldap": "LDAP Credentials",
+  "signup.email": "电子邮箱和密码",
+  "signup.gitlab": "GitLab 单一登入",
+  "signup.google": "谷歌帐号",
+  "signup.ldap": "LDAP 登录身份",
   "signup.office365": "Office 365",
-  "signup.title": "Create an account with:",
+  "signup.title": "创建一个账户以：",
   "signup_team.choose": "您的团队：",
   "signup_team.createTeam": "或者创建一个团队",
   "signup_team.disabled": "团队创建已被禁用。请联系管理员获得权限。",
@@ -1664,7 +1670,7 @@
   "team_export_tab.unable": "不能导出: {error}",
   "team_import_tab.failure": "导入失败：",
   "team_import_tab.import": "导入",
-  "team_import_tab.importHelp": "<p>从Slack中导入一个团队，转到Slack>团队设置>导入/导出数据>导出>开始导出。Slack不允许您导出存储在Slack中的文件、图片、个人组或私信。因此，导入至Mattermost中的Slack只支持导入您Slack团队公共频道的文本信息。</p><p>导入至Mattermost中的Slack是Beta版本。尚未导入Slack bot帖子，暂不支持Slack @提到我的。</p>",
+  "team_import_tab.importHelp": "<p>从 Slack 中导入一个团队：前往 Slack >  Team Settings > Import/Export Data > Export > Start Export。Slack不允许您导出存储在Slack中的文件、图片、私人组或私信。因此，导入至 Mattermost 中的 Slack 只支持导入您 Slack 团队公共频道中的文本信息。</p><p>Mattermost 中的 Slack 导入功能是Beta版本。导入 Slack bot 的信息暂不支持。</p>",
   "team_import_tab.importSlack": "从Slack(Beta)导入",
   "team_import_tab.importing": "导入...",
   "team_import_tab.successful": "导入成功：",
@@ -1689,7 +1695,7 @@
   "team_settings_modal.importTab": "导入",
   "team_settings_modal.title": "团队设置",
   "textbox.bold": "**加粗**",
-  "textbox.edit": "编辑信息",
+  "textbox.edit": "编辑消息",
   "textbox.help": "帮助",
   "textbox.inlinecode": "`内嵌代码`",
   "textbox.italic": "_斜体_",
@@ -1719,11 +1725,11 @@
   "user.settings.advance.enabledFeatures": "已启用 {count, number} 项功能",
   "user.settings.advance.formattingDesc": "开启时，文章会显示链接，表情符，格式，以及添加断行。默认下，此选项时开启的。修改此设定需要刷新页面。",
   "user.settings.advance.formattingTitle": "启用帖文格式",
-  "user.settings.advance.joinLeaveDesc": "When \"On\", System Messages saying a user has joined or left a channel will be visible. When \"Off\", the System Messages about joining or leaving a channel will be hidden. A message will still show up when you are added to a channel, so you can receive a notification.",
+  "user.settings.advance.joinLeaveDesc": "当 \"开启\" 时，用户加入或退出频道将会显示系统消息。当 \"关闭\" 时，用户加入或退出频道将不会显示系统消息。不过您加入到一个频道时仍然会显示系统消息而收到通知。",
   "user.settings.advance.joinLeaveTitle": "开启加入/退出信息",
   "user.settings.advance.markdown_preview": "在消息输入框中显示markdown预览选项",
-  "user.settings.advance.off": "关",
-  "user.settings.advance.on": "开",
+  "user.settings.advance.off": "关闭",
+  "user.settings.advance.on": "开启",
   "user.settings.advance.preReleaseDesc": "检查您想预览的任何预发布功能。在设置生效前，您可能还需要刷新页面。",
   "user.settings.advance.preReleaseTitle": "预览预发布功能",
   "user.settings.advance.sendDesc": "如果启用“Enter”键插入一个新行，按“Ctrl+Enter”键提交消息。",
@@ -1733,9 +1739,9 @@
   "user.settings.custom_theme.awayIndicator": "离开显示",
   "user.settings.custom_theme.buttonBg": "按钮BG",
   "user.settings.custom_theme.buttonColor": "文本按钮",
-  "user.settings.custom_theme.centerChannelBg": "中心频道BG",
-  "user.settings.custom_theme.centerChannelColor": "中心频道文本",
-  "user.settings.custom_theme.centerChannelTitle": "输入频道样式",
+  "user.settings.custom_theme.centerChannelBg": "中间栏 BG",
+  "user.settings.custom_theme.centerChannelColor": "中间栏文本",
+  "user.settings.custom_theme.centerChannelTitle": "中间栏样式",
   "user.settings.custom_theme.codeTheme": "代码主题",
   "user.settings.custom_theme.copyPaste": "复制和粘贴分享主题颜色: ",
   "user.settings.custom_theme.linkButtonTitle": "链接已经按钮样式",
@@ -1747,8 +1753,8 @@
   "user.settings.custom_theme.newMessageSeparator": "新消息分隔符",
   "user.settings.custom_theme.onlineIndicator": "在线显示",
   "user.settings.custom_theme.sidebarBg": "侧边栏BG",
-  "user.settings.custom_theme.sidebarHeaderBg": "侧边栏头背景",
-  "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": "侧边栏文本活跃的颜色”",
@@ -1756,12 +1762,12 @@
   "user.settings.custom_theme.sidebarTitle": "侧栏风格",
   "user.settings.custom_theme.sidebarUnreadText": "侧边栏未读文本",
   "user.settings.display.channelDisplayTitle": "频道显示模式",
-  "user.settings.display.channeldisplaymode": "选择中央间频道的宽度。",
+  "user.settings.display.channeldisplaymode": "选择中间栏的宽度。",
   "user.settings.display.clockDisplay": "时钟显示",
   "user.settings.display.collapseDesc": "可用时，展开链接显示内容预览。",
   "user.settings.display.collapseDisplay": "链接预览",
-  "user.settings.display.collapseOff": "关",
-  "user.settings.display.collapseOn": "开",
+  "user.settings.display.collapseOff": "关闭",
+  "user.settings.display.collapseOn": "开启",
   "user.settings.display.fixedWidthCentered": "固定宽度，居中",
   "user.settings.display.fontDesc": "选择在Mattermost用户界面显示的字体。",
   "user.settings.display.fontTitle": "显示字体",
@@ -1774,7 +1780,7 @@
   "user.settings.display.messageDisplayDescription": "选择在频道里信息如何显示。",
   "user.settings.display.messageDisplayTitle": "信息显示",
   "user.settings.display.militaryClock": "24小时格式（例如：16:00）",
-  "user.settings.display.nameOptsDesc": "设置在帖子和私信列表中怎样显示其他用户的名字。",
+  "user.settings.display.nameOptsDesc": "设置在信息和私信列表中如何显示其他用户的名字。",
   "user.settings.display.normalClock": "12小时格式（例如：4:00 PM）",
   "user.settings.display.preferTime": "选择您喜欢的时间显示格式。",
   "user.settings.display.showFullname": "显示姓名",
@@ -1796,7 +1802,7 @@
   "user.settings.general.emailGitlabCantUpdate": "通过GitLab进行登录。电子邮件不能被更新，用于通知的电子邮件地址是{email}。",
   "user.settings.general.emailGoogleCantUpdate": "通过Google进行登录。电子邮件不能被更新。用于通知的电子邮件地址是{email}。",
   "user.settings.general.emailHelp1": "电子邮件地址用于登录，通知以及密码重置。如果修改电子邮件需要重新验证。",
-  "user.settings.general.emailHelp2": "电子邮件已被您的系统管理员禁用。未启用前您将无法收到通知邮件。",
+  "user.settings.general.emailHelp2": "电子邮件已被您的系统管理员禁用。未启用前将无法发送电子邮件通知。",
   "user.settings.general.emailHelp3": "电子邮件地址用于登录，通知以及密码重置。",
   "user.settings.general.emailHelp4": "验证邮件已发送到{email}。",
   "user.settings.general.emailLdapCantUpdate": "通过LDAP进行登录。电子邮件不能被更新，用于通知的电子邮件地址是{email}。",
@@ -1807,11 +1813,11 @@
   "user.settings.general.emptyName": "点击 '编辑' 添加您的全名",
   "user.settings.general.emptyNickname": "点击 '编辑' 添加一个昵称",
   "user.settings.general.field_handled_externally": "此栏由您的登入提供商决定。如果您想更改，您需要到您的登入提供者改动。",
-  "user.settings.general.firstName": "姓",
+  "user.settings.general.firstName": "名字",
   "user.settings.general.fullName": "全名",
   "user.settings.general.imageTooLarge": "无法上传头像。文件太大。",
   "user.settings.general.imageUpdated": "图片上次更新日期{date}",
-  "user.settings.general.lastName": "名字",
+  "user.settings.general.lastName": "姓氏",
   "user.settings.general.loginGitlab": "通过GitLab({email})登录",
   "user.settings.general.loginGoogle": "通过Google ({email})登录",
   "user.settings.general.loginLdap": "通过LDAP ({email})登录",
@@ -1833,12 +1839,12 @@
   "user.settings.general.validEmail": "请输入一个有效的电子邮件地址",
   "user.settings.general.validImage": "只能上传JPG和PNG图片",
   "user.settings.import_theme.cancel": "取消",
-  "user.settings.import_theme.importBody": "为导入主题,去Slack小组寻找“Preferences->SidebarTheme”.打开自定义主题选项,复制主题颜色值并粘贴: ",
+  "user.settings.import_theme.importBody": "如想导入主题，去 Slack 团队并寻找 \"Preferences -> Sidebar Theme\"。打开自定义主题选项，复制主题颜色值并粘贴至此：",
   "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 翻译服务器</a>。",
+  "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应用扫描二维码并填写一个由应用程序提供的令牌。",
@@ -1859,53 +1865,74 @@
   "user.settings.notifications.allActivity": "所有活动",
   "user.settings.notifications.channelWide": "频道范围提及 \"@channel\", \"@all\"",
   "user.settings.notifications.close": "关闭",
-  "user.settings.notifications.comments": "评论串通知",
-  "user.settings.notifications.commentsAny": "提到任何你参与的主题中的评论 (这包括提及你的主题和任何你评论后的评论)",
-  "user.settings.notifications.commentsInfo": "您参与的评论串的通知触发模式。",
-  "user.settings.notifications.commentsNever": "没有评论提及",
-  "user.settings.notifications.commentsRoot": "任何对你帖中的评论的提及",
+  "user.settings.notifications.comments": "回复通知",
+  "user.settings.notifications.commentsAny": "在我开头或回复过的消息串触发通知",
+  "user.settings.notifications.commentsInfo": "除了您被提及的通知外，选择如果您想收到串回复通知。",
+  "user.settings.notifications.commentsNever": "Do not trigger notifications on messages in reply threads unless I'm mentioned",
+  "user.settings.notifications.commentsRoot": "在我开头的消息串触发通知",
   "user.settings.notifications.desktop": "发送桌面通知",
+  "user.settings.notifications.desktop.allFirefoxForever": "所有活动，一直显示",
+  "user.settings.notifications.desktop.allFirefoxTimed": "所有活动，显示 {seconds} 秒",
+  "user.settings.notifications.desktop.allNoSoundForever": "所有活动，无声，一直显示",
+  "user.settings.notifications.desktop.allNoSoundTimed": "所有活动，无声，显示 {seconds} 秒",
+  "user.settings.notifications.desktop.allSoundForever": "所有活动，有声，一直显示",
+  "user.settings.notifications.desktop.allSoundTimed": "所有活动，有声，显示 {seconds} 秒",
+  "user.settings.notifications.desktop.duration": "通知时长",
+  "user.settings.notifications.desktop.durationInfo": "设置桌面通知将在屏幕显示多久。",
+  "user.settings.notifications.desktop.mentionsFirefoxForever": "提及和私信，一直显示",
+  "user.settings.notifications.desktop.mentionsFirefoxTimed": "提及和私信，显示 {seconds} 秒",
+  "user.settings.notifications.desktop.mentionsNoSoundForever": "提及和私信，无声，一直显示",
+  "user.settings.notifications.desktop.mentionsNoSoundTimed": "提及和私信，无声，显示 {seconds} 秒",
+  "user.settings.notifications.desktop.mentionsSoundForever": "提及和私信，有声，一直显示",
+  "user.settings.notifications.desktop.mentionsSoundTimed": "提及和私信，有声，显示 {seconds} 秒",
+  "user.settings.notifications.desktop.seconds": "{seconds} 秒",
+  "user.settings.notifications.desktop.sound": "通知声音",
+  "user.settings.notifications.desktop.title": "桌面通知",
+  "user.settings.notifications.desktop.unlimited": "无限制",
   "user.settings.notifications.desktopSounds": "桌面通知声音",
-  "user.settings.notifications.emailBatchingInfo": "通知将根据这里设置的最高频率合并多条通知到一条电子邮件发送。",
-  "user.settings.notifications.emailInfo": "当您离开{siteName}超过5分钟或离线，系统将发送提到和私信的电子邮件通知。",
-  "user.settings.notifications.emailNotifications": "发送电子邮件通知",
+  "user.settings.notifications.emailBatchingInfo": "一段时间内收到的通知将合并到一封电子邮件。",
+  "user.settings.notifications.emailInfo": "当您离开{siteName}超过5分钟或离线，系统将发送提及和私信的电子邮件通知。",
+  "user.settings.notifications.emailNotifications": "邮件通知",
   "user.settings.notifications.everyHour": "每小时",
   "user.settings.notifications.everyXMinutes": "每 {minute} 分钟",
   "user.settings.notifications.header": "通知",
   "user.settings.notifications.immediately": "立刻",
-  "user.settings.notifications.info": "桌面通知在Firefox、Safari、Chrome、InternetExplorer和Edge中有效。",
+  "user.settings.notifications.info": "桌面通知可在 火狐, Safari 以及 Chrome 下使用。",
   "user.settings.notifications.never": "从不",
   "user.settings.notifications.noWords": "敏感词没有配置",
-  "user.settings.notifications.off": "关",
-  "user.settings.notifications.on": "开",
+  "user.settings.notifications.off": "关闭",
+  "user.settings.notifications.on": "开启",
   "user.settings.notifications.onlyMentions": "只在提及和私信中",
-  "user.settings.notifications.push": "发送手机推送",
+  "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.sounds_info": "通知声音可在 IE11, Edge, Safari 以及 Chrome 下使用。",
   "user.settings.notifications.teamWide": "团队范围的提及\"@all\"",
   "user.settings.notifications.title": "通知设置",
   "user.settings.notifications.usernameMention": "您提到的用户名“@{username}”",
   "user.settings.notifications.wordsTrigger": "触发提及词",
-  "user.settings.push_notification.allActivityAway": "For all activity when away or offline",
-  "user.settings.push_notification.allActivityOffline": "For all activity when offline",
-  "user.settings.push_notification.allActivityOnline": "For all activity when online, away or offline",
-  "user.settings.push_notification.away": "Away or offline",
+  "user.settings.push_notification.allActivityAway": "所有离开或离线时的活动",
+  "user.settings.push_notification.allActivityOffline": "所有离线时的活动",
+  "user.settings.push_notification.allActivityOnline": "所有在线，离开或离线时的活动",
+  "user.settings.push_notification.away": "离开或离线",
   "user.settings.push_notification.disabled": "被系统管理员禁用",
   "user.settings.push_notification.disabled_long": "移动设备推送通知已被系统管理员停用。",
   "user.settings.push_notification.info": "当 Mattermost 有活动时会推送通知到您的移动设备。",
-  "user.settings.push_notification.off": "关",
-  "user.settings.push_notification.offline": "Offline",
-  "user.settings.push_notification.online": "Online, away or offline",
-  "user.settings.push_notification.onlyMentionsAway": "For mentions and direct messages when away or offline",
-  "user.settings.push_notification.onlyMentionsOffline": "For mentions and direct messages when offline",
-  "user.settings.push_notification.onlyMentionsOnline": "For mentions and direct messages when online, away or offline",
-  "user.settings.push_notification.status_info": "Notification alerts are pushed to your mobile device depending on your online status.",
+  "user.settings.push_notification.off": "关闭",
+  "user.settings.push_notification.offline": "离线",
+  "user.settings.push_notification.online": "在线，离开或离线",
+  "user.settings.push_notification.onlyMentionsAway": "所有离开或离线时的提及和私信",
+  "user.settings.push_notification.onlyMentionsOffline": "所有离线时的提及和私信",
+  "user.settings.push_notification.onlyMentionsOnline": "所有在线，离开或离线时的提及和私信",
+  "user.settings.push_notification.send": "发送手机推送",
+  "user.settings.push_notification.status": "触发推送通知当",
+  "user.settings.push_notification.status_info": "通知只有在您的在线状态符合以上选择时才发送推送。",
   "user.settings.security.close": "关闭",
   "user.settings.security.currentPassword": "当前密码",
-  "user.settings.security.currentPasswordError": "请输入您的当前密码",
+  "user.settings.security.currentPasswordError": "请输入您当前密码。",
+  "user.settings.security.deauthorize": "解除授权",
   "user.settings.security.emailPwd": "邮箱和密码",
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "谷歌",
@@ -1916,6 +1943,10 @@
   "user.settings.security.logoutActiveSessions": "查看并退出正在执行的会话",
   "user.settings.security.method": "登录方式",
   "user.settings.security.newPassword": "新密码",
+  "user.settings.security.noApps": "没有任何授权的 OAuth 2.0 应用。",
+  "user.settings.security.oauthApps": "OAuth 2.0 应用",
+  "user.settings.security.oauthAppsDescription": "点击 '编辑' 来管理您的 OAuth 2.0 应用",
+  "user.settings.security.oauthAppsHelp": "应用以您的名义根据您设定的权限读取您的数据。",
   "user.settings.security.office365": "Office 365",
   "user.settings.security.oneSignin": "同时间只能用一种方式登录。切换登录方式会有邮件告知您改动是否成功。",
   "user.settings.security.password": "密码",
@@ -1937,20 +1968,20 @@
   "user.settings.security.passwordErrorUppercaseSymbol": "您的密码必须包含至少 {min} 个字符且至少有一个大写字母以及一个符号（如\"~!@#$%^&*()\"）。",
   "user.settings.security.passwordGitlabCantUpdate": "通过GitLab登录。电子邮件不能被更新。",
   "user.settings.security.passwordLdapCantUpdate": "通过LDAP登录。电子邮件不能被更新。",
-  "user.settings.security.passwordMatchError": "您输入的新密码不匹配",
+  "user.settings.security.passwordMatchError": "您输入的新密码不一致。",
   "user.settings.security.passwordMinLength": "无效最小长度，无法显示预览。",
   "user.settings.security.retypePassword": "再次输入新密码",
   "user.settings.security.saml": "SAML",
   "user.settings.security.switchEmail": "切换到使用邮箱和密码登录",
-  "user.settings.security.switchGitlab": "切换到使用GitLabSSO登录",
-  "user.settings.security.switchGoogle": "切换到GoogleSSO登录",
-  "user.settings.security.switchLdap": "切换至使用LDAP",
-  "user.settings.security.switchOffice365": "切换到使用Office 365 SSO",
-  "user.settings.security.switchSaml": "切换到使用SAML SSO登录",
+  "user.settings.security.switchGitlab": "切换到使用 GitLab SSO",
+  "user.settings.security.switchGoogle": "切换到使用 Google SSO",
+  "user.settings.security.switchLdap": "切换到使用 LDAP",
+  "user.settings.security.switchOffice365": "切换到使用 Office 365 SSO",
+  "user.settings.security.switchSaml": "切换到使用 SAML SSO",
   "user.settings.security.title": "安全设置",
   "user.settings.security.viewHistory": "查看访问历史",
   "user_list.notFound": "没有找到用户",
-  "view_image.loading": "加载中",
+  "view_image.loading": "加载中 ",
   "view_image_popover.download": "下载",
   "view_image_popover.file": "文件 {total}/{count}",
   "view_image_popover.publicLink": "获取公开链接",
diff --git a/webapp/i18n/zh_TW.json b/webapp/i18n/zh_TW.json
index 48489e00a..6f5efdaee 100644
--- a/webapp/i18n/zh_TW.json
+++ b/webapp/i18n/zh_TW.json
@@ -102,7 +102,7 @@
   "add_oauth_app.description.help": "OAuth 2.0 應用程式的敘述。",
   "add_oauth_app.descriptionRequired": "請填入 OAuth 2.0 應用程式的敘述。",
   "add_oauth_app.doneHelp": "已設定 OAuth 2.0 應用程式。當應用程式要求認證時請用以下的用戶端 ID 與用戶端密碼。",
-  "add_oauth_app.doneUrlHelp": "請發送資料到以下的網址。",
+  "add_oauth_app.doneUrlHelp": "以下為您所授權的重導向網址。",
   "add_oauth_app.header": "新增",
   "add_oauth_app.homepage.help": "OAuth 2.0 應用程式的首頁網址。請根據伺服器設定選擇 HTTP 或 HTTPS。",
   "add_oauth_app.homepageRequired": "請填入 OAuth 2.0 應用程式的首頁網址。",
@@ -141,6 +141,7 @@
   "admin.audits.title": "使用者活動記錄",
   "admin.authentication.email": "電子郵件認證",
   "admin.authentication.gitlab": "GitLab",
+  "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
   "admin.banner.heading": "註：",
@@ -198,6 +199,8 @@
   "admin.compliance_table.userId": "要求者",
   "admin.connectionSecurityNone": "無",
   "admin.connectionSecurityNoneDescription": "Mattermost 將使用不安全的連線。",
+  "admin.connectionSecurityPlain": "PLAIN",
+  "admin.connectionSecurityPlainDescription": "Mattermost 將使用不安全的連線來連線跟認證。",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "不安全的連線，嘗試提升為 TLS 安全連線",
   "admin.connectionSecurityTest": "測試連線",
@@ -214,7 +217,7 @@
   "admin.customization.enableCustomEmojiTitle": "啟用自訂繪文字：",
   "admin.customization.iosAppDownloadLinkDesc": "新增下載 iOS 應用程式的連結。用行動網頁瀏覽器存取站台的使用者將會看到提示頁面以下載應用程式。此欄留空則不會出現提示頁面。",
   "admin.customization.iosAppDownloadLinkTitle": "iOS 應用程式下載連結：",
-  "admin.customization.nativeAppLinks": "原生應用程式連結：",
+  "admin.customization.nativeAppLinks": "Mattermost App Links",
   "admin.customization.restrictCustomEmojiCreationAdmin": "允許系統及團隊管理員新增自訂繪文字",
   "admin.customization.restrictCustomEmojiCreationAll": "允許所有人新增自訂繪文字",
   "admin.customization.restrictCustomEmojiCreationDesc": "限制僅特定使用者可以新增自訂繪文字。",
@@ -383,7 +386,7 @@
   "admin.image.storeTitle": "檔案儲存系統：",
   "admin.image.thumbHeightDescription": "上傳圖片的縮圖高度。改變這個值只會改變之後的縮圖如何顯示，但不會改變以前的縮圖。",
   "admin.image.thumbHeightExample": "例如：\"100\"",
-  "admin.image.thumbHeightTitle": "附加檔案縮圖高：",
+  "admin.image.thumbHeightTitle": "附件檔案縮圖高：",
   "admin.image.thumbWidthDescription": "上傳圖片的縮圖寬度。改變這個值只會改變之後的縮圖如何顯示，但不會改變以前的縮圖。",
   "admin.image.thumbWidthExample": "例如：\"120\"",
   "admin.image.thumbWidthTitle": "附加檔案縮圖寬：",
@@ -401,13 +404,13 @@
   "admin.ldap.emailAttrTitle": "電子郵件位址屬性：",
   "admin.ldap.enableDesc": "啟用時，Mattermost 允許使用 LDAP 登入",
   "admin.ldap.enableTitle": "啟用 LDAP 登入：",
-  "admin.ldap.firstnameAttrDesc": "用於設定 Mattermost 使用者名字的 LDAP 伺服器屬性。",
+  "admin.ldap.firstnameAttrDesc": "(非必須) 用於設定 Mattermost 使用者名字的 LDAP 伺服器屬性。",
   "admin.ldap.firstnameAttrEx": "如：\"givenName\"",
   "admin.ldap.firstnameAttrTitle": "名字屬性",
   "admin.ldap.idAttrDesc": "此屬性在 LDAP 伺服器上的值將會被用做 Mattermost 裡獨特、唯一的識別值。該屬性值最好不會變更，例如使用者名稱 或 uid。如果一個使用者的這個屬性值有所變更，Mattermost 將會根據新值建立一個跟原本帳戶無關的新帳戶。這將是未來使用者在 Mattermost 登入頁面所要填入\"LDAP 使用者名稱\"欄位的值。通常此屬性設定成與上面的\"用戶名稱\"屬性相同。如果您的團隊習慣用 domain\\username 登入其他使用 LDAP 認證的服務，最好在本欄位填入 domain\\username 以保持一致性。",
   "admin.ldap.idAttrEx": "例如：\"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "ID 的屬性：",
-  "admin.ldap.lastnameAttrDesc": "用於設定 Mattermost 使用者姓氏的 LDAP 伺服器屬性。",
+  "admin.ldap.lastnameAttrDesc": "(非必須) 用於設定 Mattermost 使用者姓氏的 LDAP 伺服器屬性。",
   "admin.ldap.lastnameAttrEx": "例如：\"sn\"",
   "admin.ldap.lastnameAttrTitle": "姓氏屬性：",
   "admin.ldap.loginNameDesc": "顯示在登入頁面上登入欄位的提示字。預設為\"LDAP 使用者名稱\"。",
@@ -415,7 +418,7 @@
   "admin.ldap.loginNameTitle": "登入欄位名：",
   "admin.ldap.maxPageSizeEx": "例如：\"2000\"",
   "admin.ldap.maxPageSizeHelpText": "Mattermost 向 LDAP 伺服器請求使用者資料時單次最多的數量。0表示無上限。",
-  "admin.ldap.maxPageSizeTitle": "最大分頁大小",
+  "admin.ldap.maxPageSizeTitle": "最大分頁大小：",
   "admin.ldap.nicknameAttrDesc": "(非必須) 用於設定 Mattermost 使用者暱稱的 LDAP 伺服器屬性。",
   "admin.ldap.nicknameAttrEx": "例如：\"匿稱\"",
   "admin.ldap.nicknameAttrTitle": "匿稱的屬性：",
@@ -429,13 +432,15 @@
   "admin.ldap.serverDesc": "LDAP 伺服器的網域或 IP 位址。",
   "admin.ldap.serverEx": "例如：\"10.0.0.23\"",
   "admin.ldap.serverTitle": "LDAP 伺服器：",
-  "admin.ldap.skipCertificateVerification": "跳過驗證憑證",
+  "admin.ldap.skipCertificateVerification": "跳過驗證憑證：",
   "admin.ldap.skipCertificateVerificationDesc": "TLS 或 STARTTLS 連線時跳過驗證憑證。不建議使用於需要 TLS 的正式環境。測試用設定。",
   "admin.ldap.syncFailure": "同步失敗：{error}",
   "admin.ldap.syncIntervalHelpText": "LDAP 同步更新 Mattermost 使用者資料以反應 LDAP 伺服器上的變更。舉例來說，當 LDAP 伺服器上一個使用者名字改變時，在執行同步的時候這個改變會更新 Mattermost。在 LDAP 伺服器上被移除或是停用的帳號，其對應的 Mattermost 帳號會被設定成“停用”，並且撤銷帳號的工作階段。Mattermost 根據輸入的間隔執行同步。如，如果輸入60，Mattermost將會每60分鐘同步一次。",
-  "admin.ldap.syncIntervalTitle": "同步間隔(分)",
+  "admin.ldap.syncIntervalTitle": "同步間隔(分)：",
   "admin.ldap.syncNowHelpText": "立刻開始 LDAP 同步。",
   "admin.ldap.sync_button": "開始 LDAP 同步",
+  "admin.ldap.testFailure": "LDAP 測試失敗：{error}",
+  "admin.ldap.testHelpText": "測試 Mattermost 與 LDAP 伺服器間的連線。如需詳細錯誤訊息，請參閱紀錄檔案。",
   "admin.ldap.uernameAttrDesc": "用於設定 Mattermost 使用者名稱的 LDAP 伺服器屬性。這有可能跟 ID 為同一個屬性。",
   "admin.ldap.userFilterDisc": "(非必須)輸入 LDAP 過濾條件用來搜尋使用者。只有該條件找出來的用戶可以存取 Mattermost。對Active Directory，排除被關閉的使用者的條件為 (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2)))。",
   "admin.ldap.userFilterEx": "例如 \"(objectClass=user)\"",
@@ -513,9 +518,9 @@
   "admin.password.requirementsDescription": "有效密碼所應有的字元類型。",
   "admin.password.symbol": "至少一個符號(\"~!@#$%^&*()\")",
   "admin.password.uppercase": "至少一個大寫英文字母",
-  "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": "啟用張貼頻率限制：",
@@ -558,7 +563,7 @@
   "admin.saml.enableTitle": "啟用 SAML 登入：",
   "admin.saml.encryptDescription": "啟用時，Mattermost 會解密利用您的服務提供者的公開憑證所加密的 SAML 宣告。",
   "admin.saml.encryptTitle": "啟用加密：",
-  "admin.saml.firstnameAttrDesc": "用於設定 Mattermost 使用者名字的 SAML 宣告屬性。",
+  "admin.saml.firstnameAttrDesc": "(非必須) 用於設定 Mattermost 使用者暱稱的 SAML 宣告屬性。",
   "admin.saml.firstnameAttrEx": "如 \"FirstName\"",
   "admin.saml.firstnameAttrTitle": "名字屬性：",
   "admin.saml.idpCertificateFileDesc": "身分識別提供者所簽發的公開認證憑證。",
@@ -570,7 +575,7 @@
   "admin.saml.idpUrlDesc": "Mattermost 發送 SAML 要求以開始登入程序的網址。",
   "admin.saml.idpUrlEx": "如：\"https://idp.example.org/SAML2/SSO/Login\"",
   "admin.saml.idpUrlTitle": "SAML SSO 網址：",
-  "admin.saml.lastnameAttrDesc": "用於設定 Mattermost 使用者姓氏的 SAML 宣告屬性。",
+  "admin.saml.lastnameAttrDesc": "(非必須) 用於設定 Mattermost 使用者暱稱的 SAML 宣告屬性。",
   "admin.saml.lastnameAttrEx": "如：\"LastName\"",
   "admin.saml.lastnameAttrTitle": "姓氏屬性：",
   "admin.saml.localeAttrDesc": "(非必須) 用於設定 Mattermost 使用者暱稱的 SAML 宣告屬性。",
@@ -627,8 +632,8 @@
   "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": "啟用時，將允許 Webhook 以及斜線命令修改發文時的圖示。註：此功能跟允許覆蓋使用者名稱並用時有導致釣魚攻擊的可能性。",
-  "admin.service.iconTitle": "允許 Webhook 以及斜線命令置換個人圖像：",
+  "admin.service.iconDescription": "啟用時，將允許 Webhook 以及斜線命令還有其他整合功能 (如 <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>) 修改發文時的圖示。註：此功能跟允許覆蓋使用者名稱並用時有導致釣魚攻擊的可能性。",
+  "admin.service.iconTitle": "允許外部整合功能置換個人圖像：",
   "admin.service.insecureTlsDesc": "允許時，所有的對外 HTTPS 請求將會接受未驗證、自簽章的憑證。如：將允許傳出的 Webhook 連至任意網域下使用自簽章的 TLS 憑證的伺服器。註：這樣將產生中間人攻擊的危險性。",
   "admin.service.insecureTlsTitle": "啟用不安全的對外連線：",
   "admin.service.integrationAdmin": "限制僅團隊與系統管理者可以建立整合功能：",
@@ -642,8 +647,8 @@
   "admin.service.mobileSessionDaysDesc": "從使用者最後一次輸入他們的認證到工作階段過期之間的天數。修改設定之後新的工作階段長度會在下次使用者輸入認證之後開始生效。",
   "admin.service.outWebhooksDesc": "啟用時，允許傳出的 Webhook。請參閱<a href='http://docs.mattermost.com/developer/webhooks-outgoing.html' target='_blank'>文件</a>。",
   "admin.service.outWebhooksTitle": "啟用傳出的 Webhook：",
-  "admin.service.overrideDescription": "啟用時，將允許 Webhook 以及斜線命令修改發文時的使用者名稱。註：此功能跟允許覆蓋圖示並用時有導致釣魚攻擊的可能性。",
-  "admin.service.overrideTitle": "允許 Webhook 以及斜線命令置換使用者名稱：",
+  "admin.service.overrideDescription": "啟用時，將允許 Webhook 以及斜線命令還有其他整合功能 (如 <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>) 修改發文時的使用者名稱。註：此功能跟允許覆蓋圖示並用時有導致釣魚攻擊的可能性。",
+  "admin.service.overrideTitle": "允許外部整合功能置換使用者名稱：",
   "admin.service.securityDesc": "啟用時，如果過去12小時內有發布相關的安全性修正，將會寄發通知信給系統管理者。需要啟用電子郵件功能。",
   "admin.service.securityTitle": "啟用安全性示警: ",
   "admin.service.segmentDescription": "Segment.com 是個可以用來追蹤詳細系統使用狀況的線上服務。您可以在 Segment.com 註冊一個免費帳號以獲取金鑰。",
@@ -684,14 +689,14 @@
   "admin.sidebar.gitlab": "GitLab",
   "admin.sidebar.images": "圖片",
   "admin.sidebar.integrations": "整合",
-  "admin.sidebar.ldap": "LDAP",
+  "admin.sidebar.ldap": "AD/LDAP",
   "admin.sidebar.legalAndSupport": "法律與支援",
   "admin.sidebar.license": "版本與授權",
   "admin.sidebar.localization": "語言",
   "admin.sidebar.logging": "記錄",
   "admin.sidebar.login": "登入",
   "admin.sidebar.logs": "記錄",
-  "admin.sidebar.nativeAppLinks": "原生應用程式連結：",
+  "admin.sidebar.nativeAppLinks": "Mattermost App Links",
   "admin.sidebar.notifications": "通知",
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "其它",
@@ -963,7 +968,7 @@
   "channel_loader.posted": "已發文",
   "channel_loader.socketError": "無法連線到 Mattermost。如果問題持續存在，請系統管理員檢查 WebSocket 連接埠。",
   "channel_loader.someone": "某人",
-  "channel_loader.something": " 做一些新的事情",
+  "channel_loader.something": " 做了新事",
   "channel_loader.unknown_error": "從伺服器收到不在預期內的狀態碼。",
   "channel_loader.uploadedFile": " 已上傳一個檔案",
   "channel_loader.uploadedImage": " 已上傳一張圖片",
@@ -1056,7 +1061,7 @@
   "create_post.comment": "註解",
   "create_post.post": "訊息",
   "create_post.shortcutsNotSupported": "此裝置不支援鍵盤快速鍵。",
-  "create_post.tutorialTip": "<h4>發送訊息</h4><p>在這邊輸入訊息並按下 <strong>Enter</strong> 來發文。</p><p>按下<strong>附加</strong>按鈕來上傳圖片或是檔案。</p>",
+  "create_post.tutorialTip": "<h4>發送訊息</h4><p>在這邊輸入訊息並按下 <strong>Enter</strong> 來發文。</p><p>按下<strong>附件</strong>按鈕來上傳圖片或是檔案。</p>",
   "create_post.write": "輸入訊息...",
   "create_team.agreement": "一旦建立帳號使用{siteName}，即表示您同意<a href='/static/help/terms.html'>服務條款</a>以及<a href='/static/help/privacy.html'>隱私政策</a>。如果您不同意，請停止使用{siteName}。",
   "create_team.display_name.back": "回到上一步",
@@ -1201,15 +1206,15 @@
   "get_team_invite_link_modal.title": "團隊邀請連結",
   "help.attaching.downloading": "#### 下載檔案\n按檔案縮圖旁邊的下載圖示以下載附加檔案，或是打開檔案預覽並按**下載**。",
   "help.attaching.dragdrop": "#### 拖放功能\n從電腦拖拉檔案到右側邊欄或是中間來上傳檔案。拖放功能會將檔案附加至訊息輸入框，接著你可以輸入訊息或是直接按下**ENTER**發文。",
-  "help.attaching.icon": "#### 附加檔案圖示\n或者您也可以藉由按訊息輸入框裡面的灰色迴紋針以上傳檔案。這將會開啟系統的檔案瀏覽器，您可以在此尋找想要的檔案並按下**開啟**將檔案上傳至訊息輸入框。接著輸入訊息或是直接按下**ENTER**發文。",
+  "help.attaching.icon": "#### 附件檔案圖示\n或者您也可以藉由按訊息輸入框裡面的灰色迴紋針以上傳檔案。這將會開啟系統的檔案瀏覽器，您可以在此尋找想要的檔案並按下**開啟**將檔案上傳至訊息輸入框。接著輸入訊息或是直接按下**ENTER**發文。",
   "help.attaching.limitations": "## 檔案大小限制\n在 Mattermost 中，每個訊息最多可以附加五個檔案，每個檔案最大為 50Mb。",
-  "help.attaching.methods": "## 如何附加檔案\n拖放檔案或是按下訊息輸入框的附加檔案圖示。",
+  "help.attaching.methods": "## 如何附加檔案\n拖放檔案或是按下訊息輸入框的附件檔案圖示。",
   "help.attaching.notSupported": "尚未支援文件預覽 (Word, Excel, PPT)。",
   "help.attaching.pasting": "#### 貼上\n使用 Chrome 跟 Edge 瀏覽器時，您也可以直接從剪貼簿貼上以上傳檔案。此功能尚未支援其他瀏覽器。",
   "help.attaching.previewer": "## 檔案預覽器\nMattermost 有內建檔案預覽器用來觀看、下載檔案並分享公開連結。按附加檔案的縮圖便可以用檔案預覽器打開。",
-  "help.attaching.publicLinks": "#### 分享公開連結\n公開連結讓您可以分享附加檔案給 Mattermost 團隊以外的人。按下附加檔案縮圖以打開檔案預覽器然後按**取得公開連結**。這會開啟一個帶有連結的對話框。當分享這個連結給他人並被他人打開的時候，會自動開始下載檔案。",
+  "help.attaching.publicLinks": "#### 分享公開連結\n公開連結讓您可以分享附件檔案給 Mattermost 團隊以外的人。按下附件檔案縮圖以打開檔案預覽器然後按**取得公開連結**。這會開啟一個帶有連結的對話框。當分享這個連結給他人並被他人打開的時候，會自動開始下載檔案。",
   "help.attaching.publicLinks2": "如果檔案預覽器裡面找不到**取得公開連結**但想要啟用這功能，您可以詢問系統管理員請他在系統主控台裡的**安全** > **公開連結**處開啟。",
-  "help.attaching.supported": "#### 支援的媒體類型\n如果您嘗試預覽預覽器不支援的媒體，檔案預覽器會顯示附加檔案的標準圖示。支援的媒體格式跟瀏覽器以及作業系統高度相關，不過在大部分瀏覽器上使用 Mattermost 支援下列的格式：",
+  "help.attaching.supported": "#### 支援的媒體類型\n如果您嘗試預覽預覽器不支援的媒體，檔案預覽器會顯示附件檔案的標準圖示。支援的媒體格式跟瀏覽器以及作業系統高度相關，不過在大部分瀏覽器上使用 Mattermost 支援下列的格式：",
   "help.attaching.supportedList": "- 圖片：BMP, GIF, JPG, JPEG, PNG\n- 影像：MP4\n- 聲音：MP3, M4A\n- 文件：PDF",
   "help.attaching.title": "# 附加檔案\n_____",
   "help.commands.builtin": "## 內建命令\n下列的斜線命令在所有的 Mattermost 上都可以使用：",
@@ -1233,7 +1238,7 @@
   "help.formatting.emojiExample": ":smile: :+1: :sheep:",
   "help.formatting.emojis": "## 繪文字\n\n輸入 `:` 打開繪文字自動完成。完整的繪文字列表在[這裡](http://www.emoji-cheat-sheet.com/)。如果您想要用的繪文字不存在，也可以自己建立[自訂繪文字](http://docs.mattermost.com/help/settings/custom-emoji.html)。",
   "help.formatting.example": "如：",
-  "help.formatting.githubTheme": "**GitHub 主題**",
+  "help.formatting.githubTheme": "**GitHub 主題配色**",
   "help.formatting.headings": "## 標題\n\n在標題前輸入 # 跟一個空白以建立標題。用多一點的 # 以建立小一點的標題。",
   "help.formatting.headings2": "或是用 `===` 或 `---` 在文字的下一行劃線來建立標題。",
   "help.formatting.headings2Example": "大標題\n-------------",
@@ -1246,46 +1251,46 @@
   "help.formatting.linkEx": "[看看 Mattermost!](https://about.mattermost.com/)",
   "help.formatting.links": "## 連結\n\n將想顯示的文字放入方括號跟對應的連結放入括號以建立連結。",
   "help.formatting.listExample": "* 列表項目一\n* 列表項目二\n    * 項目二子項目",
-  "help.formatting.lists": "## Lists\n\nCreate a list by using `*` or `-` as bullets. Indent a bullet point by adding two spaces in front of it.",
-  "help.formatting.monokaiTheme": "**Monokai Theme**",
-  "help.formatting.ordered": "Make it an ordered list by using numbers instead:",
-  "help.formatting.orderedExample": "1. Item one\n2. Item two",
-  "help.formatting.quotes": "## Block quotes\n\nCreate block quotes using `>`.",
-  "help.formatting.quotesExample": "`> block quotes` renders as:",
-  "help.formatting.quotesRender": "> block quotes",
-  "help.formatting.renders": "Renders as:",
-  "help.formatting.solirizedDarkTheme": "**Solarized Dark Theme**",
-  "help.formatting.solirizedLightTheme": "**Solarized Light Theme**",
-  "help.formatting.style": "## Text Style\n\nYou can use either `_` or `*` around a word to make it italic. Use two to make it bold.\n\n* `_italics_` renders as _italics_\n* `**bold**` renders as **bold**\n* `**_bold-italic_**` renders as **_bold-italics_**\n* `~~strikethrough~~` renders as ~~strikethrough~~",
+  "help.formatting.lists": "## 清單\n\n用 `*` 或 `-` 當作項目符號來產生清單。可以在項目符號前面加上 2 個空白來縮排。",
+  "help.formatting.monokaiTheme": "**Monokai 主題配色**",
+  "help.formatting.ordered": "改用數字來建立順序清單：",
+  "help.formatting.orderedExample": "1. 項目一\n2. 項目二",
+  "help.formatting.quotes": "## 引述區塊\n\n用 `>` 建立像是引述的區塊。",
+  "help.formatting.quotesExample": "`> 引述區塊` 顯示為：",
+  "help.formatting.quotesRender": "> 引述區塊",
+  "help.formatting.renders": "顯示為：",
+  "help.formatting.solirizedDarkTheme": "**Solarized Dark 主題配色**",
+  "help.formatting.solirizedLightTheme": "**Solarized Light 主題配色**",
+  "help.formatting.style": "## 文字樣式\n\n用 `_` 或 `*` 將文字括起來以使用斜體，用 2 個則顯示粗體。\n\n* `_斜體_` 顯示為 _斜體_\n* `**粗體**` 顯示為 **粗體**\n* `**_粗斜_**` 顯示為 **_粗斜_**\n* `~~刪除線~~` 顯示為 ~~刪除線~~",
   "help.formatting.supportedSyntax": "支援的語言：\n`as`, `applescript`, `osascript`, `scpt`, `bash`, `sh`, `zsh`, `clj`, `boot`, `cl2`, `cljc`, `cljs`, `cljs.hl`, `cljscm`, `cljx`, `hic`, `coffee`, `_coffee`, `cake`, `cjsx`, `cson`, `iced`, `cpp`, `c`, `cc`, `h`, `c++`, `h++`, `hpp`, `cs`, `csharp`, `css`, `d`, `di`, `dart`, `delphi`, `dpr`, `dfm`, `pas`, `pascal`, `freepascal`, `lazarus`, `lpr`, `lfm`, `diff`, `django`, `jinja`, `dockerfile`, `docker`, `erl`, `f90`, `f95`, `fsharp`, `fs`, `gcode`, `nc`, `go`, `groovy`, `handlebars`, `hbs`, `html.hbs`, `html.handlebars`, `hs`, `hx`, `java`, `jsp`, `js`, `jsx`, `json`, `jl`, `kt`, `ktm`, `kts`, `less`, `lisp`, `lua`, `mk`, `mak`, `md`, `mkdown`, `mkd`, `matlab`, `m`, `mm`, `objc`, `obj-c`, `ml`, `perl`, `pl`, `php`, `php3`, `php4`, `php5`, `php6`, `ps`, `ps1`, `pp`, `py`, `gyp`, `r`, `ruby`, `rb`, `gemspec`, `podspec`, `thor`, `irb`, `rs`, `scala`, `scm`, `sld`, `scss`, `st`, `sql`, `swift`, `tex`, `vbnet`, `vb`, `bas`, `vbs`, `v`, `veo`, `xml`, `html`, `xhtml`, `rss`, `atom`, `xsl`, `plist`, `yaml`",
-  "help.formatting.syntax": "### Syntax Highlighting\n\nTo add syntax highlighting, type the language to be highlighted after the ``` at the beginning of the code block. Mattermost also offers four different code themes (GitHub, Solarized Dark, Solarized Light, Monokai) that can be changed in **Account Settings** > **Display** > **Theme** > **Custom Theme** > **Center Channel Styles**",
+  "help.formatting.syntax": "### 標示語法\n\n在程式碼區塊起始的 ``` 後面輸入想標示的語言以標示語法。Mattermost 提供四種不同的主題配色 (GitHub, Solarized Dark, Solarized Light, Monokai) ，可在 **帳號設定** > **顯示** > **主題** > **自訂主題** > **中央頻道樣式** 變更設定。",
   "help.formatting.syntaxEx": "    package main\n    import \"fmt\"\n    func main() {\n        fmt.Println(\"Hello, 世界\")\n    }",
-  "help.formatting.tableExample": "| Left-Aligned  | Center Aligned  | Right Aligned |\n| :------------ |:---------------:| -----:|\n| Left column 1 | this text       |  $100 |\n| Left column 2 | is              |   $10 |\n| Left column 3 | centered        |    $1 |",
-  "help.formatting.tables": "## Tables\n\nCreate a table by placing a dashed line under the header row and separating the columns with a pipe `|`. (The columns don’t need to line up exactly for it to work). Choose how to align table columns by including colons `:` within the header row.",
-  "help.formatting.title": "# Formatting Text\n_____",
-  "help.learnMore": "Learn more about:",
-  "help.link.attaching": "Attaching Files",
-  "help.link.commands": "# 執行指令\n___",
-  "help.link.composing": "Composing Messages and Replies",
-  "help.link.formatting": "Formatting Messages using Markdown",
-  "help.link.mentioning": "Mentioning Teammates",
-  "help.link.messaging": "Basic Messaging",
-  "help.mentioning.channel": "#### @Channel\nYou can mention an entire channel by typing `@channel`. All members of the channel will receive a mention notification that behaves the same way as if the members had been mentioned personally.",
-  "help.mentioning.channelExample": "@channel great work on interviews this week. I think we found some excellent potential candidates!",
-  "help.mentioning.mentions": "## @Mentions\nUse @mentions to get the attention of specific team members.",
-  "help.mentioning.recent": "## Recent Mentions\nClick `@` next to the search box to query for your most recent @mentions and words that trigger mentions. Click **Jump** next to a search result in the RHS to jump the center pane to the channel and location of the message with the mention.",
-  "help.mentioning.title": "# Mentioning Teammates\n_____",
-  "help.mentioning.triggers": "## Words That Trigger Mentions\nIn addition to being notified by @username and @channel, you can customize words that trigger mention notifications in **Account Settings** > **Notifications** > **Words that trigger mentions**. By default, you will receive mention notifications on your first name, and you can add more words by typing them into the input box separated by commas. This is useful if you want to be notified of all posts on certain topics, for example, “interviewing” or “marketing”.",
-  "help.mentioning.username": "#### @Username\nYou can mention a teammate by using the `@` symbol plus their username to send them a mention notification.\n\nType `@` to bring up a list of team members who can be mentioned. To filter the list, type the first few letters of any username, first name, last name, or nickname. The **Up** and **Down** arrow keys can then be used to scroll through entries in the list, and pressing **ENTER** will select which user to mention. Once selected, the username will automatically replace the full name or nickname.\nThe following example sends a special mention notification to **alice** that alerts her of the channel and message where she has been mentioned. If **alice** is away from Mattermost and has [email notifications](http://docs.mattermost.com/help/getting-started/configuring-notifications.html#email-notifications) turned on, then she will receive an email alert of her mention along with the message text.",
-  "help.mentioning.usernameCont": "If the user you mentioned does not belong to the channel, a System Message will be posted to let you know. This is a temporary message only seen by the person who triggered it. To add the mentioned user to the channel, go to the dropdown menu beside the channel name and select **Add Members**.",
-  "help.mentioning.usernameExample": "@alice how did your interview go with the new candidate?",
-  "help.messaging.attach": "**Attach files** by dragging and dropping into Mattermost or clicking the attachment icon in the text input box.",
-  "help.messaging.emoji": "**Quickly add emoji** by typing \":\", which will open an emoji autocomplete. If the existing emoji don't cover what you want to express, you can also create your own [Custom Emoji](http://docs.mattermost.com/help/settings/custom-emoji.html).",
-  "help.messaging.format": "**Format your messages** using Markdown that supports text styling, headings, links, emoticons, code blocks, block quotes, tables, lists and in-line images.",
-  "help.messaging.notify": "**Notify teammates** when they are needed by typing `@username`.",
-  "help.messaging.reply": "**Reply to messages** by clicking the reply arrow next to the message text.",
-  "help.messaging.title": "# Messaging Basics\n_____",
-  "help.messaging.write": "**Write messages** using the text input box at the bottom of Mattermost. Press **ENTER** to send a message. Use **Shift+ENTER** to create a new line without sending a message.",
+  "help.formatting.tableExample": "| 靠左對齊 | 置中對齊  | 靠右對齊 |\n| :------- |:---------:| --------:|\n| 左欄位 1 | 這文字    |     $100 |\n| 左欄位 2 | 為        |      $10 |\n| 左欄位 3 | 置中      |       $1 |",
+  "help.formatting.tables": "## 表格\n\n在標頭列底下放上虛線並用直立線符號 `|` 分隔欄位來建立表格 (欄位不需要精準的對齊)。在標頭列加入冒號 `:` 來設定欄位該如何對齊。",
+  "help.formatting.title": "# 設定文字格式\n_____",
+  "help.learnMore": "獲取更多訊息：",
+  "help.link.attaching": "附加檔案",
+  "help.link.commands": "執行指令",
+  "help.link.composing": "編寫訊息跟回覆",
+  "help.link.formatting": "用 Markdown 設定訊息文字",
+  "help.link.mentioning": "提及團隊成員",
+  "help.link.messaging": "基本傳訊",
+  "help.mentioning.channel": "#### @頻道\n輸入 `@channel` 來提及整個頻道。頻道的所有成員都會像被單獨提及一樣收到提及通知。",
+  "help.mentioning.channelExample": "@channel 這周的面試大家做的好，我覺得我們應該找到了些很有潛力的應徵者！",
+  "help.mentioning.mentions": "## @提及\n用 @提及 來引起特定團隊成員的注意。",
+  "help.mentioning.recent": "## 最近提及\n按下搜尋欄旁邊的 `@` 查詢最近的 @提及跟觸發提及的字。按右側邊欄裡搜尋結果旁的**跳至**來將中間欄移動至提及的頻道跟提及訊息的位置。",
+  "help.mentioning.title": "# 提及團隊成員\n_____",
+  "help.mentioning.triggers": "## 觸發提及的字\n除了被 @使用者名稱 跟 @頻道 通知以外，您還可以在 **帳號設定** > **通知** > **觸發提及的字** 自訂觸發提及的字。預設為您的名字，在輸入欄輸入更多的字並用逗號分隔來增加觸發字。在想要接收所有關於某主題的訊息時這功能特別有用，如：\"面試\"或\"行銷\"。",
+  "help.mentioning.username": "#### @使用者名稱\n用 `@` 符號加上他們的使用者名稱來發送提及通知給團隊成員。\n\n輸入 `@` 打開可以提及的團隊成員清單。輸入使用者名稱、名字、姓氏或暱稱的前幾個字母以過濾清單。用**上** 跟 **下** 方向鍵來捲動清單，按 **ENTER** 選擇要提及的使用者。一旦選取，使用者名稱會自動取代全名或是暱稱。\n以下的例子將發送提及通知給 **alice** ，該通知將會告訴她被提及的訊息跟頻道。如果 **alice** 正好離開 Mattermost 且有啟用[電子郵件通知](http://docs.mattermost.com/help/getting-started/configuring-notifications.html#email-notifications)，她將會收到帶有訊息的電子郵件通知。",
+  "help.mentioning.usernameCont": "如果提及的使用者不屬於這頻道，系統將會發出訊息讓您知道。這會是個暫時訊息且只有您看的到。按頻道名稱旁邊的下拉選單並選**新增成員**將提及的使用者加進頻道。",
+  "help.mentioning.usernameExample": "@alice 你跟應徵者的面試過得怎樣？",
+  "help.messaging.attach": "拖放檔案到 Mattermost 或是按文字輸入框旁邊的附件圖示來**附加檔案**。",
+  "help.messaging.emoji": "輸入 \":\" 開啟繪文字的自動完成以**快速增加繪文字**。如果已有的繪文字不夠用，可以建立新的[自訂繪文字](http://docs.mattermost.com/help/settings/custom-emoji.html)。",
+  "help.messaging.format": "使用 Markdown 來**設定訊息格式**，它支援文字樣式、標題、連結、表情符號、程式碼區塊、引述區塊、表格、清單跟內嵌圖片。",
+  "help.messaging.notify": "當需要團隊成員時輸入 `@使用者名稱` 來**通知團隊成員**。",
+  "help.messaging.reply": "按訊息文字旁邊的回覆箭頭以**回覆訊息**。",
+  "help.messaging.title": "# 傳訊基礎\n_____",
+  "help.messaging.write": "用 Mattermost 底部的文字輸入框來**編寫訊息**。按 **ENTER** 發送訊息。用 **Shift+ENTER** 在不發送訊息下插入新行。",
   "installed_command.header": "斜線命令",
   "installed_commands.add": "新增斜線命令",
   "installed_commands.empty": "沒有命令",
@@ -1308,6 +1313,7 @@
   "installed_integrations.creation": "由{creator}在{createAt, date, full}所建立",
   "installed_integrations.delete": "刪除",
   "installed_integrations.hideSecret": "隱藏密碼",
+  "installed_integrations.regenSecret": "重新產生密碼",
   "installed_integrations.regenToken": "重新產生 Token",
   "installed_integrations.showSecret": "顯示密碼",
   "installed_integrations.token": "Token：{token}",
@@ -1408,7 +1414,7 @@
   "login.noEmailUsername": "請輸入電子郵件地址或使用者名稱",
   "login.noEmailUsernameLdapUsername": "請輸入電子郵件地址、使用者名稱或 {ldapUsername}",
   "login.noLdapUsername": "請輸入 {ldapUsername}",
-  "login.noMethods": "No sign in methods are enabled. Please contact your System Administrator.",
+  "login.noMethods": "沒有啟用的登入方法。請聯絡系統管理員。",
   "login.noPassword": "請輸入密碼",
   "login.noUsername": "請輸入使用者名稱",
   "login.noUsernameLdapUsername": "請輸入使用者名稱或 {ldapUsername}",
@@ -1468,7 +1474,7 @@
   "navbar_dropdown.leave": "離開團隊",
   "navbar_dropdown.logout": "登出",
   "navbar_dropdown.manageMembers": "會員管理",
-  "navbar_dropdown.nativeApps": "下載原生應用程式",
+  "navbar_dropdown.nativeApps": "Download Mattermost Apps",
   "navbar_dropdown.report": "回報錯誤",
   "navbar_dropdown.switchTeam": "切換至 {team}",
   "navbar_dropdown.switchTo": "切換至：",
@@ -1490,7 +1496,7 @@
   "password_send.link": "<p>已寄送密碼重置連結到<b>{email}</b></p>",
   "password_send.reset": "重置我的密碼",
   "password_send.title": "密碼重設",
-  "pdf_preview.max_pages": "PDF previews only show the first five pages.",
+  "pdf_preview.max_pages": "PDF 預覽只顯示前五頁。",
   "pending_post_actions.cancel": "取消",
   "pending_post_actions.retry": "重試",
   "permalink.error.access": "此永久連結通往被刪除的訊息或是您沒有觀看權限的頻道。",
@@ -1589,7 +1595,7 @@
   "sidebar_right_menu.inviteNew": "邀請新成員",
   "sidebar_right_menu.logout": "登出",
   "sidebar_right_menu.manageMembers": "成員管理",
-  "sidebar_right_menu.nativeApps": "下載原生應用程式",
+  "sidebar_right_menu.nativeApps": "Download Mattermost Apps",
   "sidebar_right_menu.recentMentions": "最近提及",
   "sidebar_right_menu.report": "回報錯誤",
   "sidebar_right_menu.switch_team": "選擇團隊",
@@ -1597,11 +1603,11 @@
   "sidebar_right_menu.teamSettings": "團隊設定",
   "sidebar_right_menu.viewMembers": "檢視成員",
   "signup.email": "電子郵件跟密碼",
-  "signup.gitlab": "GitLab Single-Sign-On",
-  "signup.google": "Google Account",
-  "signup.ldap": "LDAP Credentials",
+  "signup.gitlab": "GitLab 單一登入",
+  "signup.google": "Google 帳號",
+  "signup.ldap": "LDAP 認證",
   "signup.office365": "Office 365",
-  "signup.title": "Create an account with:",
+  "signup.title": "用下列之一建立帳號：",
   "signup_team.choose": "您所屬的團隊：",
   "signup_team.createTeam": "或是建立團隊",
   "signup_team.disabled": "建立團隊功能已被停用。如須使用請聯絡系統管理員。",
@@ -1664,7 +1670,7 @@
   "team_export_tab.unable": " 無法匯出：{error}",
   "team_import_tab.failure": " 匯入失敗：",
   "team_import_tab.import": "匯入",
-  "team_import_tab.importHelp": "<p>由 Slack 匯入團隊：前往 Slack > Team Settings > Import/Export Data > Export > Start Export。Slack 無法匯出 Slack 當中的檔案、圖片、私人群組或直接訊息。因此 Mattermost 的匯入 Slack 功能只支援匯入在您 Slack 團隊的公開頻道中的文字訊息</p><p>Mattermost 的匯入 Slack 功能是 beta 版。目前無法匯入Slack bot 的貼文並且尚未支援 Slack 的 @mentions。</p>",
+  "team_import_tab.importHelp": "<p>由 Slack 匯入團隊：前往 Slack > Team Settings > Import/Export Data > Export > Start Export。Slack 無法匯出 Slack 當中的檔案、圖片、私人群組或直接訊息。因此 Mattermost 的匯入 Slack 功能只支援匯入在您 Slack 團隊的公開頻道中的文字訊息</p><p>Mattermost 的匯入 Slack 功能是 beta 版。目前無法匯入Slack bot 的貼文。</p>",
   "team_import_tab.importSlack": "由 Slack 匯入 (Beta)",
   "team_import_tab.importing": " 匯入中...",
   "team_import_tab.successful": " 匯入成功：",
@@ -1719,8 +1725,8 @@
   "user.settings.advance.enabledFeatures": "已啟用 {count, number} 項功能",
   "user.settings.advance.formattingDesc": "啟用時，文章會顯示連結、顯示繪文字、套用樣式到文字上並自動斷行。此設定預設為開啟。修改此設定後需要重新讀取頁面以生效。",
   "user.settings.advance.formattingTitle": "啟用文章格式設定",
-  "user.settings.advance.joinLeaveDesc": "When \"On\", System Messages saying a user has joined or left a channel will be visible. When \"Off\", the System Messages about joining or leaving a channel will be hidden. A message will still show up when you are added to a channel, so you can receive a notification.",
-  "user.settings.advance.joinLeaveTitle": "Enable Join/Leave Messages",
+  "user.settings.advance.joinLeaveDesc": "當\"啟用\"時，頻道會顯示使用者加入或離開的系統訊息。當\"關閉\"時，頻道會隱藏使用者加入或離開的系統訊息。當您被加入頻道時，不論設定如何都會顯示訊息以提醒您。",
+  "user.settings.advance.joinLeaveTitle": "啟用加入/離開訊息",
   "user.settings.advance.markdown_preview": "在訊息輸入方塊顯示 Markdown 預覽選項",
   "user.settings.advance.off": "關閉",
   "user.settings.advance.on": "啟用",
@@ -1859,53 +1865,74 @@
   "user.settings.notifications.allActivity": "所有的活動",
   "user.settings.notifications.channelWide": "對頻道全員的提及 \"@channel\"、\"@all\"",
   "user.settings.notifications.close": "關閉",
-  "user.settings.notifications.comments": "註解串通知",
-  "user.settings.notifications.commentsAny": "您有參與的註解串中有任何新註解時通知您 (包括您為首文張貼人時的所有註解以及在您註解一個貼文之後對該文的所有註解)",
-  "user.settings.notifications.commentsInfo": "您參與的註解串中新貼文觸發通知的模式",
-  "user.settings.notifications.commentsNever": "對註解不通知",
-  "user.settings.notifications.commentsRoot": "通知所有對您的貼文的註解",
+  "user.settings.notifications.comments": "回覆通知",
+  "user.settings.notifications.commentsAny": "我開啟或是有參與的討論串有回覆時觸發通知",
+  "user.settings.notifications.commentsInfo": "除了被提及的時候通知外，選擇是否要接受討論串回覆通知。",
+  "user.settings.notifications.commentsNever": "Do not trigger notifications on messages in reply threads unless I'm mentioned",
+  "user.settings.notifications.commentsRoot": "我開啟的討論串有訊息時觸發通知",
   "user.settings.notifications.desktop": "發送桌面通知",
+  "user.settings.notifications.desktop.allFirefoxForever": "所有的活動，一直顯示",
+  "user.settings.notifications.desktop.allFirefoxTimed": "所有的活動，顯示 {seconds} 秒",
+  "user.settings.notifications.desktop.allNoSoundForever": "所有的活動，無通知音效，一直顯示",
+  "user.settings.notifications.desktop.allNoSoundTimed": "所有的活動，無通知音效，顯示 {seconds} 秒",
+  "user.settings.notifications.desktop.allSoundForever": "所有的活動，有通知音效，一直顯示",
+  "user.settings.notifications.desktop.allSoundTimed": "所有的活動，有通知音效，顯示 {seconds} 秒",
+  "user.settings.notifications.desktop.duration": "通知長度",
+  "user.settings.notifications.desktop.durationInfo": "設定桌面通知在畫面上顯示多久。",
+  "user.settings.notifications.desktop.mentionsFirefoxForever": "提及跟直接訊息，一直顯示",
+  "user.settings.notifications.desktop.mentionsFirefoxTimed": "提及跟直接訊息，顯示 {seconds} 秒",
+  "user.settings.notifications.desktop.mentionsNoSoundForever": "提及跟直接訊息，無通知音效，一直顯示",
+  "user.settings.notifications.desktop.mentionsNoSoundTimed": "提及跟直接訊息，無通知音效，顯示 {seconds} 秒",
+  "user.settings.notifications.desktop.mentionsSoundForever": "提及跟直接訊息，有通知音效，一直顯示",
+  "user.settings.notifications.desktop.mentionsSoundTimed": "提及跟直接訊息，有通知音效，顯示 {seconds} 秒",
+  "user.settings.notifications.desktop.seconds": "{seconds} 秒",
+  "user.settings.notifications.desktop.sound": "通知音效",
+  "user.settings.notifications.desktop.title": "桌面通知",
+  "user.settings.notifications.desktop.unlimited": "無限制",
   "user.settings.notifications.desktopSounds": "桌面通知音效",
-  "user.settings.notifications.emailBatchingInfo": "通知將會合併成一封電子郵件並根據這邊選擇的最長頻率發送。",
+  "user.settings.notifications.emailBatchingInfo": "於所選的時間間隔內收到的通知將被合併成一封電子郵件寄送。",
   "user.settings.notifications.emailInfo": "在離線或是離開 {siteName} 超過 5 分鐘時，會發送電子郵件以通知關於您的提及與直接訊息。",
-  "user.settings.notifications.emailNotifications": "發送電子郵件通知",
+  "user.settings.notifications.emailNotifications": "電子郵件通知",
   "user.settings.notifications.everyHour": "每小時",
   "user.settings.notifications.everyXMinutes": "每 {count} 分鐘",
   "user.settings.notifications.header": "通知",
   "user.settings.notifications.immediately": "立即",
-  "user.settings.notifications.info": "只有 Firefox、Safari、Chrome、Internet Explorer 和 Edge 可以使用桌面通知。",
+  "user.settings.notifications.info": "Firefox、Safari、Chrome 可以使用桌面通知。",
   "user.settings.notifications.never": "永不",
   "user.settings.notifications.noWords": "沒有設定單字",
   "user.settings.notifications.off": "關閉",
   "user.settings.notifications.on": "啟用",
   "user.settings.notifications.onlyMentions": "僅限於提及跟直接訊息",
-  "user.settings.notifications.push": "發送行動推播",
+  "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、Internet Explorer 和 Edge 可以使用桌面通知音效。",
+  "user.settings.notifications.sounds_info": "IE11、Edge、Safari、Chrome 可以使用通知音效。",
   "user.settings.notifications.teamWide": "對團隊全員的提及 \"@all\"",
   "user.settings.notifications.title": "通知設定",
   "user.settings.notifications.usernameMention": "提及您的使用者名稱 \"@{username}\"",
   "user.settings.notifications.wordsTrigger": "觸發提及的字",
-  "user.settings.push_notification.allActivityAway": "For all activity when away or offline",
-  "user.settings.push_notification.allActivityOffline": "For all activity when offline",
-  "user.settings.push_notification.allActivityOnline": "For all activity when online, away or offline",
-  "user.settings.push_notification.away": "Away or offline",
+  "user.settings.push_notification.allActivityAway": "離開或離線時的所有活動",
+  "user.settings.push_notification.allActivityOffline": "離線時的所有活動",
+  "user.settings.push_notification.allActivityOnline": "線上、離開或離線時的所有活動",
+  "user.settings.push_notification.away": "離開或離線",
   "user.settings.push_notification.disabled": "被系統管理員停用",
   "user.settings.push_notification.disabled_long": "行動裝置推播已被系統管理員停用。",
   "user.settings.push_notification.info": "當 Mattermost 有活動時會推發通知提醒到您的行動裝置。",
   "user.settings.push_notification.off": "關閉",
-  "user.settings.push_notification.offline": "Offline",
-  "user.settings.push_notification.online": "Online, away or offline",
-  "user.settings.push_notification.onlyMentionsAway": "For mentions and direct messages when away or offline",
-  "user.settings.push_notification.onlyMentionsOffline": "For mentions and direct messages when offline",
-  "user.settings.push_notification.onlyMentionsOnline": "For mentions and direct messages when online, away or offline",
-  "user.settings.push_notification.status_info": "Notification alerts are pushed to your mobile device depending on your online status.",
+  "user.settings.push_notification.offline": "離線",
+  "user.settings.push_notification.online": "線上、離開或離線",
+  "user.settings.push_notification.onlyMentionsAway": "線上、離開或離線時的提及跟直接訊息",
+  "user.settings.push_notification.onlyMentionsOffline": "離線時的提及跟直接訊息",
+  "user.settings.push_notification.onlyMentionsOnline": "線上、離開或離線時的提及跟直接訊息",
+  "user.settings.push_notification.send": "發送行動推播通知",
+  "user.settings.push_notification.status": "何時觸發推播通知",
+  "user.settings.push_notification.status_info": "只有在上線狀態符合上面的選項時才會發送通知到行動裝置上。",
   "user.settings.security.close": "關閉",
   "user.settings.security.currentPassword": "目前的密碼",
   "user.settings.security.currentPasswordError": "請輸入原先的密碼。",
+  "user.settings.security.deauthorize": "解除授權",
   "user.settings.security.emailPwd": "電子郵件跟密碼",
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "Google",
@@ -1916,6 +1943,10 @@
   "user.settings.security.logoutActiveSessions": "觀看並登出使用中的工作階段",
   "user.settings.security.method": "登入方式",
   "user.settings.security.newPassword": "新密碼",
+  "user.settings.security.noApps": "尚未授權給任一 OAuth 2.0 應用程式。",
+  "user.settings.security.oauthApps": "OAuth 2.0 應用程式",
+  "user.settings.security.oauthAppsDescription": "按'編輯'來管理 OAuth 2.0 應用程式",
+  "user.settings.security.oauthAppsHelp": "應用程式根據您准許的權限代表您存取個人資料。",
   "user.settings.security.office365": "Office 365",
   "user.settings.security.oneSignin": "同時間只能只用一種登入方式。如果更換登入方式成功，將會寄送通知信。",
   "user.settings.security.password": "密碼",