translations PR 20170807 (#7144)

* translations PR 20170807

* Fix pt-BR variable

14 files changed, 6740 insertions, 1540 deletions

diff --git a/i18n/de.json b/i18n/de.json
index 83fcf0344..d8377a768 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -81,7 +81,7 @@
   },
   {
     "id": "api.admin.recycle_db_start.warn",
-    "translation": "Versuche die Datenbankverbindung erneut zu verwenden."
+    "translation": "Versuche die Datenbankverbindung zu recyclen."
   },
   {
     "id": "api.admin.remove_certificate.delete.app_error",
@@ -417,7 +417,7 @@
   },
   {
     "id": "api.command.execute_command.failed.app_error",
-    "translation": "Ein Befehl mit dem Trigger '{{.Trigger}}' ist fehlgeschlagen"
+    "translation": "Befehl mit dem Trigger '{{.Trigger}}' ist fehlgeschlagen"
   },
   {
     "id": "api.command.execute_command.failed_empty.app_error",
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "Befehl mit dem Auslösewort '{{.Trigger}}' nicht gefunden. Um eine Nachricht mit \"/\" beginnend zu senden, versuchen Sie ein Leerzeichen vor der Nachricht zu setzen."
+    "translation": "Befehl mit dem Auslösewort '{{.Trigger}}' nicht gefunden. Um eine Nachricht mit \"/\" beginnend zu senden, versuchen Sie ein Leerzeichen an den Beginn der Nachricht zu setzen."
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -485,7 +485,7 @@
   },
   {
     "id": "api.command.update.app_error",
-    "translation": "Ungültige Berechtigungen um den Befehl zu aktualisieren"
+    "translation": "Ungültige Berechtigungen, um den Befehl zu aktualisieren"
   },
   {
     "id": "api.command_away.desc",
@@ -513,7 +513,7 @@
   },
   {
     "id": "api.command_channel_header.message.app_error",
-    "translation": "Der Befehl /überschrift muss Text beinhalten"
+    "translation": "Der Befehl /überschrift muss Text beinhalten."
   },
   {
     "id": "api.command_channel_header.name",
@@ -521,7 +521,7 @@
   },
   {
     "id": "api.command_channel_header.permission.app_error",
-    "translation": "Sie haben nicht die benötigten Berechtigungen, um die Kanalüberschrift zu bearbeiten."
+    "translation": "Sie haben nicht die nötigen Berechtigungen, um die Kanalüberschrift zu bearbeiten."
   },
   {
     "id": "api.command_channel_header.update_channel.app_error",
@@ -532,6 +532,90 @@
     "translation": "Kanalüberschrift erfolgreich aktualisiert."
   },
   {
+    "id": "api.command_channel_purpose.channel.app_error",
+    "translation": "Fehler beim Laden des aktuellen Kanals."
+  },
+  {
+    "id": "api.command_channel_purpose.desc",
+    "translation": "Kanalzweck bearbeiten"
+  },
+  {
+    "id": "api.command_channel_purpose.direct_group.app_error",
+    "translation": "Kann Kanalzweck nicht für Direktnachrichten setzen. Benutzen sie stattdessen /überschrift, um den Kanalzweck zu setzen."
+  },
+  {
+    "id": "api.command_channel_purpose.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_purpose.message.app_error",
+    "translation": "Es muss eine Nachricht für den Befehl /zweck angegeben werden."
+  },
+  {
+    "id": "api.command_channel_purpose.name",
+    "translation": "zweck"
+  },
+  {
+    "id": "api.command_channel_purpose.permission.app_error",
+    "translation": "Sie haben nicht die nötigen Berechtigungen, um den Kanalzweck zu bearbeiten."
+  },
+  {
+    "id": "api.command_channel_purpose.update_channel.app_error",
+    "translation": "Fehler beim Aktualisieren des aktuellen Kanals."
+  },
+  {
+    "id": "api.command_channel_rename.channel.app_error",
+    "translation": "Fehler beim Laden des aktuellen Kanals."
+  },
+  {
+    "id": "api.command_channel_rename.desc",
+    "translation": "Kanal umbenennen"
+  },
+  {
+    "id": "api.command_channel_rename.direct_group.app_error",
+    "translation": "Direktnachrichtenkanäle können nicht umbenannt werden."
+  },
+  {
+    "id": "api.command_channel_rename.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_rename.message.app_error",
+    "translation": "Es muss eine Nachricht für den Befehl /umbenennen angegeben werden."
+  },
+  {
+    "id": "api.command_channel_rename.name",
+    "translation": "umbenennen"
+  },
+  {
+    "id": "api.command_channel_rename.permission.app_error",
+    "translation": "Sie haben nicht die nötigen Berechtigungen, um den Kanal umzubenennen."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.app_error",
+    "translation": "Fehler beim Aktualisieren des aktuellen Kanals."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.success",
+    "translation": "Kanalname erfolgreich aktualisiert."
+  },
+  {
+    "id": "api.command_code.desc",
+    "translation": "Text als Codeblock anzeigen"
+  },
+  {
+    "id": "api.command_code.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_code.message.app_error",
+    "translation": "Es muss eine Nachricht für den Befehl /code angegeben werden."
+  },
+  {
+    "id": "api.command_code.name",
+    "translation": "code"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "Automatisches Einklappen von Bildervorschauen einschalten"
   },
@@ -541,7 +625,7 @@
   },
   {
     "id": "api.command_collapse.success",
-    "translation": "Links zu Bildern werden per Standard verkleinert"
+    "translation": "Links zu Bildern werden nun per Standard verkleinert"
   },
   {
     "id": "api.command_echo.create.app_error",
@@ -549,11 +633,11 @@
   },
   {
     "id": "api.command_echo.delay.app_error",
-    "translation": "Die Verzögerung muss kürzer als 10000 Sekunden sein"
+    "translation": "Verzögerungen müssen kürzer als 10000 Sekunden sein"
   },
   {
     "id": "api.command_echo.desc",
-    "translation": "Echo-Beschreibung des Benutzerkontos"
+    "translation": "Text, der durch Verwendung des Befehls /echo von ihrem Benutzerkonto gesendet wird"
   },
   {
     "id": "api.command_echo.high_volume.app_error",
@@ -565,7 +649,7 @@
   },
   {
     "id": "api.command_echo.message.app_error",
-    "translation": "Es muss eine Nachricht für den /echo Befehl angegeben werden."
+    "translation": "Es muss eine Nachricht für den Befehl /echo angegeben werden."
   },
   {
     "id": "api.command_echo.name",
@@ -624,6 +708,30 @@
     "translation": "Kanal beigetreten."
   },
   {
+    "id": "api.command_leave.desc",
+    "translation": "Leave the current channel"
+  },
+  {
+    "id": "api.command_leave.fail.app_error",
+    "translation": "Es trat ein Fehler beim Betreten des Kanals auf."
+  },
+  {
+    "id": "api.command_leave.list.app_error",
+    "translation": "Es trat ein Fehler beim Auflisten der Kanäle auf."
+  },
+  {
+    "id": "api.command_leave.missing.app_error",
+    "translation": "Der Kanal konnte nicht gefunden werden"
+  },
+  {
+    "id": "api.command_leave.name",
+    "translation": "leave"
+  },
+  {
+    "id": "api.command_leave.success",
+    "translation": "Left the channel."
+  },
+  {
     "id": "api.command_logout.desc",
     "translation": "Von Mattermost abmelden"
   },
@@ -717,7 +825,7 @@
   },
   {
     "id": "api.command_search.name",
-    "translation": "suche"
+    "translation": "suchen"
   },
   {
     "id": "api.command_search.unsupported.app_error",
@@ -725,7 +833,7 @@
   },
   {
     "id": "api.command_settings.desc",
-    "translation": "Öffnet die Kontoeinstellungen"
+    "translation": "Kontoeinstellungen öffnen"
   },
   {
     "id": "api.command_settings.name",
@@ -949,7 +1057,7 @@
   },
   {
     "id": "api.context.mfa_required.app_error",
-    "translation": "Multifaktor-Authentifikation ist auf diesem Server erforderlich."
+    "translation": "Multi-Faktor-Authentifizierung ist auf diesem Server erforderlich."
   },
   {
     "id": "api.context.missing_teamid.app_error",
@@ -1009,7 +1117,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
-    "translation": "Direktnachricht"
+    "translation": "Direct Message from "
   },
   {
     "id": "api.email_batching.render_batched_post.go_to_post",
@@ -1017,7 +1125,11 @@
   },
   {
     "id": "api.email_batching.render_batched_post.group_message",
-    "translation": "Gruppennachricht"
+    "translation": "Group Message from "
+  },
+  {
+    "id": "api.email_batching.render_batched_post.notification",
+    "translation": "Notification from "
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
@@ -1026,8 +1138,8 @@
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
     "translation": {
-      "one": "Sie haben eine neue Nachricht.",
-      "other": "Sie haben {{.Count}} neue Nachrichten."
+      "one": "You have a new notification.",
+      "other": "You have {{.Count}} new notifications."
     }
   },
   {
@@ -1511,7 +1623,7 @@
   },
   {
     "id": "api.oauth.invalid_state_token.app_error",
-    "translation": "Ungültiges Status-Token"
+    "translation": "Ungültiger Status-Token"
   },
   {
     "id": "api.oauth.regenerate_secret.app_error",
@@ -1696,24 +1808,12 @@
     "translation": "Fehler beim Abrufen der Teams während des Senden von teamübergreifender DM user_id=%v, err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.mention_body",
-    "translation": "Sie haben eine neue Erwähnung."
-  },
-  {
     "id": "api.post.send_notifications_and_forget.mention_subject",
     "translation": "Neue Erwähnung"
   },
   {
-    "id": "api.post.send_notifications_and_forget.message_body",
-    "translation": "Sie haben eine neue Nachricht."
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.message_subject",
-    "translation": "Neue Direktnachricht"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " Eine oder mehrere Dateien hochgeladen "
+    "translation": " Eine oder mehrere Dateien hochgeladen in "
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only_dm",
@@ -1728,6 +1828,10 @@
     "translation": " hat Sie erwähnt in "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "translation": " hat Sie erwähnt in "
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_message",
     "translation": " hat dir eine Nachricht gesendet"
   },
@@ -1736,6 +1840,10 @@
     "translation": " geschrieben in "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
+    "translation": " posted a message"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
     "translation": "Fehler beim Senden der Pushnachricht device_id={{.DeviceId}}, err={{.Error}}"
   },
@@ -1873,11 +1981,11 @@
   },
   {
     "id": "api.slackimport.slack_add_bot_user.email_pwd",
-    "translation": "Slack-Bot-/Integrationsnachrichten-Importbenutzer: E-Mail, Passwort: {{.Email}}, {{.Password}}\r\n"
+    "translation": "The Integration/Slack Bot user with email {{.Email}} and password {{.Password}} has been imported.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_bot_user.unable_import",
-    "translation": "Konnte Slack-Bot-/Integrationsnachrichten-Importbenutzer nicht importieren: {{.Username}}\r\n"
+    "translation": "Unable to import the Integration/Slack Bot user {{.Username}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.added",
@@ -1885,71 +1993,71 @@
   },
   {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
-    "translation": "Fehler beim Hinzufügen des Benutzers zum Kanal: {{.Username}}\r\n"
+    "translation": "Unable to add Slack user {{.Username}} to channel.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed",
-    "translation": "{{.DisplayName}} konnte nicht importiert werden\r\n"
+    "translation": "Unable to import Slack channel {{.DisplayName}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Slack-Importer: Kanal konnte nicht importiert werden: %s"
+    "translation": "Slack Import: Unable to import Slack channel: %s."
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
-    "translation": "Wurde mit bestehendem Kanal zusammengeführt: {{.DisplayName}}\r\n"
+    "translation": "The Slack channel {{.DisplayName}} already exists as an active Mattermost channel. Both channels have been merged.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_posts.attach_files.error",
-    "translation": "Fehler beim Anfügen der Dateien zu Nachricht, post_id=%s, file_ids=%v, err=%v"
+    "translation": "Slack Import: An error occurred when attaching files to a message, post_id=%s, file_ids=%v, err=%v."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot.warn",
-    "translation": "Slack-Bot-Beiträge wurden noch nicht importiert"
+    "translation": "Slack Import: Slack bot messages cannot be imported yet."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot_user_no_exists.warn",
-    "translation": "Slack-Importer: Bot-Nachrichten werden nicht importiert, da der Benutzer für den Bot-Import nicht existiert."
+    "translation": "Slack Import: Unable to import the bot message as the bot user does not exist."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
-    "translation": "Dateikommentar undefiniert"
+    "translation": "Slack Import: Unable to import the message as it has no comments."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_usr.debug",
-    "translation": "Nachricht ohne Benutzer"
+    "translation": "Slack Import: Unable to import the message as the user field is missing."
   },
   {
     "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
-    "translation": "Slack-Importer: Bot-Nachrichten werden nicht importiert, da das BotId-Feld fehlt."
+    "translation": "Slack Import: Unable to import bot message as the BotId field is missing."
   },
   {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
-    "translation": "Nicht unterstützter Nachrichtentyp: %v, %v"
+    "translation": "Slack Import: Unable to import the message as its type is not supported: post_type=%v, post_subtype=%v."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_found.warn",
-    "translation": "Keine Datei im Slack-Export mit Upload-Nachricht gefunden mit Datei-ID {{.FileId}}"
+    "translation": "Slack Import: Unable to import file {{.FileId}} as the file is missing from the Slack export zip file."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_in_json.warn",
-    "translation": "Kann Datei nicht importieren, wenn kein \"file\" Bereich im Export existiert."
+    "translation": "Slack Import: Unable to attach the file to the post as the latter has no \"file\" section present in Slack export."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_open_failed.warn",
-    "translation": "Die Datei mit der ID {{.FileId}} kann nicht aus dem Export-Archiv geöffnet werden: {{.Error}}"
+    "translation": "Slack Import: Unable to open the file {{.FileId}} from the Slack export: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_upload_failed.warn",
-    "translation": "Hochladen der Datei für Dateinachricht mit der ID {{.FileId}} ist mit folgendem Fehler fehlgeschlagen: {{.Error}}"
+    "translation": "Slack Import: An error occurred when uploading file {{.FileId}}: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.user_no_exists.debug",
-    "translation": "Benutzer: %v existiert nicht!"
+    "translation": "Slack Import: Unable to add the message as the Slack user %v does not exist in Mattermost."
   },
   {
     "id": "api.slackimport.slack_add_posts.without_user.debug",
-    "translation": "Nachricht ohne Benutzer"
+    "translation": "Slack Import: Unable to import the message as the user field is missing."
   },
   {
     "id": "api.slackimport.slack_add_users.created",
@@ -1957,15 +2065,15 @@
   },
   {
     "id": "api.slackimport.slack_add_users.email_pwd",
-    "translation": "E-Mail-Adresse, Passwort: {{.Email}}, {{.Password}}\r\n"
+    "translation": "Slack user with email {{.Email}} and password {{.Password}} has been imported.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing",
-    "translation": "Benutzer mit vorhandenem Account zusammengeführt: {{.Email}}, {{.Username}}\r\n"
+    "translation": "Slack user merged with an existing Mattermost user with matching email {{.Email}} and username {{.Username}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing_failed",
-    "translation": "Es wurde versucht, den Benutzer mit existierendem Konto ({{.Email}}, {{.Username}}) zusammenzuführen, konnte den Benutzer aber nicht zu diesem Team hinzufügen.\r\n"
+    "translation": "Slack user merged with an existing Mattermost user with matching email {{.Email}} and username {{.Username}}, but was unable to add the user to their team.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address",
@@ -1981,19 +2089,19 @@
   },
   {
     "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
-    "translation": "Konnte keinen zu !channel passenden regulären Ausdruck für Slack-Channel {{.ChannelID}} {{.ChannelName}} erstellen"
+    "translation": "Slack Import: Unable to compile the !channel, matching regular expression for the Slack channel {{.ChannelName}} (id={{.ChannelID}})."
   },
   {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
-    "translation": "Fehlerhafter Zeitstempel gefunden"
+    "translation": "Slack Import: Bad timestamp detected."
   },
   {
     "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
-    "translation": "Konnte keinen zu @Erwähnung passenden regulären Ausdruck für Slack-Benutzer {{.UserID}} {{.Username}} erstellen"
+    "translation": "Slack Import: Unable to compile the @mention, matching regular expression for the Slack user {{.Username}} (id={{.UserID}})."
   },
   {
     "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
-    "translation": "Slack-Importer: Konnte den Benutzer für den Bot-Import nicht deaktivieren."
+    "translation": "Slack Import: Unable to deactivate the user account used for the bot."
   },
   {
     "id": "api.slackimport.slack_import.log",
@@ -2017,7 +2125,7 @@
   },
   {
     "id": "api.slackimport.slack_import.open.app_error",
-    "translation": "Konnte nicht öffnen: {{.Filename}}"
+    "translation": "Unable to open the file: {{.Filename}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_import.team_fail",
@@ -2025,23 +2133,23 @@
   },
   {
     "id": "api.slackimport.slack_import.zip.app_error",
-    "translation": "Zip-Datei konnte nicht geöffnet werden"
+    "translation": "Unable to open the Slack export zip file.\r\n"
   },
   {
     "id": "api.slackimport.slack_parse_channels.error",
-    "translation": "Fehler beim Verarbeiten der Slack-Kanäle. Import könnte trotzdem funktionieren."
+    "translation": "Slack Import: Error occurred when parsing some Slack channels. Import may work anyway."
   },
   {
     "id": "api.slackimport.slack_parse_posts.error",
-    "translation": "Fehler beim Verarbeiten einiger Slack-Nachrichten. Import könnte trotzdem funktionieren."
+    "translation": "Slack Import: Error occurred when parsing some Slack posts. Import may work anyway."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack-Importer: Kanal {{.ChannelName}} hat einen zu langen Anzeigenamen. Er wird beim Import gekürzt."
+    "translation": "Slack-Importer: Kanal {{.ChannelName}} hat einen zu langen Namen. Er wird beim Import gekürzt."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Slack-Importer: Kanal {{.ChannelName}} hat eine zu lange Überschrift. Sie wird beim Import gekürzt."
+    "translation": "Slack-Importer: Kanal {{.ChannelName}} hat einen zu langen Namen. Er wird beim Import gekürzt."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
@@ -2297,7 +2405,7 @@
   },
   {
     "id": "api.templates.mfa_activated_body.info",
-    "translation": "Multi-Faktor-Authentifizierung wurde Ihrem Zugang auf {{ .SiteURL }} hinzugefügt.<br>Wenn diese Änderung nicht durch Sie initiiert wurde kontaktieren Sie bitte Ihren Systemadministrator."
+    "translation": "Multi-Faktor-Authentifizierung wurde Ihrem Zugang auf {{ .SiteURL }} hinzugefügt.<br>Wenn diese Änderung nicht durch Sie initiiert wurde, kontaktieren Sie bitte Ihren Systemadministrator."
   },
   {
     "id": "api.templates.mfa_activated_body.title",
@@ -2332,22 +2440,6 @@
     "translation": "Gehe zum Beitrag"
   },
   {
-    "id": "api.templates.post_body.info",
-    "translation": "KANAL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}}.{{.Month}}"
-  },
-  {
-    "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}} von {{.SenderDisplayName}} am {{.Day}}.{{.Month}}.{{.Year}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_group_message",
-    "translation": "Neue Gruppennachricht von {{.SenderDisplayName}} am {{.Day}}.{{.Month}}.{{.Year}}"
-  },
-  {
     "id": "api.templates.reset_body.button",
     "translation": "Passwort zurücksetzen"
   },
@@ -2404,6 +2496,18 @@
     "translation": "[MATTERMOST] Änderung zu Ihrem Zugang durch die Mattermost-3.0-Aktualisierung"
   },
   {
+    "id": "api.templates.user_access_token_body.info",
+    "translation": "A user access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.user_access_token_body.title",
+    "translation": "User access token added to your account"
+  },
+  {
+    "id": "api.templates.user_access_token_subject",
+    "translation": "[{{ .SiteName }}] User access token added to your account"
+  },
+  {
     "id": "api.templates.username_change_body.info",
     "translation": "Ihr Benutzername für {{.TeamDisplayName}} wurde in {{.NewUsername}} geändert.<br>Wenn Sie diese Änderungen nicht durchgeführt haben, kontaktieren Sie bitte den Systemadministrator."
   },
@@ -2760,6 +2864,10 @@
     "translation": "Die Bestätigungs-E-Mail über die Änderung des Passworts konnte nicht versandt werden"
   },
   {
+    "id": "api.user.send_user_access_token.error",
+    "translation": "Failed to send user access token added email successfully"
+  },
+  {
     "id": "api.user.send_verify_email_and_forget.failed.error",
     "translation": "Die Bestätigungs-E-Mail konnte nicht versandt werden"
   },
@@ -3072,6 +3180,10 @@
     "translation": "Konnte Gruppenkanal nicht erstellen"
   },
   {
+    "id": "app.import.import_direct_post.save_preferences.error",
+    "translation": "Fehler beim Import der Direktnachricht. Einstellungen konnten nicht gespeichert werden."
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "Benutzer der Nachricht existiert nicht"
   },
@@ -3108,6 +3220,10 @@
     "translation": "Fehler beim Importieren der Nachricht. Kanal mit dem Namen \"{{.ChannelName}}\" konnte nicht gefunden werden."
   },
   {
+    "id": "app.import.import_post.save_preferences.error",
+    "translation": "Fehler beim Import der Nachricht. Einstellungen konnten nicht gespeichert werden."
+  },
+  {
     "id": "app.import.import_post.team_not_found.error",
     "translation": "Fehler beim Importieren der Nachricht. Team mit dem Namen \"{{.TeamName}}\" konnte nicht gefunden werden."
   },
@@ -3116,6 +3232,10 @@
     "translation": "Fehler beim Importieren der Nachricht. Benutzer mit dem Namen \"{{.Username}}\" konnte nicht gefunden werden."
   },
   {
+    "id": "app.import.import_user_channels.save_preferences.error",
+    "translation": "Fehler beim Import der Benutzer-Kanalmitgliedschaften. Einstellungen konnten nicht gespeichert werden."
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "Kanal create_at darf nicht 0 sein, wenn angegeben."
   },
@@ -3176,8 +3296,12 @@
     "translation": "Direktkanalmitgliederliste enthält zu viele Einträge"
   },
   {
+    "id": "app.import.validate_direct_channel_import_data.unknown_favoriter.error",
+    "translation": "Direktnachrichtenkanal kann nur von Mitgliedern favorisiert werden. \"{{.Username}}\" ist kein Mitglied."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
-    "translation": "Fehlende erforderliche Nachrichteigenschaft: channel_members"
+    "translation": "Fehlende erforderliche Direktnachrichteneigenschaft: channel_members"
   },
   {
     "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
@@ -3204,6 +3328,10 @@
     "translation": "Fehlende erforderliche Nachrichteigenschaft: message"
   },
   {
+    "id": "app.import.validate_direct_post_import_data.unknown_flagger.error",
+    "translation": "Direktnachrichtenkanal kann nur von Mitgliedern markiert werden. \"{{.Username}}\" ist kein Mitglied."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
     "translation": "Fehlende erforderliche Nachrichteigenschaft: user"
   },
@@ -3292,6 +3420,10 @@
     "translation": "Ungültige MarkUnread NotifyProps für Kanalmitgliedschaft des Benutzers."
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mobile.error",
+    "translation": "Ungültige Desktop NotifyProps für Kanalmitgliedschaft des Benutzers."
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "Ungültige Rollen für die Kanalmitgliedschaft des Benutzers."
   },
@@ -3328,6 +3460,38 @@
     "translation": "Benutzer nickname ist zu lang."
   },
   {
+    "id": "app.import.validate_user_import_data.notify_props_channel_trigger_invalid.error",
+    "translation": "Invalid Channel Trigger Notify Prop for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_comment_trigger_invalid.error",
+    "translation": "Invalid Comment Trigger Notify Prop for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error",
+    "translation": "Invalid Desktop Duration Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_invalid.error",
+    "translation": "Invalid Desktop Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_sound_invalid.error",
+    "translation": "Invalid Desktop Sound Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_email_invalid.error",
+    "translation": "Invalid Email Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_invalid.error",
+    "translation": "Invalid Mobile Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_push_status_invalid.error",
+    "translation": "Invalid Mobile Push Status Notify Prop for user."
+  },
+  {
     "id": "app.import.validate_user_import_data.pasword_length.error",
     "translation": "Benutzerpasswort hat ungültige Länge."
   },
@@ -3356,6 +3520,54 @@
     "translation": "Team name fehlt in Teammitgliedschaft des Benutzers."
   },
   {
+    "id": "app.notification.body.intro.direct.full",
+    "translation": "Sie haben eine neue Nachricht."
+  },
+  {
+    "id": "app.notification.body.intro.direct.generic",
+    "translation": "You have a new direct message from {{.SenderName}}"
+  },
+  {
+    "id": "app.notification.body.intro.notification.full",
+    "translation": "You have a new notification."
+  },
+  {
+    "id": "app.notification.body.intro.notification.generic",
+    "translation": "You have a new notification from {{.SenderName}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.full",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full",
+    "translation": "KANAL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}}.{{.Month}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}"
+  },
+  {
+    "id": "app.notification.subject.direct.full",
+    "translation": "Neue Gruppennachricht von {{.SenderDisplayName}} am {{.Day}}.{{.Month}}.{{.Year}}"
+  },
+  {
+    "id": "app.notification.subject.notification.full",
+    "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
+    "id": "app.user_access_token.disabled",
+    "translation": "Benutzer-Zugriffs-Token sind auf diesem Server deaktiviert. Bitte kontaktieren Sie ihren Systemadministrator für Details."
+  },
+  {
+    "id": "app.user_access_token.invalid_or_missing",
+    "translation": "Ungültiger oder fehlender Token"
+  },
+  {
     "id": "authentication.permissions.create_group_channel.description",
     "translation": "Die Möglichkeit, neue Gruppennachrichtenkanäle zu erstellen"
   },
@@ -3364,6 +3576,14 @@
     "translation": "Gruppennachrichten erstellen"
   },
   {
+    "id": "authentication.permissions.create_post_public.description",
+    "translation": "Die Möglichkeit, Nachrichten in öffentlichen Kanälen zu erstellen"
+  },
+  {
+    "id": "authentication.permissions.create_post_public.name",
+    "translation": "Nachrichten in öffentlichen Kanälen erstellen"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Die Möglichkeit, neue Teams zu erstellen"
   },
@@ -3372,6 +3592,22 @@
     "translation": "Teams erstellen"
   },
   {
+    "id": "authentication.permissions.create_user_access_token.description",
+    "translation": "Fähigkeit zum Erstellen von Benutzer-Zugriffs-Token"
+  },
+  {
+    "id": "authentication.permissions.create_user_access_token.name",
+    "translation": "Benutzer-Zugriffs-Token erstellen"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.description",
+    "translation": "Die Möglichkeit, Jobs zu verwalten"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.name",
+    "translation": "Jobs verwalten"
+  },
+  {
     "id": "authentication.permissions.manage_team_roles.description",
     "translation": "Die Möglichkeit, die Rollen eines Teammitgliedes zu ändern"
   },
@@ -3388,6 +3624,22 @@
     "translation": "Öffentliche Kanäle lesen"
   },
   {
+    "id": "authentication.permissions.read_user_access_token.description",
+    "translation": "Fähigkeit zum Lesen der Felder id, description and user_id von Benutzer-Zugriffs-Token"
+  },
+  {
+    "id": "authentication.permissions.read_user_access_token.name",
+    "translation": "Benutzer-Zugriffs-Token lesen"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.description",
+    "translation": "Fähigkeit zum Widerrufen von Benutzer-Zugriffs-Token"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.name",
+    "translation": "Benutzer-Zugriffs-Token widerrufen"
+  },
+  {
     "id": "authentication.permissions.team_invite_user.description",
     "translation": "Die Möglichkeit, Benutzer in ein Team einzuladen"
   },
@@ -3404,6 +3656,46 @@
     "translation": "Slash Befehle verwenden"
   },
   {
+    "id": "authentication.roles.system_post_all.description",
+    "translation": "Eine Rolle mit der Berechtigung, in jeden öffentlichen, privaten oder Direktnachrichtenkanal im System zu senden"
+  },
+  {
+    "id": "authentication.roles.system_post_all.name",
+    "translation": "In öffentliche, private und Direktnachrichtenkanäle senden"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.description",
+    "translation": "Eine Rolle mit der Berechtigung, in jeden öffentlichen Kanal im System zu senden"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.name",
+    "translation": "In öffentliche Kanäle senden"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.description",
+    "translation": "Eine Rolle mit den Berechtigungen zum Erstellen, Lesen und Widerrufen von Benutzer-Zugriffs-Token"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.name",
+    "translation": "Benutzer-Zugriffs-Token"
+  },
+  {
+    "id": "authentication.roles.team_post_all.description",
+    "translation": "Eine Rolle mit der Berechtigung, in jeden öffentlichen oder privaten Kanal im System zu senden"
+  },
+  {
+    "id": "authentication.roles.team_post_all.name",
+    "translation": "In öffentliche und private Kanäle senden"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.description",
+    "translation": "Eine Rolle mit der Berechtigung, in jeden öffentlichen Kanal im Team zu senden"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.name",
+    "translation": "In öffentliche Kanäle senden"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "Feature erfordert Enterprise Lizenz. Bitte kontaktieren Sie Ihren Systemadministrator wegen Upgrade Ihrer Enterprise Lizenz."
   },
@@ -3496,38 +3788,62 @@
     "translation": "Compliance Export gestartet für Job '{{.JobName}}' in '{{.FilePath}}'"
   },
   {
-    "id": "ent.elasticsearch.search_posts.disabled",
-    "translation": "ElasticSearch-Suche ist auf diesem Server deaktiviert"
+    "id": "ent.elasticsearch.create_client.connect_failed",
+    "translation": "Fehler beim Einrichten des ElasticSearch-Client"
   },
   {
-    "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "Suche konnte nicht abgeschlossen werden"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_create_failed",
+    "translation": "Konnte ElasticSearch-Index nicht erstellen"
   },
   {
-    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
-    "translation": "Konnte Suchergebnisse nicht dekodieren"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_exists_failed",
+    "translation": "Konnte nicht bestimmen, ob der ElasticSearch-Index existiert"
   },
   {
-    "id": "ent.elasticsearch.start.connect_failed",
-    "translation": "Fehler beim Einrichten des ElasticSearch-Client"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_mapping_failed",
+    "translation": "Konnte ElasticSearch-Index-Mapping nicht einrichten"
   },
   {
-    "id": "ent.elasticsearch.start.index_create_failed",
-    "translation": "Konnte ElasticSearch-Index nicht erstellen"
+    "id": "ent.elasticsearch.delete_post.error",
+    "translation": "Löschen der Nachricht fehlgeschlagen"
   },
   {
-    "id": "ent.elasticsearch.start.index_exists_failed",
-    "translation": "Konnte nicht bestimmen, ob der ElasticSearch-Index existiert"
+    "id": "ent.elasticsearch.generic.disabled",
+    "translation": "ElasticSearch-Suche ist auf diesem Server nicht aktiviert"
   },
   {
-    "id": "ent.elasticsearch.start.index_mapping_failed",
-    "translation": "Konnte ElasticSearch-Index-Mapping nicht einrichten"
+    "id": "ent.elasticsearch.index_post.error",
+    "translation": "Indizierung der Nachricht fehlgeschlagen"
+  },
+  {
+    "id": "ent.elasticsearch.not_started.error",
+    "translation": "Elasticsearch ist nicht gestartet"
+  },
+  {
+    "id": "ent.elasticsearch.purge_indexes.delete_failed",
+    "translation": "Konnte ElasticSearch-Index nicht löschen"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.disabled",
+    "translation": "ElasticSearch-Suche ist auf diesem Server deaktiviert"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.search_failed",
+    "translation": "Suche konnte nicht abgeschlossen werden"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
+    "translation": "Konnte Suchergebnisse nicht dekodieren"
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Konnte ElasticSearch-Index-Einstellungen nicht setzen"
   },
   {
+    "id": "ent.elasticsearch.test_config.connect_failed",
+    "translation": "Verbindung zum Elasticsearch-Server fehlgeschlagen."
+  },
+  {
     "id": "ent.elasticsearch.test_config.indexing_disabled.error",
     "translation": "Elasticsearch ist deaktiviert."
   },
@@ -3536,6 +3852,10 @@
     "translation": "Lizenz unterstützt Elasticsearch nicht."
   },
   {
+    "id": "ent.elasticsearch.test_config.reenter_password",
+    "translation": "Elasticsearch-Server-URL oder -Benutzername hat sich geändert. Bitte geben Sie das Elasticsearch-Passwort erneut ein, um die Verbindung zu testen."
+  },
+  {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "Benutzerdefinierte Emojireaktionen durch die aktuelle Lizenz deaktiviert. Bitte kontaktieren Sie Ihren Systemadministrator wegen eines Enterprise Lizenzupgrades."
   },
@@ -3709,7 +4029,7 @@
   },
   {
     "id": "ent.saml.license_disable.app_error",
-    "translation": "Ihre Lizenz unterstützt keine SAML Authentifizierung."
+    "translation": "Ihre Lizenz unterstützt keine SAML-Authentifizierung."
   },
   {
     "id": "ent.saml.metadata.app_error",
@@ -3748,6 +4068,14 @@
     "translation": "Seite nicht gefunden"
   },
   {
+    "id": "jobs.request_cancellation.status.error",
+    "translation": "Konnte Abbruch für Job, der sich nicht in einem abbrechbaren Status befindet, nicht anfordern."
+  },
+  {
+    "id": "jobs.set_job_error.update.error",
+    "translation": "Konnte Job-Status nicht auf fehlerhaft setzen"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Konnte Kanal nicht finden: %v, %v Möglichkeiten gesucht"
   },
@@ -4116,6 +4444,10 @@
     "translation": "Ungültiges Intervall für E-Mail-Stapelverarbeitung.  Muss 30 Sekunden oder mehr sein."
   },
   {
+    "id": "model.config.is_valid.email_notification_contents_type.app_error",
+    "translation": "Invalid email notification contents type for email settings. Must be one of either 'full' or 'generic'."
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "Ungültiger Salt für Passwort-Zuücksetzung in E-Mail-Einstellungen.  Muss 32 Zeichen oder mehr sein."
   },
@@ -4436,6 +4768,22 @@
     "translation": "Ungültige Benutzer-ID"
   },
   {
+    "id": "model.job.is_valid.create_at.app_error",
+    "translation": "Erstellt am muss eine gültige Zeit sein"
+  },
+  {
+    "id": "model.job.is_valid.id.app_error",
+    "translation": "Ungültige Job-ID"
+  },
+  {
+    "id": "model.job.is_valid.status.app_error",
+    "translation": "Ungültiger Job-Status"
+  },
+  {
+    "id": "model.job.is_valid.type.app_error",
+    "translation": "Ungültiger Job-Typ"
+  },
+  {
     "id": "model.oauth.is_valid.app_id.app_error",
     "translation": "Ungültige App-ID"
   },
@@ -4812,6 +5160,18 @@
     "translation": "Ungültiger Benutzername"
   },
   {
+    "id": "model.user_access_token.is_valid.description.app_error",
+    "translation": "Ungültige Beschreibung, muss aus 256 Zeichen oder weniger bestehen"
+  },
+  {
+    "id": "model.user_access_token.is_valid.token.app_error",
+    "translation": "Ungültiges Zugriffstoken"
+  },
+  {
+    "id": "model.user_access_token.is_valid.user_id.app_error",
+    "translation": "Ungültige Benutzer-ID"
+  },
+  {
     "id": "model.utils.decode_json.app_error",
     "translation": "Konnte nicht dekodieren"
   },
@@ -4921,7 +5281,7 @@
   },
   {
     "id": "store.sql.schema_version.critical",
-    "translation": "Das Datenbankschema der Version %v kann nicht aktualisiert werden.  Sie dürfen keine Version überspringen."
+    "translation": "Database schema version %v is no longer supported. This Mattermost server supports automatic upgrades from schema version %v through schema version %v. Downgrades are not supported. Please manually upgrade to at least version %v before continuing"
   },
   {
     "id": "store.sql.short_ciphertext",
@@ -5296,24 +5656,24 @@
     "translation": "Die Dateiinformationen konnten nicht gespeichert oder aktualisiert werden"
   },
   {
-    "id": "store.sql_job_status.delete_by_type.app_error",
-    "translation": "Der Job-Status konnte nicht gelöscht werden"
+    "id": "store.sql_job.delete.app_error",
+    "translation": "Der Job konnte nicht gelöscht werden"
   },
   {
-    "id": "store.sql_job_status.get.app_error",
-    "translation": "Der Job-Status konnte nicht abgerufen werden"
+    "id": "store.sql_job.get.app_error",
+    "translation": "Der Job konnte nicht abgerufen werden"
   },
   {
-    "id": "store.sql_job_status.get_all.app_error",
-    "translation": "Wir konnten nicht den Status aller Jobs abrufen"
+    "id": "store.sql_job.get_all.app_error",
+    "translation": "Die Jobs konnten nicht abgerufen werden"
   },
   {
-    "id": "store.sql_job_status.save.app_error",
-    "translation": "Der Job-Status konnte nicht gespeichert werden"
+    "id": "store.sql_job.save.app_error",
+    "translation": "Der Job konnte nicht gespeichert werden"
   },
   {
-    "id": "store.sql_job_status.update.app_error",
-    "translation": "Der Job-Status konnte nicht aktualisiert werden"
+    "id": "store.sql_job.update.app_error",
+    "translation": "Der Job konnte nicht aktualisiert werden"
   },
   {
     "id": "store.sql_license.get.app_error",
@@ -5464,6 +5824,10 @@
     "translation": "Die übergeordneten Nachrichten des Kanals konnten nicht abgerufen werden"
   },
   {
+    "id": "store.sql_post.get_posts_batch_for_indexing.get.app_error",
+    "translation": "Die Nachrichten-Gruppe konnte nicht zur Indizierung abgerufen werden"
+  },
+  {
     "id": "store.sql_post.get_posts_by_ids.app_error",
     "translation": "Die Nachrichten konnten nicht abgerufen werden"
   },
@@ -5941,11 +6305,11 @@
   },
   {
     "id": "store.sql_user.save.email_exists.ldap_app_error",
-    "translation": "Dieser Account verwendet keine AD/LDAP Authentifikation. Bitte melden Sie sich mit E-Mail-Adresse und Passwort an."
+    "translation": "Dieser Account verwendet keine AD/LDAP-Authentifizierung. Bitte melden Sie sich mit E-Mail-Adresse und Passwort an."
   },
   {
     "id": "store.sql_user.save.email_exists.saml_app_error",
-    "translation": "Dieser Account verwendet keine SAML Authentifikation. Bitte melden Sie sich mit E-Mail-Adresse und Passwort an."
+    "translation": "Dieser Account verwendet keine SAML-Authentifizierung. Bitte melden Sie sich mit E-Mail-Adresse und Passwort an."
   },
   {
     "id": "store.sql_user.save.existing.app_error",
@@ -6040,6 +6404,26 @@
     "translation": "Es konnte das E-Mail-Adresse bestätigt Feld nicht aktualisiert werden"
   },
   {
+    "id": "store.sql_user_access_token.delete.app_error",
+    "translation": "Das Benutzer-Zugriffs-Token konnte nicht entfernt werden"
+  },
+  {
+    "id": "store.sql_user_access_token.get.app_error",
+    "translation": "Das Benutzer-Zugriffs-Token konnte nicht abgerufen werden"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_token.app_error",
+    "translation": "Das Benutzer-Zugriffs-Token konnte nicht über Token abgerufen werden"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_user.app_error",
+    "translation": "Die Benutzer-Zugriffs-Token konnten nicht über den Benutzer abgerufen werden"
+  },
+  {
+    "id": "store.sql_user_access_token.save.app_error",
+    "translation": "Das Benutzer-Zugriffs-Token konnte nicht gespeichert werden"
+  },
+  {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "Die Anzahl der eingehenden Webhooks konnte nicht gezählt werden"
   },
@@ -6080,10 +6464,18 @@
     "translation": "Die Webhooks konnten nicht abgerufen werden"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_incoming_by_channel.app_error",
+    "translation": "Der Webhook konnte nicht gelöscht werden"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_incoming_by_user.app_error",
     "translation": "Der Webhook konnte nicht gelöscht werden"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_outgoing_by_channel.app_error",
+    "translation": "Der Webhook konnte nicht gelöscht werden"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error",
     "translation": "Der Webhook konnte nicht gelöscht werden"
   },
@@ -6116,6 +6508,10 @@
     "translation": "System"
   },
   {
+    "id": "utils.config.add_client_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  Adding DefaultClientLocale to AvailableLocales."
+  },
+  {
     "id": "utils.config.load_config.decoding.panic",
     "translation": "Fehler beim Dekodieren der Konfigurationsdatei={{.Filename}}, err={{.Error}}"
   },
@@ -6136,8 +6532,12 @@
     "translation": "Es ist ein Fehler beim Speichern der Datei in {{.Filename}} aufgetreten"
   },
   {
+    "id": "utils.config.supported_available_locales.app_error",
+    "translation": "Unable to load mattermost configuration file:  AvailableLocales must include DefaultClientLocale. Setting AvailableLocales to all locales as default value."
+  },
+  {
     "id": "utils.config.supported_client_locale.app_error",
-    "translation": "Konnte Mattermost Konfigurationsdatei nicht laden:  DefaultClientLocale muss eine der unterstützen Locales entsprechen"
+    "translation": "Unable to load mattermost configuration file:  DefaultClientLocale must be one of the supported locales. Setting DefaultClientLocale to en as default value."
   },
   {
     "id": "utils.config.supported_server_locale.app_error",
diff --git a/i18n/en.json b/i18n/en.json
index 3b2d2662e..70a243e56 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -532,112 +532,128 @@
     "translation": "Channel header successfully updated."
   },
   {
-    "id": "api.command_collapse.desc",
-    "translation": "Turn on auto-collapsing of image previews"
+    "id": "api.command_channel_purpose.channel.app_error",
+    "translation": "Error to retrieve the current channel."
   },
   {
-    "id": "api.command_collapse.name",
-    "translation": "collapse"
+    "id": "api.command_channel_purpose.desc",
+    "translation": "Edit the channel purpose"
   },
   {
-    "id": "api.command_collapse.success",
-    "translation": "Image links now collapse by default"
+    "id": "api.command_channel_purpose.direct_group.app_error",
+    "translation": "Cannot set purpose for direct message channels. Use /header to set the header instead."
   },
   {
-    "id": "api.command_echo.create.app_error",
-    "translation": "Unable to create /echo post, err=%v"
+    "id": "api.command_channel_purpose.hint",
+    "translation": "[text]"
   },
   {
-    "id": "api.command_echo.delay.app_error",
-    "translation": "Delays must be under 10000 seconds"
+    "id": "api.command_channel_purpose.message.app_error",
+    "translation": "A message must be provided with the /purpose command."
   },
   {
-    "id": "api.command_echo.desc",
-    "translation": "Echo back text from your account"
+    "id": "api.command_channel_purpose.name",
+    "translation": "purpose"
   },
   {
-    "id": "api.command_echo.high_volume.app_error",
-    "translation": "High volume of echo request, cannot process request"
+    "id": "api.command_channel_purpose.permission.app_error",
+    "translation": "You do not have the appropriate permissions to edit the channel purpose."
   },
   {
-    "id": "api.command_echo.hint",
-    "translation": "'message' [delay in seconds]"
+    "id": "api.command_channel_purpose.update_channel.app_error",
+    "translation": "Error to update the current channel."
   },
   {
-    "id": "api.command_echo.message.app_error",
-    "translation": "A message must be provided with the /echo command."
+    "id": "api.command_channel_rename.channel.app_error",
+    "translation": "Error to retrieve the current channel."
   },
   {
-    "id": "api.command_echo.name",
-    "translation": "echo"
+    "id": "api.command_channel_rename.desc",
+    "translation": "Rename the channel"
   },
   {
-    "id": "api.command_channel_purpose.name",
-    "translation": "purpose"
+    "id": "api.command_channel_rename.direct_group.app_error",
+    "translation": "Cannot rename direct message channels."
   },
   {
-    "id": "api.command_channel_purpose.hint",
+    "id": "api.command_channel_rename.hint",
     "translation": "[text]"
   },
   {
-    "id": "api.command_channel_purpose.desc",
-    "translation": "Edit the channel purpose"
+    "id": "api.command_channel_rename.message.app_error",
+    "translation": "A message must be provided with the /rename command."
   },
   {
-    "id": "api.command_channel_purpose.channel.app_error",
-    "translation": "Error to retrieve the current channel."
+    "id": "api.command_channel_rename.name",
+    "translation": "rename"
   },
   {
-    "id": "api.command_channel_purpose.permission.app_error",
-    "translation": "You do not have the appropriate permissions to edit the channel purpose."
+    "id": "api.command_channel_rename.permission.app_error",
+    "translation": "You do not have the appropriate permissions to rename the channel."
   },
   {
-    "id": "api.command_channel_purpose.direct_group.app_error",
-    "translation": "Cannot set purpose for direct message channels. Use /header to set the header instead."
+    "id": "api.command_channel_rename.update_channel.app_error",
+    "translation": "Error to update the current channel."
   },
   {
-    "id": "api.command_channel_purpose.message.app_error",
-    "translation": "A message must be provided with the /purpose command."
+    "id": "api.command_channel_rename.update_channel.success",
+    "translation": "Channel name successfully updated."
   },
   {
-    "id": "api.command_channel_purpose.update_channel.app_error",
-    "translation": "Error to update the current channel."
+    "id": "api.command_code.desc",
+    "translation": "Display text as a code block"
   },
   {
-    "id": "api.command_channel_rename.name",
-    "translation": "rename"
+    "id": "api.command_code.hint",
+    "translation": "[text]"
   },
   {
-    "id": "api.command_channel_rename.hint",
-    "translation": "[text]"
+    "id": "api.command_code.message.app_error",
+    "translation": "A message must be provided with the /code command."
   },
   {
-    "id": "api.command_channel_rename.desc",
-    "translation": "Rename the channel"
+    "id": "api.command_code.name",
+    "translation": "code"
   },
   {
-    "id": "api.command_channel_rename.channel.app_error",
-    "translation": "Error to retrieve the current channel."
+    "id": "api.command_collapse.desc",
+    "translation": "Turn on auto-collapsing of image previews"
   },
   {
-    "id": "api.command_channel_rename.permission.app_error",
-    "translation": "You do not have the appropriate permissions to rename the channel."
+    "id": "api.command_collapse.name",
+    "translation": "collapse"
   },
   {
-    "id": "api.command_channel_rename.message.app_error",
-    "translation": "A message must be provided with the /rename command."
+    "id": "api.command_collapse.success",
+    "translation": "Image links now collapse by default"
   },
   {
-    "id": "api.command_channel_rename.update_channel.app_error",
-    "translation": "Error to update the current channel."
+    "id": "api.command_echo.create.app_error",
+    "translation": "Unable to create /echo post, err=%v"
   },
   {
-    "id": "api.command_channel_rename.update_channel.success",
-    "translation": "Channel name successfully updated."
+    "id": "api.command_echo.delay.app_error",
+    "translation": "Delays must be under 10000 seconds"
   },
   {
-    "id": "api.command_channel_rename.direct_group.app_error",
-    "translation": "Cannot rename direct message channels."
+    "id": "api.command_echo.desc",
+    "translation": "Echo back text from your account"
+  },
+  {
+    "id": "api.command_echo.high_volume.app_error",
+    "translation": "High volume of echo request, cannot process request"
+  },
+  {
+    "id": "api.command_echo.hint",
+    "translation": "'message' [delay in seconds]"
+  },
+  {
+    "id": "api.command_echo.message.app_error",
+    "translation": "A message must be provided with the /echo command."
+  },
+  {
+    "id": "api.command_echo.name",
+    "translation": "echo"
   },
   {
     "id": "api.command_expand.desc",
@@ -980,22 +996,6 @@
     "translation": "ALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\n"
   },
   {
-    "id": "api.command_code.desc",
-    "translation": "Display text as a code block"
-  },
-  {
-    "id": "api.command_code.hint",
-    "translation": "[text]"
-  },
-  {
-    "id": "api.command_code.name",
-    "translation": "code"
-  },
-  {
-    "id": "api.command_code.message.app_error",
-    "translation": "A message must be provided with the /code command."
-  },
-  {
     "id": "api.command_shrug.desc",
     "translation": "Adds ¯\\_(ツ)_/¯ to your message"
   },
@@ -2436,18 +2436,6 @@
     "translation": "[{{ .SiteName }}] Your password has been updated"
   },
   {
-    "id": "api.templates.user_access_token_body.info",
-    "translation": "A user access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
-  },
-  {
-    "id": "api.templates.user_access_token_body.title",
-    "translation": "User access token added to your account"
-  },
-  {
-    "id": "api.templates.user_access_token_subject",
-    "translation": "[{{ .SiteName }}] User access token added to your account"
-  },
-  {
     "id": "api.templates.post_body.button",
     "translation": "Go To Post"
   },
@@ -2508,6 +2496,18 @@
     "translation": "[MATTERMOST] Changes to your account for Mattermost 3.0 Upgrade"
   },
   {
+    "id": "api.templates.user_access_token_body.info",
+    "translation": "A user access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.user_access_token_body.title",
+    "translation": "User access token added to your account"
+  },
+  {
+    "id": "api.templates.user_access_token_subject",
+    "translation": "[{{ .SiteName }}] User access token added to your account"
+  },
+  {
     "id": "api.templates.username_change_body.info",
     "translation": "Your username for {{.TeamDisplayName}} has been changed to {{.NewUsername}}.<br>If you did not make this change, please contact the system administrator."
   },
@@ -2848,10 +2848,6 @@
     "translation": "Failed to send update password email successfully"
   },
   {
-    "id": "api.user.send_user_access_token.error",
-    "translation": "Failed to send user access token added email successfully"
-  },
-  {
     "id": "api.user.send_password_reset.find.app_error",
     "translation": "We couldn’t find an account with that address."
   },
@@ -2868,6 +2864,10 @@
     "translation": "Failed to send update password email successfully"
   },
   {
+    "id": "api.user.send_user_access_token.error",
+    "translation": "Failed to send user access token added email successfully"
+  },
+  {
     "id": "api.user.send_verify_email_and_forget.failed.error",
     "translation": "Failed to send verification email successfully"
   },
@@ -3116,54 +3116,6 @@
     "translation": "Invalid {{.Name}} parameter"
   },
   {
-    "id": "app.notification.subject.direct.full",
-    "translation": "[{{.SiteName}}] New Direct Message from {{.SenderDisplayName}} on {{.Month}} {{.Day}}, {{.Year}}"
-  },
-  {
-    "id": "app.notification.subject.notification.full",
-    "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}"
-  },
-  {
-    "id": "app.notification.body.intro.direct.full",
-    "translation": "You have a new direct message."
-  },
-  {
-    "id": "app.notification.body.intro.direct.generic",
-    "translation": "You have a new direct message from {{.SenderName}}"
-  },
-  {
-    "id": "app.notification.body.intro.notification.full",
-    "translation": "You have a new notification."
-  },
-  {
-    "id": "app.notification.body.intro.notification.generic",
-    "translation": "You have a new notification from {{.SenderName}}"
-  },
-  {
-    "id": "app.notification.body.text.direct.full",
-    "translation": "{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
-  },
-  {
-    "id": "app.notification.body.text.direct.generic",
-    "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
-  },
-  {
-    "id": "app.notification.body.text.notification.full",
-    "translation": "CHANNEL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
-  },
-  {
-    "id": "app.notification.body.text.notification.generic",
-    "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
-  },
-  {
-    "id": "app.user_access_token.disabled",
-    "translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details."
-  },
-  {
-    "id": "app.user_access_token.invalid_or_missing",
-    "translation": "Invalid or missing token"
-  },
-  {
     "id": "app.channel.create_channel.no_team_id.app_error",
     "translation": "Must specify the team ID to create a channel"
   },
@@ -3228,24 +3180,12 @@
     "translation": "Failed to get group channel"
   },
   {
-    "id": "app.import.import_direct_post.user_not_found.error",
-    "translation": "Post user does not exist"
-  },
-  {
     "id": "app.import.import_direct_post.save_preferences.error",
     "translation": "Error importing direct post. Failed to save preferences."
   },
   {
-    "id": "app.import.import_user_channels.save_preferences.error",
-    "translation": "Error importing user channel memberships. Failed to save preferences."
-  },
-  {
-    "id": "app.import.validate_direct_channel_import_data.unknown_favoriter.error",
-    "translation": "Direct channel can only be favorited by members. \"{{.Username}}\" is not a member."
-  },
-  {
-    "id": "app.import.validate_direct_post_import_data.unknown_flagger.error",
-    "translation": "Direct post can only be flagged by members of the channel it is in. \"{{.Username}}\" is not a member."
+    "id": "app.import.import_direct_post.user_not_found.error",
+    "translation": "Post user does not exist"
   },
   {
     "id": "app.import.import_line.null_channel.error",
@@ -3280,6 +3220,10 @@
     "translation": "Error importing post. Channel with name \"{{.ChannelName}}\" could not be found."
   },
   {
+    "id": "app.import.import_post.save_preferences.error",
+    "translation": "Error importing post. Failed to save preferences."
+  },
+  {
     "id": "app.import.import_post.team_not_found.error",
     "translation": "Error importing post. Team with name \"{{.TeamName}}\" could not be found."
   },
@@ -3288,8 +3232,8 @@
     "translation": "Error importing post. User with username \"{{.Username}}\" could not be found."
   },
   {
-    "id": "app.import.import_post.save_preferences.error",
-    "translation": "Error importing post. Failed to save preferences."
+    "id": "app.import.import_user_channels.save_preferences.error",
+    "translation": "Error importing user channel memberships. Failed to save preferences."
   },
   {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
@@ -3352,6 +3296,10 @@
     "translation": "Direct channel members list contains too many items"
   },
   {
+    "id": "app.import.validate_direct_channel_import_data.unknown_favoriter.error",
+    "translation": "Direct channel can only be favorited by members. \"{{.Username}}\" is not a member."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
     "translation": "Missing required direct post property: channel_members"
   },
@@ -3380,6 +3328,10 @@
     "translation": "Missing required direct post property: message"
   },
   {
+    "id": "app.import.validate_direct_post_import_data.unknown_flagger.error",
+    "translation": "Direct post can only be flagged by members of the channel it is in. \"{{.Username}}\" is not a member."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
     "translation": "Missing required direct post property: user"
   },
@@ -3464,14 +3416,14 @@
     "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
   },
   {
-    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mobile.error",
-    "translation": "Invalid Mobile NotifyProps for User's Channel Membership."
-  },
-  {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
     "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mobile.error",
+    "translation": "Invalid Mobile NotifyProps for User's Channel Membership."
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "Invalid roles for User's Channel Membership."
   },
@@ -3508,34 +3460,22 @@
     "translation": "User nickname is too long."
   },
   {
-    "id": "app.import.validate_user_import_data.pasword_length.error",
-    "translation": "User Password has invalid length."
-  },
-  {
-    "id": "app.import.validate_user_import_data.position_length.error",
-    "translation": "User Position is too long."
-  },
-  {
-    "id": "app.import.validate_user_import_data.roles_invalid.error",
-    "translation": "User roles are not valid."
+    "id": "app.import.validate_user_import_data.notify_props_channel_trigger_invalid.error",
+    "translation": "Invalid Channel Trigger Notify Prop for user."
   },
   {
-    "id": "app.import.validate_user_import_data.username_invalid.error",
-    "translation": "Username is not valid."
+    "id": "app.import.validate_user_import_data.notify_props_comment_trigger_invalid.error",
+    "translation": "Invalid Comment Trigger Notify Prop for user."
   },
   {
-    "id": "app.import.validate_user_import_data.username_missing.error",
-    "translation": "Missing require user property: username."
+    "id": "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error",
+    "translation": "Invalid Desktop Duration Notify Prop value for user."
   },
   {
     "id": "app.import.validate_user_import_data.notify_props_desktop_invalid.error",
     "translation": "Invalid Desktop Notify Prop value for user."
   },
   {
-    "id": "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error",
-    "translation": "Invalid Desktop Duration Notify Prop value for user."
-  },
-  {
     "id": "app.import.validate_user_import_data.notify_props_desktop_sound_invalid.error",
     "translation": "Invalid Desktop Sound Notify Prop value for user."
   },
@@ -3552,92 +3492,80 @@
     "translation": "Invalid Mobile Push Status Notify Prop for user."
   },
   {
-    "id": "app.import.validate_user_import_data.notify_props_channel_trigger_invalid.error",
-    "translation": "Invalid Channel Trigger Notify Prop for user."
-  },
-  {
-    "id": "app.import.validate_user_import_data.notify_props_comment_trigger_invalid.error",
-    "translation": "Invalid Comment Trigger Notify Prop for user."
-  },
-  {
-    "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
-    "translation": "Invalid roles for User's Team Membership."
-  },
-  {
-    "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
-    "translation": "Team name missing from User's Team Membership."
+    "id": "app.import.validate_user_import_data.pasword_length.error",
+    "translation": "User Password has invalid length."
   },
   {
-    "id": "authentication.roles.system_post_all.name",
-    "translation": "Post in Public, Private and Direct Channels"
+    "id": "app.import.validate_user_import_data.position_length.error",
+    "translation": "User Position is too long."
   },
   {
-    "id": "authentication.roles.system_post_all.description",
-    "translation": "A role with the permission to post in any public, private or direct channel on the system"
+    "id": "app.import.validate_user_import_data.roles_invalid.error",
+    "translation": "User roles are not valid."
   },
   {
-    "id": "authentication.roles.system_post_all_public.name",
-    "translation": "Post in Public Channels"
+    "id": "app.import.validate_user_import_data.username_invalid.error",
+    "translation": "Username is not valid."
   },
   {
-    "id": "authentication.roles.system_post_all_public.description",
-    "translation": "A role with the permission to post in any public channel on the system"
+    "id": "app.import.validate_user_import_data.username_missing.error",
+    "translation": "Missing require user property: username."
   },
   {
-    "id": "authentication.roles.team_post_all.name",
-    "translation": "Post in Public and Private Channels"
+    "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
+    "translation": "Invalid roles for User's Team Membership."
   },
   {
-    "id": "authentication.roles.team_post_all.description",
-    "translation": "A role with the permission to post in any public or private channel on the team"
+    "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
+    "translation": "Team name missing from User's Team Membership."
   },
   {
-    "id": "authentication.roles.team_post_all_public.name",
-    "translation": "Post in Public Channels"
+    "id": "app.notification.body.intro.direct.full",
+    "translation": "You have a new direct message."
   },
   {
-    "id": "authentication.roles.team_post_all_public.description",
-    "translation": "A role with the permission to post in any public channel on the team"
+    "id": "app.notification.body.intro.direct.generic",
+    "translation": "You have a new direct message from {{.SenderName}}"
   },
   {
-    "id": "authentication.roles.system_user_access_token.name",
-    "translation": "Personal Access Token"
+    "id": "app.notification.body.intro.notification.full",
+    "translation": "You have a new notification."
   },
   {
-    "id": "authentication.roles.system_user_access_token.description",
-    "translation": "A role with the permissions to create, read and revoke personal access tokens"
+    "id": "app.notification.body.intro.notification.generic",
+    "translation": "You have a new notification from {{.SenderName}}"
   },
   {
-    "id": "authentication.permissions.create_post_public.name",
-    "translation": "Create Posts in Public Channels"
+    "id": "app.notification.body.text.direct.full",
+    "translation": "{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
-    "id": "authentication.permissions.create_post_public.description",
-    "translation": "Ability to create posts in public channels"
+    "id": "app.notification.body.text.direct.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
-    "id": "authentication.permissions.create_user_access_token.name",
-    "translation": "Create Personal Access Token"
+    "id": "app.notification.body.text.notification.full",
+    "translation": "CHANNEL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
-    "id": "authentication.permissions.create_user_access_token.description",
-    "translation": "Ability to create personal access tokens"
+    "id": "app.notification.body.text.notification.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
-    "id": "authentication.permissions.read_user_access_token.name",
-    "translation": "Read Personal Access Tokens"
+    "id": "app.notification.subject.direct.full",
+    "translation": "[{{.SiteName}}] New Direct Message from {{.SenderDisplayName}} on {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
-    "id": "authentication.permissions.read_user_access_token.description",
-    "translation": "Ability to read personal access tokens' id, description and user_id fields"
+    "id": "app.notification.subject.notification.full",
+    "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
-    "id": "authentication.permissions.revoke_user_access_token.name",
-    "translation": "Revoke Personal Access Token"
+    "id": "app.user_access_token.disabled",
+    "translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details."
   },
   {
-    "id": "authentication.permissions.revoke_user_access_token.description",
-    "translation": "Ability to revoke personal access tokens"
+    "id": "app.user_access_token.invalid_or_missing",
+    "translation": "Invalid or missing token"
   },
   {
     "id": "authentication.permissions.create_group_channel.description",
@@ -3648,6 +3576,14 @@
     "translation": "Create Group Message"
   },
   {
+    "id": "authentication.permissions.create_post_public.description",
+    "translation": "Ability to create posts in public channels"
+  },
+  {
+    "id": "authentication.permissions.create_post_public.name",
+    "translation": "Create Posts in Public Channels"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Ability to create new teams"
   },
@@ -3656,6 +3592,14 @@
     "translation": "Create Teams"
   },
   {
+    "id": "authentication.permissions.create_user_access_token.description",
+    "translation": "Ability to create personal access tokens"
+  },
+  {
+    "id": "authentication.permissions.create_user_access_token.name",
+    "translation": "Create Personal Access Token"
+  },
+  {
     "id": "authentication.permissions.manage_jobs.description",
     "translation": "Ability to manage jobs"
   },
@@ -3680,6 +3624,22 @@
     "translation": "Read Public Channels"
   },
   {
+    "id": "authentication.permissions.read_user_access_token.description",
+    "translation": "Ability to read personal access tokens' id, description and user_id fields"
+  },
+  {
+    "id": "authentication.permissions.read_user_access_token.name",
+    "translation": "Read Personal Access Tokens"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.description",
+    "translation": "Ability to revoke personal access tokens"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.name",
+    "translation": "Revoke Personal Access Token"
+  },
+  {
     "id": "authentication.permissions.team_invite_user.description",
     "translation": "Ability to invite users to a team"
   },
@@ -3696,6 +3656,46 @@
     "translation": "Use Slash Commands"
   },
   {
+    "id": "authentication.roles.system_post_all.description",
+    "translation": "A role with the permission to post in any public, private or direct channel on the system"
+  },
+  {
+    "id": "authentication.roles.system_post_all.name",
+    "translation": "Post in Public, Private and Direct Channels"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.description",
+    "translation": "A role with the permission to post in any public channel on the system"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.name",
+    "translation": "Post in Public Channels"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.description",
+    "translation": "A role with the permissions to create, read and revoke personal access tokens"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.name",
+    "translation": "Personal Access Token"
+  },
+  {
+    "id": "authentication.roles.team_post_all.description",
+    "translation": "A role with the permission to post in any public or private channel on the team"
+  },
+  {
+    "id": "authentication.roles.team_post_all.name",
+    "translation": "Post in Public and Private Channels"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.description",
+    "translation": "A role with the permission to post in any public channel on the team"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.name",
+    "translation": "Post in Public Channels"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "Feature requires an enterprise license. Please contact your system administrator about upgrading your enterprise license."
   },
@@ -3788,52 +3788,52 @@
     "translation": "Compliance export started for job '{{.JobName}}' at '{{.FilePath}}'"
   },
   {
-    "id": "ent.elasticsearch.delete_post.error",
-    "translation": "Failed to delete the post"
+    "id": "ent.elasticsearch.create_client.connect_failed",
+    "translation": "Setting up Elasticsearch Client Failed"
   },
   {
-    "id": "ent.elasticsearch.index_post.error",
-    "translation": "Failed to index the post"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_create_failed",
+    "translation": "Failed to create Elasticsearch index"
   },
   {
-    "id": "ent.elasticsearch.not_started.error",
-    "translation": "Elasticsearch is not started"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_exists_failed",
+    "translation": "Failed to establish whether Elasticsearch index exists"
   },
   {
-    "id": "ent.elasticsearch.search_posts.disabled",
-    "translation": "Elasticsearch searching is disabled on this server"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_mapping_failed",
+    "translation": "Failed to setup Elasticsearch index mapping"
   },
   {
-    "id": "ent.elasticsearch.generic.disabled",
-    "translation": "Elasticsearch search is not enabled on this server"
+    "id": "ent.elasticsearch.delete_post.error",
+    "translation": "Failed to delete the post"
   },
   {
-    "id": "ent.elasticsearch.purge_indexes.delete_failed",
-    "translation": "Failed to delete Elasticsearch index"
+    "id": "ent.elasticsearch.generic.disabled",
+    "translation": "Elasticsearch search is not enabled on this server"
   },
   {
-    "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "Search failed to complete"
+    "id": "ent.elasticsearch.index_post.error",
+    "translation": "Failed to index the post"
   },
   {
-    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
-    "translation": "Failed to decode search results"
+    "id": "ent.elasticsearch.not_started.error",
+    "translation": "Elasticsearch is not started"
   },
   {
-    "id": "ent.elasticsearch.create_client.connect_failed",
-    "translation": "Setting up Elasticsearch Client Failed"
+    "id": "ent.elasticsearch.purge_indexes.delete_failed",
+    "translation": "Failed to delete Elasticsearch index"
   },
   {
-    "id": "ent.elasticsearch.create_index_if_not_exists.index_create_failed",
-    "translation": "Failed to create Elasticsearch index"
+    "id": "ent.elasticsearch.search_posts.disabled",
+    "translation": "Elasticsearch searching is disabled on this server"
   },
   {
-    "id": "ent.elasticsearch.create_index_if_not_exists.index_exists_failed",
-    "translation": "Failed to establish whether Elasticsearch index exists"
+    "id": "ent.elasticsearch.search_posts.search_failed",
+    "translation": "Search failed to complete"
   },
   {
-    "id": "ent.elasticsearch.create_index_if_not_exists.index_mapping_failed",
-    "translation": "Failed to setup Elasticsearch index mapping"
+    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
+    "translation": "Failed to decode search results"
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
@@ -4068,14 +4068,14 @@
     "translation": "Page not found"
   },
   {
-    "id": "jobs.set_job_error.update.error",
-    "translation": "Failed to set job status to error"
-  },
-  {
     "id": "jobs.request_cancellation.status.error",
     "translation": "Could not request cancellation for job that is not in a cancelable state."
   },
   {
+    "id": "jobs.set_job_error.update.error",
+    "translation": "Failed to set job status to error"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Could not find channel: %v, %v possibilities searched"
   },
@@ -4160,18 +4160,6 @@
     "translation": "Invalid access token"
   },
   {
-    "id": "model.user_access_token.is_valid.token.app_error",
-    "translation": "Invalid access token"
-  },
-  {
-    "id": "model.user_access_token.is_valid.user_id.app_error",
-    "translation": "Invalid user id"
-  },
-  {
-    "id": "model.user_access_token.is_valid.description.app_error",
-    "translation": "Invalid description, must be 255 or less characters"
-  },
-  {
     "id": "model.access.is_valid.client_id.app_error",
     "translation": "Invalid client id"
   },
@@ -4780,22 +4768,22 @@
     "translation": "Invalid user id"
   },
   {
-    "id": "model.job.is_valid.id.app_error",
-    "translation": "Invalid job Id"
-  },
-  {
     "id": "model.job.is_valid.create_at.app_error",
     "translation": "Create at must be a valid time"
   },
   {
-    "id": "model.job.is_valid.type.app_error",
-    "translation": "Invalid job type"
+    "id": "model.job.is_valid.id.app_error",
+    "translation": "Invalid job Id"
   },
   {
     "id": "model.job.is_valid.status.app_error",
     "translation": "Invalid job status"
   },
   {
+    "id": "model.job.is_valid.type.app_error",
+    "translation": "Invalid job type"
+  },
+  {
     "id": "model.oauth.is_valid.app_id.app_error",
     "translation": "Invalid app id"
   },
@@ -5172,6 +5160,18 @@
     "translation": "Invalid username"
   },
   {
+    "id": "model.user_access_token.is_valid.description.app_error",
+    "translation": "Invalid description, must be 255 or less characters"
+  },
+  {
+    "id": "model.user_access_token.is_valid.token.app_error",
+    "translation": "Invalid access token"
+  },
+  {
+    "id": "model.user_access_token.is_valid.user_id.app_error",
+    "translation": "Invalid user id"
+  },
+  {
     "id": "model.utils.decode_json.app_error",
     "translation": "could not decode"
   },
@@ -6216,26 +6216,6 @@
     "translation": "We couldn't update the team name"
   },
   {
-    "id": "store.sql_user_access_token.get_by_user.app_error",
-    "translation": "We couldn't get the personal access tokens by user"
-  },
-  {
-    "id": "store.sql_user_access_token.get_by_token.app_error",
-    "translation": "We couldn't get the personal access token by token"
-  },
-  {
-    "id": "store.sql_user_access_token.get.app_error",
-    "translation": "We couldn't get the personal access token"
-  },
-  {
-    "id": "store.sql_user_access_token.delete.app_error",
-    "translation": "We couldn't delete the personal access token"
-  },
-  {
-    "id": "store.sql_user_access_token.save.app_error",
-    "translation": "We couldn't save the personal access token"
-  },
-  {
     "id": "store.sql_user.analytics_get_inactive_users_count.app_error",
     "translation": "We could not count the inactive users"
   },
@@ -6424,6 +6404,26 @@
     "translation": "Unable to update verify email field"
   },
   {
+    "id": "store.sql_user_access_token.delete.app_error",
+    "translation": "We couldn't delete the personal access token"
+  },
+  {
+    "id": "store.sql_user_access_token.get.app_error",
+    "translation": "We couldn't get the personal access token"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_token.app_error",
+    "translation": "We couldn't get the personal access token by token"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_user.app_error",
+    "translation": "We couldn't get the personal access tokens by user"
+  },
+  {
+    "id": "store.sql_user_access_token.save.app_error",
+    "translation": "We couldn't save the personal access token"
+  },
+  {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "We couldn't count the incoming webhooks"
   },
@@ -6464,19 +6464,19 @@
     "translation": "We couldn't get the webhooks"
   },
   {
-    "id": "store.sql_webhooks.permanent_delete_incoming_by_user.app_error",
+    "id": "store.sql_webhooks.permanent_delete_incoming_by_channel.app_error",
     "translation": "We couldn't delete the webhook"
   },
   {
-    "id": "store.sql_webhooks.permanent_delete_incoming_by_channel.app_error",
+    "id": "store.sql_webhooks.permanent_delete_incoming_by_user.app_error",
     "translation": "We couldn't delete the webhook"
   },
   {
-    "id": "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error",
+    "id": "store.sql_webhooks.permanent_delete_outgoing_by_channel.app_error",
     "translation": "We couldn't delete the webhook"
   },
   {
-    "id": "store.sql_webhooks.permanent_delete_outgoing_by_channel.app_error",
+    "id": "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error",
     "translation": "We couldn't delete the webhook"
   },
   {
@@ -6508,6 +6508,10 @@
     "translation": "System"
   },
   {
+    "id": "utils.config.add_client_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  Adding DefaultClientLocale to AvailableLocales."
+  },
+  {
     "id": "utils.config.load_config.decoding.panic",
     "translation": "Error decoding config file={{.Filename}}, err={{.Error}}"
   },
@@ -6528,10 +6532,6 @@
     "translation": "An error occurred while saving the file to {{.Filename}}"
   },
   {
-    "id": "utils.config.add_client_locale.app_error",
-    "translation": "Unable to load mattermost configuration file:  Adding DefaultClientLocale to AvailableLocales."
-  },
-  {
     "id": "utils.config.supported_available_locales.app_error",
     "translation": "Unable to load mattermost configuration file:  AvailableLocales must include DefaultClientLocale. Setting AvailableLocales to all locales as default value."
   },
diff --git a/i18n/es.json b/i18n/es.json
index e32abcdb1..69db22128 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -532,6 +532,90 @@
     "translation": "El encabezado del canal fue actualizado correctamente."
   },
   {
+    "id": "api.command_channel_purpose.channel.app_error",
+    "translation": "Error al recuperar el canal actual."
+  },
+  {
+    "id": "api.command_channel_purpose.desc",
+    "translation": "Editar el propósito del canal"
+  },
+  {
+    "id": "api.command_channel_purpose.direct_group.app_error",
+    "translation": "No se puede establecer el propósito en los canales de mensaje directo. Utiliza /header para establecer el encabezado en su lugar."
+  },
+  {
+    "id": "api.command_channel_purpose.hint",
+    "translation": "[texto]"
+  },
+  {
+    "id": "api.command_channel_purpose.message.app_error",
+    "translation": "Un mensaje debe ser proporcionado con el comando /purpose."
+  },
+  {
+    "id": "api.command_channel_purpose.name",
+    "translation": "propósito"
+  },
+  {
+    "id": "api.command_channel_purpose.permission.app_error",
+    "translation": "No tienes los permisos adecuados para modificar el propósito del canal."
+  },
+  {
+    "id": "api.command_channel_purpose.update_channel.app_error",
+    "translation": "Error al actualizar el canal actual."
+  },
+  {
+    "id": "api.command_channel_rename.channel.app_error",
+    "translation": "Error al recuperar el canal actual."
+  },
+  {
+    "id": "api.command_channel_rename.desc",
+    "translation": "Renombrar el canal"
+  },
+  {
+    "id": "api.command_channel_rename.direct_group.app_error",
+    "translation": "No puedes renombrar un canal de mensajes directos"
+  },
+  {
+    "id": "api.command_channel_rename.hint",
+    "translation": "[texto]"
+  },
+  {
+    "id": "api.command_channel_rename.message.app_error",
+    "translation": "Un mensaje debe ser proporcionado con el comando /rename."
+  },
+  {
+    "id": "api.command_channel_rename.name",
+    "translation": "rename"
+  },
+  {
+    "id": "api.command_channel_rename.permission.app_error",
+    "translation": "No tienes los permisos adecuados para renombrar el canal."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.app_error",
+    "translation": "Error al actualizar el canal actual."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.success",
+    "translation": "El nombre del canal fue actualizado correctamente."
+  },
+  {
+    "id": "api.command_code.desc",
+    "translation": "Mostrar el texto como un bloque de código"
+  },
+  {
+    "id": "api.command_code.hint",
+    "translation": "[texto]"
+  },
+  {
+    "id": "api.command_code.message.app_error",
+    "translation": "Un mensaje debe ser proporcionado con el comando /code."
+  },
+  {
+    "id": "api.command_code.name",
+    "translation": "código"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "Activar auto-colapso de previsualizaciones de imagen"
   },
@@ -624,6 +708,30 @@
     "translation": "Te uniste al canal."
   },
   {
+    "id": "api.command_leave.desc",
+    "translation": "Abandonar el canal actual"
+  },
+  {
+    "id": "api.command_leave.fail.app_error",
+    "translation": "Ocurrió un error al abandonar al canal."
+  },
+  {
+    "id": "api.command_leave.list.app_error",
+    "translation": "Ocurrió un error al listar los canales."
+  },
+  {
+    "id": "api.command_leave.missing.app_error",
+    "translation": "No pudimos encontrar el canal"
+  },
+  {
+    "id": "api.command_leave.name",
+    "translation": "leave"
+  },
+  {
+    "id": "api.command_leave.success",
+    "translation": "Abandonaste el canal."
+  },
+  {
     "id": "api.command_logout.desc",
     "translation": "Salir de Mattermost"
   },
@@ -1009,7 +1117,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
-    "translation": "Mensaje Directo"
+    "translation": "Direct Message from "
   },
   {
     "id": "api.email_batching.render_batched_post.go_to_post",
@@ -1017,7 +1125,11 @@
   },
   {
     "id": "api.email_batching.render_batched_post.group_message",
-    "translation": "Mensaje de Grupo"
+    "translation": "Group Message from "
+  },
+  {
+    "id": "api.email_batching.render_batched_post.notification",
+    "translation": "Notification from "
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
@@ -1026,8 +1138,8 @@
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
     "translation": {
-      "one": "Tienes un mensaje nuevo.",
-      "other": "Tienes {{.Count}} mensajes nuevos."
+      "one": "You have a new notification.",
+      "other": "You have {{.Count}} new notifications."
     }
   },
   {
@@ -1696,22 +1808,10 @@
     "translation": "No se pudo obtener los equipos durante el envío de mensaje directo entre equipos user_id=%v, err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.mention_body",
-    "translation": "Tienes una mención nueva."
-  },
-  {
     "id": "api.post.send_notifications_and_forget.mention_subject",
     "translation": "Nueva Mención"
   },
   {
-    "id": "api.post.send_notifications_and_forget.message_body",
-    "translation": "Tienes un mensaje nuevo."
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.message_subject",
-    "translation": "Nuevo Mensaje Directo"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.push_image_only",
     "translation": " Cargó uno o más archivos en "
   },
@@ -1728,6 +1828,10 @@
     "translation": " te mencionó en "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "translation": " te mencionó en "
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_message",
     "translation": " te envió un mensaje directo"
   },
@@ -1736,6 +1840,10 @@
     "translation": " publicado en "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
+    "translation": " publicó un mensaje"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
     "translation": "Error al enviar push device_id={{.DeviceId}}, err={{.Error}}"
   },
@@ -1873,11 +1981,11 @@
   },
   {
     "id": "api.slackimport.slack_add_bot_user.email_pwd",
-    "translation": "Usuario de Slack Bot/Integración para Importar Mensajes: Email, Contraseña: {{.Email}}, {{.Password}}\r\n"
+    "translation": "The Integration/Slack Bot user with email {{.Email}} and password {{.Password}} has been imported.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_bot_user.unable_import",
-    "translation": "No se pudo importar los mensajes del usuario importado Slack Bot/Integración: {{.Username}}\r\n"
+    "translation": "Unable to import the Integration/Slack Bot user {{.Username}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.added",
@@ -1885,71 +1993,71 @@
   },
   {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
-    "translation": "Falla al agregar el usuario al canal: {{.Username}}\r\n"
+    "translation": "Unable to add Slack user {{.Username}} to channel.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed",
-    "translation": "Falla al importar: {{.DisplayName}}\r\n"
+    "translation": "Unable to import Slack channel {{.DisplayName}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Importador de Slack: no se pudo importar el canal: %s"
+    "translation": "Slack Import: Unable to import Slack channel: %s."
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
-    "translation": "Unificado al canal existente: {{.DisplayName}}\r\n"
+    "translation": "The Slack channel {{.DisplayName}} already exists as an active Mattermost channel. Both channels have been merged.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_posts.attach_files.error",
-    "translation": "Se encontró un error al adjuntar archivos al mensaje, post_id=%s, file_ids=%v, err=%v"
+    "translation": "Slack Import: An error occurred when attaching files to a message, post_id=%s, file_ids=%v, err=%v."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot.warn",
-    "translation": "Mensajes del Bot de Slack no han sido importados todavía"
+    "translation": "Slack Import: Slack bot messages cannot be imported yet."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot_user_no_exists.warn",
-    "translation": "Importador de Slack: No se importan los mensajes de bot porque el usuario bot-importing no existe."
+    "translation": "Slack Import: Unable to import the bot message as the bot user does not exist."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
-    "translation": "Comentario de archivo indefinido"
+    "translation": "Slack Import: Unable to import the message as it has no comments."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_usr.debug",
-    "translation": "Mensaje sin usuario"
+    "translation": "Slack Import: Unable to import the message as the user field is missing."
   },
   {
     "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
-    "translation": "Importador de Slack: No se importan los mensajes de bot porque falta el campo BotId."
+    "translation": "Slack Import: Unable to import bot message as the BotId field is missing."
   },
   {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
-    "translation": "Tipo de mensaje no soportado: %v, %v"
+    "translation": "Slack Import: Unable to import the message as its type is not supported: post_type=%v, post_subtype=%v."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_found.warn",
-    "translation": "No se encontró el archivo en la exportación de Slack para adjuntar al mensaje con ID de archivo {{.FileId}}"
+    "translation": "Slack Import: Unable to import file {{.FileId}} as the file is missing from the Slack export zip file."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_in_json.warn",
-    "translation": "No se puede importar el archivo para adjuntar al mensaje sin la sección \"file\" presente en la exportación."
+    "translation": "Slack Import: Unable to attach the file to the post as the latter has no \"file\" section present in Slack export."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_open_failed.warn",
-    "translation": "No se puede abrir el archivo adjunto con ID {{.FileId}} en el archivo de exportación con error: {{.Error}}"
+    "translation": "Slack Import: Unable to open the file {{.FileId}} from the Slack export: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_upload_failed.warn",
-    "translation": "Se produjo un error al subir un archivo adjunto al mensaje con ID del archivo {{.FileId}} con el siguiente error: {{.Error}}"
+    "translation": "Slack Import: An error occurred when uploading file {{.FileId}}: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.user_no_exists.debug",
-    "translation": "El usuario: %v no existe!"
+    "translation": "Slack Import: Unable to add the message as the Slack user %v does not exist in Mattermost."
   },
   {
     "id": "api.slackimport.slack_add_posts.without_user.debug",
-    "translation": "Mensaje sin usuario"
+    "translation": "Slack Import: Unable to import the message as the user field is missing."
   },
   {
     "id": "api.slackimport.slack_add_users.created",
@@ -1957,15 +2065,15 @@
   },
   {
     "id": "api.slackimport.slack_add_users.email_pwd",
-    "translation": "Correo electrónico, Contraseña: {{.Email}}, {{.Password}}\r\n"
+    "translation": "Slack user with email {{.Email}} and password {{.Password}} has been imported.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing",
-    "translation": "Combinado el usuario con una cuenta existente: {{.Email}}, {{.Username}}\r\n"
+    "translation": "Slack user merged with an existing Mattermost user with matching email {{.Email}} and username {{.Username}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing_failed",
-    "translation": "Se trató de combinar el usuario con una cuenta existente: {{.Email}}, {{.Username}}, pero no se pudo agregar el usuario a este equipo.\r\n"
+    "translation": "Slack user merged with an existing Mattermost user with matching email {{.Email}} and username {{.Username}}, but was unable to add the user to their team.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address",
@@ -1981,19 +2089,19 @@
   },
   {
     "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
-    "translation": "No se pudo compilar la coincidencia del !canal con expresión regular para el canal de Slack {{.ChannelID}} {{.ChannelName}}"
+    "translation": "Slack Import: Unable to compile the !channel, matching regular expression for the Slack channel {{.ChannelName}} (id={{.ChannelID}})."
   },
   {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
-    "translation": "Se ha detectado la marca del tiempo errada"
+    "translation": "Slack Import: Bad timestamp detected."
   },
   {
     "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}}"
+    "translation": "Slack Import: Unable to compile the @mention, matching regular expression for the Slack user {{.Username}} (id={{.UserID}})."
   },
   {
     "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
-    "translation": "Importador de Slack: Falla al desactivar el usuario bot-importing."
+    "translation": "Slack Import: Unable to deactivate the user account used for the bot."
   },
   {
     "id": "api.slackimport.slack_import.log",
@@ -2017,7 +2125,7 @@
   },
   {
     "id": "api.slackimport.slack_import.open.app_error",
-    "translation": "No se pudo abrir: {{.Filename}}"
+    "translation": "Unable to open the file: {{.Filename}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_import.team_fail",
@@ -2025,15 +2133,15 @@
   },
   {
     "id": "api.slackimport.slack_import.zip.app_error",
-    "translation": "No se puede abrir el archivo comprimido"
+    "translation": "Unable to open the Slack export zip file.\r\n"
   },
   {
     "id": "api.slackimport.slack_parse_channels.error",
-    "translation": "Error de análisis de los canales de slack. Importación puede que funcione de todos modos."
+    "translation": "Slack Import: Error occurred when parsing some Slack channels. Import may work anyway."
   },
   {
     "id": "api.slackimport.slack_parse_posts.error",
-    "translation": "Error en el análisis de los mensajes de slack. Importación puede que funcione de todos modos."
+    "translation": "Slack Import: Error occurred when parsing some Slack posts. Import may work anyway."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
@@ -2041,7 +2149,7 @@
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Importador de Slack: El canal: {{.ChannelName}} tiene una cabecera, que es demasiado larga. Se truncará cuando sea importado."
+    "translation": "Importador de Slack: El canal: {{.ChannelName}} tiene un nombre que es demasiado largo. Se truncará cuando sea importado."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
@@ -2332,22 +2440,6 @@
     "translation": "Ir a al mensaje"
   },
   {
-    "id": "api.templates.post_body.info",
-    "translation": "Canal: {{.ChannelName}}<br>{{.SenderName}} - {{.Day}} {{.Month}}, {{.Hour}}:{{.Minute}} {{.TimeZone}}"
-  },
-  {
-    "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}} de {{.SenderDisplayName}} el {{.Day}} {{.Month}}, {{.Year}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_group_message",
-    "translation": "Nuevo Mensaje de Grupo de {{.SenderDisplayName}} el {{.Day}} {{.Month}}, {{.Year}}"
-  },
-  {
     "id": "api.templates.reset_body.button",
     "translation": "Restablecer Contraseña"
   },
@@ -2404,6 +2496,18 @@
     "translation": "[MATTERMOST] Cambios a tu cuenta para la Actualización a Mattermost 3.0"
   },
   {
+    "id": "api.templates.user_access_token_body.info",
+    "translation": "Un token de acceso de usuario ha sido agregado a tu cuenta en {{ .SiteURL }}. El token puede ser utilizado para accesar {{.SiteName}} con tu cuenta.<br>Si este cambió no fue realizado por ti, por favor contacta a tu administrador del sistema."
+  },
+  {
+    "id": "api.templates.user_access_token_body.title",
+    "translation": "Token de acceso de usuario agregado a tu cuenta"
+  },
+  {
+    "id": "api.templates.user_access_token_subject",
+    "translation": "[{{ .SiteName }}] Token de acceso de usuario añadido a tu cuenta"
+  },
+  {
     "id": "api.templates.username_change_body.info",
     "translation": "Tu nombre de usuario en {{.TeamDisplayName}} ha sido cambiado por {{.NewUsername}}.<br>Si este cambio no fue realizado por ti, por favor contacta un administrador de sistema."
   },
@@ -2760,6 +2864,10 @@
     "translation": "Error al enviar la notificación por correo del cambio satisfactorio de contraseña"
   },
   {
+    "id": "api.user.send_user_access_token.error",
+    "translation": "Error al enviar correo electrónico de token de acceso de usuario añadido correctamente"
+  },
+  {
     "id": "api.user.send_verify_email_and_forget.failed.error",
     "translation": "Error al enviar la notificación por correo electrónico de la verificación del correo electrónico"
   },
@@ -3072,6 +3180,10 @@
     "translation": "No se pudo obtener el canal de grupo"
   },
   {
+    "id": "app.import.import_direct_post.save_preferences.error",
+    "translation": "Error en la importación mensajes directos. Error al guardar las preferencias."
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "El usuario que publicó el mensaje no existe"
   },
@@ -3108,6 +3220,10 @@
     "translation": "Error al importar el mensaje. El canal con el nombre \"{{.ChannelName}}\" no pudo ser encontrado."
   },
   {
+    "id": "app.import.import_post.save_preferences.error",
+    "translation": "Error al importar el mensaje. Error al guardar las preferencias."
+  },
+  {
     "id": "app.import.import_post.team_not_found.error",
     "translation": "Error al importar el mensaje. El equipo con el nombre \"{{.TeamName}}\" no pudo ser encontrado."
   },
@@ -3116,6 +3232,10 @@
     "translation": "Error al importar el mensaje. El usuario con nombre de usuario \"{{.Username}}\" no pudo ser encontrado."
   },
   {
+    "id": "app.import.import_user_channels.save_preferences.error",
+    "translation": "Error al importar las membresías del canal. Error al guardar las preferencias."
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "La propiedad create_at del canal no debe ser cero si se proporciona."
   },
@@ -3176,6 +3296,10 @@
     "translation": "La lista de miembros del canal directo contiene demasiados elementos"
   },
   {
+    "id": "app.import.validate_direct_channel_import_data.unknown_favoriter.error",
+    "translation": "Canales directos sólo pueden establecerse como favoritos por sus miembros. \"{{.Username}}\" no es un miembro."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
     "translation": "Falta la propiedad del mensaje: channel_members."
   },
@@ -3204,6 +3328,10 @@
     "translation": "Falta la propiedad obligatoria del mensaje del canal directo: message"
   },
   {
+    "id": "app.import.validate_direct_post_import_data.unknown_flagger.error",
+    "translation": "Mensajes en canales directos sólo pueden ser marcado por sus miembros. \"{{.Username}}\" no es un miembro."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
     "translation": "Falta la propiedad obligatoria del mensaje del canal directo: user"
   },
@@ -3285,13 +3413,17 @@
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
-    "translation": "Las NotifyProps de escritorio para el Canal del Usuario en la Afiliación no es válido."
+    "translation": "Las propiedades de notificación de escritorio para el miembro de canal no son válidas."
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
     "translation": "Las NotifyProps de MarkUnread para el Canal del Usuario en la Afiliación no es válido."
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mobile.error",
+    "translation": "Las propiedades de notificación móviles para el miembro de canal no son válidas."
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "Invalid roles for User's Channel Membership."
   },
@@ -3328,6 +3460,38 @@
     "translation": "La propiedad nickname del usuario es demasiado larga."
   },
   {
+    "id": "app.import.validate_user_import_data.notify_props_channel_trigger_invalid.error",
+    "translation": "La propiedad de las palabras que desencadenan notificaciones del usuario no es válida."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_comment_trigger_invalid.error",
+    "translation": "La propiedad de notificación por comentarios del usuario no es válida."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error",
+    "translation": "La propiedad de la duración para la notificación de escritorio del usuario no es válida."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_invalid.error",
+    "translation": "Las propiedades de notificación de escritorio del usuario no es válida."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_sound_invalid.error",
+    "translation": "La propiedad de sonido para la notificación de escritorio del usuario no es válida."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_email_invalid.error",
+    "translation": "La propiedad de notificación de correo electrónico del usuario no es válida."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_invalid.error",
+    "translation": "La propiedad de notificación móvil del usuario no es válida."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_push_status_invalid.error",
+    "translation": "La propiedad de notificación del estatus del usuario para recibir mediante push no es válida."
+  },
+  {
     "id": "app.import.validate_user_import_data.pasword_length.error",
     "translation": "La contraseña del usuario tiene una longitud no válida."
   },
@@ -3356,6 +3520,54 @@
     "translation": "Team name missing from User's Team Membership."
   },
   {
+    "id": "app.notification.body.intro.direct.full",
+    "translation": "Tienes un mensaje nuevo."
+  },
+  {
+    "id": "app.notification.body.intro.direct.generic",
+    "translation": "You have a new direct message from {{.SenderName}}"
+  },
+  {
+    "id": "app.notification.body.intro.notification.full",
+    "translation": "You have a new notification."
+  },
+  {
+    "id": "app.notification.body.intro.notification.generic",
+    "translation": "You have a new notification from {{.SenderName}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.full",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full",
+    "translation": "Canal: {{.ChannelName}}<br>{{.SenderName}} - {{.Day}} {{.Month}}, {{.Hour}}:{{.Minute}} {{.TimeZone}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}"
+  },
+  {
+    "id": "app.notification.subject.direct.full",
+    "translation": "Nuevo Mensaje de Grupo de {{.SenderDisplayName}} el {{.Day}} {{.Month}}, {{.Year}}"
+  },
+  {
+    "id": "app.notification.subject.notification.full",
+    "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
+    "id": "app.user_access_token.disabled",
+    "translation": "Los tokens de acceso de usuario están deshabilitadas en este servidor. Por favor, póngase en contacto con su administrador del sistema para obtener más detalles."
+  },
+  {
+    "id": "app.user_access_token.invalid_or_missing",
+    "translation": "Token no válido o ausente"
+  },
+  {
     "id": "authentication.permissions.create_group_channel.description",
     "translation": "Capacidad para crear nuevos canales de mensaje de grupo"
   },
@@ -3364,6 +3576,14 @@
     "translation": "Create Mensaje de Grupo"
   },
   {
+    "id": "authentication.permissions.create_post_public.description",
+    "translation": "Capacidad para crear mensajes en los canales públicos"
+  },
+  {
+    "id": "authentication.permissions.create_post_public.name",
+    "translation": "Crear Publicaciones en Canales Públicos"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Capacidad para crear equipos nuevos"
   },
@@ -3372,6 +3592,22 @@
     "translation": "Crear Equipos"
   },
   {
+    "id": "authentication.permissions.create_user_access_token.description",
+    "translation": "Capacidad para crear tokens de acceso de usuario"
+  },
+  {
+    "id": "authentication.permissions.create_user_access_token.name",
+    "translation": "Crear Token de Acceso de Usuario"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.description",
+    "translation": "Capacidad para administrar los trabajos"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.name",
+    "translation": "Administrar Trabajos"
+  },
+  {
     "id": "authentication.permissions.manage_team_roles.description",
     "translation": "Capacidad para cambiar los roles de un miembro del equipo"
   },
@@ -3388,6 +3624,22 @@
     "translation": "Leer Canales Públicos"
   },
   {
+    "id": "authentication.permissions.read_user_access_token.description",
+    "translation": "Capacidad para leer los campos de id, description y user_id de los tokens de acceso "
+  },
+  {
+    "id": "authentication.permissions.read_user_access_token.name",
+    "translation": "Leer Tokens de Acceso de Usuario"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.description",
+    "translation": "Capacidad para revocar tokens de acceso de usuario"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.name",
+    "translation": "Revocar Token de Acceso de Usuario"
+  },
+  {
     "id": "authentication.permissions.team_invite_user.description",
     "translation": "Capacidad para invitar usuarios a un equipo"
   },
@@ -3404,6 +3656,46 @@
     "translation": "Usar Comandos de Barra"
   },
   {
+    "id": "authentication.roles.system_post_all.description",
+    "translation": "Un rol con el permiso para publicar mensajes en cualquier canal público, privado o directo en el sistema"
+  },
+  {
+    "id": "authentication.roles.system_post_all.name",
+    "translation": "Publicar en Canales Públicos, Privados y Directos"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.description",
+    "translation": "Un rol con el permiso para publicar en cualquier canal público en el sistema"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.name",
+    "translation": "Publicar en Canales Públicos"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.description",
+    "translation": "Un rol con el permiso de crear, leer y revocar tokens de acceso de usuario"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.name",
+    "translation": "Token de Acceso de Usuario"
+  },
+  {
+    "id": "authentication.roles.team_post_all.description",
+    "translation": "Un rol con el permiso para publicar mensajes en cualquier canal público o privado en el equipo"
+  },
+  {
+    "id": "authentication.roles.team_post_all.name",
+    "translation": "Publicar en Canales Públicos y Privados"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.description",
+    "translation": "Un rol con el permiso para publicar en cualquier canal público en el equipo"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.name",
+    "translation": "Publicar en Canales Públicos"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "La característica requiere una licencia de empresa. Por favor, póngase en contacto con su Administrador del Sistema acerca de la actualización de su licencia empresarial."
   },
@@ -3496,36 +3788,60 @@
     "translation": "Iniciado el trabajo '{{.JobName}}' para exportar el Cumplimiento en '{{.FilePath}}'"
   },
   {
-    "id": "ent.elasticsearch.search_posts.disabled",
-    "translation": "La búsqueda con ElasticSearch está deshabilitada en este servidor"
+    "id": "ent.elasticsearch.create_client.connect_failed",
+    "translation": "La configuración del cliente de Elasticsearch falló"
   },
   {
-    "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "La búsqueda no se pudo completar"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_create_failed",
+    "translation": "No se pudo crear el índice de Elasticsearch"
   },
   {
-    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
-    "translation": "No pudo decodificar los resultados de búsqueda"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_exists_failed",
+    "translation": "No se pudo establecer si existe un índice de Elasticsearch"
+  },
+  {
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_mapping_failed",
+    "translation": "Error al configurar el mapa de índices de Elasticsearch"
   },
   {
-    "id": "ent.elasticsearch.start.connect_failed",
-    "translation": "La configuración de ElasticSearch Cliente falló"
+    "id": "ent.elasticsearch.delete_post.error",
+    "translation": "Error al eliminar el mensaje"
   },
   {
-    "id": "ent.elasticsearch.start.index_create_failed",
-    "translation": "No se pudo crear el índice de ElasticSearch"
+    "id": "ent.elasticsearch.generic.disabled",
+    "translation": "La búsqueda con Elasticsearch está deshabilitada en este servidor"
   },
   {
-    "id": "ent.elasticsearch.start.index_exists_failed",
-    "translation": "No se pudo establecer si existe un índice de ElasticSearch"
+    "id": "ent.elasticsearch.index_post.error",
+    "translation": "Error al indexar el mensaje"
   },
   {
-    "id": "ent.elasticsearch.start.index_mapping_failed",
-    "translation": "Error al configurar el mapa de índices de ElasticSearch"
+    "id": "ent.elasticsearch.not_started.error",
+    "translation": "Elasticsearch no se ha iniciado"
+  },
+  {
+    "id": "ent.elasticsearch.purge_indexes.delete_failed",
+    "translation": "No se pudo borrar el índice de ElasticSearch"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.disabled",
+    "translation": "La búsqueda con Elasticsearch está deshabilitada en este servidor"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.search_failed",
+    "translation": "La búsqueda no se pudo completar"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
+    "translation": "No pudo decodificar los resultados de búsqueda"
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
-    "translation": "No se pudo establecer el índice de configuración de ElasticSearch"
+    "translation": "No se pudo establecer el índice de configuración de Elasticsearch"
+  },
+  {
+    "id": "ent.elasticsearch.test_config.connect_failed",
+    "translation": "La conexión al servidor Elasticsearch no pudo establecer."
   },
   {
     "id": "ent.elasticsearch.test_config.indexing_disabled.error",
@@ -3536,6 +3852,10 @@
     "translation": "La licencia no admite Elasticsearch."
   },
   {
+    "id": "ent.elasticsearch.test_config.reenter_password",
+    "translation": "La dirección URL del Servidor Elasticsearch o el nombre de Usuario ha cambiado. Por favor, vuelva a introducir la contraseña de Elasticsearch para probar la conexión."
+  },
+  {
     "id": "ent.emoji.licence_disable.app_error",
     "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 empresarial."
   },
@@ -3748,6 +4068,14 @@
     "translation": "Página no encontrada"
   },
   {
+    "id": "jobs.request_cancellation.status.error",
+    "translation": "No se puede solicitar la cancelación de un trabajo que no está en un estado cancelable."
+  },
+  {
+    "id": "jobs.set_job_error.update.error",
+    "translation": "No se puede establecer el estado al trabajo de error"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "No pudimos encontrar el canal: %v, búsqueda realizada con estas posibilidades %v"
   },
@@ -4116,6 +4444,10 @@
     "translation": "Intervalo inválido para los correos electrónicos por lotes en la configuración de correo electrónico.  Debe ser de 30 segundos o más."
   },
   {
+    "id": "model.config.is_valid.email_notification_contents_type.app_error",
+    "translation": "Invalid email notification contents type for email settings. Must be one of either 'full' or 'generic'."
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "Salt para restablecer contraseñas en la configuración de correos es inválido.  Debe ser de 32 caracteres o más."
   },
@@ -4436,6 +4768,22 @@
     "translation": "Id del Usuario inválido"
   },
   {
+    "id": "model.job.is_valid.create_at.app_error",
+    "translation": "Create debe ser un tiempo válido"
+  },
+  {
+    "id": "model.job.is_valid.id.app_error",
+    "translation": "ID de trabajo no válido."
+  },
+  {
+    "id": "model.job.is_valid.status.app_error",
+    "translation": "Estado del trabajo no válido"
+  },
+  {
+    "id": "model.job.is_valid.type.app_error",
+    "translation": "Tipo de trabajo inválido"
+  },
+  {
     "id": "model.oauth.is_valid.app_id.app_error",
     "translation": "Id de la App inválido"
   },
@@ -4812,6 +5160,18 @@
     "translation": "Nombre de usuario inválido"
   },
   {
+    "id": "model.user_access_token.is_valid.description.app_error",
+    "translation": "Descripción no válida, debe tener 255 o menos carácteres"
+  },
+  {
+    "id": "model.user_access_token.is_valid.token.app_error",
+    "translation": "Token de acceso no válido"
+  },
+  {
+    "id": "model.user_access_token.is_valid.user_id.app_error",
+    "translation": "Id de usuario no válido"
+  },
+  {
     "id": "model.utils.decode_json.app_error",
     "translation": "no se puede decodificar"
   },
@@ -4921,7 +5281,7 @@
   },
   {
     "id": "store.sql.schema_version.critical",
-    "translation": "La version del esquema de la base de datos %v no puede ser actualizada.  No debes saltarte ninguna versión anterior."
+    "translation": "Database schema version %v is no longer supported. This Mattermost server supports automatic upgrades from schema version %v through schema version %v. Downgrades are not supported. Please manually upgrade to at least version %v before continuing"
   },
   {
     "id": "store.sql.short_ciphertext",
@@ -5296,24 +5656,24 @@
     "translation": "No pudimos guardar o actualizar la información del archivo"
   },
   {
-    "id": "store.sql_job_status.delete_by_type.app_error",
-    "translation": "No pudimos eliminar el trabajo de estatus"
+    "id": "store.sql_job.delete.app_error",
+    "translation": "No pudimos eliminar el trabajo"
   },
   {
-    "id": "store.sql_job_status.get.app_error",
-    "translation": "No pudimos obtener el trabajo de estatus"
+    "id": "store.sql_job.get.app_error",
+    "translation": "No pudimos obtener el trabajo"
   },
   {
-    "id": "store.sql_job_status.get_all.app_error",
-    "translation": "No pudimos obtener todos los trabajos de estatus"
+    "id": "store.sql_job.get_all.app_error",
+    "translation": "No pudimos obtener los trabajos"
   },
   {
-    "id": "store.sql_job_status.save.app_error",
-    "translation": "No pudimos guardar el trabajo de estatus"
+    "id": "store.sql_job.save.app_error",
+    "translation": "No pudimos guardar el trabajo"
   },
   {
-    "id": "store.sql_job_status.update.app_error",
-    "translation": "No pudimos actualizar el trabajo de estatus"
+    "id": "store.sql_job.update.app_error",
+    "translation": "No pudimos actualizar el trabajo"
   },
   {
     "id": "store.sql_license.get.app_error",
@@ -5464,6 +5824,10 @@
     "translation": "No pudimos obtener los mensajes padres del canal"
   },
   {
+    "id": "store.sql_post.get_posts_batch_for_indexing.get.app_error",
+    "translation": "No se pudo obtener los mensajes en lote para la indexación"
+  },
+  {
     "id": "store.sql_post.get_posts_by_ids.app_error",
     "translation": "No pudimos obtener los mensajes"
   },
@@ -6040,6 +6404,26 @@
     "translation": "No se puede actualizar el campo de verificar correo"
   },
   {
+    "id": "store.sql_user_access_token.delete.app_error",
+    "translation": "No pudimos eliminar el token de acceso de usuario"
+  },
+  {
+    "id": "store.sql_user_access_token.get.app_error",
+    "translation": "No pudimos obtener el token de acceso de usuario"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_token.app_error",
+    "translation": "No pudimos obtener el token de acceso de usuario por token"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_user.app_error",
+    "translation": "No pudimos obtener el token de acceso de usuario por usuario"
+  },
+  {
+    "id": "store.sql_user_access_token.save.app_error",
+    "translation": "No pudimos guardar el token de acceso de usuario"
+  },
+  {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "No pudimos contar la cantidad de webhooks entrantes"
   },
@@ -6080,10 +6464,18 @@
     "translation": "No pudimos obtener los webhooks"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_incoming_by_channel.app_error",
+    "translation": "No pudimos eliminar el webhook"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_incoming_by_user.app_error",
     "translation": "No pudimos eliminar el webhook"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_outgoing_by_channel.app_error",
+    "translation": "No pudimos eliminar el webhook"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error",
     "translation": "No pudimos eliminar el webhook"
   },
@@ -6116,6 +6508,10 @@
     "translation": "Sistema"
   },
   {
+    "id": "utils.config.add_client_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  Adding DefaultClientLocale to AvailableLocales."
+  },
+  {
     "id": "utils.config.load_config.decoding.panic",
     "translation": "Error decifrando la configuración del archivo={{.Filename}}, err={{.Error}}"
   },
@@ -6136,8 +6532,12 @@
     "translation": "Ocurrió un error mientras se guardaba el archivo en {{.Filename}}"
   },
   {
+    "id": "utils.config.supported_available_locales.app_error",
+    "translation": "Unable to load mattermost configuration file:  AvailableLocales must include DefaultClientLocale. Setting AvailableLocales to all locales as default value."
+  },
+  {
     "id": "utils.config.supported_client_locale.app_error",
-    "translation": "No se pudo cargar la configuración de mattermost:  El valor de DefaultClientLocale debe ser uno de los idiomas soportados"
+    "translation": "Unable to load mattermost configuration file:  DefaultClientLocale must be one of the supported locales. Setting DefaultClientLocale to en as default value."
   },
   {
     "id": "utils.config.supported_server_locale.app_error",
diff --git a/i18n/fr.json b/i18n/fr.json
index 55f288749..fdf954005 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -532,6 +532,90 @@
     "translation": "L'entête du canal a été mis à jour avec succès."
   },
   {
+    "id": "api.command_channel_purpose.channel.app_error",
+    "translation": "Impossible de récupérer le canal courant."
+  },
+  {
+    "id": "api.command_channel_purpose.desc",
+    "translation": "Edit the channel purpose"
+  },
+  {
+    "id": "api.command_channel_purpose.direct_group.app_error",
+    "translation": "Cannot set purpose for direct message channels. Use /header to set the header instead."
+  },
+  {
+    "id": "api.command_channel_purpose.hint",
+    "translation": "[texte]"
+  },
+  {
+    "id": "api.command_channel_purpose.message.app_error",
+    "translation": "Un message doit être fourni avec la commande /echo."
+  },
+  {
+    "id": "api.command_channel_purpose.name",
+    "translation": "purpose"
+  },
+  {
+    "id": "api.command_channel_purpose.permission.app_error",
+    "translation": "Vous ne disposez pas des permissions requises pour éditer l'entête du canal."
+  },
+  {
+    "id": "api.command_channel_purpose.update_channel.app_error",
+    "translation": "Une erreur s'est produite lors de la mise à jour du canal."
+  },
+  {
+    "id": "api.command_channel_rename.channel.app_error",
+    "translation": "Impossible de récupérer le canal courant."
+  },
+  {
+    "id": "api.command_channel_rename.desc",
+    "translation": "Rename the channel"
+  },
+  {
+    "id": "api.command_channel_rename.direct_group.app_error",
+    "translation": "Impossible de quitter un canal de messages privés"
+  },
+  {
+    "id": "api.command_channel_rename.hint",
+    "translation": "[texte]"
+  },
+  {
+    "id": "api.command_channel_rename.message.app_error",
+    "translation": "Un message doit être fourni avec la commande /echo."
+  },
+  {
+    "id": "api.command_channel_rename.name",
+    "translation": "rename"
+  },
+  {
+    "id": "api.command_channel_rename.permission.app_error",
+    "translation": "Vous ne disposez pas des permissions requises pour éditer l'entête du canal."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.app_error",
+    "translation": "Une erreur s'est produite lors de la mise à jour du canal."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.success",
+    "translation": "L'entête du canal a été mis à jour avec succès."
+  },
+  {
+    "id": "api.command_code.desc",
+    "translation": "Display text as a code block"
+  },
+  {
+    "id": "api.command_code.hint",
+    "translation": "[texte]"
+  },
+  {
+    "id": "api.command_code.message.app_error",
+    "translation": "Un message doit être fourni avec la commande /echo."
+  },
+  {
+    "id": "api.command_code.name",
+    "translation": "code"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "Activer la réduction automatique des aperçus d'images"
   },
@@ -624,6 +708,30 @@
     "translation": "Canal rejoint."
   },
   {
+    "id": "api.command_leave.desc",
+    "translation": "Leave the current channel"
+  },
+  {
+    "id": "api.command_leave.fail.app_error",
+    "translation": "Une erreur s'est produite en rejoignant le canal."
+  },
+  {
+    "id": "api.command_leave.list.app_error",
+    "translation": "Une erreur s'est produite lors de la récupération de la liste des canaux."
+  },
+  {
+    "id": "api.command_leave.missing.app_error",
+    "translation": "Impossible de trouver le canal"
+  },
+  {
+    "id": "api.command_leave.name",
+    "translation": "leave"
+  },
+  {
+    "id": "api.command_leave.success",
+    "translation": "Left the channel."
+  },
+  {
     "id": "api.command_logout.desc",
     "translation": "Se déconnecter de Mattermost"
   },
@@ -1009,7 +1117,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
-    "translation": "Message privé"
+    "translation": "Direct Message from "
   },
   {
     "id": "api.email_batching.render_batched_post.go_to_post",
@@ -1017,7 +1125,11 @@
   },
   {
     "id": "api.email_batching.render_batched_post.group_message",
-    "translation": "Message de groupe"
+    "translation": "Group Message from "
+  },
+  {
+    "id": "api.email_batching.render_batched_post.notification",
+    "translation": "Notification from "
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
@@ -1026,8 +1138,8 @@
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
     "translation": {
-      "one": "Vous avez un nouveau message.",
-      "other": "Vous avez {{.Count}} nouveaux messages."
+      "one": "You have a new notification.",
+      "other": "You have {{.Count}} new notifications."
     }
   },
   {
@@ -1696,22 +1808,10 @@
     "translation": "Impossible d'obtenir les équipes lors de l'envoi d'un message privé entre équipes user_id=%v, err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.mention_body",
-    "translation": "Vous avez une nouvelle mention."
-  },
-  {
     "id": "api.post.send_notifications_and_forget.mention_subject",
     "translation": "Nouvelle Mention"
   },
   {
-    "id": "api.post.send_notifications_and_forget.message_body",
-    "translation": "Vous avez un nouveau message."
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.message_subject",
-    "translation": "Nouveau message privé"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.push_image_only",
     "translation": " A envoyé un ou plusieurs fichiers sur "
   },
@@ -1728,6 +1828,10 @@
     "translation": " vous a mentionné sur "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "translation": " vous a mentionné sur "
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_message",
     "translation": " vous a envoyé un message privé"
   },
@@ -1736,6 +1840,10 @@
     "translation": " publié dans "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
+    "translation": " posted a message"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
     "translation": "Impossible d'envoyer la notification push device_id={{.DeviceId}}, err={{.Error}}"
   },
@@ -1873,11 +1981,11 @@
   },
   {
     "id": "api.slackimport.slack_add_bot_user.email_pwd",
-    "translation": "Importation de l'utilisateur pour le Bot Slack/messages d'intégration : adresse e-mail, mot de passe : {{.Email}}, {{.Password}}\r\n"
+    "translation": "The Integration/Slack Bot user with email {{.Email}} and password {{.Password}} has been imported.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_bot_user.unable_import",
-    "translation": "Impossible d'importer l'utilisateur pour le Bot Slack/messages d'intégration : {{.Username}}\r\n"
+    "translation": "Unable to import the Integration/Slack Bot user {{.Username}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.added",
@@ -1885,71 +1993,71 @@
   },
   {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
-    "translation": "Impossible d'ajouter l'utilisateur au canal : {{.Username}}\r\n"
+    "translation": "Unable to add Slack user {{.Username}} to channel.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed",
-    "translation": "Échec de l'import : {{.DisplayName}}\r\n"
+    "translation": "Unable to import Slack channel {{.DisplayName}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Importateur Slack : Impossible d'importer le canal: %s"
+    "translation": "Slack Import: Unable to import Slack channel: %s."
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
-    "translation": "Fusionné avec un canal existant : {{.DisplayName}}\r\n"
+    "translation": "The Slack channel {{.DisplayName}} already exists as an active Mattermost channel. Both channels have been merged.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_posts.attach_files.error",
-    "translation": "Une erreur s'est produite lors de l'ajout des fichiers au message, post_id=%s, file_ids=%v, err=%v"
+    "translation": "Slack Import: An error occurred when attaching files to a message, post_id=%s, file_ids=%v, err=%v."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot.warn",
-    "translation": "Les messages du bot Slack ne sont pas encore importés"
+    "translation": "Slack Import: Slack bot messages cannot be imported yet."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot_user_no_exists.warn",
-    "translation": "Importateur Slack : Impossible d'importer le message du bot car un utilisateur pour le bot n'existe pas"
+    "translation": "Slack Import: Unable to import the bot message as the bot user does not exist."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
-    "translation": "Commentaire de fichier non défini"
+    "translation": "Slack Import: Unable to import the message as it has no comments."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_usr.debug",
-    "translation": "Message sans utilisateur"
+    "translation": "Slack Import: Unable to import the message as the user field is missing."
   },
   {
     "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
-    "translation": "Importateur Slack : Impossible d'importer le message du bot car le champ BodId est absent"
+    "translation": "Slack Import: Unable to import bot message as the BotId field is missing."
   },
   {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
-    "translation": "Type de message non supporté : %v, %v"
+    "translation": "Slack Import: Unable to import the message as its type is not supported: post_type=%v, post_subtype=%v."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_found.warn",
-    "translation": "Aucun fichier trouvé dans l'export du message Slack contenant le fichier envoyé portant l'ID {{.FileId}}"
+    "translation": "Slack Import: Unable to import file {{.FileId}} as the file is missing from the Slack export zip file."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_in_json.warn",
-    "translation": "Impossible d'importer le fichier car l'exportation de Slack ne comporte pas de section 'file'"
+    "translation": "Slack Import: Unable to attach the file to the post as the latter has no \"file\" section present in Slack export."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_open_failed.warn",
-    "translation": "Impossible d'ouvrir le fichier portant l'ID {{.FileId}} provenant de l'exportation de Slack car l'erreur suivante s'est produite : {{.Error}}"
+    "translation": "Slack Import: Unable to open the file {{.FileId}} from the Slack export: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_upload_failed.warn",
-    "translation": "L'envoi du message comprenant le fichier ayant l'ID {{.FileId}} a échoué avec l'erreur : {{.Error}}"
+    "translation": "Slack Import: An error occurred when uploading file {{.FileId}}: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.user_no_exists.debug",
-    "translation": "Utilisateur : %v n'existe pas !"
+    "translation": "Slack Import: Unable to add the message as the Slack user %v does not exist in Mattermost."
   },
   {
     "id": "api.slackimport.slack_add_posts.without_user.debug",
-    "translation": "Message sans utilisateur"
+    "translation": "Slack Import: Unable to import the message as the user field is missing."
   },
   {
     "id": "api.slackimport.slack_add_users.created",
@@ -1957,15 +2065,15 @@
   },
   {
     "id": "api.slackimport.slack_add_users.email_pwd",
-    "translation": "E-mail, Mot de passe : {{.Email}}, {{.Password}}\r\n"
+    "translation": "Slack user with email {{.Email}} and password {{.Password}} has been imported.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing",
-    "translation": "L'utilisateur a été fusionné avec le compte existant : {{.Email}}, {{.Username}}\r\n"
+    "translation": "Slack user merged with an existing Mattermost user with matching email {{.Email}} and username {{.Username}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing_failed",
-    "translation": "Impossible de fusionner l'utilisateur avec le compte existant : {{.Email}}, {{.Username}}, l'utilisateur n'a pas été ajouté à cette équipe.\r\n"
+    "translation": "Slack user merged with an existing Mattermost user with matching email {{.Email}} and username {{.Username}}, but was unable to add the user to their team.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address",
@@ -1981,19 +2089,19 @@
   },
   {
     "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
-    "translation": "Échec de la compilation de l'expression régulière correspondant à !channel pour l'utilisateur Slack {{.UserID}} {{.Username}}"
+    "translation": "Slack Import: Unable to compile the !channel, matching regular expression for the Slack channel {{.ChannelName}} (id={{.ChannelID}})."
   },
   {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
-    "translation": "Mauvais timestamp détecté"
+    "translation": "Slack Import: Bad timestamp detected."
   },
   {
     "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
-    "translation": "Échec de la compilation de la @mention correspondant à l'expression régulière pour l'utilisateur Slack {{.UserID}} {{.Username}}"
+    "translation": "Slack Import: Unable to compile the @mention, matching regular expression for the Slack user {{.Username}} (id={{.UserID}})."
   },
   {
     "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
-    "translation": "Importateur Slack : Impossible de désactiver l'utilisateur dédié au bot"
+    "translation": "Slack Import: Unable to deactivate the user account used for the bot."
   },
   {
     "id": "api.slackimport.slack_import.log",
@@ -2017,7 +2125,7 @@
   },
   {
     "id": "api.slackimport.slack_import.open.app_error",
-    "translation": "Impossible d'ouvrir : {{.Filename}}"
+    "translation": "Unable to open the file: {{.Filename}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_import.team_fail",
@@ -2025,23 +2133,23 @@
   },
   {
     "id": "api.slackimport.slack_import.zip.app_error",
-    "translation": "Impossible d'ouvrir le fichier zip"
+    "translation": "Unable to open the Slack export zip file.\r\n"
   },
   {
     "id": "api.slackimport.slack_parse_channels.error",
-    "translation": "Erreur lors de la lecture des canaux de slack. L'importation peut toutefois quand même fonctionner."
+    "translation": "Slack Import: Error occurred when parsing some Slack channels. Import may work anyway."
   },
   {
     "id": "api.slackimport.slack_parse_posts.error",
-    "translation": "Erreur lors de la lecture de certains messages slack. L'importation peut toutefois quand même fonctionner."
+    "translation": "Slack Import: Error occurred when parsing some Slack posts. Import may work anyway."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Importateur Slack : Le nom d'affichage du canal {{.ChannelName}} est trop long. Il sera tronqué lors de l'import."
+    "translation": "Importateur Slack : Le nom du canal {{.ChannelName}} est trop long. Il sera tronqué lors de l'import."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Importateur Slack : L'entête du canal {{.ChannelName}} est trop long. Il sera tronqué lors de l'import."
+    "translation": "Importateur Slack : Le nom du canal {{.ChannelName}} est trop long. Il sera tronqué lors de l'import."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
@@ -2332,22 +2440,6 @@
     "translation": "Aller au message"
   },
   {
-    "id": "api.templates.post_body.info",
-    "translation": "CANAL : {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
-  },
-  {
-    "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}} de {{.SenderDisplayName}} du {{.Day}} {{.Month}} {{.Year}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_group_message",
-    "translation": "Nouveau message de groupe de {{.SenderDisplayName}} du {{.Day}} {{.Month}} {{.Year}}"
-  },
-  {
     "id": "api.templates.reset_body.button",
     "translation": "Réinitialiser le mot de passe"
   },
@@ -2404,6 +2496,18 @@
     "translation": "[MATTERMOST] Modifications sur votre compte utilisateur pour Mattermost 3.0"
   },
   {
+    "id": "api.templates.user_access_token_body.info",
+    "translation": "A user access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.user_access_token_body.title",
+    "translation": "User access token added to your account"
+  },
+  {
+    "id": "api.templates.user_access_token_subject",
+    "translation": "[{{ .SiteName }}] User access token added to your account"
+  },
+  {
     "id": "api.templates.username_change_body.info",
     "translation": "Votre nom d'utilisateur pour {{.TeamDisplayName}} a été modifiée en {{.NewUsername}}.<br>Si vous n'êtes pas à l'origine de cette action, veuillez contacter votre administrateur système."
   },
@@ -2760,6 +2864,10 @@
     "translation": "Impossible d'envoyer l'e-mail de mise à jour du mot de passe"
   },
   {
+    "id": "api.user.send_user_access_token.error",
+    "translation": "Failed to send user access token added email successfully"
+  },
+  {
     "id": "api.user.send_verify_email_and_forget.failed.error",
     "translation": "Impossible d'envoyer l'e-mail de vérification"
   },
@@ -3072,6 +3180,10 @@
     "translation": "Impossible de récupérer le canal de messages de groupe"
   },
   {
+    "id": "app.import.import_direct_post.save_preferences.error",
+    "translation": "Error importing direct post. Failed to save preferences."
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "Le message de l'utilisateur n'existe pas"
   },
@@ -3108,6 +3220,10 @@
     "translation": "Erreur lors de l'importation du message. Le canal portant le nom \"{{.ChannelName}}\" n'a pas pu être trouvé."
   },
   {
+    "id": "app.import.import_post.save_preferences.error",
+    "translation": "Error importing post. Failed to save preferences."
+  },
+  {
     "id": "app.import.import_post.team_not_found.error",
     "translation": "Erreur lors de l'importation du message. L'équipe portant le nom \"{{.TeamName}}\" n'a pas pu être trouvée."
   },
@@ -3116,6 +3232,10 @@
     "translation": "Erreur lors de l'importation du message. L'utilisateur portant le nom \"{{.Username}}\" n'a pas pu être trouvé."
   },
   {
+    "id": "app.import.import_user_channels.save_preferences.error",
+    "translation": "Error importing user channel memberships. Failed to save preferences."
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "La propriété de canal create_at ne doit pas être 0 si ce champ est fourni."
   },
@@ -3176,6 +3296,10 @@
     "translation": "La liste des membres du canal de messages privés contient trop d'éléments"
   },
   {
+    "id": "app.import.validate_direct_channel_import_data.unknown_favoriter.error",
+    "translation": "Direct channel can only be favorited by members. \"{{.Username}}\" is not a member."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
     "translation": "La propriété requise pour un message privé est manquante: channel_members"
   },
@@ -3204,6 +3328,10 @@
     "translation": "La propriété requise pour un message privé est manquante: message"
   },
   {
+    "id": "app.import.validate_direct_post_import_data.unknown_flagger.error",
+    "translation": "Direct post can only be flagged by members of the channel it is in. \"{{.Username}}\" is not a member."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
     "translation": "La propriété requise pour un message privé est manquante: user"
   },
@@ -3292,6 +3420,10 @@
     "translation": "La propriété MarkUnread NotifyProps de la liste des canaux de l'utilisateur est invalide."
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mobile.error",
+    "translation": "La propriété Desktop NotifyProps de la liste des canaux de l'utilisateur est invalide."
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "Rôles invalides pour la liste des canaux de l'utilisateur."
   },
@@ -3328,6 +3460,38 @@
     "translation": "Le surnom de l'utilisateur est trop long."
   },
   {
+    "id": "app.import.validate_user_import_data.notify_props_channel_trigger_invalid.error",
+    "translation": "Invalid Channel Trigger Notify Prop for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_comment_trigger_invalid.error",
+    "translation": "Invalid Comment Trigger Notify Prop for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error",
+    "translation": "Invalid Desktop Duration Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_invalid.error",
+    "translation": "Invalid Desktop Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_sound_invalid.error",
+    "translation": "Invalid Desktop Sound Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_email_invalid.error",
+    "translation": "Invalid Email Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_invalid.error",
+    "translation": "Invalid Mobile Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_push_status_invalid.error",
+    "translation": "Invalid Mobile Push Status Notify Prop for user."
+  },
+  {
     "id": "app.import.validate_user_import_data.pasword_length.error",
     "translation": "Le mot de passe utilisateur a une longueur invalide."
   },
@@ -3356,6 +3520,54 @@
     "translation": "Le nom d'équipe est manquant de la liste des canaux de l'utilisateur."
   },
   {
+    "id": "app.notification.body.intro.direct.full",
+    "translation": "Vous avez un nouveau message."
+  },
+  {
+    "id": "app.notification.body.intro.direct.generic",
+    "translation": "You have a new direct message from {{.SenderName}}"
+  },
+  {
+    "id": "app.notification.body.intro.notification.full",
+    "translation": "You have a new notification."
+  },
+  {
+    "id": "app.notification.body.intro.notification.generic",
+    "translation": "You have a new notification from {{.SenderName}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.full",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full",
+    "translation": "CANAL : {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.subject.direct.full",
+    "translation": "Nouveau message de groupe de {{.SenderDisplayName}} du {{.Day}} {{.Month}} {{.Year}}"
+  },
+  {
+    "id": "app.notification.subject.notification.full",
+    "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
+    "id": "app.user_access_token.disabled",
+    "translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details."
+  },
+  {
+    "id": "app.user_access_token.invalid_or_missing",
+    "translation": "Invalid or missing token"
+  },
+  {
     "id": "authentication.permissions.create_group_channel.description",
     "translation": "Possibilité de créer de nouveaux canaux pour les messages de groupe."
   },
@@ -3364,6 +3576,14 @@
     "translation": "Créer un message de groupe"
   },
   {
+    "id": "authentication.permissions.create_post_public.description",
+    "translation": "Ability to create posts in public channels"
+  },
+  {
+    "id": "authentication.permissions.create_post_public.name",
+    "translation": "Create Posts in Public Channels"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Possibilité de créer de nouvelles équipes"
   },
@@ -3372,6 +3592,22 @@
     "translation": "Créer des équipes"
   },
   {
+    "id": "authentication.permissions.create_user_access_token.description",
+    "translation": "Ability to create personal access tokens"
+  },
+  {
+    "id": "authentication.permissions.create_user_access_token.name",
+    "translation": "Create Personal Access Token"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.description",
+    "translation": "Ability to manage jobs"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.name",
+    "translation": "Manage Jobs"
+  },
+  {
     "id": "authentication.permissions.manage_team_roles.description",
     "translation": "Possibilité de changer les rôles d'un membre d'une équipe"
   },
@@ -3388,6 +3624,22 @@
     "translation": "Lire les canaux publics"
   },
   {
+    "id": "authentication.permissions.read_user_access_token.description",
+    "translation": "Ability to read personal access tokens' id, description and user_id fields"
+  },
+  {
+    "id": "authentication.permissions.read_user_access_token.name",
+    "translation": "Read Personal Access Tokens"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.description",
+    "translation": "Ability to revoke personal access tokens"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.name",
+    "translation": "Revoke Personal Access Token"
+  },
+  {
     "id": "authentication.permissions.team_invite_user.description",
     "translation": "Possibilité d'inviter des utilisateurs dans une équipe"
   },
@@ -3404,6 +3656,46 @@
     "translation": "Utiliser les commandes slash"
   },
   {
+    "id": "authentication.roles.system_post_all.description",
+    "translation": "A role with the permission to post in any public, private or direct channel on the system"
+  },
+  {
+    "id": "authentication.roles.system_post_all.name",
+    "translation": "Post in Public, Private and Direct Channels"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.description",
+    "translation": "A role with the permission to post in any public channel on the system"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.name",
+    "translation": "Post in Public Channels"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.description",
+    "translation": "A role with the permissions to create, read and revoke personal access tokens"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.name",
+    "translation": "Personal Access Token"
+  },
+  {
+    "id": "authentication.roles.team_post_all.description",
+    "translation": "A role with the permission to post in any public or private channel on the team"
+  },
+  {
+    "id": "authentication.roles.team_post_all.name",
+    "translation": "Post in Public and Private Channels"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.description",
+    "translation": "A role with the permission to post in any public channel on the team"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.name",
+    "translation": "Post in Public Channels"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "Fonctionnalité désactivée pour la licence courante. Veuillez contacter votre administrateur système concernant la mise à niveau de votre licence entreprise."
   },
@@ -3496,38 +3788,62 @@
     "translation": "L'export de compatibilité a démarré pour le job '{{.JobName}}' à '{{.FilePath}}'"
   },
   {
-    "id": "ent.elasticsearch.search_posts.disabled",
-    "translation": "La recherche ElasticSearch est désactivée sur ce serveur"
+    "id": "ent.elasticsearch.create_client.connect_failed",
+    "translation": "La configuration du client ElasticSearch a échoué"
   },
   {
-    "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "La recherche a échoué"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_create_failed",
+    "translation": "Impossible de créer l'index d'ElasticSearch"
   },
   {
-    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
-    "translation": "Impossible de décoder les résultats de recherche"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_exists_failed",
+    "translation": "Impossible de savoir si l'index d'ElasticSearch existe"
   },
   {
-    "id": "ent.elasticsearch.start.connect_failed",
-    "translation": "La configuration du client ElasticSearch a échoué"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_mapping_failed",
+    "translation": "Impossible de configurer le mappage de l'index d'ElasticSearch"
+  },
+  {
+    "id": "ent.elasticsearch.delete_post.error",
+    "translation": "Failed to delete the post"
+  },
+  {
+    "id": "ent.elasticsearch.generic.disabled",
+    "translation": "La recherche ElasticSearch est désactivée sur ce serveur"
+  },
+  {
+    "id": "ent.elasticsearch.index_post.error",
+    "translation": "Failed to index the post"
+  },
+  {
+    "id": "ent.elasticsearch.not_started.error",
+    "translation": "Elasticsearch is not started"
   },
   {
-    "id": "ent.elasticsearch.start.index_create_failed",
+    "id": "ent.elasticsearch.purge_indexes.delete_failed",
     "translation": "Impossible de créer l'index d'ElasticSearch"
   },
   {
-    "id": "ent.elasticsearch.start.index_exists_failed",
-    "translation": "Impossible de savoir si l'index d'ElasticSearch existe"
+    "id": "ent.elasticsearch.search_posts.disabled",
+    "translation": "La recherche ElasticSearch est désactivée sur ce serveur"
   },
   {
-    "id": "ent.elasticsearch.start.index_mapping_failed",
-    "translation": "Impossible de configurer le mappage de l'index d'ElasticSearch"
+    "id": "ent.elasticsearch.search_posts.search_failed",
+    "translation": "La recherche a échoué"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
+    "translation": "Impossible de décoder les résultats de recherche"
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Impossible de définir les paramètres de l'index d'ElasticSearch"
   },
   {
+    "id": "ent.elasticsearch.test_config.connect_failed",
+    "translation": "Connecting to Elasticsearch server failed."
+  },
+  {
     "id": "ent.elasticsearch.test_config.indexing_disabled.error",
     "translation": "Elasticsearch est désactivé."
   },
@@ -3536,6 +3852,10 @@
     "translation": "La licence actuelle ne supporte pas Elasticsearch."
   },
   {
+    "id": "ent.elasticsearch.test_config.reenter_password",
+    "translation": "The Elasticsearch Server URL or Username has changed. Please re-enter the Elasticsearch password to test connection."
+  },
+  {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "Les émoticônes personnalisées sont désactivées par la licence actuellement utilisée. Veuillez contacter votre administrateur système à propos d'une mise à niveau vers la licence entreprise."
   },
@@ -3748,6 +4068,14 @@
     "translation": "Page introuvable"
   },
   {
+    "id": "jobs.request_cancellation.status.error",
+    "translation": "Could not request cancellation for job that is not in a cancelable state."
+  },
+  {
+    "id": "jobs.set_job_error.update.error",
+    "translation": "Failed to set job status to error"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Impossible de trouver le canal : %v, %v possibilités recherchées"
   },
@@ -4116,6 +4444,10 @@
     "translation": "Intervalle d'envoi d'e-mails par lot invalide pour les paramètres d'e-mail. Doit être égal ou supérieur à 30 secondes."
   },
   {
+    "id": "model.config.is_valid.email_notification_contents_type.app_error",
+    "translation": "Invalid email notification contents type for email settings. Must be one of either 'full' or 'generic'."
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "Clé de salage de réinitialisation de mot de passe invalide dans les paramètres de messagerie. Doit être composée de 32 caractères ou plus."
   },
@@ -4436,6 +4768,22 @@
     "translation": "Id utilisateur invalide"
   },
   {
+    "id": "model.job.is_valid.create_at.app_error",
+    "translation": "La date de création doit être une date valide"
+  },
+  {
+    "id": "model.job.is_valid.id.app_error",
+    "translation": "Type invalide"
+  },
+  {
+    "id": "model.job.is_valid.status.app_error",
+    "translation": "Invalid job status"
+  },
+  {
+    "id": "model.job.is_valid.type.app_error",
+    "translation": "Type invalide"
+  },
+  {
     "id": "model.oauth.is_valid.app_id.app_error",
     "translation": "Id app invalide"
   },
@@ -4812,6 +5160,18 @@
     "translation": "Nom d'utilisateur invalide"
   },
   {
+    "id": "model.user_access_token.is_valid.description.app_error",
+    "translation": "Invalid description, must be 255 or less characters"
+  },
+  {
+    "id": "model.user_access_token.is_valid.token.app_error",
+    "translation": "Jeton d'accès invalide"
+  },
+  {
+    "id": "model.user_access_token.is_valid.user_id.app_error",
+    "translation": "Id utilisateur invalide"
+  },
+  {
     "id": "model.utils.decode_json.app_error",
     "translation": "impossible de décoder"
   },
@@ -4921,7 +5281,7 @@
   },
   {
     "id": "store.sql.schema_version.critical",
-    "translation": "Le schéma de la base de données en version %v ne peut être mis à jour. Vous ne devez pas sauter une version."
+    "translation": "Database schema version %v is no longer supported. This Mattermost server supports automatic upgrades from schema version %v through schema version %v. Downgrades are not supported. Please manually upgrade to at least version %v before continuing"
   },
   {
     "id": "store.sql.short_ciphertext",
@@ -5296,24 +5656,24 @@
     "translation": "Impossible de sauvegarder l'information ou modifier l'information du fichier"
   },
   {
-    "id": "store.sql_job_status.delete_by_type.app_error",
-    "translation": "Impossible de supprimer le statut du job"
+    "id": "store.sql_job.delete.app_error",
+    "translation": "Impossible de supprimer le message"
   },
   {
-    "id": "store.sql_job_status.get.app_error",
-    "translation": "Impossible de récupérer le statut du job"
+    "id": "store.sql_job.get.app_error",
+    "translation": "Impossible d'obtenir le message"
   },
   {
-    "id": "store.sql_job_status.get_all.app_error",
-    "translation": "Impossible de récupérer l'ensemble des statuts de job"
+    "id": "store.sql_job.get_all.app_error",
+    "translation": "Impossible de récupérer les messages"
   },
   {
-    "id": "store.sql_job_status.save.app_error",
-    "translation": "Impossible de sauvegarder le statut du job"
+    "id": "store.sql_job.save.app_error",
+    "translation": "Impossible d'enregistrer le message"
   },
   {
-    "id": "store.sql_job_status.update.app_error",
-    "translation": "Impossible de mettre à jour le statut du job"
+    "id": "store.sql_job.update.app_error",
+    "translation": "Impossible de mettre à jour le message"
   },
   {
     "id": "store.sql_license.get.app_error",
@@ -5464,6 +5824,10 @@
     "translation": "Impossible d'obtenir les messages parent pour le canal"
   },
   {
+    "id": "store.sql_post.get_posts_batch_for_indexing.get.app_error",
+    "translation": "We couldn't get the posts batch for indexing"
+  },
+  {
     "id": "store.sql_post.get_posts_by_ids.app_error",
     "translation": "Impossible de récupérer les messages"
   },
@@ -6040,6 +6404,26 @@
     "translation": "Impossible de mettre à jour le champ de vérification de l'adresse e-mail"
   },
   {
+    "id": "store.sql_user_access_token.delete.app_error",
+    "translation": "Impossible de retirer le jeton d'accès"
+  },
+  {
+    "id": "store.sql_user_access_token.get.app_error",
+    "translation": "Impossible de retirer le jeton d'accès"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_token.app_error",
+    "translation": "Impossible de retirer le jeton d'accès"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_user.app_error",
+    "translation": "Impossible de retirer le jeton d'accès"
+  },
+  {
+    "id": "store.sql_user_access_token.save.app_error",
+    "translation": "Impossible d'enregistrer le jeton d'accès."
+  },
+  {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "Impossible de compter les webhooks entrants"
   },
@@ -6080,10 +6464,18 @@
     "translation": "Impossible d'obtenir les webhooks"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_incoming_by_channel.app_error",
+    "translation": "Impossible de supprimer le webhook"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_incoming_by_user.app_error",
     "translation": "Impossible de supprimer le webhook"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_outgoing_by_channel.app_error",
+    "translation": "Impossible de supprimer le webhook"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error",
     "translation": "Impossible de supprimer le webhook"
   },
@@ -6116,6 +6508,10 @@
     "translation": "Système"
   },
   {
+    "id": "utils.config.add_client_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  Adding DefaultClientLocale to AvailableLocales."
+  },
+  {
     "id": "utils.config.load_config.decoding.panic",
     "translation": "Erreur de décodage de la configuration fichier={{.Filename}}, err={{.Error}}"
   },
@@ -6136,8 +6532,12 @@
     "translation": "Une erreur s'est produite lors de l'enregistrement du fichier {{.Filename}}"
   },
   {
+    "id": "utils.config.supported_available_locales.app_error",
+    "translation": "Unable to load mattermost configuration file:  AvailableLocales must include DefaultClientLocale. Setting AvailableLocales to all locales as default value."
+  },
+  {
     "id": "utils.config.supported_client_locale.app_error",
-    "translation": "Impossible de charger le fichier de configuration de Mattermost : DefaultClientLocale doit être l'un des paramètres régionaux pris en charge"
+    "translation": "Unable to load mattermost configuration file:  DefaultClientLocale must be one of the supported locales. Setting DefaultClientLocale to en as default value."
   },
   {
     "id": "utils.config.supported_server_locale.app_error",
diff --git a/i18n/it.json b/i18n/it.json
index 95ec55b3b..ec40ff1d3 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -532,6 +532,90 @@
     "translation": "Intestazione del canale aggiornata."
   },
   {
+    "id": "api.command_channel_purpose.channel.app_error",
+    "translation": "Errore nel caricamento del canale."
+  },
+  {
+    "id": "api.command_channel_purpose.desc",
+    "translation": "Modifica lo scopo del canale"
+  },
+  {
+    "id": "api.command_channel_purpose.direct_group.app_error",
+    "translation": "Impossibile impostare lo scopo dei canali per i messaggi diretti. E' possibile utilizzare il comando /header per impostare l'intestazione di questi canali."
+  },
+  {
+    "id": "api.command_channel_purpose.hint",
+    "translation": "[testo]"
+  },
+  {
+    "id": "api.command_channel_purpose.message.app_error",
+    "translation": "E necessarrio fornitre un messaggio al comando /purpose."
+  },
+  {
+    "id": "api.command_channel_purpose.name",
+    "translation": "scopo"
+  },
+  {
+    "id": "api.command_channel_purpose.permission.app_error",
+    "translation": "Non si dispone dei permessi necessari per modificare lo scopo del canale."
+  },
+  {
+    "id": "api.command_channel_purpose.update_channel.app_error",
+    "translation": "Errore nell'aggiornamento del canale."
+  },
+  {
+    "id": "api.command_channel_rename.channel.app_error",
+    "translation": "Errore nel caricamento del canale."
+  },
+  {
+    "id": "api.command_channel_rename.desc",
+    "translation": "Rinomina il canale"
+  },
+  {
+    "id": "api.command_channel_rename.direct_group.app_error",
+    "translation": "Impossibile rinominare un canale di messaggi diretti."
+  },
+  {
+    "id": "api.command_channel_rename.hint",
+    "translation": "[testo]"
+  },
+  {
+    "id": "api.command_channel_rename.message.app_error",
+    "translation": "Con il comando /rename è necessario fornire un messaggio."
+  },
+  {
+    "id": "api.command_channel_rename.name",
+    "translation": "rinomina"
+  },
+  {
+    "id": "api.command_channel_rename.permission.app_error",
+    "translation": "Non si dispone dei permessi necessari per rinominare il canale."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.app_error",
+    "translation": "Errore nell'aggiornamento del canale."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.success",
+    "translation": "Nome del canale aggiornato."
+  },
+  {
+    "id": "api.command_code.desc",
+    "translation": "Visualizza il testo come un blocco di codice"
+  },
+  {
+    "id": "api.command_code.hint",
+    "translation": "[testo]"
+  },
+  {
+    "id": "api.command_code.message.app_error",
+    "translation": "Fornire un messaggio con il comando /code."
+  },
+  {
+    "id": "api.command_code.name",
+    "translation": "codice"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "Abilita auto-compressione delle immagini di anteprima"
   },
@@ -624,6 +708,30 @@
     "translation": "Entrato nel canale."
   },
   {
+    "id": "api.command_leave.desc",
+    "translation": "Esci dal canale corrente"
+  },
+  {
+    "id": "api.command_leave.fail.app_error",
+    "translation": "Si è verificato un errore durante l'uscita dal canale."
+  },
+  {
+    "id": "api.command_leave.list.app_error",
+    "translation": "Si è verificato un errore durante la generazione della lista dei canali."
+  },
+  {
+    "id": "api.command_leave.missing.app_error",
+    "translation": "Impossibile trovare il canale."
+  },
+  {
+    "id": "api.command_leave.name",
+    "translation": "abbandona"
+  },
+  {
+    "id": "api.command_leave.success",
+    "translation": "Canale abbandonato."
+  },
+  {
     "id": "api.command_logout.desc",
     "translation": "Logout da Mattermost"
   },
@@ -1009,7 +1117,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
-    "translation": "Messaggio Diretto"
+    "translation": "Messaggio Diretto da"
   },
   {
     "id": "api.email_batching.render_batched_post.go_to_post",
@@ -1017,7 +1125,11 @@
   },
   {
     "id": "api.email_batching.render_batched_post.group_message",
-    "translation": "Messaggio di gruppo"
+    "translation": "Messaggio di Gruppo da"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.notification",
+    "translation": "Notifica da"
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
@@ -1026,8 +1138,8 @@
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
     "translation": {
-      "one": "Hai un nuovo messaggio.Tu hai {{.Count}} nuovi messaggi.",
-      "other": ""
+      "one": "Hai una nuova notifica.",
+      "other": "Hai {{.Count}} nuove notifiche."
     }
   },
   {
@@ -1696,22 +1808,10 @@
     "translation": "Impossibile caricare i gruppi durante l'invio di un DM cross-team user_id=%v, err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.mention_body",
-    "translation": "Sei stato citato."
-  },
-  {
     "id": "api.post.send_notifications_and_forget.mention_subject",
     "translation": "Nuova citazione"
   },
   {
-    "id": "api.post.send_notifications_and_forget.message_body",
-    "translation": "Hai un nuovo messaggio."
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.message_subject",
-    "translation": "Nuovo Messaggio Diretto"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.push_image_only",
     "translation": " ha caricato uno o più file in "
   },
@@ -1728,6 +1828,10 @@
     "translation": " ti ha citato in "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "translation": " ti ha citato"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_message",
     "translation": " ti ha inviato un messaggio diretto"
   },
@@ -1736,6 +1840,10 @@
     "translation": " pubblicato in "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
+    "translation": " ha pubblicato un messaggio"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
     "translation": "Impossibile inviare un push device_id={{.DeviceId}}, err={{.Error}}"
   },
@@ -1873,83 +1981,83 @@
   },
   {
     "id": "api.slackimport.slack_add_bot_user.email_pwd",
-    "translation": "Slack Bot/Integra pubblicazioni Importa Utente: Email, Password: {{.Email}}, {{.Password}}\r\n"
+    "translation": "L' Integrazione/Slack-Bot-User con email {{.Email}} e password {{.Password}} è stata importata.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_bot_user.unable_import",
-    "translation": "Impossibile importare Slack Bot/Integra pubblicazioni Utente: {{.Username}}\r\n"
+    "translation": "Impossibile importare l'Integrazione/Slack-Bot-user {{.Username}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.added",
-    "translation": "\r\n Canale Aggiunto \r\n"
+    "translation": "\r\n Canali aggiunti:\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
-    "translation": "Impossibile aggiungere utente al canale: {{.Username}}\r\n"
+    "translation": "Impossibile aggiungere l'utente Slack {{.Username}} al canale.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed",
-    "translation": "Errore durante l'import: {{.DisplayName}}\r\n"
+    "translation": "Impossibile importare il canale Slack {{.DisplayName}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Importazione Slack: importazione del canale %s fallita"
+    "translation": "Slack Import: Impossibile importare il canale Slack: %s."
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
-    "translation": "Unito al canale esistente: {{.DisplayName}}\r\n"
+    "translation": "Il canale Slack {{.DisplayName}} è già esistente come canale Mattermost. Entrambi i canali sono stati uniti.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_posts.attach_files.error",
-    "translation": "Incontrato un errore allegando file ad una pubblicazione, post_id=%s, file_ids=%v, err=%v"
+    "translation": "Slack Import: Si è verificato un errore durante l'associazione dei file ad un messaggio, post_id=%s, file_ids=%v, err=%v."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot.warn",
-    "translation": "Le pubblicazioni slack bot non sono ancora importate"
+    "translation": "Slack Import: I messaggi dei Slack-Bot non possono essere importati."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot_user_no_exists.warn",
-    "translation": "Importazione Slack: il messaggio bot non viene importato perché l'utente che sta importando non esiste."
+    "translation": "Slack Import: Impossibile importare i messaggi del Bot in quanto l'utente Bot non esiste."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
-    "translation": "Commento del file non definito"
+    "translation": "Slack Import: Unable to import the message as it has no comments."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_usr.debug",
-    "translation": "Messaggio senza utente"
+    "translation": "Slack Import: Unable to import the message as the user field is missing."
   },
   {
     "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
-    "translation": "Importazione Slack: Importazione del messaggio bot fallita per la mancanza del campo BotId."
+    "translation": "Slack Import: Unable to import bot message as the BotId field is missing."
   },
   {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
-    "translation": "Pubblicazione non supportata: %v, %v"
+    "translation": "Slack Import: Unable to import the message as its type is not supported: post_type=%v, post_subtype=%v."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_found.warn",
-    "translation": "Nessun file trovato durante l'esportazione Slack per il messaggio di invio file ID {{.FileId}}"
+    "translation": "Slack Import: Unable to import file {{.FileId}} as the file is missing from the Slack export zip file."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_in_json.warn",
-    "translation": "Impossibile importare il file per caricare la pubblicazione se non esiste una sezione \"file\" nell'esportazione."
+    "translation": "Slack Import: Unable to attach the file to the post as the latter has no \"file\" section present in Slack export."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_open_failed.warn",
-    "translation": "Non posso aprire il caricamento con ID {{.FileId}} nell'archivio di esportazione con error: {{.Error}}"
+    "translation": "Slack Import: Unable to open the file {{.FileId}} from the Slack export: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_upload_failed.warn",
-    "translation": "Caricamento del file per l'invio messaggio con file ID {{.FileId}} fallito con errore: {{.Error}}"
+    "translation": "Slack Import: An error occurred when uploading file {{.FileId}}: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.user_no_exists.debug",
-    "translation": "L'utente: %v non esiste!"
+    "translation": "Slack Import: Unable to add the message as the Slack user %v does not exist in Mattermost."
   },
   {
     "id": "api.slackimport.slack_add_posts.without_user.debug",
-    "translation": "Messaggio senza utente"
+    "translation": "Slack Import: Unable to import the message as the user field is missing."
   },
   {
     "id": "api.slackimport.slack_add_users.created",
@@ -1957,15 +2065,15 @@
   },
   {
     "id": "api.slackimport.slack_add_users.email_pwd",
-    "translation": "Email, Password: {{.Email}}, {{.Password}}\r\n"
+    "translation": "Slack user with email {{.Email}} and password {{.Password}} has been imported.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing",
-    "translation": "L'utente è stato incluso nell'account esistente: {{.Email}}, {{.Username}}\r\n"
+    "translation": "Slack user merged with an existing Mattermost user with matching email {{.Email}} and username {{.Username}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing_failed",
-    "translation": "Tentata la fusione di questo utente con l'account esistente: {{.Email}}, {{.Username}}, ma non è stato possibile aggiungere l'utente a questo team.\r\n"
+    "translation": "Slack user merged with an existing Mattermost user with matching email {{.Email}} and username {{.Username}}, but was unable to add the user to their team.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address",
@@ -1981,19 +2089,19 @@
   },
   {
     "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
-    "translation": "Impossibile compilare il !channel corrispondente l'espressione regolare per canale Slack {{.ChannelID}} {{.ChannelName}}"
+    "translation": "Slack Import: Unable to compile the !channel, matching regular expression for the Slack channel {{.ChannelName}} (id={{.ChannelID}})."
   },
   {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
-    "translation": "Rilevato timestamp incorretto"
+    "translation": "Slack Import: Bad timestamp detected."
   },
   {
     "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
-    "translation": "Impossibile compilare la @mention corrispondente l'espressione regolare per l'utente Slack {{.UserID}} {{.Username}}"
+    "translation": "Slack Import: Unable to compile the @mention, matching regular expression for the Slack user {{.Username}} (id={{.UserID}})."
   },
   {
     "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
-    "translation": "Importatore Slack: Impossibile disattivare l'utente bot-importazione."
+    "translation": "Slack Import: Unable to deactivate the user account used for the bot."
   },
   {
     "id": "api.slackimport.slack_import.log",
@@ -2017,7 +2125,7 @@
   },
   {
     "id": "api.slackimport.slack_import.open.app_error",
-    "translation": "Impossibile aprire il file: {{.Filename}}"
+    "translation": "Unable to open the file: {{.Filename}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_import.team_fail",
@@ -2025,15 +2133,15 @@
   },
   {
     "id": "api.slackimport.slack_import.zip.app_error",
-    "translation": "Impossibile aprire file zip"
+    "translation": "Unable to open the Slack export zip file.\r\n"
   },
   {
     "id": "api.slackimport.slack_parse_channels.error",
-    "translation": "Errore di lettura dei canali Slack. L'importazione potrebbe ugualmente funzionare."
+    "translation": "Slack Import: Error occurred when parsing some Slack channels. Import may work anyway."
   },
   {
     "id": "api.slackimport.slack_parse_posts.error",
-    "translation": "Errore di lettura di alcuni pubblicazioni Slack. L'importazione potrebbe ugualmente funzionare."
+    "translation": "Slack Import: Error occurred when parsing some Slack posts. Import may work anyway."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
@@ -2041,7 +2149,7 @@
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Importazione Slack: il canale {{.ChannelName}} ha un'intestazione troppo lunga. Verrà troncata durante l'importazione."
+    "translation": "Importazione Slack: il canale {{.ChannelName}} ha un nome troppo lungo. Verrà troncato durante l'importazione."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
@@ -2285,7 +2393,7 @@
   },
   {
     "id": "api.templates.invite_body.info",
-    "translation": "Il gruppo {{.SenderStatus}} <strong>{{.SenderName}}</strong>, ti ha invitato a entrare in <strong>{{.TeamDisplayName}}</strong>."
+    "translation": "<strong>{{.SenderName}}</strong> ti ha invitato a entrare in <strong>{{.TeamDisplayName}}</strong>."
   },
   {
     "id": "api.templates.invite_body.title",
@@ -2332,28 +2440,12 @@
     "translation": "Vai alla pubblicazione"
   },
   {
-    "id": "api.templates.post_body.info",
-    "translation": "CANALE: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_channel",
-    "translation": "{{.SubjectText}} su {{.TeamDisplayName}} ({{.ChannelName}}) il {{.Day}} {{.Month}} {{.Year}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_direct_message",
-    "translation": "{{.SubjectText}} su {{.TeamDisplayName}} da {{.SenderDisplayName}} il {{.Day}} {{.Month}} {{.Year}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_group_message",
-    "translation": "{{.SubjectText}} su {{.TeamDisplayName}} da {{.SenderDisplayName}} il {{.Day}} {{.Month}} {{.Year}}"
-  },
-  {
     "id": "api.templates.reset_body.button",
     "translation": "Reimposta password"
   },
   {
     "id": "api.templates.reset_body.info",
-    "translation": "Per cambiare la tua password, clicka su \"Resetta Password\" qui sotto.<br>Se non vuoi resettare la tua password, ignora questo messaggio e la tua password rimarrà la stessa. Il collegamento di reset scadrà in 24 ore."
+    "translation": "Per cambiare la tua password, clicca su \"Resetta Password\" qui sotto.<br>Se non vuoi resettare la tua password, ignora questo messaggio e la tua password rimarrà la stessa. Il collegamento di reset scadrà in 24 ore."
   },
   {
     "id": "api.templates.reset_body.title",
@@ -2404,6 +2496,18 @@
     "translation": "[MATTERMOST] Cambiamenti al tuo account per l'upgrade a Mattermost 3.0"
   },
   {
+    "id": "api.templates.user_access_token_body.info",
+    "translation": "Un token di accesso è stato aggiunto al tuo account su {{ .SiteURL }}. Può essere utilizzato per accedere a {{.SiteName}} con il tuo account.<br>Se questa operazione non l'hai fatta tu, contatta l'amministratore di sistema."
+  },
+  {
+    "id": "api.templates.user_access_token_body.title",
+    "translation": "Token di accesso aggiunto al tuo account"
+  },
+  {
+    "id": "api.templates.user_access_token_subject",
+    "translation": "[{{ .SiteName }}] Token di accesso aggiunto al tuo account"
+  },
+  {
     "id": "api.templates.username_change_body.info",
     "translation": "Il tuo username per {{.TeamDisplayName}} è stato cambiato in {{.NewUsername}}.<br>Se non vuoi questo cambiamento, contatta il tuo amministratore di sistema."
   },
@@ -2421,7 +2525,7 @@
   },
   {
     "id": "api.templates.verify_body.info",
-    "translation": "Per favore verifica la tua email clickando qui sotto."
+    "translation": "Per favore verifica la tua email cliccando qui sotto."
   },
   {
     "id": "api.templates.verify_body.title",
@@ -2441,7 +2545,7 @@
   },
   {
     "id": "api.templates.welcome_body.info",
-    "translation": "Per favore verifica la tua email clickando qui sotto."
+    "translation": "Per favore verifica la tua email cliccando qui sotto."
   },
   {
     "id": "api.templates.welcome_body.info2",
@@ -2760,6 +2864,10 @@
     "translation": "Invio email per la verifica dell'update della password fallito"
   },
   {
+    "id": "api.user.send_user_access_token.error",
+    "translation": "Impossibile inviare l'email di notifica per la creazione del token di accesso"
+  },
+  {
     "id": "api.user.send_verify_email_and_forget.failed.error",
     "translation": "Invio email di verifica fallita"
   },
@@ -3072,6 +3180,10 @@
     "translation": "Canale di gruppo non trovato"
   },
   {
+    "id": "app.import.import_direct_post.save_preferences.error",
+    "translation": "Errore durante l'importazione delle pubblicazioni dirette. Impossibile salvare le preferenze."
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "L'utente della pubblicazione non esiste"
   },
@@ -3108,6 +3220,10 @@
     "translation": "Errore di importazione della pubblicazione. Il canale chiamato \"{{.ChannelName}}\" non è stato trovato."
   },
   {
+    "id": "app.import.import_post.save_preferences.error",
+    "translation": "Errore durante l'importazione delle pubblicazioni. Impossibile salvare le preferenze."
+  },
+  {
     "id": "app.import.import_post.team_not_found.error",
     "translation": "Errore di importazione della pubblicazione. Il gruppo chiamato \"{{.TeamName}}\" non è stato trovato."
   },
@@ -3116,6 +3232,10 @@
     "translation": "Errore di importazione della pubblicazione. L'utente chiamato \"{{.TeamName}}\" non è stato trovato."
   },
   {
+    "id": "app.import.import_user_channels.save_preferences.error",
+    "translation": "Errore durante l'importazione dei membri del canale. Impossibile salvare le preferenze."
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "Il campo create_at del canale, se presente, non deve essere zero."
   },
@@ -3176,6 +3296,10 @@
     "translation": "La lista dei membri del canale diretto contiene troppi elementi"
   },
   {
+    "id": "app.import.validate_direct_channel_import_data.unknown_favoriter.error",
+    "translation": "Il canale diretto può diventare un canale preferito solo per i membri. \"{{.Username}}\" non è un membro."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
     "translation": "Manca una proprietà richiesta nella pubblicazione diretta: membri del canale"
   },
@@ -3204,6 +3328,10 @@
     "translation": "Manca una proprietà richiesta nella pubblicazione diretta: messaggio"
   },
   {
+    "id": "app.import.validate_direct_post_import_data.unknown_flagger.error",
+    "translation": "Una pubblicazione diretta può essere marcata solo dai membri del canali in cui si trova. \"{{.Username}}\" non è un membro."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
     "translation": "Manca una proprietà richiesta nella pubblicazione diretta: utente"
   },
@@ -3292,6 +3420,10 @@
     "translation": "MarkUnread NotifyProps non valido nelle iscrizioni dell'utente."
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mobile.error",
+    "translation": "Proprietà notifiche cellulare non valida per i gruppi di appantenenza dell'utente."
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "Ruoli non validi per le iscrizioni canale dell'utente."
   },
@@ -3328,6 +3460,38 @@
     "translation": "Il campo soprannome dell'utente è troppo lungo."
   },
   {
+    "id": "app.import.validate_user_import_data.notify_props_channel_trigger_invalid.error",
+    "translation": "Proprietà scatena notifiche canale non valida per l'utente."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_comment_trigger_invalid.error",
+    "translation": "Proprietà scatena notifiche commento non valida per l'utente."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error",
+    "translation": "Proprietà durata notifiche desktop non valida per l'utente."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_invalid.error",
+    "translation": "Proprietà notifiche su desktop non valida per l'utente."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_sound_invalid.error",
+    "translation": "Proprietà suono notifiche desktop non valida per l'utente."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_email_invalid.error",
+    "translation": "Proprietà notifiche email non valida per l'utente."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_invalid.error",
+    "translation": "Proprietà notifiche su cellulare non valida per l'utente."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_push_status_invalid.error",
+    "translation": "Proprietà stato notifiche push non valida per l'utente."
+  },
+  {
     "id": "app.import.validate_user_import_data.pasword_length.error",
     "translation": "La Password ha una lunghezza non valida."
   },
@@ -3356,6 +3520,54 @@
     "translation": "Nome gruppo mancante nelle iscrizioni al gruppo dell'utente."
   },
   {
+    "id": "app.notification.body.intro.direct.full",
+    "translation": "Hai un nuovo messaggio.Tu hai {{.Count}} nuovi messaggi."
+  },
+  {
+    "id": "app.notification.body.intro.direct.generic",
+    "translation": "You have a new direct message from {{.SenderName}}"
+  },
+  {
+    "id": "app.notification.body.intro.notification.full",
+    "translation": "You have a new notification."
+  },
+  {
+    "id": "app.notification.body.intro.notification.generic",
+    "translation": "You have a new notification from {{.SenderName}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.full",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full",
+    "translation": "CANALE: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.subject.direct.full",
+    "translation": "{{.SubjectText}} su {{.TeamDisplayName}} da {{.SenderDisplayName}} il {{.Day}} {{.Month}} {{.Year}}"
+  },
+  {
+    "id": "app.notification.subject.notification.full",
+    "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
+    "id": "app.user_access_token.disabled",
+    "translation": "I token di accesso sono disattivati su questo server. Per favore contatta l'Amministratore di Sistema per ulteriori dettagli."
+  },
+  {
+    "id": "app.user_access_token.invalid_or_missing",
+    "translation": "Token mancante o non valido"
+  },
+  {
     "id": "authentication.permissions.create_group_channel.description",
     "translation": "Capacità di creare nuovi canali messaggio di gruppo"
   },
@@ -3364,6 +3576,14 @@
     "translation": "Crea Messaggio di Gruppo"
   },
   {
+    "id": "authentication.permissions.create_post_public.description",
+    "translation": "Capacità di pubblicare in canali pubblici"
+  },
+  {
+    "id": "authentication.permissions.create_post_public.name",
+    "translation": "Pubblicare in Canali Pubblici"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Possibilità di creare nuovi gruppi"
   },
@@ -3372,6 +3592,22 @@
     "translation": "Creare gruppi"
   },
   {
+    "id": "authentication.permissions.create_user_access_token.description",
+    "translation": "Capacità di creare token di accesso"
+  },
+  {
+    "id": "authentication.permissions.create_user_access_token.name",
+    "translation": "Generare Token di Accesso"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.description",
+    "translation": "Possibilità di gestire i lavori"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.name",
+    "translation": "Gestione lavori"
+  },
+  {
     "id": "authentication.permissions.manage_team_roles.description",
     "translation": "Possibilità di cambiare i ruoli di un membro del gruppo"
   },
@@ -3388,6 +3624,22 @@
     "translation": "Leggere Canali Pubblici"
   },
   {
+    "id": "authentication.permissions.read_user_access_token.description",
+    "translation": "Capacità di visualizzare l'id dei token di accesso, la descrizione e l'id utente"
+  },
+  {
+    "id": "authentication.permissions.read_user_access_token.name",
+    "translation": "Visualizzare Token di Accesso"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.description",
+    "translation": "Capacità di revocare i token di accesso"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.name",
+    "translation": "Revoca Token di Accesso"
+  },
+  {
     "id": "authentication.permissions.team_invite_user.description",
     "translation": "Possibilità di invitare utenti nel gruppo"
   },
@@ -3404,6 +3656,46 @@
     "translation": "Usare comandi slash"
   },
   {
+    "id": "authentication.roles.system_post_all.description",
+    "translation": "Un ruolo con il permesso di pubblicare in qualsiasi canale pubblico, privato o diretto del sistema"
+  },
+  {
+    "id": "authentication.roles.system_post_all.name",
+    "translation": "Pubblicazione nei canali pubblici, privati e diretti"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.description",
+    "translation": "Un ruolo con il permesso di pubblicare in qualsiasi canale pubblico del sistema"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.name",
+    "translation": "Pubblicazione in Canali Pubblici"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.description",
+    "translation": "Un ruolo con il permesso di creare, visualizzare e revocare i token di accesso"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.name",
+    "translation": "Token di Accesso"
+  },
+  {
+    "id": "authentication.roles.team_post_all.description",
+    "translation": "Un ruolo con il permesso di pubblicare in qualsiasi canale pubblico o privato del gruppo"
+  },
+  {
+    "id": "authentication.roles.team_post_all.name",
+    "translation": "Pubblicazione nei canali pubblici e privati"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.description",
+    "translation": "Un ruolo con il permesso di pubblicare in qualsiasi canale pubblico del gruppo"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.name",
+    "translation": "Pubblicazione in Canali Pubblici"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "La funzionalità richiede una licenza enterprise. Contattare l'amministratore di sistema chiedendo di aggiornare la licenza enterprise."
   },
@@ -3496,36 +3788,60 @@
     "translation": "Esportazione di conformita fallita per l'attività '{{.JobName}}' in '{{.FilePath}}'"
   },
   {
-    "id": "ent.elasticsearch.search_posts.disabled",
-    "translation": "La ricerca ElasticSearch è disabilitata su questo server"
+    "id": "ent.elasticsearch.create_client.connect_failed",
+    "translation": "Impostazione del Client Elasticsearch fallita"
   },
   {
-    "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "La ricerca non è stata completata"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_create_failed",
+    "translation": "Impossibile creare un indice Elasticsearch"
   },
   {
-    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
-    "translation": "Impossibile decodificare i risultati della ricerca"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_exists_failed",
+    "translation": "Impossibile stabilire se esiste un indice Elasticsearch"
+  },
+  {
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_mapping_failed",
+    "translation": "Impossibile impostare la mappe degli indici di Elasticsearch"
+  },
+  {
+    "id": "ent.elasticsearch.delete_post.error",
+    "translation": "Impossibile cancellare la pubblicazione"
+  },
+  {
+    "id": "ent.elasticsearch.generic.disabled",
+    "translation": "La ricerca Elasticsearch è disabilitata su questo server"
   },
   {
-    "id": "ent.elasticsearch.start.connect_failed",
-    "translation": "Impostazione del client ElasticSearch fallita"
+    "id": "ent.elasticsearch.index_post.error",
+    "translation": "Impossibile indicizzare la pubblicazione"
   },
   {
-    "id": "ent.elasticsearch.start.index_create_failed",
-    "translation": "Impossibile creare un indice ElasticSearch"
+    "id": "ent.elasticsearch.not_started.error",
+    "translation": "Elasticsearch non è in esecuzione"
   },
   {
-    "id": "ent.elasticsearch.start.index_exists_failed",
-    "translation": "Impossibile stabilire se esiste un indice ElasticSearch"
+    "id": "ent.elasticsearch.purge_indexes.delete_failed",
+    "translation": "Impossibile cancellare l'indice ElasticSearch"
   },
   {
-    "id": "ent.elasticsearch.start.index_mapping_failed",
-    "translation": "Impossibile impostare l'index mapping di ElasticSearch"
+    "id": "ent.elasticsearch.search_posts.disabled",
+    "translation": "La ricerca Elasticsearch è disabilitata su questo server"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.search_failed",
+    "translation": "La ricerca non è stata completata"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
+    "translation": "Impossibile decodificare i risultati della ricerca"
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
-    "translation": "Impossibile salvare le impostazioni dell'index ElasticSearch"
+    "translation": "Impossibile salvare le impostazioni dell'index Elasticsearch"
+  },
+  {
+    "id": "ent.elasticsearch.test_config.connect_failed",
+    "translation": "Connessione al server Elasticsearch fallita."
   },
   {
     "id": "ent.elasticsearch.test_config.indexing_disabled.error",
@@ -3536,6 +3852,10 @@
     "translation": "La licenza non supporta l'uso di Elasticsearch."
   },
   {
+    "id": "ent.elasticsearch.test_config.reenter_password",
+    "translation": "L'URL o il nome utente del server Elasticsearch è cambiato. Reinserire la password di Elasticsearch per provare la connessione."
+  },
+  {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "Le limitazioni sugli emoji personalizzati non sono abilitate per la licenza attuale. Contattare l'amministratore di sistema chiedendo di aggiornare la licenza enterprise."
   },
@@ -3748,6 +4068,14 @@
     "translation": "Pagina non trovata"
   },
   {
+    "id": "jobs.request_cancellation.status.error",
+    "translation": "L'attuale stato del lavoro non ne permette la cancellazione."
+  },
+  {
+    "id": "jobs.set_job_error.update.error",
+    "translation": "Impossibile impostare lo stato del lavoro in errore"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Impossibile trovare il canale: %v, %v possibilità tentate"
   },
@@ -4116,6 +4444,10 @@
     "translation": "Intervallo spedizione email programmata non valido per le impostazioni email.  Deve essere maggiore o uguale a 30 secondi."
   },
   {
+    "id": "model.config.is_valid.email_notification_contents_type.app_error",
+    "translation": "Invalid email notification contents type for email settings. Must be one of either 'full' or 'generic'."
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "Password reset salt non valido per le impostazioni email.  Deve essere maggiore o uguale a 32 caratteri."
   },
@@ -4436,6 +4768,22 @@
     "translation": "User id non valido"
   },
   {
+    "id": "model.job.is_valid.create_at.app_error",
+    "translation": "Creato alle deve essere un tempo valido"
+  },
+  {
+    "id": "model.job.is_valid.id.app_error",
+    "translation": "Id lavoro non valido"
+  },
+  {
+    "id": "model.job.is_valid.status.app_error",
+    "translation": "Stato lavoro non valido"
+  },
+  {
+    "id": "model.job.is_valid.type.app_error",
+    "translation": "Tipo lavoro non valido"
+  },
+  {
     "id": "model.oauth.is_valid.app_id.app_error",
     "translation": "App id non valido"
   },
@@ -4812,6 +5160,18 @@
     "translation": "Nome utente non valido"
   },
   {
+    "id": "model.user_access_token.is_valid.description.app_error",
+    "translation": "Descrizione non valida, lunghezza massima consentita di 255 caratteri"
+  },
+  {
+    "id": "model.user_access_token.is_valid.token.app_error",
+    "translation": "Token di accesso invalido"
+  },
+  {
+    "id": "model.user_access_token.is_valid.user_id.app_error",
+    "translation": "Id utente non valido"
+  },
+  {
     "id": "model.utils.decode_json.app_error",
     "translation": "impossibile decodificare"
   },
@@ -4921,7 +5281,7 @@
   },
   {
     "id": "store.sql.schema_version.critical",
-    "translation": "Lo schema di databese versione %v non può essere aggiornato.  Non devi saltare una versione."
+    "translation": "Database schema version %v is no longer supported. This Mattermost server supports automatic upgrades from schema version %v through schema version %v. Downgrades are not supported. Please manually upgrade to at least version %v before continuing"
   },
   {
     "id": "store.sql.short_ciphertext",
@@ -5296,24 +5656,24 @@
     "translation": "Non è stato possibile salvare o aggiornare le informazioni sul file"
   },
   {
-    "id": "store.sql_job_status.delete_by_type.app_error",
-    "translation": "Non è stato possibile cancellare lo stato del job"
+    "id": "store.sql_job.delete.app_error",
+    "translation": "Non è possibile cancellare il lavoro"
   },
   {
-    "id": "store.sql_job_status.get.app_error",
-    "translation": "Impossibile recuperare lo stato del job"
+    "id": "store.sql_job.get.app_error",
+    "translation": "Impossibile recuperare il lavoro"
   },
   {
-    "id": "store.sql_job_status.get_all.app_error",
-    "translation": "Non è stato possibile recuperare lo stato di tutti i job"
+    "id": "store.sql_job.get_all.app_error",
+    "translation": "Impossibile recuperare i lavori"
   },
   {
-    "id": "store.sql_job_status.save.app_error",
-    "translation": "Non è stato possibile salvare lo stato del job"
+    "id": "store.sql_job.save.app_error",
+    "translation": "Impossibile salvare il lavoro"
   },
   {
-    "id": "store.sql_job_status.update.app_error",
-    "translation": "Non è stato possibile aggiornare lo stato del job"
+    "id": "store.sql_job.update.app_error",
+    "translation": "Impossibile aggiornare il lavoro"
   },
   {
     "id": "store.sql_license.get.app_error",
@@ -5464,6 +5824,10 @@
     "translation": "Impossibile recuperare la pubblicazione genitore per il canale"
   },
   {
+    "id": "store.sql_post.get_posts_batch_for_indexing.get.app_error",
+    "translation": "Impossibile trovare la coda delle pubblicazioni da indicizzare"
+  },
+  {
     "id": "store.sql_post.get_posts_by_ids.app_error",
     "translation": "Non è stato possibile recuperare la pubblicazione"
   },
@@ -6040,6 +6404,26 @@
     "translation": "Impossibile aggiornare il campo verifica email"
   },
   {
+    "id": "store.sql_user_access_token.delete.app_error",
+    "translation": "Impossibile eliminare il token di accesso"
+  },
+  {
+    "id": "store.sql_user_access_token.get.app_error",
+    "translation": "Impossibile trovare il token di accesso"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_token.app_error",
+    "translation": "Impossibile trovare il token di accesso per token"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_user.app_error",
+    "translation": "Impossibile trovare i token di accesso per utente"
+  },
+  {
+    "id": "store.sql_user_access_token.save.app_error",
+    "translation": "Impossibile salvare il token di accesso"
+  },
+  {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "Non è stato possibile effettuare il conteggio dei webhook in ingresso"
   },
@@ -6080,10 +6464,18 @@
     "translation": "Non è stato possibile recuperare i webhook"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_incoming_by_channel.app_error",
+    "translation": "Impossibile eliminare il webhook"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_incoming_by_user.app_error",
     "translation": "Non è stato possibile eliminare il webhook"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_outgoing_by_channel.app_error",
+    "translation": "Impossibile eliminare il webhook"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error",
     "translation": "Non è stato possibile eliminare il webhook"
   },
@@ -6116,6 +6508,10 @@
     "translation": "Sistema"
   },
   {
+    "id": "utils.config.add_client_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  Adding DefaultClientLocale to AvailableLocales."
+  },
+  {
     "id": "utils.config.load_config.decoding.panic",
     "translation": "Errore durante la decodifica del file di configurazione={{.Filename}}, err={{.Error}}"
   },
@@ -6136,8 +6532,12 @@
     "translation": "Si è verificato un errore durante il salvataggio del file in {{.Filename}}"
   },
   {
+    "id": "utils.config.supported_available_locales.app_error",
+    "translation": "Unable to load mattermost configuration file:  AvailableLocales must include DefaultClientLocale. Setting AvailableLocales to all locales as default value."
+  },
+  {
     "id": "utils.config.supported_client_locale.app_error",
-    "translation": "Impossibile caricare il file di configurazione mattermost:  DefaultClientLocale deve essere uno dei linguaggi supportati"
+    "translation": "Unable to load mattermost configuration file:  DefaultClientLocale must be one of the supported locales. Setting DefaultClientLocale to en as default value."
   },
   {
     "id": "utils.config.supported_server_locale.app_error",
diff --git a/i18n/ja.json b/i18n/ja.json
index cb33cb133..c4bf63c64 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -297,7 +297,7 @@
   },
   {
     "id": "api.channel.join_channel.post_and_forget",
-    "translation": "%vがチャンネルに参加しました。"
+    "translation": "%v がチャンネルに参加しました。"
   },
   {
     "id": "api.channel.leave.default.app_error",
@@ -313,7 +313,7 @@
   },
   {
     "id": "api.channel.leave.left",
-    "translation": "%vがチャンネルから脱退しました。"
+    "translation": "%v がチャンネルから脱退しました。"
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.create_post.error",
@@ -532,6 +532,90 @@
     "translation": "チャンネルヘッダーは正常に更新されました。"
   },
   {
+    "id": "api.command_channel_purpose.channel.app_error",
+    "translation": "現在のチャンネルを取得する際にエラーが発生しました。"
+  },
+  {
+    "id": "api.command_channel_purpose.desc",
+    "translation": "チャンネルの目的を編集する"
+  },
+  {
+    "id": "api.command_channel_purpose.direct_group.app_error",
+    "translation": "ダイレクトメッセージチャンネルに目的を設定できません。代わりにヘッダーを設定する /header を使用してください。"
+  },
+  {
+    "id": "api.command_channel_purpose.hint",
+    "translation": "[テキスト]"
+  },
+  {
+    "id": "api.command_channel_purpose.message.app_error",
+    "translation": "/purpose コマンドはメッセージを指定しなくてはいけません。"
+  },
+  {
+    "id": "api.command_channel_purpose.name",
+    "translation": "目的"
+  },
+  {
+    "id": "api.command_channel_purpose.permission.app_error",
+    "translation": "あなたにはチャンネルの目的を編集するのに必要な権限が付与されていません。"
+  },
+  {
+    "id": "api.command_channel_purpose.update_channel.app_error",
+    "translation": "現在のチャンネルを更新する際にエラーが発生しました。"
+  },
+  {
+    "id": "api.command_channel_rename.channel.app_error",
+    "translation": "現在のチャンネルを取得する際にエラーが発生しました。"
+  },
+  {
+    "id": "api.command_channel_rename.desc",
+    "translation": "チャンネル名を変更する"
+  },
+  {
+    "id": "api.command_channel_rename.direct_group.app_error",
+    "translation": "ダイレクトメッセージチャンネル名を変更することはできません。"
+  },
+  {
+    "id": "api.command_channel_rename.hint",
+    "translation": "[テキスト]"
+  },
+  {
+    "id": "api.command_channel_rename.message.app_error",
+    "translation": "/rename コマンドはメッセージを指定しなくてはいけません。"
+  },
+  {
+    "id": "api.command_channel_rename.name",
+    "translation": "名称変更"
+  },
+  {
+    "id": "api.command_channel_rename.permission.app_error",
+    "translation": "あなたにはチャンネル名を変更するのに必要な権限が付与されていません。"
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.app_error",
+    "translation": "現在のチャンネルを更新する際にエラーが発生しました。"
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.success",
+    "translation": "チャンネル名は正常に更新されました。"
+  },
+  {
+    "id": "api.command_code.desc",
+    "translation": "テキストをコードブロックとして表示します"
+  },
+  {
+    "id": "api.command_code.hint",
+    "translation": "[テキスト]"
+  },
+  {
+    "id": "api.command_code.message.app_error",
+    "translation": "/echo コマンドはメッセージを指定しなくてはいけません。"
+  },
+  {
+    "id": "api.command_code.name",
+    "translation": "コード"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "画像プレビューの自動折りたたみをオンにします"
   },
@@ -624,6 +708,30 @@
     "translation": "チャンネルに参加しました。"
   },
   {
+    "id": "api.command_leave.desc",
+    "translation": "現在のチャンネルを脱退する"
+  },
+  {
+    "id": "api.command_leave.fail.app_error",
+    "translation": "チャンネルを脱退する際にエラーが発生しました。"
+  },
+  {
+    "id": "api.command_leave.list.app_error",
+    "translation": "チャンネル一覧を作成中にエラーが発生しました。"
+  },
+  {
+    "id": "api.command_leave.missing.app_error",
+    "translation": "チャンネルが見付かりません。"
+  },
+  {
+    "id": "api.command_leave.name",
+    "translation": "脱退"
+  },
+  {
+    "id": "api.command_leave.success",
+    "translation": "チャンネルを脱退しました。"
+  },
+  {
     "id": "api.command_logout.desc",
     "translation": "Mattermostからログアウトする"
   },
@@ -1009,7 +1117,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
-    "translation": "ダイレクトメッセージ"
+    "translation": "ダイレクトメッセージ from "
   },
   {
     "id": "api.email_batching.render_batched_post.go_to_post",
@@ -1017,7 +1125,11 @@
   },
   {
     "id": "api.email_batching.render_batched_post.group_message",
-    "translation": "グループメッセージ"
+    "translation": "グループメッセージ from "
+  },
+  {
+    "id": "api.email_batching.render_batched_post.notification",
+    "translation": "通知 from "
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
@@ -1026,7 +1138,7 @@
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
     "translation": {
-      "one": "新しいメッセージが1通あります。新しいメッセージが{{.Count}}通あります。",
+      "one": "新しい通知があります。{{.Count}} の新しい通知があります。",
       "other": ""
     }
   },
@@ -1696,22 +1808,10 @@
     "translation": "チームを横断したダイレクトメッセージを送信する際に、チームを取得できませんでした user_id=%v, err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.mention_body",
-    "translation": "新しいあなたについての投稿が1つあります。"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.mention_subject",
     "translation": "あなたについての新しい投稿"
   },
   {
-    "id": "api.post.send_notifications_and_forget.message_body",
-    "translation": "新しいメッセージが1つあります。"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.message_subject",
-    "translation": "新しいダイレクトメッセージ"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.push_image_only",
     "translation": " 一つ以上のファイルをアップロードしました "
   },
@@ -1728,6 +1828,10 @@
     "translation": "があなたについて話しました:"
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "translation": " があなたについて話しました"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_message",
     "translation": "があなたにダイレクトメッセージを送りました"
   },
@@ -1736,6 +1840,10 @@
     "translation": " posted in "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
+    "translation": " がメッセージを投稿しました"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
     "translation": "プッシュ通知を送信出来ませんでした device_id={{.DeviceId}}, err={{.Error}}"
   },
@@ -1873,127 +1981,127 @@
   },
   {
     "id": "api.slackimport.slack_add_bot_user.email_pwd",
-    "translation": "Slack Bot/Integration投稿インポートユーザー: 電子メール, パスワード: {{.Email}}, {{.Password}}\r\n"
+    "translation": "電子メールアドレス {{.Email}} と パスワード {{.Password}} を持つ統合機能/SlackBotユーザーがインポートされました。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_bot_user.unable_import",
-    "translation": "Slack Bot/Integration投稿インポートユーザーをインポートできませんでした: {{.Username}}\r\n"
+    "translation": "統合機能/SlackBotユーザー {{.Username}} がインポートできませんでした。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.added",
-    "translation": "\r\n チャンネルが追加されました \r\n"
+    "translation": "\r\nチャンネルが追加されました: \r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
-    "translation": "チャンネルにユーザーを追加できませんでした: {{.Username}}\r\n"
+    "translation": "チャンネルにSlackユーザー {{.Username}} を追加できませんでした。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed",
-    "translation": "インポートできませんでした: {{.DisplayName}}\r\n"
+    "translation": "Slackチャンネル {{.DisplayName}} をインポートできませんでした。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Slack Importer: チャンネルをインポートできませんでした: %s"
+    "translation": "Slackインポート: Slackチャンネルをインポートできませんでした: %s。"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
-    "translation": "既存のチャンネルにマージしました: {{.DisplayName}}\r\n"
+    "translation": "Slackチャンネル {{.DisplayName}} は有効なMattermostのチャンネルとして既に存在しています。両方のチャンネルがマージされます。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_posts.attach_files.error",
-    "translation": "投稿へファイルを添付する際にエラーが発生しました post_id=%s, file_ids=%v, err=%v"
+    "translation": "Slackインポート: メッセージにファイルを添付する際にエラーが発生しました post_id=%s, file_ids=%v, err=%v。"
   },
   {
     "id": "api.slackimport.slack_add_posts.bot.warn",
-    "translation": "Slack botの投稿はまだインポートされていません"
+    "translation": "Slackインポート: SlackBotメッセージは、まだインポートできません。"
   },
   {
     "id": "api.slackimport.slack_add_posts.bot_user_no_exists.warn",
-    "translation": "Slack Importer: botインポートユーザーが存在しないためbotメッセージをインポートしませんでした。"
+    "translation": "Slackインポート: Botユーザーが存在しないため、ボットメッセージをインポートできませんでした。"
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
-    "translation": "ファイルコメントが定義されていません"
+    "translation": "Slackインポート: コメントが無いため、メッセージをインポートできませんでした。"
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_usr.debug",
-    "translation": "ユーザーなしのメッセージ"
+    "translation": "Slackインポート: userフィールドが存在しないため、メッセージをインポートできませんでした。"
   },
   {
     "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
-    "translation": "Slack Importer: 項目BotIdが欠けていたためbotメッセージをインポートしませんでした。"
+    "translation": "Slackインポート: BotIdフィールドが存在しないため、Botメッセージをインポートできませんでした。"
   },
   {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
-    "translation": "サポートされていない投稿の形式: %v, %v"
+    "translation": "Slackインポート: typeがサポートされていないため、メッセージをインポートできませんでした: post_type=%v, post_subtype=%v。"
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_found.warn",
-    "translation": "ファイルID{{.FileId}}を持ったファイルアップロードメッセージのSlackエクスポートにファイルが見付かりません"
+    "translation": "Slackインポート: Slackからエクスポートしたzipファイルにファイルが存在しないため、 {{.FileId}} のファイルをインポートできませんでした。"
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_in_json.warn",
-    "translation": "エクスポートで\"file\"セクションのないアップロードの投稿はインポートできません。"
+    "translation": "Slackインポート: Slackエクスポートに \"file\" セクションが存在しないため、投稿にファイルを添付できませんでした。"
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_open_failed.warn",
-    "translation": "エクスポートアーカイブ内のID {{.FileId}}のアップロードを開けませんでした。: {{.Error}}"
+    "translation": "Slackインポート: Slackエクスポートから {{.FileId}} のファイルを開けませんでした: {{.Error}}。"
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_upload_failed.warn",
-    "translation": "ファイルID {{.FileId}}のアップロードメッセージのファイルのアップロードに失敗しました: {{.Error}}"
+    "translation": "Slackインポート: {{.FileId}} のファイルをアップロードする際にエラーが発生しました: {{.Error}}。"
   },
   {
     "id": "api.slackimport.slack_add_posts.user_no_exists.debug",
-    "translation": "ユーザー: %v は存在していません!"
+    "translation": "Slackインポート: MattermostにSlackユーザー %v が存在しないため、メッセージを追加できませんでした。"
   },
   {
     "id": "api.slackimport.slack_add_posts.without_user.debug",
-    "translation": "ユーザーなしのメッセージ"
+    "translation": "Slackインポート: userフィールドが存在しないため、メッセージをインポートできませんでした。"
   },
   {
     "id": "api.slackimport.slack_add_users.created",
-    "translation": "\r\n ユーザーが作成されました\r\n"
+    "translation": "\r\n ユーザーが作成されました:\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.email_pwd",
-    "translation": "電子メールアドレス、パスワード: {{.Email}}, {{.Password}}\r\n"
+    "translation": "電子メールアドレス {{.Email}} とパスワード {{.Password}} を持つSlackがインポートされました。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing",
-    "translation": "既に存在するユーザーとマージしました: {{.Email}}, {{.Username}}\r\n"
+    "translation": "電子メールアドレス {{.Email}} とユーザー名 {{.Username}} を持つ既存のMattermostユーザーとSlackユーザーをマージしました。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing_failed",
-    "translation": "既存のアカウント{{.Email}}, {{.Username}} とユーザーをマージしようとしましたが、このチームにユーザーを追加できませんでした。\r\n"
+    "translation": "電子メールアドレス {{.Email}} とユーザー名 {{.Username}} を持つ既存のMattermostユーザーとSlackユーザーをマージしましたが、そのユーザーをチームに追加できませんでした。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address",
-    "translation": "ユーザー {{.Username}} はSlackエクスポートで電子メールアドレスが設定されていません。プレイスホルダーの {{.Email}} を利用してください。システムにログインした時、そのユーザーは電子メールアドレスを更新する必要があります。\r\n"
+    "translation": "Slackエクスポートにユーザー {{.Username}} の電子メールアドレスが存在しません。プレースホルダーとして {{.Email}} が利用されます。システムにログインした時、そのユーザーは電子メールアドレスを更新する必要があります。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address.warn",
-    "translation": "ユーザー {{.Username}} はSlackエクスポートで電子メールアドレスが設定されていません。プレイスホルダーの {{.Email}} を利用してください。システムにログインした時、そのユーザーは電子メールアドレスを更新する必要があります。"
+    "translation": "Slackインポート: Slackエクスポートにユーザー {{.Username}} の電子メールアドレスが存在しません。プレイスホルダーとして {{.Email}} が利用されます。システムにログインした時、そのユーザーは電子メールアドレスを更新する必要があります。"
   },
   {
     "id": "api.slackimport.slack_add_users.unable_import",
-    "translation": "ユーザーをインポートできません: {{.Username}}\r\n"
+    "translation": "Slackユーザーをインポートできません: {{.Username}}\r\n"
   },
   {
     "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
-    "translation": "Slackチャンネル{{.ChannelID}} {{.ChannelName}}の!channelに一致する正規表現のコンパイルに失敗しました。"
+    "translation": "Slackインポート: Slackチャンネル {{.ChannelName}}(id={{.ChannelID}}) の正規表現にマッチする!channelをコンパイルできませんでした。"
   },
   {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
-    "translation": "不正なタイムスタンプが検出されました"
+    "translation": "Slackインポート: 不正なタイムスタンプが検出されました。"
   },
   {
     "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
-    "translation": "Slackユーザー{{.UserID}} {{.Username}}の@mensionに一致する正規表現のコンパイルに失敗しました。"
+    "translation": "Slackインポート: Slackユーザー {{.Username}} (id={{.UserID}})の正規表現とマッチする@mentionをコンパイルできませんでした。"
   },
   {
     "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
-    "translation": "Slack Importer: botインポートユーザーを非活性にできませんでした。"
+    "translation": "Slackインポート: Botに使われるユーザーアカウントを無効にできませんでした。"
   },
   {
     "id": "api.slackimport.slack_import.log",
@@ -2013,43 +2121,43 @@
   },
   {
     "id": "api.slackimport.slack_import.notes",
-    "translation": "\r\n 注意事項 \r\n"
+    "translation": "\r\n注意事項: \r\n"
   },
   {
     "id": "api.slackimport.slack_import.open.app_error",
-    "translation": "開くことができません: {{.Filename}}"
+    "translation": "ファイルを開けませんでした: {{.Filename}}。\r\n"
   },
   {
     "id": "api.slackimport.slack_import.team_fail",
-    "translation": "インポートするチームを取得できませんでした\r\n"
+    "translation": "インポートするチームを取得できませんでした。\r\n"
   },
   {
     "id": "api.slackimport.slack_import.zip.app_error",
-    "translation": "ZIPファイルを開くことができません"
+    "translation": "Slackエクスポートのzipファイルを開けませんでした。\r\n"
   },
   {
     "id": "api.slackimport.slack_parse_channels.error",
-    "translation": "Slackのチャンネルを読み込み中にエラーが発生しました。しかしインポートは継続できます。"
+    "translation": "Slackインポート: Slackチャンネルを解析する際にエラーが発生しました。インポート自体は動作している可能性があります。"
   },
   {
     "id": "api.slackimport.slack_parse_posts.error",
-    "translation": "Slackの投稿を読み込み中にエラーが発生しました。しかしインポートは継続できます。"
+    "translation": "Slackインポート: Slack投稿を解析する際にエラーが発生しました。インポート自体は動作している可能性があります。"
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack Importer: チャンネル {{.ChannelName}} の表示名が長すぎます。インポートの際に切り詰められます。"
+    "translation": "Slackインポート: チャンネル {{.ChannelName}}の名前が長すぎます。インポートの際に切り詰められます。"
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Slack Importer: チャンネル {{.ChannelName}}のヘッダーが長すぎます。インポートの際に切り詰められます。"
+    "translation": "Slackインポート: チャンネル {{.ChannelName}}のヘッダーが長すぎます。インポートの際に切り詰められます。"
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slack Importer: チャンネル {{.ChannelName}}の名前が長すぎます。インポートの際に切り詰められます。"
+    "translation": "Slackインポート: チャンネル {{.ChannelName}}のハンドルが長すぎます。インポートの際に切り詰められます。"
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Slack Importer: チャンネル {{.ChannelName}}の目的が長すぎます。インポートの際に切り詰められます。"
+    "translation": "Slackインポート: チャンネル {{.ChannelName}}の目的が長すぎます。インポートの際に切り詰められます。"
   },
   {
     "id": "api.status.init.debug",
@@ -2332,22 +2440,6 @@
     "translation": "投稿へ行く"
   },
   {
-    "id": "api.templates.post_body.info",
-    "translation": "チャンネル: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_channel",
-    "translation": "{{.TeamDisplayName}} (チャンネル: {{.ChannelName}})の{{.SubjectText}} 日付: {{.Month}} {{.Day}}, {{.Year}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_direct_message",
-    "translation": "{{.SenderDisplayName}}からの{{.SubjectText}} 日付: {{.Month}} {{.Day}}, {{.Year}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_group_message",
-    "translation": "{{ .SenderDisplayName}} からの新しいグループメッセージ 日付: {{.Month}} {{.Day}}, {{.Year}}"
-  },
-  {
     "id": "api.templates.reset_body.button",
     "translation": "パスワードの初期化"
   },
@@ -2404,6 +2496,18 @@
     "translation": "[MATTERMOST] Mattermost 3.0アップデートのためのあなたのアカウントの変更"
   },
   {
+    "id": "api.templates.user_access_token_body.info",
+    "translation": "ユーザーアクセストークンが {{ .SiteURL }} のあなたのアカウントに追加されました。あなたのアカウントで{{.SiteName}}へアクセスするために利用することができます。<br>この変更があなたによって行われたものでない場合、システム管理者に連絡してください。"
+  },
+  {
+    "id": "api.templates.user_access_token_body.title",
+    "translation": "ユーザーアクセストークンがあなたのアカウントに追加されました"
+  },
+  {
+    "id": "api.templates.user_access_token_subject",
+    "translation": "[{{ .SiteName }}] ユーザーアクセストークンがあなたのアカウントに追加されました"
+  },
+  {
     "id": "api.templates.username_change_body.info",
     "translation": "あなたの{{.TeamDisplayName}}用のユーザー名が{{.NewUsernamel}}に変更されました。<br>あなたがこの変更をしていない場合には、システム管理者に問い合わせてください。"
   },
@@ -2760,6 +2864,10 @@
     "translation": "パスワード更新の電子メールを送信できませんでした"
   },
   {
+    "id": "api.user.send_user_access_token.error",
+    "translation": "ユーザーアクセストークン追加の電子メールを送信できませんでした"
+  },
+  {
     "id": "api.user.send_verify_email_and_forget.failed.error",
     "translation": "確認の電子メールを送信できませんでした"
   },
@@ -3072,6 +3180,10 @@
     "translation": "グループチャンネルを取得できませんでした"
   },
   {
+    "id": "app.import.import_direct_post.save_preferences.error",
+    "translation": "ダイレクト投稿のインポートでエラーが発生しました。設定を保存できませんでした。"
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "投稿ユーザーが存在しません"
   },
@@ -3108,6 +3220,10 @@
     "translation": "投稿のインポート中にエラーが発生しました。 名前 \"{{.ChannelName}}\" のチャンネルが見つかりません。"
   },
   {
+    "id": "app.import.import_post.save_preferences.error",
+    "translation": "投稿のインポートでエラーが発生しました。設定を保存できませんでした。"
+  },
+  {
     "id": "app.import.import_post.team_not_found.error",
     "translation": "投稿のインポート中にエラーが発生しました。 名前 \"{{.TeamName}}\" のチームが見つかりません。"
   },
@@ -3116,6 +3232,10 @@
     "translation": "投稿のインポート中にエラーが発生しました。 名前 \"{{.Username}}\" のユーザーが見つかりません。"
   },
   {
+    "id": "app.import.import_user_channels.save_preferences.error",
+    "translation": "チャンネルメンバーシップのインポートでエラーが発生しました。設定を保存できませんでした。"
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "チャンネル作成日時には0を設定できません。"
   },
@@ -3176,8 +3296,12 @@
     "translation": "ダイレクトチャンネルのメンバーリストに含まれる項目が多すぎます"
   },
   {
+    "id": "app.import.validate_direct_channel_import_data.unknown_favoriter.error",
+    "translation": "ダイレクトチャンネルはメンバーだけがお気に入りできます。 \"{{.Username}}\"はメンバーではありません。"
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
-    "translation": "必須の投稿設定値 channel_members が存在しません。"
+    "translation": "必須のダイレクト投稿設定値 channel_members が存在しません。"
   },
   {
     "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
@@ -3204,6 +3328,10 @@
     "translation": "必須のダイレクト投稿設定値 message が存在しません。"
   },
   {
+    "id": "app.import.validate_direct_post_import_data.unknown_flagger.error",
+    "translation": "ダイレクト投稿はそのチャンネルに所属するメンバーだけがフラグを立てることが出来ます。\"{{.Username}}\"はメンバーではありません。"
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
     "translation": "必須のダイレクト投稿設定値 user が存在しません。"
   },
@@ -3292,6 +3420,10 @@
     "translation": "ユーザーのチャンネルメンバーシップの未読マーク設定が不正です。"
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mobile.error",
+    "translation": "ユーザーのチャンネルメンバーシップのモバイル通知設定が不正です。"
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "ユーザーのチャネルメンバーシップの役割が不正です。"
   },
@@ -3328,6 +3460,38 @@
     "translation": "ユーザーのニックネームが長すぎます。"
   },
   {
+    "id": "app.import.validate_user_import_data.notify_props_channel_trigger_invalid.error",
+    "translation": "ユーザーのチャンネル通知トリガーの設定が不正です。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_comment_trigger_invalid.error",
+    "translation": "ユーザーのコメント通知トリガーの設定が不正です。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error",
+    "translation": "ユーザーのデスクトップ通知持続時間の設定値が不正です。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_invalid.error",
+    "translation": "ユーザーのデスクトップ通知の設定値が不正です。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_sound_invalid.error",
+    "translation": "ユーザーのデスクトップ通知音の設定値が不正です。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_email_invalid.error",
+    "translation": "ユーザーの電子メール通知の設定値が不正です。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_invalid.error",
+    "translation": "ユーザーのモバイル通知の設定値が不正です。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_push_status_invalid.error",
+    "translation": "ユーザーのモバイルプッシュ通知ステータスの設定が不正です。"
+  },
+  {
     "id": "app.import.validate_user_import_data.pasword_length.error",
     "translation": "ユーザーのパスワードの長さが不正です。"
   },
@@ -3356,6 +3520,54 @@
     "translation": "ユーザーのチームメンバーシップにチーム名が存在しません。"
   },
   {
+    "id": "app.notification.body.intro.direct.full",
+    "translation": "新しいダイレクトメッセージがあります。"
+  },
+  {
+    "id": "app.notification.body.intro.direct.generic",
+    "translation": "{{.SenderName}} からの新しいダイレクトメッセージがあります"
+  },
+  {
+    "id": "app.notification.body.intro.notification.full",
+    "translation": "新しい通知があります。"
+  },
+  {
+    "id": "app.notification.body.intro.notification.generic",
+    "translation": "{{.SenderName}} からの新しい通知があります"
+  },
+  {
+    "id": "app.notification.body.text.direct.full",
+    "translation": "{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full",
+    "translation": "チャンネル: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.subject.direct.full",
+    "translation": "[{{ .SiteName}}] {{.Month}} {{.Day}}, {{.Year}} {{.SenderDisplayName}} からの新しいグループメッセージ"
+  },
+  {
+    "id": "app.notification.subject.notification.full",
+    "translation": "[{{.SiteName}}] {{.Month}} {{.Day}}, {{.Year}} {{.TeamName}}の通知"
+  },
+  {
+    "id": "app.user_access_token.disabled",
+    "translation": "このサーバーではユーザーアクセストークンが無効になっています。詳しくはシステム管理者に問い合わせてください。"
+  },
+  {
+    "id": "app.user_access_token.invalid_or_missing",
+    "translation": "トークンが存在しないか不正です"
+  },
+  {
     "id": "authentication.permissions.create_group_channel.description",
     "translation": "新しいグループメッセージチャンネルを作成できるようにする"
   },
@@ -3364,6 +3576,14 @@
     "translation": "グループメッセージを作成する"
   },
   {
+    "id": "authentication.permissions.create_post_public.description",
+    "translation": "公開チャンネルへの投稿を作成できるようにする"
+  },
+  {
+    "id": "authentication.permissions.create_post_public.name",
+    "translation": "公開チャンネルへの投稿作成"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "新しいチームを作成できるようにする"
   },
@@ -3372,6 +3592,22 @@
     "translation": "チームを作成する"
   },
   {
+    "id": "authentication.permissions.create_user_access_token.description",
+    "translation": "ユーザーアクセストークンを作成できるようにする"
+  },
+  {
+    "id": "authentication.permissions.create_user_access_token.name",
+    "translation": "ユーザーアクセストークンを作成する"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.description",
+    "translation": "ジョブを管理できるようにする"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.name",
+    "translation": "ジョブ管理"
+  },
+  {
     "id": "authentication.permissions.manage_team_roles.description",
     "translation": "チームメンバーの役割を変更できるようにする"
   },
@@ -3388,6 +3624,22 @@
     "translation": "公開チャンネルを読む"
   },
   {
+    "id": "authentication.permissions.read_user_access_token.description",
+    "translation": "ユーザーアクセストークンのトークンID、説明、ユーザーIDを読み取ることができるようにする"
+  },
+  {
+    "id": "authentication.permissions.read_user_access_token.name",
+    "translation": "ユーザーアクセストークンを読み取る"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.description",
+    "translation": "ユーザーアクセストークンを破棄できるようにする"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.name",
+    "translation": "ユーザーアクセストークンを破棄する"
+  },
+  {
     "id": "authentication.permissions.team_invite_user.description",
     "translation": "チームにユーザーを招待できるようにする"
   },
@@ -3404,6 +3656,46 @@
     "translation": "スラッシュコマンドを使用する"
   },
   {
+    "id": "authentication.roles.system_post_all.description",
+    "translation": "システム上のすべての公開・非公開・ダイレクトチャンネルへ投稿する権限を持つ役割です"
+  },
+  {
+    "id": "authentication.roles.system_post_all.name",
+    "translation": "公開・非公開・ダイレクトチャンネルへの投稿"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.description",
+    "translation": "システム上のすべての公開チャンネルへ投稿する権限を持つ役割です"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.name",
+    "translation": "公開チャンネルへの投稿"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.description",
+    "translation": "ユーザーアクセストークンを作成・読み取り・破棄する権限を持つ役割です"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.name",
+    "translation": "ユーザーアクセストークン"
+  },
+  {
+    "id": "authentication.roles.team_post_all.description",
+    "translation": "システム上のすべての公開・非公開チャンネルへ投稿する権限を持つ役割です"
+  },
+  {
+    "id": "authentication.roles.team_post_all.name",
+    "translation": "公開・非公開チャンネルへの投稿"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.description",
+    "translation": "チーム内のすべての公開チャンネルへ投稿する権限を持つ役割です"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.name",
+    "translation": "公開チャンネルへの投稿"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "機能にはエンタープライズライセンスが必要です。システム管理者にエンタープライズライセンスをアップグレードするように連絡してください。"
   },
@@ -3496,36 +3788,60 @@
     "translation": "コンプライアンスエクスポートが開始されました ジョブ='{{.JobName}}'、ファイル='{{.FilePath}}'"
   },
   {
-    "id": "ent.elasticsearch.search_posts.disabled",
-    "translation": "このサーバーではElasticSearchによる検索は無効です。"
+    "id": "ent.elasticsearch.create_client.connect_failed",
+    "translation": "Elasticsearchクライアントを設定できませんでした"
   },
   {
-    "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "検索を完了できませんでした"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_create_failed",
+    "translation": "Elasticsearchのインデックスを作成できませんでした"
   },
   {
-    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
-    "translation": "検索結果をデコードできませんでした"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_exists_failed",
+    "translation": "Elasticsearchインデックスの存在を確認できませんでした"
   },
   {
-    "id": "ent.elasticsearch.start.connect_failed",
-    "translation": "ElasticSearchクライアントを設定できませんでした"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_mapping_failed",
+    "translation": "Elasticsearchインデックスのマッピングを設定できませんでした"
   },
   {
-    "id": "ent.elasticsearch.start.index_create_failed",
-    "translation": "ElasticSearchのインデックスを作成できませんでした"
+    "id": "ent.elasticsearch.delete_post.error",
+    "translation": "投稿を削除できませんでした"
   },
   {
-    "id": "ent.elasticsearch.start.index_exists_failed",
-    "translation": "ElasticSearchインデックスの存在を確認できませんでした"
+    "id": "ent.elasticsearch.generic.disabled",
+    "translation": "このサーバーではElasticsearchによる検索は無効です。"
   },
   {
-    "id": "ent.elasticsearch.start.index_mapping_failed",
-    "translation": "ElasticSearchインデックスのマッピングを設定できませんでした"
+    "id": "ent.elasticsearch.index_post.error",
+    "translation": "投稿にインデックスを付与できませんでした"
+  },
+  {
+    "id": "ent.elasticsearch.not_started.error",
+    "translation": "Elasticsearchが起動されていません"
+  },
+  {
+    "id": "ent.elasticsearch.purge_indexes.delete_failed",
+    "translation": "Elasticsearchのインデックスを削除できませんでした"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.disabled",
+    "translation": "このサーバーではElasticsearchによる検索は無効です。"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.search_failed",
+    "translation": "検索を完了できませんでした"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
+    "translation": "検索結果をデコードできませんでした"
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
-    "translation": "ElasticSearchインデックス設定を設定できませんでした"
+    "translation": "Elasticsearchインデックス設定を設定できませんでした"
+  },
+  {
+    "id": "ent.elasticsearch.test_config.connect_failed",
+    "translation": "Elasticsearchサーバーへ接続できませんでした"
   },
   {
     "id": "ent.elasticsearch.test_config.indexing_disabled.error",
@@ -3536,6 +3852,10 @@
     "translation": "ライセンスはElasticsearchをサポートしていません。"
   },
   {
+    "id": "ent.elasticsearch.test_config.reenter_password",
+    "translation": "ElasticsearchサーバーのURLかユーザー名が変更されました。接続をテストするためにElasticsearchのパスワードを再度入力してください。"
+  },
+  {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "カスタム絵文字の制限機能が現在のライセンスでは無効になっています。システム管理者にエンタープライズライセンスをアップグレードするように連絡してください。"
   },
@@ -3748,6 +4068,14 @@
     "translation": "ページが見付かりません"
   },
   {
+    "id": "jobs.request_cancellation.status.error",
+    "translation": "ジョブがキャンセル可能な状態でないため、ジョブのキャンセルをリクエストできませんでした。"
+  },
+  {
+    "id": "jobs.set_job_error.update.error",
+    "translation": "ジョブの状態をエラーに設定できませんでした"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "チャンネルが見付かりません: %v、%vではありませんか"
   },
@@ -4116,6 +4444,10 @@
     "translation": "電子メール設定の電子メールバッチ処理間隔が不正です。  30秒以上にしてください。"
   },
   {
+    "id": "model.config.is_valid.email_notification_contents_type.app_error",
+    "translation": "電子メール設定の電子メール通知内容の種別が不正です。'full' か 'generic' のどちらか一つでなければなりません。"
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "電子メールの設定におけるパスワードを初期化するためのソルトが不正です。32文字以上でなくてはいけません。"
   },
@@ -4436,6 +4768,22 @@
     "translation": "不正なユーザーIDです"
   },
   {
+    "id": "model.job.is_valid.create_at.app_error",
+    "translation": "作成日時は有効な時刻にしてください"
+  },
+  {
+    "id": "model.job.is_valid.id.app_error",
+    "translation": "不正なジョブIDです"
+  },
+  {
+    "id": "model.job.is_valid.status.app_error",
+    "translation": "不正なジョブ状態です"
+  },
+  {
+    "id": "model.job.is_valid.type.app_error",
+    "translation": "不正なジョブ形式です"
+  },
+  {
     "id": "model.oauth.is_valid.app_id.app_error",
     "translation": "不正なアプリケーションIDです"
   },
@@ -4812,6 +5160,18 @@
     "translation": "不正なユーザー名です"
   },
   {
+    "id": "model.user_access_token.is_valid.description.app_error",
+    "translation": "不正な説明です。255文字以内にしてください。"
+  },
+  {
+    "id": "model.user_access_token.is_valid.token.app_error",
+    "translation": "不正なアクセストークンです"
+  },
+  {
+    "id": "model.user_access_token.is_valid.user_id.app_error",
+    "translation": "不正なユーザーIDです"
+  },
+  {
     "id": "model.utils.decode_json.app_error",
     "translation": "デコードできませんでした"
   },
@@ -4921,7 +5281,7 @@
   },
   {
     "id": "store.sql.schema_version.critical",
-    "translation": "%vのデータベーススキーマのバージョンはアップグレードできません。バージョンをスキップできません。"
+    "translation": "データベーススキーマのバージョン %v はもうサポートされていません。このMattermostサーバーはスキーマバージョン %v から %v への自動アップグレードをサポートしています。ダウングレードはサポートされていません。続ける前に少なくともバージョン %v までは手動でアップグレードしてください。"
   },
   {
     "id": "store.sql.short_ciphertext",
@@ -5189,7 +5549,7 @@
   },
   {
     "id": "store.sql_channel.update.previously.app_error",
-    "translation": "扱おうとしているチャンネルは以前に作成されました"
+    "translation": "そのハンドルを持つチャンネルは以前に作成されました"
   },
   {
     "id": "store.sql_channel.update.updating.app_error",
@@ -5296,24 +5656,24 @@
     "translation": "ファイル情報を保存、または更新できませんでした"
   },
   {
-    "id": "store.sql_job_status.delete_by_type.app_error",
-    "translation": "ジョブの状態を削除できませんでした"
+    "id": "store.sql_job.delete.app_error",
+    "translation": "ジョブを削除できませんでした"
   },
   {
-    "id": "store.sql_job_status.get.app_error",
-    "translation": "ジョブの状態を取得できませんでした"
+    "id": "store.sql_job.get.app_error",
+    "translation": "ジョブを取得できませんでした"
   },
   {
-    "id": "store.sql_job_status.get_all.app_error",
-    "translation": "すべてのジョブの状態を取得できませんでした"
+    "id": "store.sql_job.get_all.app_error",
+    "translation": "ジョブを取得できませんでした"
   },
   {
-    "id": "store.sql_job_status.save.app_error",
-    "translation": "ジョブの状態を保存できませんでした"
+    "id": "store.sql_job.save.app_error",
+    "translation": "ジョブを保存できませんでした"
   },
   {
-    "id": "store.sql_job_status.update.app_error",
-    "translation": "ジョブの状態を更新できませんでした"
+    "id": "store.sql_job.update.app_error",
+    "translation": "ジョブを更新できませんでした"
   },
   {
     "id": "store.sql_license.get.app_error",
@@ -5464,6 +5824,10 @@
     "translation": "チャンネルの親に当たる投稿を取得できませんでした"
   },
   {
+    "id": "store.sql_post.get_posts_batch_for_indexing.get.app_error",
+    "translation": "インデックス付与のための投稿のバッチ処理を取得できませんでした"
+  },
+  {
     "id": "store.sql_post.get_posts_by_ids.app_error",
     "translation": "投稿を取得できませんでした"
   },
@@ -6040,6 +6404,26 @@
     "translation": "電子メールアドレスの確認欄を更新できません"
   },
   {
+    "id": "store.sql_user_access_token.delete.app_error",
+    "translation": "ユーザーアクセストークンを削除できませんでした"
+  },
+  {
+    "id": "store.sql_user_access_token.get.app_error",
+    "translation": "ユーザーアクセストークンを取得できませんでした"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_token.app_error",
+    "translation": "トークンによってユーザーアクセストークンを取得することができませんでした"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_user.app_error",
+    "translation": "ユーザーによってユーザーアクセストークンを取得することができませんでした"
+  },
+  {
+    "id": "store.sql_user_access_token.save.app_error",
+    "translation": "ユーザーアクセストークンを保存できませんでした。"
+  },
+  {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "内向きのウェブフック数を取得できませんでした"
   },
@@ -6080,10 +6464,18 @@
     "translation": "ウェブフックを取得できませんでした"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_incoming_by_channel.app_error",
+    "translation": "ウェブフックを削除できませんでした"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_incoming_by_user.app_error",
     "translation": "ウェブフックを削除できませんでした"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_outgoing_by_channel.app_error",
+    "translation": "ウェブフックを削除できませんでした"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error",
     "translation": "ウェブフックを削除できませんでした"
   },
@@ -6116,6 +6508,10 @@
     "translation": "システム"
   },
   {
+    "id": "utils.config.add_client_locale.app_error",
+    "translation": "Mattermost設定ファイルを読み込めませんでした:  AvailableLocalesにDefaultClientLocaleが追加されました。"
+  },
+  {
     "id": "utils.config.load_config.decoding.panic",
     "translation": "設定値をデコードできません file={{.Filename}}, err={{.Error}}"
   },
@@ -6136,8 +6532,12 @@
     "translation": "ファイルを{{.Filename}}に保存中にエラーが発生しました"
   },
   {
+    "id": "utils.config.supported_available_locales.app_error",
+    "translation": "Mattermost設定ファイルを読み込めませんでした:  AvailableLocalesはDefaultClientLocaleを含んでいなければなりません。デフォルト値としてAvailableLocalesに全ての言語を設定しました。"
+  },
+  {
     "id": "utils.config.supported_client_locale.app_error",
-    "translation": "mattermostの設定ファイルをロードできませんでした:  DefaultClientLocale はサポートされているロケールでなければなりません"
+    "translation": "Mattermost設定ファイルを読み込めませんでした:  DefaultClientLocaleはサポートされている言語の一つでなければなりません。デフォルト値としてDefaultClientLocaleに en を設定しました。"
   },
   {
     "id": "utils.config.supported_server_locale.app_error",
diff --git a/i18n/ko.json b/i18n/ko.json
index 73a60c36b..3da61e870 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -532,6 +532,90 @@
     "translation": "채널 머릿말이 성공적으로 업데이트되었습니다."
   },
   {
+    "id": "api.command_channel_purpose.channel.app_error",
+    "translation": "현재 채널을 찾는 중 오류가 발생하였습니다."
+  },
+  {
+    "id": "api.command_channel_purpose.desc",
+    "translation": "Edit the channel purpose"
+  },
+  {
+    "id": "api.command_channel_purpose.direct_group.app_error",
+    "translation": "Cannot set purpose for direct message channels. Use /header to set the header instead."
+  },
+  {
+    "id": "api.command_channel_purpose.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_purpose.message.app_error",
+    "translation": "메시지는 /echo 명령어와 함께 제공되어야 합니다."
+  },
+  {
+    "id": "api.command_channel_purpose.name",
+    "translation": "purpose"
+  },
+  {
+    "id": "api.command_channel_purpose.permission.app_error",
+    "translation": "당신은 채널 머릿말을 수정할 권한을 가지고 있지 않습니다."
+  },
+  {
+    "id": "api.command_channel_purpose.update_channel.app_error",
+    "translation": "현재 채널의 업데이트에 실패하였습니다."
+  },
+  {
+    "id": "api.command_channel_rename.channel.app_error",
+    "translation": "현재 채널을 찾는 중 오류가 발생하였습니다."
+  },
+  {
+    "id": "api.command_channel_rename.desc",
+    "translation": "Rename the channel"
+  },
+  {
+    "id": "api.command_channel_rename.direct_group.app_error",
+    "translation": "개인 메시지 채널은 나갈 수 없습니다"
+  },
+  {
+    "id": "api.command_channel_rename.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_rename.message.app_error",
+    "translation": "메시지는 /echo 명령어와 함께 제공되어야 합니다."
+  },
+  {
+    "id": "api.command_channel_rename.name",
+    "translation": "rename"
+  },
+  {
+    "id": "api.command_channel_rename.permission.app_error",
+    "translation": "당신은 채널 머릿말을 수정할 권한을 가지고 있지 않습니다."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.app_error",
+    "translation": "현재 채널의 업데이트에 실패하였습니다."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.success",
+    "translation": "채널 머릿말이 성공적으로 업데이트되었습니다."
+  },
+  {
+    "id": "api.command_code.desc",
+    "translation": "Display text as a code block"
+  },
+  {
+    "id": "api.command_code.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_code.message.app_error",
+    "translation": "메시지는 /echo 명령어와 함께 제공되어야 합니다."
+  },
+  {
+    "id": "api.command_code.name",
+    "translation": "code"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "이미지 미리보기를 자동으로 접습니다"
   },
@@ -624,6 +708,30 @@
     "translation": "참가한 채널"
   },
   {
+    "id": "api.command_leave.desc",
+    "translation": "Leave the current channel"
+  },
+  {
+    "id": "api.command_leave.fail.app_error",
+    "translation": "채널에 참가하는 중 오류가 발생했습니다."
+  },
+  {
+    "id": "api.command_leave.list.app_error",
+    "translation": "채널 목록을 나열하는 중 오류가 발생하였습니다."
+  },
+  {
+    "id": "api.command_leave.missing.app_error",
+    "translation": "채널을 찾을 수 없습니다"
+  },
+  {
+    "id": "api.command_leave.name",
+    "translation": "leave"
+  },
+  {
+    "id": "api.command_leave.success",
+    "translation": "Left the channel."
+  },
+  {
     "id": "api.command_logout.desc",
     "translation": "Mattermost 로그아웃"
   },
@@ -1009,7 +1117,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
-    "translation": "개인 메시지"
+    "translation": "Direct Message from "
   },
   {
     "id": "api.email_batching.render_batched_post.go_to_post",
@@ -1017,7 +1125,11 @@
   },
   {
     "id": "api.email_batching.render_batched_post.group_message",
-    "translation": "그룹 메세지"
+    "translation": "Group Message from "
+  },
+  {
+    "id": "api.email_batching.render_batched_post.notification",
+    "translation": "Notification from "
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
@@ -1026,8 +1138,8 @@
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
     "translation": {
-      "one": "한개의 신규 메시지가 있습니다.",
-      "other": ""
+      "one": "You have a new notification.",
+      "other": "You have {{.Count}} new notifications."
     }
   },
   {
@@ -1696,22 +1808,10 @@
     "translation": "Failed to get teams when sending cross-team DM user_id=%v, err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.mention_body",
-    "translation": "신규 메시지가 있습니다."
-  },
-  {
     "id": "api.post.send_notifications_and_forget.mention_subject",
     "translation": "신규 메시지"
   },
   {
-    "id": "api.post.send_notifications_and_forget.message_body",
-    "translation": "한개의 신규 메시지가 있습니다."
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.message_subject",
-    "translation": "신규 메시지"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.push_image_only",
     "translation": " Uploaded one or more files in "
   },
@@ -1728,6 +1828,10 @@
     "translation": " mentioned you in "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "translation": " mentioned you in "
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_message",
     "translation": " 에게 받은 개인 메시지 "
   },
@@ -1736,6 +1840,10 @@
     "translation": " posted in "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
+    "translation": " posted a message"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
     "translation": "Failed to send push device_id={{.DeviceId}}, err={{.Error}}"
   },
@@ -1873,11 +1981,11 @@
   },
   {
     "id": "api.slackimport.slack_add_bot_user.email_pwd",
-    "translation": "Slack Bot/Integration Posts Import User: Email, Password: {{.Email}}, {{.Password}}\r\n"
+    "translation": "The Integration/Slack Bot user with email {{.Email}} and password {{.Password}} has been imported.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_bot_user.unable_import",
-    "translation": "Unable to import Slack Bot/Integration Posts Import User: {{.Username}}\r\n"
+    "translation": "Unable to import the Integration/Slack Bot user {{.Username}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.added",
@@ -1885,71 +1993,71 @@
   },
   {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
-    "translation": "채널에 유저 추가시 오류 발생: {{.Username}}\r\n"
+    "translation": "Unable to add Slack user {{.Username}} to channel.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed",
-    "translation": "추가 시 오류가 발생함: {{.DisplayName}}\r\n"
+    "translation": "Unable to import Slack channel {{.DisplayName}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Slack Importer: Failed to import channel: %s"
+    "translation": "Slack Import: Unable to import Slack channel: %s."
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
-    "translation": "기존 채널과 합쳐짐. {{.DisplayName}}\r\n"
+    "translation": "The Slack channel {{.DisplayName}} already exists as an active Mattermost channel. Both channels have been merged.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_posts.attach_files.error",
-    "translation": "게시글에 파일을 첨부하는 동안 에러가 발생되었습니다, post_id=%s, file_ids=%v, err=%v"
+    "translation": "Slack Import: An error occurred when attaching files to a message, post_id=%s, file_ids=%v, err=%v."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot.warn",
-    "translation": "Slack bot posts are not imported yet"
+    "translation": "Slack Import: Slack bot messages cannot be imported yet."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot_user_no_exists.warn",
-    "translation": "Slack Importer: Not importing bot message as the bot-importing user does not exist."
+    "translation": "Slack Import: Unable to import the bot message as the bot user does not exist."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
-    "translation": "파일 코멘트가 정의되지 않았습니다."
+    "translation": "Slack Import: Unable to import the message as it has no comments."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_usr.debug",
-    "translation": "작성자 없는 메시지"
+    "translation": "Slack Import: Unable to import the message as the user field is missing."
   },
   {
     "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
-    "translation": "Slack Importer: Not importing bot message due to lack of BotId field."
+    "translation": "Slack Import: Unable to import bot message as the BotId field is missing."
   },
   {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
-    "translation": "지원되지 않는 글 형식: %v, %v"
+    "translation": "Slack Import: Unable to import the message as its type is not supported: post_type=%v, post_subtype=%v."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_found.warn",
-    "translation": "Slack export의 파일 업로드 메시지를 위한 파일(file id : {{.FileId}})가 없습니다."
+    "translation": "Slack Import: Unable to import file {{.FileId}} as the file is missing from the Slack export zip file."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_in_json.warn",
-    "translation": "Cannot import file for upload post with no \"file\" section present in export."
+    "translation": "Slack Import: Unable to attach the file to the post as the latter has no \"file\" section present in Slack export."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_open_failed.warn",
-    "translation": "export archive의 업로드 파일(file id : {{.FileId}})을 열 수 없습니다, error: {{.Error}}"
+    "translation": "Slack Import: Unable to open the file {{.FileId}} from the Slack export: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_upload_failed.warn",
-    "translation": "메세지를 업로드하기 위한 파일(ID : {{.FileId}} )을 업로드하는 것을 실패했습니다, error: {{.Error}}"
+    "translation": "Slack Import: An error occurred when uploading file {{.FileId}}: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.user_no_exists.debug",
-    "translation": "사용자 %v 가 존재하지 않습니다!"
+    "translation": "Slack Import: Unable to add the message as the Slack user %v does not exist in Mattermost."
   },
   {
     "id": "api.slackimport.slack_add_posts.without_user.debug",
-    "translation": "작성자 없는 메시지"
+    "translation": "Slack Import: Unable to import the message as the user field is missing."
   },
   {
     "id": "api.slackimport.slack_add_users.created",
@@ -1957,23 +2065,23 @@
   },
   {
     "id": "api.slackimport.slack_add_users.email_pwd",
-    "translation": "이메일, 비밀번호: {{.Email}}, {{.Password}}\r\n"
+    "translation": "Slack user with email {{.Email}} and password {{.Password}} has been imported.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing",
-    "translation": "기존 사용자 정보와 병합됩니다: {{.Email}}, {{.Username}}\r\n"
+    "translation": "Slack user merged with an existing Mattermost user with matching email {{.Email}} and username {{.Username}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing_failed",
-    "translation": "Tried to merge user with existing account: {{.Email}}, {{.Username}}, but failed to add the user to this team.\r\n"
+    "translation": "Slack user merged with an existing Mattermost user with matching email {{.Email}} and username {{.Username}}, but was unable to add the user to their team.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address",
-    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system.\r\n"
+    "translation": "User {{.Username}} does not have an email address in the Slack export. Used {{.Email}} as a placeholder. The user should update their email address once logged in to the system.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address.warn",
-    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system."
+    "translation": "Slack Import: User {{.Username}} does not have an email address in the Slack export. Used {{.Email}} as a placeholder. The user should update their email address once logged in to the system."
   },
   {
     "id": "api.slackimport.slack_add_users.unable_import",
@@ -1981,19 +2089,19 @@
   },
   {
     "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
-    "translation": "Failed to compile the @mention matching regular expression for Slack user {{.UserID}} {{.Username}}"
+    "translation": "Slack Import: Unable to compile the !channel, matching regular expression for the Slack channel {{.ChannelName}} (id={{.ChannelID}})."
   },
   {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
-    "translation": "잘못된 시간 서식이 있습니다."
+    "translation": "Slack Import: Bad timestamp detected."
   },
   {
     "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}}"
+    "translation": "Slack Import: Unable to compile the @mention, matching regular expression for the Slack user {{.Username}} (id={{.UserID}})."
   },
   {
     "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
-    "translation": "Slack Importer: Failed to deactivate the bot-importing user."
+    "translation": "Slack Import: Unable to deactivate the user account used for the bot."
   },
   {
     "id": "api.slackimport.slack_import.log",
@@ -2017,7 +2125,7 @@
   },
   {
     "id": "api.slackimport.slack_import.open.app_error",
-    "translation": "파일을 열 수 없습니다. {{.Filename}}"
+    "translation": "Unable to open the file: {{.Filename}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_import.team_fail",
@@ -2025,31 +2133,31 @@
   },
   {
     "id": "api.slackimport.slack_import.zip.app_error",
-    "translation": "Zip 파일을 열 수 없습니다."
+    "translation": "Unable to open the Slack export zip file.\r\n"
   },
   {
     "id": "api.slackimport.slack_parse_channels.error",
-    "translation": "슬랙 채널 파싱 중 오류가 발생했습니다. 가져오기는 계속 진행됩니다."
+    "translation": "Slack Import: Error occurred when parsing some Slack channels. Import may work anyway."
   },
   {
     "id": "api.slackimport.slack_parse_posts.error",
-    "translation": "슬랙 글 파싱 중 오류가 발생했습니다. 가져오기는 계속 진행됩니다."
+    "translation": "Slack Import: Error occurred when parsing some Slack posts. Import may work anyway."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack Importer: Channel {{.ChannelName}} has a display name which is too long. It will be truncated when imported."
+    "translation": "Slack Import: Channel {{.ChannelName}} display name exceeds the maximum length. It will be truncated when imported."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Slack Importer: Channel {{.ChannelName}} has a header which is too long. It will be truncated when imported."
+    "translation": "Slack Import: Channel {{.ChannelName}} header exceeds the maximum length. It will be truncated when imported."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slack Importer: Channel {{.ChannelName}} has a name which is too long. It will be truncated when imported."
+    "translation": "Slack Import: Channel {{.ChannelName}} handle exceeds the maximum length. It will be truncated when imported."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Slack Importer: Channel {{.ChannelName}} has a purpose which is too long. It will be truncated when imported."
+    "translation": "Slack Import: Channel {{.ChannelName}} purpose exceeds the maximum length. It will be truncated when imported."
   },
   {
     "id": "api.status.init.debug",
@@ -2332,22 +2440,6 @@
     "translation": "글로 이동하기"
   },
   {
-    "id": "api.templates.post_body.info",
-    "translation": "채널: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
-  },
-  {
-    "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 {{.SenderDisplayName}} at {{.Month}} {{.Day}}, {{.Year}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_group_message",
-    "translation": "{{.SubjectText}} on {{.TeamDisplayName}} at {{.Month}} {{.Day}}, {{.Year}}"
-  },
-  {
     "id": "api.templates.reset_body.button",
     "translation": "비밀번호 재설정"
   },
@@ -2404,6 +2496,18 @@
     "translation": "[MATTERMOST] Mattermost 3.0 업그레이드를 위해 계정을 변경하세요."
   },
   {
+    "id": "api.templates.user_access_token_body.info",
+    "translation": "A user access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.user_access_token_body.title",
+    "translation": "User access token added to your account"
+  },
+  {
+    "id": "api.templates.user_access_token_subject",
+    "translation": "[{{ .SiteName }}] User access token added to your account"
+  },
+  {
     "id": "api.templates.username_change_body.info",
     "translation": "{{.TeamDisplayName}} 사용자명이 {{.NewUsername}}(으)로 변경되었습니다.<br> 잘못 변경된 경우, 시스템 관리자에게 문의하세요."
   },
@@ -2760,6 +2864,10 @@
     "translation": "비밀번호 변경 알림 메일을 발송하지 못하였습니다."
   },
   {
+    "id": "api.user.send_user_access_token.error",
+    "translation": "Failed to send user access token added email successfully"
+  },
+  {
     "id": "api.user.send_verify_email_and_forget.failed.error",
     "translation": "이메일 확인 메일을 발송하지 못하였습니다."
   },
@@ -3072,6 +3180,10 @@
     "translation": "Failed to get group channel"
   },
   {
+    "id": "app.import.import_direct_post.save_preferences.error",
+    "translation": "Error importing direct post. Failed to save preferences."
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "Post user does not exist"
   },
@@ -3108,6 +3220,10 @@
     "translation": "Error importing post. Channel with name \"{{.ChannelName}}\" could not be found."
   },
   {
+    "id": "app.import.import_post.save_preferences.error",
+    "translation": "Error importing post. Failed to save preferences."
+  },
+  {
     "id": "app.import.import_post.team_not_found.error",
     "translation": "Error importing post. Team with name \"{{.TeamName}}\" could not be found."
   },
@@ -3116,6 +3232,10 @@
     "translation": "Error importing post. User with username \"{{.Username}}\" could not be found."
   },
   {
+    "id": "app.import.import_user_channels.save_preferences.error",
+    "translation": "Error importing user channel memberships. Failed to save preferences."
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "Channel create_at must not be zero if provided."
   },
@@ -3176,6 +3296,10 @@
     "translation": "Direct channel members list contains too many items"
   },
   {
+    "id": "app.import.validate_direct_channel_import_data.unknown_favoriter.error",
+    "translation": "Direct channel can only be favorited by members. \"{{.Username}}\" is not a member."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
     "translation": "Missing required direct post property: channel_members"
   },
@@ -3204,6 +3328,10 @@
     "translation": "Missing required direct post property: message"
   },
   {
+    "id": "app.import.validate_direct_post_import_data.unknown_flagger.error",
+    "translation": "Direct post can only be flagged by members of the channel it is in. \"{{.Username}}\" is not a member."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
     "translation": "Missing required direct post property: user"
   },
@@ -3292,6 +3420,10 @@
     "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mobile.error",
+    "translation": "Invalid Mobile NotifyProps for User's Channel Membership."
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "Invalid roles for User's Channel Membership."
   },
@@ -3328,6 +3460,38 @@
     "translation": "User nickname is too long."
   },
   {
+    "id": "app.import.validate_user_import_data.notify_props_channel_trigger_invalid.error",
+    "translation": "Invalid Channel Trigger Notify Prop for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_comment_trigger_invalid.error",
+    "translation": "Invalid Comment Trigger Notify Prop for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error",
+    "translation": "Invalid Desktop Duration Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_invalid.error",
+    "translation": "Invalid Desktop Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_sound_invalid.error",
+    "translation": "Invalid Desktop Sound Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_email_invalid.error",
+    "translation": "Invalid Email Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_invalid.error",
+    "translation": "Invalid Mobile Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_push_status_invalid.error",
+    "translation": "Invalid Mobile Push Status Notify Prop for user."
+  },
+  {
     "id": "app.import.validate_user_import_data.pasword_length.error",
     "translation": "User Password has invalid length."
   },
@@ -3356,6 +3520,54 @@
     "translation": "Team name missing from User's Team Membership."
   },
   {
+    "id": "app.notification.body.intro.direct.full",
+    "translation": "한개의 신규 메시지가 있습니다."
+  },
+  {
+    "id": "app.notification.body.intro.direct.generic",
+    "translation": "You have a new direct message from {{.SenderName}}"
+  },
+  {
+    "id": "app.notification.body.intro.notification.full",
+    "translation": "You have a new notification."
+  },
+  {
+    "id": "app.notification.body.intro.notification.generic",
+    "translation": "You have a new notification from {{.SenderName}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.full",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full",
+    "translation": "채널: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.subject.direct.full",
+    "translation": "{{.SubjectText}} on {{.TeamDisplayName}} at {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
+    "id": "app.notification.subject.notification.full",
+    "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
+    "id": "app.user_access_token.disabled",
+    "translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details."
+  },
+  {
+    "id": "app.user_access_token.invalid_or_missing",
+    "translation": "Invalid or missing token"
+  },
+  {
     "id": "authentication.permissions.create_group_channel.description",
     "translation": "Ability to create new group message channels"
   },
@@ -3364,6 +3576,14 @@
     "translation": "Create Group Message"
   },
   {
+    "id": "authentication.permissions.create_post_public.description",
+    "translation": "Ability to create posts in public channels"
+  },
+  {
+    "id": "authentication.permissions.create_post_public.name",
+    "translation": "Create Posts in Public Channels"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Ability to create new teams"
   },
@@ -3372,6 +3592,22 @@
     "translation": "Create Teams"
   },
   {
+    "id": "authentication.permissions.create_user_access_token.description",
+    "translation": "Ability to create personal access tokens"
+  },
+  {
+    "id": "authentication.permissions.create_user_access_token.name",
+    "translation": "Create Personal Access Token"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.description",
+    "translation": "Ability to manage jobs"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.name",
+    "translation": "Manage Jobs"
+  },
+  {
     "id": "authentication.permissions.manage_team_roles.description",
     "translation": "Ability to change the roles of a team member"
   },
@@ -3388,6 +3624,22 @@
     "translation": "Read Public Channels"
   },
   {
+    "id": "authentication.permissions.read_user_access_token.description",
+    "translation": "Ability to read personal access tokens' id, description and user_id fields"
+  },
+  {
+    "id": "authentication.permissions.read_user_access_token.name",
+    "translation": "Read Personal Access Tokens"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.description",
+    "translation": "Ability to revoke personal access tokens"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.name",
+    "translation": "Revoke Personal Access Token"
+  },
+  {
     "id": "authentication.permissions.team_invite_user.description",
     "translation": "팀 사용자 초대 권한"
   },
@@ -3404,6 +3656,46 @@
     "translation": "슬래시 명령어 사용"
   },
   {
+    "id": "authentication.roles.system_post_all.description",
+    "translation": "A role with the permission to post in any public, private or direct channel on the system"
+  },
+  {
+    "id": "authentication.roles.system_post_all.name",
+    "translation": "Post in Public, Private and Direct Channels"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.description",
+    "translation": "A role with the permission to post in any public channel on the system"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.name",
+    "translation": "Post in Public Channels"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.description",
+    "translation": "A role with the permissions to create, read and revoke personal access tokens"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.name",
+    "translation": "Personal Access Token"
+  },
+  {
+    "id": "authentication.roles.team_post_all.description",
+    "translation": "A role with the permission to post in any public or private channel on the team"
+  },
+  {
+    "id": "authentication.roles.team_post_all.name",
+    "translation": "Post in Public and Private Channels"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.description",
+    "translation": "A role with the permission to post in any public channel on the team"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.name",
+    "translation": "Post in Public Channels"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "기능을 활성화 하려면 엔터프라이즈 라이센스가 필요합니다. 시스템 관리자에게 업그레이드를 문의해보세요."
   },
@@ -3496,36 +3788,60 @@
     "translation": "Compliance export started for job '{{.JobName}}' at '{{.FilePath}}'"
   },
   {
-    "id": "ent.elasticsearch.search_posts.disabled",
-    "translation": "ElasticSearch searching is disabled on this server"
+    "id": "ent.elasticsearch.create_client.connect_failed",
+    "translation": "Setting up Elasticsearch Client Failed"
   },
   {
-    "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "Search failed to complete"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_create_failed",
+    "translation": "Failed to create Elasticsearch index"
   },
   {
-    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
-    "translation": "Failed to decode search results"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_exists_failed",
+    "translation": "Failed to establish whether Elasticsearch index exists"
+  },
+  {
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_mapping_failed",
+    "translation": "Failed to setup Elasticsearch index mapping"
+  },
+  {
+    "id": "ent.elasticsearch.delete_post.error",
+    "translation": "Failed to delete the post"
+  },
+  {
+    "id": "ent.elasticsearch.generic.disabled",
+    "translation": "Elasticsearch search is not enabled on this server"
+  },
+  {
+    "id": "ent.elasticsearch.index_post.error",
+    "translation": "Failed to index the post"
+  },
+  {
+    "id": "ent.elasticsearch.not_started.error",
+    "translation": "Elasticsearch is not started"
   },
   {
-    "id": "ent.elasticsearch.start.connect_failed",
-    "translation": "Setting up ElasticSearch Client Failed"
+    "id": "ent.elasticsearch.purge_indexes.delete_failed",
+    "translation": "Failed to delete Elasticsearch index"
   },
   {
-    "id": "ent.elasticsearch.start.index_create_failed",
-    "translation": "Failed to create ElasticSearch index"
+    "id": "ent.elasticsearch.search_posts.disabled",
+    "translation": "Elasticsearch searching is disabled on this server"
   },
   {
-    "id": "ent.elasticsearch.start.index_exists_failed",
-    "translation": "Failed to establish whether ElasticSearch index exists"
+    "id": "ent.elasticsearch.search_posts.search_failed",
+    "translation": "Search failed to complete"
   },
   {
-    "id": "ent.elasticsearch.start.index_mapping_failed",
-    "translation": "Failed to setup ElasticSearch index mapping"
+    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
+    "translation": "Failed to decode search results"
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
-    "translation": "Failed to set ElasticSearch index settings"
+    "translation": "Failed to set Elasticsearch index settings"
+  },
+  {
+    "id": "ent.elasticsearch.test_config.connect_failed",
+    "translation": "Connecting to Elasticsearch server failed."
   },
   {
     "id": "ent.elasticsearch.test_config.indexing_disabled.error",
@@ -3536,6 +3852,10 @@
     "translation": "License does not support Elasticsearch."
   },
   {
+    "id": "ent.elasticsearch.test_config.reenter_password",
+    "translation": "The Elasticsearch Server URL or Username has changed. Please re-enter the Elasticsearch password to test connection."
+  },
+  {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "사용자 정의 이모티콘 제한을 활성화 하려면 엔터프라이즈 라이센스가 필요합니다. 시스템 관리자에게 업그레이드를 문의해보세요."
   },
@@ -3748,6 +4068,14 @@
     "translation": "페이지가 없습니다."
   },
   {
+    "id": "jobs.request_cancellation.status.error",
+    "translation": "Could not request cancellation for job that is not in a cancelable state."
+  },
+  {
+    "id": "jobs.set_job_error.update.error",
+    "translation": "Failed to set job status to error"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Could not find channel: %v, %v possibilites searched"
   },
@@ -4116,6 +4444,10 @@
     "translation": "Invalid email batching interval for email settings.  Must be 30 seconds or more."
   },
   {
+    "id": "model.config.is_valid.email_notification_contents_type.app_error",
+    "translation": "Invalid email notification contents type for email settings. Must be one of either 'full' or 'generic'."
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "Invalid password reset salt for email settings.  Must be 32 chars or more."
   },
@@ -4436,6 +4768,22 @@
     "translation": "잘못된 사용자 ID"
   },
   {
+    "id": "model.job.is_valid.create_at.app_error",
+    "translation": "Create at must be a valid time"
+  },
+  {
+    "id": "model.job.is_valid.id.app_error",
+    "translation": "잘못된 형식"
+  },
+  {
+    "id": "model.job.is_valid.status.app_error",
+    "translation": "Invalid job status"
+  },
+  {
+    "id": "model.job.is_valid.type.app_error",
+    "translation": "잘못된 형식"
+  },
+  {
     "id": "model.oauth.is_valid.app_id.app_error",
     "translation": "잘못된 앱 ID"
   },
@@ -4812,6 +5160,18 @@
     "translation": "잘못된 유저이름입니다."
   },
   {
+    "id": "model.user_access_token.is_valid.description.app_error",
+    "translation": "Invalid description, must be 255 or less characters"
+  },
+  {
+    "id": "model.user_access_token.is_valid.token.app_error",
+    "translation": "잘못된 접근 토큰입니다."
+  },
+  {
+    "id": "model.user_access_token.is_valid.user_id.app_error",
+    "translation": "잘못된 사용자 ID"
+  },
+  {
     "id": "model.utils.decode_json.app_error",
     "translation": "could not decode"
   },
@@ -4921,7 +5281,7 @@
   },
   {
     "id": "store.sql.schema_version.critical",
-    "translation": "The database schema version of %v cannot be upgraded.  You must not skip a version."
+    "translation": "Database schema version %v is no longer supported. This Mattermost server supports automatic upgrades from schema version %v through schema version %v. Downgrades are not supported. Please manually upgrade to at least version %v before continuing"
   },
   {
     "id": "store.sql.short_ciphertext",
@@ -5296,23 +5656,23 @@
     "translation": "We couldn't save or update the file info"
   },
   {
-    "id": "store.sql_job_status.delete_by_type.app_error",
+    "id": "store.sql_job.delete.app_error",
     "translation": "채널을 찾을 수 없습니다"
   },
   {
-    "id": "store.sql_job_status.get.app_error",
+    "id": "store.sql_job.get.app_error",
     "translation": "채널을 찾을 수 없습니다"
   },
   {
-    "id": "store.sql_job_status.get_all.app_error",
+    "id": "store.sql_job.get_all.app_error",
     "translation": "채널을 찾을 수 없습니다"
   },
   {
-    "id": "store.sql_job_status.save.app_error",
+    "id": "store.sql_job.save.app_error",
     "translation": "채널을 찾을 수 없습니다"
   },
   {
-    "id": "store.sql_job_status.update.app_error",
+    "id": "store.sql_job.update.app_error",
     "translation": "채널을 찾을 수 없습니다"
   },
   {
@@ -5464,6 +5824,10 @@
     "translation": "We couldn't get the parent posts for the channel"
   },
   {
+    "id": "store.sql_post.get_posts_batch_for_indexing.get.app_error",
+    "translation": "We couldn't get the posts batch for indexing"
+  },
+  {
     "id": "store.sql_post.get_posts_by_ids.app_error",
     "translation": "채널을 찾을 수 없습니다"
   },
@@ -6040,6 +6404,26 @@
     "translation": "Unable to update verify email field"
   },
   {
+    "id": "store.sql_user_access_token.delete.app_error",
+    "translation": "채널을 찾을 수 없습니다"
+  },
+  {
+    "id": "store.sql_user_access_token.get.app_error",
+    "translation": "채널을 찾을 수 없습니다"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_token.app_error",
+    "translation": "채널을 찾을 수 없습니다"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_user.app_error",
+    "translation": "채널을 찾을 수 없습니다"
+  },
+  {
+    "id": "store.sql_user_access_token.save.app_error",
+    "translation": "채널을 찾을 수 없습니다"
+  },
+  {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "Incoming webhook 갯수를 셀 수 없었습니다"
   },
@@ -6080,10 +6464,18 @@
     "translation": "Webhook들을 찾는 데 실패했습니다"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_incoming_by_channel.app_error",
+    "translation": "Webhook을 삭제하는 데 실패했습니다"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_incoming_by_user.app_error",
     "translation": "Webhook을 삭제하는 데 실패했습니다"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_outgoing_by_channel.app_error",
+    "translation": "Webhook을 삭제하는 데 실패했습니다"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error",
     "translation": "Webhook을 삭제하는 데 실패했습니다"
   },
@@ -6116,6 +6508,10 @@
     "translation": "시스템"
   },
   {
+    "id": "utils.config.add_client_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  Adding DefaultClientLocale to AvailableLocales."
+  },
+  {
     "id": "utils.config.load_config.decoding.panic",
     "translation": "Error decoding config file={{.Filename}}, err={{.Error}}"
   },
@@ -6136,8 +6532,12 @@
     "translation": "An error occurred while saving the file to {{.Filename}}"
   },
   {
+    "id": "utils.config.supported_available_locales.app_error",
+    "translation": "Unable to load mattermost configuration file:  AvailableLocales must include DefaultClientLocale. Setting AvailableLocales to all locales as default value."
+  },
+  {
     "id": "utils.config.supported_client_locale.app_error",
-    "translation": "Unable to load mattermost configuration file:  DefaultClientLocale must be one of the supported locales"
+    "translation": "Unable to load mattermost configuration file:  DefaultClientLocale must be one of the supported locales. Setting DefaultClientLocale to en as default value."
   },
   {
     "id": "utils.config.supported_server_locale.app_error",
diff --git a/i18n/nl.json b/i18n/nl.json
index a3989aae1..56706714d 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -513,7 +513,7 @@
   },
   {
     "id": "api.command_channel_header.message.app_error",
-    "translation": "Text must be provided with the /header command."
+    "translation": "Een bericht moet worden opgegeven met het /echo commando."
   },
   {
     "id": "api.command_channel_header.name",
@@ -532,6 +532,90 @@
     "translation": "Channel header successfully updated."
   },
   {
+    "id": "api.command_channel_purpose.channel.app_error",
+    "translation": "Error to retrieve the current channel."
+  },
+  {
+    "id": "api.command_channel_purpose.desc",
+    "translation": "Edit the channel purpose"
+  },
+  {
+    "id": "api.command_channel_purpose.direct_group.app_error",
+    "translation": "Cannot set purpose for direct message channels. Use /header to set the header instead."
+  },
+  {
+    "id": "api.command_channel_purpose.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_purpose.message.app_error",
+    "translation": "Een bericht moet worden opgegeven met het /echo commando."
+  },
+  {
+    "id": "api.command_channel_purpose.name",
+    "translation": "purpose"
+  },
+  {
+    "id": "api.command_channel_purpose.permission.app_error",
+    "translation": "You do not have the appropriate permissions to edit the channel purpose."
+  },
+  {
+    "id": "api.command_channel_purpose.update_channel.app_error",
+    "translation": "Error to update the current channel."
+  },
+  {
+    "id": "api.command_channel_rename.channel.app_error",
+    "translation": "Error to retrieve the current channel."
+  },
+  {
+    "id": "api.command_channel_rename.desc",
+    "translation": "Rename the channel"
+  },
+  {
+    "id": "api.command_channel_rename.direct_group.app_error",
+    "translation": "Een direct kanaal kan niet verlaten worden"
+  },
+  {
+    "id": "api.command_channel_rename.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_rename.message.app_error",
+    "translation": "Een bericht moet worden opgegeven met het /echo commando."
+  },
+  {
+    "id": "api.command_channel_rename.name",
+    "translation": "rename"
+  },
+  {
+    "id": "api.command_channel_rename.permission.app_error",
+    "translation": "You do not have the appropriate permissions to rename the channel."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.app_error",
+    "translation": "Error to update the current channel."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.success",
+    "translation": "Channel name successfully updated."
+  },
+  {
+    "id": "api.command_code.desc",
+    "translation": "Display text as a code block"
+  },
+  {
+    "id": "api.command_code.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_code.message.app_error",
+    "translation": "Een bericht moet worden opgegeven met het /echo commando."
+  },
+  {
+    "id": "api.command_code.name",
+    "translation": "code"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "Automatisch inklappen van afbeelding voorbeeldweergave aanzetten"
   },
@@ -624,6 +708,30 @@
     "translation": "Deelnemen aan het kanaal."
   },
   {
+    "id": "api.command_leave.desc",
+    "translation": "Leave the current channel"
+  },
+  {
+    "id": "api.command_leave.fail.app_error",
+    "translation": "Er is een fout opgetreden tijdens het deelnemen aan het kanaal."
+  },
+  {
+    "id": "api.command_leave.list.app_error",
+    "translation": "Er is een fout opgetreden tijdens het ophalen van de kanalen."
+  },
+  {
+    "id": "api.command_leave.missing.app_error",
+    "translation": "Het kanaal kon niet gevonden worden"
+  },
+  {
+    "id": "api.command_leave.name",
+    "translation": "leave"
+  },
+  {
+    "id": "api.command_leave.success",
+    "translation": "Left the channel."
+  },
+  {
     "id": "api.command_logout.desc",
     "translation": "Uitloggen uit Mattermost"
   },
@@ -1009,7 +1117,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
-    "translation": "Direct Bericht"
+    "translation": "Direct Message from "
   },
   {
     "id": "api.email_batching.render_batched_post.go_to_post",
@@ -1017,7 +1125,11 @@
   },
   {
     "id": "api.email_batching.render_batched_post.group_message",
-    "translation": "Group Message"
+    "translation": "Group Message from "
+  },
+  {
+    "id": "api.email_batching.render_batched_post.notification",
+    "translation": "Notification from "
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
@@ -1026,8 +1138,8 @@
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
     "translation": {
-      "one": "U heeft een nieuw bericht.",
-      "other": "U heeft {{.Count}} nieuwe berichten."
+      "one": "You have a new notification.",
+      "other": "You have {{.Count}} new notifications."
     }
   },
   {
@@ -1696,22 +1808,10 @@
     "translation": "Mislukt om teams op te halen bij versturen van cross-team DM user_id=%v, err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.mention_body",
-    "translation": "U heeft een nieuwe notificatie."
-  },
-  {
     "id": "api.post.send_notifications_and_forget.mention_subject",
     "translation": "Nieuwe notificatie"
   },
   {
-    "id": "api.post.send_notifications_and_forget.message_body",
-    "translation": "U heeft een nieuw bericht."
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.message_subject",
-    "translation": "Nieuw direct bericht"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.push_image_only",
     "translation": " Uploaded one or more files in "
   },
@@ -1728,6 +1828,10 @@
     "translation": " vermeld u in "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "translation": " vermeld u in "
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_message",
     "translation": " stuurde u een direct bericht"
   },
@@ -1736,6 +1840,10 @@
     "translation": " geschreven in "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
+    "translation": " posted a message"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
     "translation": "Failed to send push device_id={{.DeviceId}}, err={{.Error}}"
   },
@@ -1873,11 +1981,11 @@
   },
   {
     "id": "api.slackimport.slack_add_bot_user.email_pwd",
-    "translation": "Slack Bot/Integration Posts Import User: Email, Password: {{.Email}}, {{.Password}}\r\n"
+    "translation": "The Integration/Slack Bot user with email {{.Email}} and password {{.Password}} has been imported.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_bot_user.unable_import",
-    "translation": "Unable to import Slack Bot/Integration Posts Import User: {{.Username}}\r\n"
+    "translation": "Unable to import the Integration/Slack Bot user {{.Username}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.added",
@@ -1885,71 +1993,71 @@
   },
   {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
-    "translation": "Er trad een fout op bij het toevoegen van een gebruiker aan een kanaal: {{.Username}}\r\n"
+    "translation": "Unable to add Slack user {{.Username}} to channel.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed",
-    "translation": "Import is mislukt: {{.DisplayName}}\r\n"
+    "translation": "Unable to import Slack channel {{.DisplayName}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Slack importeerder: Kon het kanaal niet inladen: %s"
+    "translation": "Slack Import: Unable to import Slack channel: %s."
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
-    "translation": "Samengevoegd met bestaand kanaal: {{.DisplayName}}\r\n"
+    "translation": "The Slack channel {{.DisplayName}} already exists as an active Mattermost channel. Both channels have been merged.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_posts.attach_files.error",
-    "translation": "Een error trad op bij het attachen van de bestanden bij post, post_id=%s, file_ids=%v, err=%v"
+    "translation": "Slack Import: An error occurred when attaching files to a message, post_id=%s, file_ids=%v, err=%v."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot.warn",
-    "translation": "Slack bot posts zijn nog niet geimporteerd"
+    "translation": "Slack Import: Slack bot messages cannot be imported yet."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot_user_no_exists.warn",
-    "translation": "Slack Importeerder: Bot berichten worden niet ingeladen aangezien de bot-importerende gebruiker niet bestaat. "
+    "translation": "Slack Import: Unable to import the bot message as the bot user does not exist."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
-    "translation": "Bestandsomschrijving werd niet opgegeven"
+    "translation": "Slack Import: Unable to import the message as it has no comments."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_usr.debug",
-    "translation": "Bericht zonder gebruiker"
+    "translation": "Slack Import: Unable to import the message as the user field is missing."
   },
   {
     "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
-    "translation": "Slack Importer: Not importing bot message due to lack of BotId field."
+    "translation": "Slack Import: Unable to import bot message as the BotId field is missing."
   },
   {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
-    "translation": "Niet ondersteund bericht type: %v, %v"
+    "translation": "Slack Import: Unable to import the message as its type is not supported: post_type=%v, post_subtype=%v."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_found.warn",
-    "translation": "No file found in Slack export for file upload message with file ID {{.FileId}}"
+    "translation": "Slack Import: Unable to import file {{.FileId}} as the file is missing from the Slack export zip file."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_in_json.warn",
-    "translation": "Cannot import file for upload post with no \"file\" section present in export."
+    "translation": "Slack Import: Unable to attach the file to the post as the latter has no \"file\" section present in Slack export."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_open_failed.warn",
-    "translation": "Could not open the upload file with ID {{.FileId}} in the export archive with error: {{.Error}}"
+    "translation": "Slack Import: Unable to open the file {{.FileId}} from the Slack export: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_upload_failed.warn",
-    "translation": "Uploading the file for upload message with file ID {{.FileId}} failed with error: {{.Error}}"
+    "translation": "Slack Import: An error occurred when uploading file {{.FileId}}: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.user_no_exists.debug",
-    "translation": "Gebruiker; %v bestaat niet!"
+    "translation": "Slack Import: Unable to add the message as the Slack user %v does not exist in Mattermost."
   },
   {
     "id": "api.slackimport.slack_add_posts.without_user.debug",
-    "translation": "Bericht zonder gebruiker"
+    "translation": "Slack Import: Unable to import the message as the user field is missing."
   },
   {
     "id": "api.slackimport.slack_add_users.created",
@@ -1957,23 +2065,23 @@
   },
   {
     "id": "api.slackimport.slack_add_users.email_pwd",
-    "translation": "E-mail, Wachtwoord: {{.Email}}, {{.Password}}\r\n"
+    "translation": "Slack user with email {{.Email}} and password {{.Password}} has been imported.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing",
-    "translation": "Samengevoegd met bestaand account: {{.Email}}, {{.Username}}\r\n"
+    "translation": "Slack user merged with an existing Mattermost user with matching email {{.Email}} and username {{.Username}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing_failed",
-    "translation": "Tried to merge user with existing account: {{.Email}}, {{.Username}}, but failed to add the user to this team.\r\n"
+    "translation": "Slack user merged with an existing Mattermost user with matching email {{.Email}} and username {{.Username}}, but was unable to add the user to their team.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address",
-    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system.\r\n"
+    "translation": "User {{.Username}} does not have an email address in the Slack export. Used {{.Email}} as a placeholder. The user should update their email address once logged in to the system.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address.warn",
-    "translation": "User {{.Username}} does not have an email address in the Slack export. Using {{.Email}} as a placeholder. The user should update their email address once logged in to the system."
+    "translation": "Slack Import: User {{.Username}} does not have an email address in the Slack export. Used {{.Email}} as a placeholder. The user should update their email address once logged in to the system."
   },
   {
     "id": "api.slackimport.slack_add_users.unable_import",
@@ -1981,19 +2089,19 @@
   },
   {
     "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
-    "translation": "Mislukt om de @vermelding te maken met reguliere expressie voor Slack gebruiker {{.UserID}} {{.Username}}"
+    "translation": "Slack Import: Unable to compile the !channel, matching regular expression for the Slack channel {{.ChannelName}} (id={{.ChannelID}})."
   },
   {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
-    "translation": "Ongeldige 'timestamp' gevonden"
+    "translation": "Slack Import: Bad timestamp detected."
   },
   {
     "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
-    "translation": "Mislukt om de @vermelding te maken met reguliere expressie voor Slack gebruiker {{.UserID}} {{.Username}}"
+    "translation": "Slack Import: Unable to compile the @mention, matching regular expression for the Slack user {{.Username}} (id={{.UserID}})."
   },
   {
     "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
-    "translation": "Slack Importer: Failed to deactivate the bot-importing user."
+    "translation": "Slack Import: Unable to deactivate the user account used for the bot."
   },
   {
     "id": "api.slackimport.slack_import.log",
@@ -2017,7 +2125,7 @@
   },
   {
     "id": "api.slackimport.slack_import.open.app_error",
-    "translation": "Kan bestand niet openen; {{.Filename}}"
+    "translation": "Unable to open the file: {{.Filename}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_import.team_fail",
@@ -2025,31 +2133,31 @@
   },
   {
     "id": "api.slackimport.slack_import.zip.app_error",
-    "translation": "Zip bestand kan niet worden geopend"
+    "translation": "Unable to open the Slack export zip file.\r\n"
   },
   {
     "id": "api.slackimport.slack_parse_channels.error",
-    "translation": "Error parsing slack channels. Import may work anyway."
+    "translation": "Slack Import: Error occurred when parsing some Slack channels. Import may work anyway."
   },
   {
     "id": "api.slackimport.slack_parse_posts.error",
-    "translation": "Error parsing some slack posts. Import may work anyway."
+    "translation": "Slack Import: Error occurred when parsing some Slack posts. Import may work anyway."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack Importer: Channel {{.ChannelName}} has a display name which is too long. It will be truncated when imported."
+    "translation": "Slack Import: Channel {{.ChannelName}} display name exceeds the maximum length. It will be truncated when imported."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Slack Importer: Channel {{.ChannelName}} has a header which is too long. It will be truncated when imported."
+    "translation": "Slack Import: Channel {{.ChannelName}} header exceeds the maximum length. It will be truncated when imported."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slack Importer: Channel {{.ChannelName}} has a name which is too long. It will be truncated when imported."
+    "translation": "Slack Import: Channel {{.ChannelName}} handle exceeds the maximum length. It will be truncated when imported."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Slack Importer: Channel {{.ChannelName}} has a purpose which is too long. It will be truncated when imported."
+    "translation": "Slack Import: Channel {{.ChannelName}} purpose exceeds the maximum length. It will be truncated when imported."
   },
   {
     "id": "api.status.init.debug",
@@ -2332,22 +2440,6 @@
     "translation": "Ga naar bericht"
   },
   {
-    "id": "api.templates.post_body.info",
-    "translation": "KANAAL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_channel",
-    "translation": "{{.SubjectText}} in {{.TeamDisplayName}} {{.ChannelName}}) op {{.Month}} {{.Day}} {{.Year}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_direct_message",
-    "translation": "{{.SubjectText}} in {{.TeamDisplayName}} van {{.SenderDisplayName}} op {{.Month}} {{.Day}} {{.Year}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_group_message",
-    "translation": "{{.SubjectText}} in {{.TeamDisplayName}} van {{.SenderDisplayName}} op {{.Month}} {{.Day}} {{.Year}}"
-  },
-  {
     "id": "api.templates.reset_body.button",
     "translation": "Wachtwoord opnieuw instellen"
   },
@@ -2404,6 +2496,18 @@
     "translation": "[MATTERMOST] Veranderingen aan uw account voor de Mattermost 3.0 Upgrade"
   },
   {
+    "id": "api.templates.user_access_token_body.info",
+    "translation": "A user access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.user_access_token_body.title",
+    "translation": "User access token added to your account"
+  },
+  {
+    "id": "api.templates.user_access_token_subject",
+    "translation": "[{{ .SiteName }}] User access token added to your account"
+  },
+  {
     "id": "api.templates.username_change_body.info",
     "translation": "Uw e-mailadres voor {{.TeamDisplayName}} is veranderd naar {{.NewEmail}}.<br>Als u deze wijziging niet zelf gemaakt hebt, neem kontakt op met de systeembeheerder."
   },
@@ -2760,6 +2864,10 @@
     "translation": "De e-mail voor het bijwerken van het wachtwoord kon niet verstuurd worden, fout=%v"
   },
   {
+    "id": "api.user.send_user_access_token.error",
+    "translation": "Failed to send user access token added email successfully"
+  },
+  {
     "id": "api.user.send_verify_email_and_forget.failed.error",
     "translation": "Verificatie mail kon niet verstuurd worden, fout=%v"
   },
@@ -3072,6 +3180,10 @@
     "translation": "Failed to get group channel"
   },
   {
+    "id": "app.import.import_direct_post.save_preferences.error",
+    "translation": "Error importing direct post. Failed to save preferences."
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "Post user does not exist"
   },
@@ -3108,6 +3220,10 @@
     "translation": "Error importing post. Channel with name \"{{.ChannelName}}\" could not be found."
   },
   {
+    "id": "app.import.import_post.save_preferences.error",
+    "translation": "Error importing post. Failed to save preferences."
+  },
+  {
     "id": "app.import.import_post.team_not_found.error",
     "translation": "Error importing post. Team with name \"{{.TeamName}}\" could not be found."
   },
@@ -3116,6 +3232,10 @@
     "translation": "Error importing post. User with username \"{{.Username}}\" could not be found."
   },
   {
+    "id": "app.import.import_user_channels.save_preferences.error",
+    "translation": "Error importing user channel memberships. Failed to save preferences."
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "Channel create_at must not be zero if provided."
   },
@@ -3176,6 +3296,10 @@
     "translation": "Direct channel members list contains too many items"
   },
   {
+    "id": "app.import.validate_direct_channel_import_data.unknown_favoriter.error",
+    "translation": "Direct channel can only be favorited by members. \"{{.Username}}\" is not a member."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
     "translation": "Missing required direct post property: channel_members"
   },
@@ -3204,6 +3328,10 @@
     "translation": "Missing required direct post property: message"
   },
   {
+    "id": "app.import.validate_direct_post_import_data.unknown_flagger.error",
+    "translation": "Direct post can only be flagged by members of the channel it is in. \"{{.Username}}\" is not a member."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
     "translation": "Missing required direct post property: user"
   },
@@ -3292,6 +3420,10 @@
     "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mobile.error",
+    "translation": "Invalid Mobile NotifyProps for User's Channel Membership."
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "Invalid roles for User's Channel Membership."
   },
@@ -3328,6 +3460,38 @@
     "translation": "User nickname is too long."
   },
   {
+    "id": "app.import.validate_user_import_data.notify_props_channel_trigger_invalid.error",
+    "translation": "Invalid Channel Trigger Notify Prop for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_comment_trigger_invalid.error",
+    "translation": "Invalid Comment Trigger Notify Prop for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error",
+    "translation": "Invalid Desktop Duration Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_invalid.error",
+    "translation": "Invalid Desktop Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_sound_invalid.error",
+    "translation": "Invalid Desktop Sound Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_email_invalid.error",
+    "translation": "Invalid Email Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_invalid.error",
+    "translation": "Invalid Mobile Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_push_status_invalid.error",
+    "translation": "Invalid Mobile Push Status Notify Prop for user."
+  },
+  {
     "id": "app.import.validate_user_import_data.pasword_length.error",
     "translation": "User Password has invalid length."
   },
@@ -3356,6 +3520,54 @@
     "translation": "Team name missing from User's Team Membership."
   },
   {
+    "id": "app.notification.body.intro.direct.full",
+    "translation": "U heeft een nieuw bericht."
+  },
+  {
+    "id": "app.notification.body.intro.direct.generic",
+    "translation": "You have a new direct message from {{.SenderName}}"
+  },
+  {
+    "id": "app.notification.body.intro.notification.full",
+    "translation": "You have a new notification."
+  },
+  {
+    "id": "app.notification.body.intro.notification.generic",
+    "translation": "You have a new notification from {{.SenderName}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.full",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full",
+    "translation": "KANAAL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.subject.direct.full",
+    "translation": "{{.SubjectText}} in {{.TeamDisplayName}} van {{.SenderDisplayName}} op {{.Month}} {{.Day}} {{.Year}}"
+  },
+  {
+    "id": "app.notification.subject.notification.full",
+    "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
+    "id": "app.user_access_token.disabled",
+    "translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details."
+  },
+  {
+    "id": "app.user_access_token.invalid_or_missing",
+    "translation": "Invalid or missing token"
+  },
+  {
     "id": "authentication.permissions.create_group_channel.description",
     "translation": "Ability to create new group message channels"
   },
@@ -3364,6 +3576,14 @@
     "translation": "Create Group Message"
   },
   {
+    "id": "authentication.permissions.create_post_public.description",
+    "translation": "Ability to create posts in public channels"
+  },
+  {
+    "id": "authentication.permissions.create_post_public.name",
+    "translation": "Create Posts in Public Channels"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Ability to create new teams"
   },
@@ -3372,6 +3592,22 @@
     "translation": "Create Teams"
   },
   {
+    "id": "authentication.permissions.create_user_access_token.description",
+    "translation": "Ability to create personal access tokens"
+  },
+  {
+    "id": "authentication.permissions.create_user_access_token.name",
+    "translation": "Create Personal Access Token"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.description",
+    "translation": "Ability to manage jobs"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.name",
+    "translation": "Manage Jobs"
+  },
+  {
     "id": "authentication.permissions.manage_team_roles.description",
     "translation": "Ability to change the roles of a team member"
   },
@@ -3388,6 +3624,22 @@
     "translation": "Read Public Channels"
   },
   {
+    "id": "authentication.permissions.read_user_access_token.description",
+    "translation": "Ability to read personal access tokens' id, description and user_id fields"
+  },
+  {
+    "id": "authentication.permissions.read_user_access_token.name",
+    "translation": "Read Personal Access Tokens"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.description",
+    "translation": "Ability to revoke personal access tokens"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.name",
+    "translation": "Revoke Personal Access Token"
+  },
+  {
     "id": "authentication.permissions.team_invite_user.description",
     "translation": "Mogelijkheid om gebruikers uit te nodigen in een team"
   },
@@ -3404,6 +3656,46 @@
     "translation": "Gebruik Slash Commando's"
   },
   {
+    "id": "authentication.roles.system_post_all.description",
+    "translation": "A role with the permission to post in any public, private or direct channel on the system"
+  },
+  {
+    "id": "authentication.roles.system_post_all.name",
+    "translation": "Post in Public, Private and Direct Channels"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.description",
+    "translation": "A role with the permission to post in any public channel on the system"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.name",
+    "translation": "Post in Public Channels"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.description",
+    "translation": "A role with the permissions to create, read and revoke personal access tokens"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.name",
+    "translation": "Personal Access Token"
+  },
+  {
+    "id": "authentication.roles.team_post_all.description",
+    "translation": "A role with the permission to post in any public or private channel on the team"
+  },
+  {
+    "id": "authentication.roles.team_post_all.name",
+    "translation": "Post in Public and Private Channels"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.description",
+    "translation": "A role with the permission to post in any public channel on the team"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.name",
+    "translation": "Post in Public Channels"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "Deze optie vereist een enterprise licentie. Neem contact op met de beheerder voor een upgrade van de licentie."
   },
@@ -3496,36 +3788,60 @@
     "translation": "Compliance export is mislukt voor taak '{{.JobName}}' naar '{{.FilePath}}'"
   },
   {
-    "id": "ent.elasticsearch.search_posts.disabled",
-    "translation": "ElasticSearch searching is disabled on this server"
+    "id": "ent.elasticsearch.create_client.connect_failed",
+    "translation": "Setting up Elasticsearch Client Failed"
   },
   {
-    "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "Search failed to complete"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_create_failed",
+    "translation": "Failed to create Elasticsearch index"
   },
   {
-    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
-    "translation": "Failed to decode search results"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_exists_failed",
+    "translation": "Failed to establish whether Elasticsearch index exists"
+  },
+  {
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_mapping_failed",
+    "translation": "Failed to setup Elasticsearch index mapping"
   },
   {
-    "id": "ent.elasticsearch.start.connect_failed",
-    "translation": "Setting up ElasticSearch Client Failed"
+    "id": "ent.elasticsearch.delete_post.error",
+    "translation": "Failed to delete the post"
   },
   {
-    "id": "ent.elasticsearch.start.index_create_failed",
-    "translation": "Failed to create ElasticSearch index"
+    "id": "ent.elasticsearch.generic.disabled",
+    "translation": "Elasticsearch search is not enabled on this server"
   },
   {
-    "id": "ent.elasticsearch.start.index_exists_failed",
-    "translation": "Failed to establish whether ElasticSearch index exists"
+    "id": "ent.elasticsearch.index_post.error",
+    "translation": "Failed to index the post"
   },
   {
-    "id": "ent.elasticsearch.start.index_mapping_failed",
-    "translation": "Failed to setup ElasticSearch index mapping"
+    "id": "ent.elasticsearch.not_started.error",
+    "translation": "Elasticsearch is not started"
+  },
+  {
+    "id": "ent.elasticsearch.purge_indexes.delete_failed",
+    "translation": "Failed to delete Elasticsearch index"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.disabled",
+    "translation": "Elasticsearch searching is disabled on this server"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.search_failed",
+    "translation": "Search failed to complete"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
+    "translation": "Failed to decode search results"
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
-    "translation": "Failed to set ElasticSearch index settings"
+    "translation": "Failed to set Elasticsearch index settings"
+  },
+  {
+    "id": "ent.elasticsearch.test_config.connect_failed",
+    "translation": "Connecting to Elasticsearch server failed."
   },
   {
     "id": "ent.elasticsearch.test_config.indexing_disabled.error",
@@ -3536,6 +3852,10 @@
     "translation": "License does not support Elasticsearch."
   },
   {
+    "id": "ent.elasticsearch.test_config.reenter_password",
+    "translation": "The Elasticsearch Server URL or Username has changed. Please re-enter the Elasticsearch password to test connection."
+  },
+  {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "Aangepaste emoji restricties is uitgeschakeld vanwege de huidige licentie. Neem contact op met de beheerder voor een upgrade van de licentie."
   },
@@ -3748,6 +4068,14 @@
     "translation": "Pagina niet gevonden"
   },
   {
+    "id": "jobs.request_cancellation.status.error",
+    "translation": "Could not request cancellation for job that is not in a cancelable state."
+  },
+  {
+    "id": "jobs.set_job_error.update.error",
+    "translation": "Failed to set job status to error"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Kan het kanaal %v niet vinden, %v mogelijkheden doorzocht"
   },
@@ -4116,6 +4444,10 @@
     "translation": "Verkeerde interval bij bulk email instellingen. Moet 30 secondes of meer zijn."
   },
   {
+    "id": "model.config.is_valid.email_notification_contents_type.app_error",
+    "translation": "Invalid email notification contents type for email settings. Must be one of either 'full' or 'generic'."
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "Ongeldige 'salt' voor wachtwoord reset e-mail instellingen. De salt moet 32 of meer karakters hebben."
   },
@@ -4436,6 +4768,22 @@
     "translation": "Ongeldig gebruikers id"
   },
   {
+    "id": "model.job.is_valid.create_at.app_error",
+    "translation": "Aangemaakt op moet een geldige tijd zijn"
+  },
+  {
+    "id": "model.job.is_valid.id.app_error",
+    "translation": "Ongeldige type"
+  },
+  {
+    "id": "model.job.is_valid.status.app_error",
+    "translation": "Invalid job status"
+  },
+  {
+    "id": "model.job.is_valid.type.app_error",
+    "translation": "Ongeldige type"
+  },
+  {
     "id": "model.oauth.is_valid.app_id.app_error",
     "translation": "Ongeldig app id"
   },
@@ -4812,6 +5160,18 @@
     "translation": "Ongeldige gebruikersnaam"
   },
   {
+    "id": "model.user_access_token.is_valid.description.app_error",
+    "translation": "Invalid description, must be 255 or less characters"
+  },
+  {
+    "id": "model.user_access_token.is_valid.token.app_error",
+    "translation": "Ongeldig toegangs token"
+  },
+  {
+    "id": "model.user_access_token.is_valid.user_id.app_error",
+    "translation": "Ongeldige gebruikers id"
+  },
+  {
     "id": "model.utils.decode_json.app_error",
     "translation": "kan niet decoderen"
   },
@@ -4921,7 +5281,7 @@
   },
   {
     "id": "store.sql.schema_version.critical",
-    "translation": "Database schema met versie %v kan niet geupgrade worden. Tussenliggende versies kunnen niet overgeslagen worden."
+    "translation": "Database schema version %v is no longer supported. This Mattermost server supports automatic upgrades from schema version %v through schema version %v. Downgrades are not supported. Please manually upgrade to at least version %v before continuing"
   },
   {
     "id": "store.sql.short_ciphertext",
@@ -5296,23 +5656,23 @@
     "translation": "We konden de bestandsinfo niet opslaan"
   },
   {
-    "id": "store.sql_job_status.delete_by_type.app_error",
+    "id": "store.sql_job.delete.app_error",
     "translation": "Het bericht kan niet verwijderd worden"
   },
   {
-    "id": "store.sql_job_status.get.app_error",
+    "id": "store.sql_job.get.app_error",
     "translation": "Het bericht kan niet opgehaald worden"
   },
   {
-    "id": "store.sql_job_status.get_all.app_error",
+    "id": "store.sql_job.get_all.app_error",
     "translation": "Het bericht kan niet opgehaald worden"
   },
   {
-    "id": "store.sql_job_status.save.app_error",
+    "id": "store.sql_job.save.app_error",
     "translation": "We kunnen het bericht niet opslaan"
   },
   {
-    "id": "store.sql_job_status.update.app_error",
+    "id": "store.sql_job.update.app_error",
     "translation": "Het bericht kan niet worden bijgewerkt"
   },
   {
@@ -5464,6 +5824,10 @@
     "translation": "We kunnen het start bericht voor het kanaal niet ophalen"
   },
   {
+    "id": "store.sql_post.get_posts_batch_for_indexing.get.app_error",
+    "translation": "We couldn't get the posts batch for indexing"
+  },
+  {
     "id": "store.sql_post.get_posts_by_ids.app_error",
     "translation": "Het bericht kan niet opgehaald worden"
   },
@@ -6040,6 +6404,26 @@
     "translation": "Het verificatie e-mail adres kan niet bijgewerkt worden"
   },
   {
+    "id": "store.sql_user_access_token.delete.app_error",
+    "translation": "Het access token kan niet verwijderd worden"
+  },
+  {
+    "id": "store.sql_user_access_token.get.app_error",
+    "translation": "Het access token kan niet verwijderd worden"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_token.app_error",
+    "translation": "Het access token kan niet verwijderd worden"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_user.app_error",
+    "translation": "Het access token kan niet verwijderd worden"
+  },
+  {
+    "id": "store.sql_user_access_token.save.app_error",
+    "translation": "Het access token kan niet opgeslagen worden."
+  },
+  {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "Het aantal binnenkomende webhooks kan niet geteld worden"
   },
@@ -6080,10 +6464,18 @@
     "translation": "We kunnen de webhooks niet ophalen"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_incoming_by_channel.app_error",
+    "translation": "De webhook kan niet verwijderd worden"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_incoming_by_user.app_error",
     "translation": "De webhook kan niet verwijderd worden"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_outgoing_by_channel.app_error",
+    "translation": "De webhook kan niet verwijderd worden"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error",
     "translation": "De webhook kan niet verwijderd worden"
   },
@@ -6116,6 +6508,10 @@
     "translation": "Systeem"
   },
   {
+    "id": "utils.config.add_client_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  Adding DefaultClientLocale to AvailableLocales."
+  },
+  {
     "id": "utils.config.load_config.decoding.panic",
     "translation": "Fout bij het decoderen van de config. Bestand={{.Filename}}, fout={{.Error}}"
   },
@@ -6136,8 +6532,12 @@
     "translation": "Er is ee probleem opgetreden bij het opslaan van het bestand in {{.Filename}}"
   },
   {
+    "id": "utils.config.supported_available_locales.app_error",
+    "translation": "Unable to load mattermost configuration file:  AvailableLocales must include DefaultClientLocale. Setting AvailableLocales to all locales as default value."
+  },
+  {
     "id": "utils.config.supported_client_locale.app_error",
-    "translation": "Unable to load mattermost configuration file:  DefaultClientLocale must be one of the supported locales"
+    "translation": "Unable to load mattermost configuration file:  DefaultClientLocale must be one of the supported locales. Setting DefaultClientLocale to en as default value."
   },
   {
     "id": "utils.config.supported_server_locale.app_error",
diff --git a/i18n/pl.json b/i18n/pl.json
index 9ba0d6dbe..56a38f94f 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -532,6 +532,90 @@
     "translation": "Nagłówek kanału zaktualizowany poprawnie"
   },
   {
+    "id": "api.command_channel_purpose.channel.app_error",
+    "translation": "Błąd aktualizacji bieżącego kanału."
+  },
+  {
+    "id": "api.command_channel_purpose.desc",
+    "translation": "Edit the channel purpose"
+  },
+  {
+    "id": "api.command_channel_purpose.direct_group.app_error",
+    "translation": "Cannot set purpose for direct message channels. Use /header to set the header instead."
+  },
+  {
+    "id": "api.command_channel_purpose.hint",
+    "translation": "[tekst]"
+  },
+  {
+    "id": "api.command_channel_purpose.message.app_error",
+    "translation": "Dla polecenia /echo musi zostać podana wiadomość."
+  },
+  {
+    "id": "api.command_channel_purpose.name",
+    "translation": "purpose"
+  },
+  {
+    "id": "api.command_channel_purpose.permission.app_error",
+    "translation": "Nie posiadasz odpowiednich uprawnień do edycji nagłówka kanału."
+  },
+  {
+    "id": "api.command_channel_purpose.update_channel.app_error",
+    "translation": "Błąd aktualizacji bieżącego kanału."
+  },
+  {
+    "id": "api.command_channel_rename.channel.app_error",
+    "translation": "Błąd aktualizacji bieżącego kanału."
+  },
+  {
+    "id": "api.command_channel_rename.desc",
+    "translation": "Rename the channel"
+  },
+  {
+    "id": "api.command_channel_rename.direct_group.app_error",
+    "translation": "Nie można opuścić kanału wiadomości bezpośrednich"
+  },
+  {
+    "id": "api.command_channel_rename.hint",
+    "translation": "[tekst]"
+  },
+  {
+    "id": "api.command_channel_rename.message.app_error",
+    "translation": "Dla polecenia /echo musi zostać podana wiadomość."
+  },
+  {
+    "id": "api.command_channel_rename.name",
+    "translation": "rename"
+  },
+  {
+    "id": "api.command_channel_rename.permission.app_error",
+    "translation": "Nie posiadasz odpowiednich uprawnień do edycji nagłówka kanału."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.app_error",
+    "translation": "Błąd aktualizacji bieżącego kanału."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.success",
+    "translation": "Nagłówek kanału zaktualizowany poprawnie"
+  },
+  {
+    "id": "api.command_code.desc",
+    "translation": "Display text as a code block"
+  },
+  {
+    "id": "api.command_code.hint",
+    "translation": "[tekst]"
+  },
+  {
+    "id": "api.command_code.message.app_error",
+    "translation": "Dla polecenia /echo musi zostać podana wiadomość."
+  },
+  {
+    "id": "api.command_code.name",
+    "translation": "code"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "Włącz automatyczne zwijanie podglądu obrazków"
   },
@@ -624,6 +708,30 @@
     "translation": "Dołączono do kanału."
   },
   {
+    "id": "api.command_leave.desc",
+    "translation": "Leave the current channel"
+  },
+  {
+    "id": "api.command_leave.fail.app_error",
+    "translation": "Wystąpił błąd podczas dołączania do kanału."
+  },
+  {
+    "id": "api.command_leave.list.app_error",
+    "translation": "Wystąpił błąd podczas listowania kanałów."
+  },
+  {
+    "id": "api.command_leave.missing.app_error",
+    "translation": "Nie odnaleziono kanału"
+  },
+  {
+    "id": "api.command_leave.name",
+    "translation": "leave"
+  },
+  {
+    "id": "api.command_leave.success",
+    "translation": "Left the channel."
+  },
+  {
     "id": "api.command_logout.desc",
     "translation": "Wyloguj się z Mattermost"
   },
@@ -1009,7 +1117,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
-    "translation": "Bezpośrednia wiadomość"
+    "translation": "Direct Message from "
   },
   {
     "id": "api.email_batching.render_batched_post.go_to_post",
@@ -1017,7 +1125,11 @@
   },
   {
     "id": "api.email_batching.render_batched_post.group_message",
-    "translation": "Wiadomość grupowa"
+    "translation": "Group Message from "
+  },
+  {
+    "id": "api.email_batching.render_batched_post.notification",
+    "translation": "Notification from "
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
@@ -1026,8 +1138,8 @@
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
     "translation": {
-      "one": "Masz nową wiadomość.",
-      "other": "Masz {{.Count}} nowe wiadomości"
+      "one": "You have a new notification.",
+      "other": "You have {{.Count}} new notifications."
     }
   },
   {
@@ -1696,22 +1808,10 @@
     "translation": "Nie udało się uzyskać zespołów podczas wysyłania wiadomości między zespołami user_id=%v, err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.mention_body",
-    "translation": "Wspomniano o Tobie przynajmniej raz."
-  },
-  {
     "id": "api.post.send_notifications_and_forget.mention_subject",
     "translation": "Wspomniano o Tobie"
   },
   {
-    "id": "api.post.send_notifications_and_forget.message_body",
-    "translation": "Masz jedną nową wiadomość."
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.message_subject",
-    "translation": "Nowa bezpośrednia wiadomość"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.push_image_only",
     "translation": " Wyślij jeden albo więcej plików w "
   },
@@ -1728,6 +1828,10 @@
     "translation": " wspomniał o Tobie w "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "translation": " wspomniał o Tobie w "
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_message",
     "translation": "  wysłał Ci bezpośrednią wiadomość"
   },
@@ -1736,6 +1840,10 @@
     "translation": "opublikował w"
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
+    "translation": " posted a message"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
     "translation": "Nie udało się wysłać push na device_id={{.DeviceId}}, err={{.Error}}"
   },
@@ -1873,11 +1981,11 @@
   },
   {
     "id": "api.slackimport.slack_add_bot_user.email_pwd",
-    "translation": "Użytkownik importu wiadomości dla integracji/bota Slack: Email, Hasło: {{.Email}}, {{.Password}}\r\n"
+    "translation": "The Integration/Slack Bot user with email {{.Email}} and password {{.Password}} has been imported.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_bot_user.unable_import",
-    "translation": "Nie można zaimportować użytkownika importu wiadomości integracji/bota Slack: {{.Username}}\r\n"
+    "translation": "Unable to import the Integration/Slack Bot user {{.Username}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.added",
@@ -1885,71 +1993,71 @@
   },
   {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
-    "translation": "Nie udało się dodać użytkownika do kanału: {{.Username}}\r\n"
+    "translation": "Unable to add Slack user {{.Username}} to channel.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed",
-    "translation": "Nie udało się zaimportować: {{.DisplayName}}\r\n"
+    "translation": "Unable to import Slack channel {{.DisplayName}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Importer Slack: nie udało się zaimportować kanału: %s"
+    "translation": "Slack Import: Unable to import Slack channel: %s."
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
-    "translation": "Połączono z istniejącym kanałem: {{.DisplayName}}\r\n"
+    "translation": "The Slack channel {{.DisplayName}} already exists as an active Mattermost channel. Both channels have been merged.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_posts.attach_files.error",
-    "translation": "Wystąpił błąd podczas dołączania plików do wiadomości, post_id=%s, file_ids=%v, err=%v"
+    "translation": "Slack Import: An error occurred when attaching files to a message, post_id=%s, file_ids=%v, err=%v."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot.warn",
-    "translation": "Wiadomości bota Slack nie są jeszcze importowane"
+    "translation": "Slack Import: Slack bot messages cannot be imported yet."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot_user_no_exists.warn",
-    "translation": "Importer Slack: wiadomości bota nie są importowane ponieważ użytkownik importujący bota nie istnieje."
+    "translation": "Slack Import: Unable to import the bot message as the bot user does not exist."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
-    "translation": "Komentarz pliku nie zdefiniowany"
+    "translation": "Slack Import: Unable to import the message as it has no comments."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_usr.debug",
-    "translation": "Wiadomość bez użytkownika"
+    "translation": "Slack Import: Unable to import the message as the user field is missing."
   },
   {
     "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
-    "translation": "Importer Slack: wiadomości bota nie są importowane z powodu braku pola BotId."
+    "translation": "Slack Import: Unable to import bot message as the BotId field is missing."
   },
   {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
-    "translation": "Niewspierany typ wiadomości: %v, %v"
+    "translation": "Slack Import: Unable to import the message as its type is not supported: post_type=%v, post_subtype=%v."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_found.warn",
-    "translation": "Podczas importu danych z formatu Slack'a nie znaleziono pliku z ID {{.FileId}}."
+    "translation": "Slack Import: Unable to import file {{.FileId}} as the file is missing from the Slack export zip file."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_in_json.warn",
-    "translation": "Nie można zaimportować pliku do przesłania bez sekcji \"file\" w eksporcie."
+    "translation": "Slack Import: Unable to attach the file to the post as the latter has no \"file\" section present in Slack export."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_open_failed.warn",
-    "translation": "Nie można otworzyć pliku z identyfikatorem {{.FileId}} w archiwum eksportu, błąd: {{.Error}}"
+    "translation": "Slack Import: Unable to open the file {{.FileId}} from the Slack export: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_upload_failed.warn",
-    "translation": "Przesyłanie pliku z identyfikatorem {{.FileId}} spowodowało błąd: {{.Error}}"
+    "translation": "Slack Import: An error occurred when uploading file {{.FileId}}: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.user_no_exists.debug",
-    "translation": "Użytkownik %v nie istnieje!"
+    "translation": "Slack Import: Unable to add the message as the Slack user %v does not exist in Mattermost."
   },
   {
     "id": "api.slackimport.slack_add_posts.without_user.debug",
-    "translation": "Wiadomość bez użytkownika"
+    "translation": "Slack Import: Unable to import the message as the user field is missing."
   },
   {
     "id": "api.slackimport.slack_add_users.created",
@@ -1957,15 +2065,15 @@
   },
   {
     "id": "api.slackimport.slack_add_users.email_pwd",
-    "translation": "Email, hasło: {{.Email}}, {{.Password}}\r\n"
+    "translation": "Slack user with email {{.Email}} and password {{.Password}} has been imported.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing",
-    "translation": "Scalono użytkownika z istniejącym kontem: {{.Email}}, {{.Username}}\r\n"
+    "translation": "Slack user merged with an existing Mattermost user with matching email {{.Email}} and username {{.Username}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing_failed",
-    "translation": "Próbowano połączyć użytkownika z istniejącym kontem: {{.Email}}, {{.Username}}, ale nie udało się dodać użytkownika do tej grupy.\r\n"
+    "translation": "Slack user merged with an existing Mattermost user with matching email {{.Email}} and username {{.Username}}, but was unable to add the user to their team.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address",
@@ -1981,19 +2089,19 @@
   },
   {
     "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
-    "translation": "Nie udało się skompliować !kanału pasującego do wyrażenia regularnego dla kanału Slack {{.ChannelID}} {{.ChannelName}}"
+    "translation": "Slack Import: Unable to compile the !channel, matching regular expression for the Slack channel {{.ChannelName}} (id={{.ChannelID}})."
   },
   {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
-    "translation": "Wykryto nieprawidłowy znacznik czasu"
+    "translation": "Slack Import: Bad timestamp detected."
   },
   {
     "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
-    "translation": "Nie udało się skompilować @wzmianki pasującej do wyrażenia regularnego dla użytkownika Slack {{.UserID}} {{.Username}}"
+    "translation": "Slack Import: Unable to compile the @mention, matching regular expression for the Slack user {{.Username}} (id={{.UserID}})."
   },
   {
     "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
-    "translation": "Slack Importer: Nie udało się wyłączyć użytkownika typu bot-importing."
+    "translation": "Slack Import: Unable to deactivate the user account used for the bot."
   },
   {
     "id": "api.slackimport.slack_import.log",
@@ -2017,7 +2125,7 @@
   },
   {
     "id": "api.slackimport.slack_import.open.app_error",
-    "translation": "Nie można otworzyć: {{.Filename}}"
+    "translation": "Unable to open the file: {{.Filename}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_import.team_fail",
@@ -2025,19 +2133,19 @@
   },
   {
     "id": "api.slackimport.slack_import.zip.app_error",
-    "translation": "Nie można otworzyć pliku zip"
+    "translation": "Unable to open the Slack export zip file.\r\n"
   },
   {
     "id": "api.slackimport.slack_parse_channels.error",
-    "translation": "Błąd podczas przetwarzania kanałów slack. Mimo to import może się udać."
+    "translation": "Slack Import: Error occurred when parsing some Slack channels. Import may work anyway."
   },
   {
     "id": "api.slackimport.slack_parse_posts.error",
-    "translation": "Błąd podczas przetwarzania niektórych postów slack. Mimo to import może się udać."
+    "translation": "Slack Import: Error occurred when parsing some Slack posts. Import may work anyway."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack Importer: Kanał {{.ChannelName}} ma opis, który jest za długi. Będzie on przycięty po zaimportowaniu."
+    "translation": "Slack Importer: Kanał {{.ChannelName}} ma nagłówek, który jest za długi. Będzie on przycięty po zaimportowaniu."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
@@ -2332,22 +2440,6 @@
     "translation": "Przejdź do postu"
   },
   {
-    "id": "api.templates.post_body.info",
-    "translation": "KANAŁ: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_channel",
-    "translation": "{{.SubjectText}} w {{.TeamDisplayName}} {{.Month}} {{.Day}}, {{.Year}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_direct_message",
-    "translation": "{{.SubjectText}} w {{.TeamDisplayName}} {{.Month}} {{.Day}}, {{.Year}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_group_message",
-    "translation": "Nowa wiadomość grupowa od {{ .SenderDisplayName}} {{.Month}} {{.Day}}, {{.Year}}"
-  },
-  {
     "id": "api.templates.reset_body.button",
     "translation": "Zresetuj hasło"
   },
@@ -2404,6 +2496,18 @@
     "translation": "[MATTERMOST] Zmiany na twoim koncie w po aktualizacji Mattermost 3.0"
   },
   {
+    "id": "api.templates.user_access_token_body.info",
+    "translation": "A user access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.user_access_token_body.title",
+    "translation": "User access token added to your account"
+  },
+  {
+    "id": "api.templates.user_access_token_subject",
+    "translation": "[{{ .SiteName }}] User access token added to your account"
+  },
+  {
     "id": "api.templates.username_change_body.info",
     "translation": "Twój login {{.TeamDisplayName}} został zmieniony na {{.NewUsername}}.<br>Jeśli nie to zmień, proszę, skontaktuj się z administratorem systemu."
   },
@@ -2760,6 +2864,10 @@
     "translation": "Nie udało się pomyślnie wysłać emaila ze zmianą hasła"
   },
   {
+    "id": "api.user.send_user_access_token.error",
+    "translation": "Failed to send user access token added email successfully"
+  },
+  {
     "id": "api.user.send_verify_email_and_forget.failed.error",
     "translation": "Nie udało się pomyślnie wysłać emaila weryfikacyjnego"
   },
@@ -3072,6 +3180,10 @@
     "translation": "Nie udało się uzyskać kanału grupowego"
   },
   {
+    "id": "app.import.import_direct_post.save_preferences.error",
+    "translation": "Error importing direct post. Failed to save preferences."
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "Post użytkownika nie istnieje"
   },
@@ -3108,6 +3220,10 @@
     "translation": "Błąd podczas importowania wiadomości. Kanał o nazwie \"{{.ChannelName}}\" nie został odnaleziony."
   },
   {
+    "id": "app.import.import_post.save_preferences.error",
+    "translation": "Error importing post. Failed to save preferences."
+  },
+  {
     "id": "app.import.import_post.team_not_found.error",
     "translation": "Błąd podczas importowania wiadomości. Zespół o nazwie \"{{.TeamName}}\" nie został odnaleziony."
   },
@@ -3116,6 +3232,10 @@
     "translation": "Błąd podczas importowania wiadomości. Użytkownik o nazwie \"{{.Username}}\" nie został odnaleziony."
   },
   {
+    "id": "app.import.import_user_channels.save_preferences.error",
+    "translation": "Error importing user channel memberships. Failed to save preferences."
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "Kanał create_at nie może być zero jeśli podany."
   },
@@ -3176,6 +3296,10 @@
     "translation": "Lista bezpośrednich uczestników kanału zawiera zbyt wiele elementów"
   },
   {
+    "id": "app.import.validate_direct_channel_import_data.unknown_favoriter.error",
+    "translation": "Direct channel can only be favorited by members. \"{{.Username}}\" is not a member."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
     "translation": "Brak wymaganej właściwości Post: channel_members."
   },
@@ -3204,6 +3328,10 @@
     "translation": "Brak wymaganej właściwości Post: message."
   },
   {
+    "id": "app.import.validate_direct_post_import_data.unknown_flagger.error",
+    "translation": "Direct post can only be flagged by members of the channel it is in. \"{{.Username}}\" is not a member."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
     "translation": "Brak wymaganej właściwości Post: user."
   },
@@ -3285,11 +3413,15 @@
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
-    "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
+    "translation": "Nieprawidłowe role Członka zespołu dla użytkowników."
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
-    "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
+    "translation": "Nieprawidłowe role Członka zespołu dla użytkowników."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mobile.error",
+    "translation": "Nieprawidłowe role Członka zespołu dla użytkowników."
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
@@ -3328,6 +3460,38 @@
     "translation": "Nick użytkownika jest za długi."
   },
   {
+    "id": "app.import.validate_user_import_data.notify_props_channel_trigger_invalid.error",
+    "translation": "Invalid Channel Trigger Notify Prop for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_comment_trigger_invalid.error",
+    "translation": "Invalid Comment Trigger Notify Prop for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error",
+    "translation": "Invalid Desktop Duration Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_invalid.error",
+    "translation": "Invalid Desktop Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_sound_invalid.error",
+    "translation": "Invalid Desktop Sound Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_email_invalid.error",
+    "translation": "Invalid Email Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_invalid.error",
+    "translation": "Invalid Mobile Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_push_status_invalid.error",
+    "translation": "Invalid Mobile Push Status Notify Prop for user."
+  },
+  {
     "id": "app.import.validate_user_import_data.pasword_length.error",
     "translation": "Hasło ma nieprawidłową długość."
   },
@@ -3356,6 +3520,54 @@
     "translation": "Brakuje nazwy zespołu w Członkostwie Zespołu Użytkownika."
   },
   {
+    "id": "app.notification.body.intro.direct.full",
+    "translation": "Masz nową wiadomość."
+  },
+  {
+    "id": "app.notification.body.intro.direct.generic",
+    "translation": "You have a new direct message from {{.SenderName}}"
+  },
+  {
+    "id": "app.notification.body.intro.notification.full",
+    "translation": "You have a new notification."
+  },
+  {
+    "id": "app.notification.body.intro.notification.generic",
+    "translation": "You have a new notification from {{.SenderName}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.full",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full",
+    "translation": "KANAŁ: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.subject.direct.full",
+    "translation": "Nowa wiadomość grupowa od {{ .SenderDisplayName}} {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
+    "id": "app.notification.subject.notification.full",
+    "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
+    "id": "app.user_access_token.disabled",
+    "translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details."
+  },
+  {
+    "id": "app.user_access_token.invalid_or_missing",
+    "translation": "Invalid or missing token"
+  },
+  {
     "id": "authentication.permissions.create_group_channel.description",
     "translation": "Możliwość tworzenia nowych kanałów do grupowych wiadomości"
   },
@@ -3364,6 +3576,14 @@
     "translation": "Utwórz Grupową Wiadomość"
   },
   {
+    "id": "authentication.permissions.create_post_public.description",
+    "translation": "Ability to create posts in public channels"
+  },
+  {
+    "id": "authentication.permissions.create_post_public.name",
+    "translation": "Create Posts in Public Channels"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Możliwość tworzenia nowych zespołów"
   },
@@ -3372,6 +3592,22 @@
     "translation": "Tworzenie zespołów"
   },
   {
+    "id": "authentication.permissions.create_user_access_token.description",
+    "translation": "Ability to create personal access tokens"
+  },
+  {
+    "id": "authentication.permissions.create_user_access_token.name",
+    "translation": "Create Personal Access Token"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.description",
+    "translation": "Ability to manage jobs"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.name",
+    "translation": "Manage Jobs"
+  },
+  {
     "id": "authentication.permissions.manage_team_roles.description",
     "translation": "Możliwość zmiany ról członka zespołu"
   },
@@ -3388,6 +3624,22 @@
     "translation": "Przeglądaj Publiczne Kanały"
   },
   {
+    "id": "authentication.permissions.read_user_access_token.description",
+    "translation": "Ability to read personal access tokens' id, description and user_id fields"
+  },
+  {
+    "id": "authentication.permissions.read_user_access_token.name",
+    "translation": "Read Personal Access Tokens"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.description",
+    "translation": "Ability to revoke personal access tokens"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.name",
+    "translation": "Revoke Personal Access Token"
+  },
+  {
     "id": "authentication.permissions.team_invite_user.description",
     "translation": "Możliwość zapraszania użytkowników do zespołu"
   },
@@ -3404,6 +3656,46 @@
     "translation": "Używanie poleceń"
   },
   {
+    "id": "authentication.roles.system_post_all.description",
+    "translation": "A role with the permission to post in any public, private or direct channel on the system"
+  },
+  {
+    "id": "authentication.roles.system_post_all.name",
+    "translation": "Post in Public, Private and Direct Channels"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.description",
+    "translation": "A role with the permission to post in any public channel on the system"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.name",
+    "translation": "Post in Public Channels"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.description",
+    "translation": "A role with the permissions to create, read and revoke personal access tokens"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.name",
+    "translation": "Personal Access Token"
+  },
+  {
+    "id": "authentication.roles.team_post_all.description",
+    "translation": "A role with the permission to post in any public or private channel on the team"
+  },
+  {
+    "id": "authentication.roles.team_post_all.name",
+    "translation": "Post in Public and Private Channels"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.description",
+    "translation": "A role with the permission to post in any public channel on the team"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.name",
+    "translation": "Post in Public Channels"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "Funkcjonalność wymaga licencji typu enterprise. Skontaktuj się z administratorem systemu odnośnie uzyskania licencji typu enterprise."
   },
@@ -3496,38 +3788,62 @@
     "translation": "Rozpoczęto eksport zgodności dla zadania '{{.JobName}}' do '{{.FilePath}}'"
   },
   {
-    "id": "ent.elasticsearch.search_posts.disabled",
-    "translation": "Na tym serwerze wyszukiwanie ElasticSearch jest wyłączone."
+    "id": "ent.elasticsearch.create_client.connect_failed",
+    "translation": "Nie udało się ustawić parametrów klienta ElasticSearch."
   },
   {
-    "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "Nie udało się zakończyć wyszukiwania."
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_create_failed",
+    "translation": "Nie udało się utworzyć indeksu ElasticSearch"
   },
   {
-    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
-    "translation": "Błąd w dekodowaniu wyników wyszukiwania."
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_exists_failed",
+    "translation": "Nie udało się ustalić, czy indeks elasticsearch istnieje"
   },
   {
-    "id": "ent.elasticsearch.start.connect_failed",
-    "translation": "Nie udało się ustawić parametrów klienta ElasticSearch."
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_mapping_failed",
+    "translation": "Nie można ustawić wyświetlanie indeksu elasticsearch"
+  },
+  {
+    "id": "ent.elasticsearch.delete_post.error",
+    "translation": "Failed to delete the post"
   },
   {
-    "id": "ent.elasticsearch.start.index_create_failed",
+    "id": "ent.elasticsearch.generic.disabled",
+    "translation": "Na tym serwerze wyszukiwanie ElasticSearch jest wyłączone."
+  },
+  {
+    "id": "ent.elasticsearch.index_post.error",
+    "translation": "Failed to index the post"
+  },
+  {
+    "id": "ent.elasticsearch.not_started.error",
+    "translation": "Elasticsearch is not started"
+  },
+  {
+    "id": "ent.elasticsearch.purge_indexes.delete_failed",
     "translation": "Nie udało się utworzyć indeksu ElasticSearch"
   },
   {
-    "id": "ent.elasticsearch.start.index_exists_failed",
-    "translation": "Nie udało się ustalić, czy indeks elasticsearch istnieje"
+    "id": "ent.elasticsearch.search_posts.disabled",
+    "translation": "Na tym serwerze wyszukiwanie ElasticSearch jest wyłączone."
   },
   {
-    "id": "ent.elasticsearch.start.index_mapping_failed",
-    "translation": "Nie można ustawić wyświetlanie indeksu elasticsearch"
+    "id": "ent.elasticsearch.search_posts.search_failed",
+    "translation": "Nie udało się zakończyć wyszukiwania."
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
+    "translation": "Błąd w dekodowaniu wyników wyszukiwania."
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Nie udało się określić ustawienia indeks elasticsearch"
   },
   {
+    "id": "ent.elasticsearch.test_config.connect_failed",
+    "translation": "Connecting to Elasticsearch server failed."
+  },
+  {
     "id": "ent.elasticsearch.test_config.indexing_disabled.error",
     "translation": "Elasticsearch jest wyłączony"
   },
@@ -3536,6 +3852,10 @@
     "translation": "Licencja nie obsługuje elasticsearch."
   },
   {
+    "id": "ent.elasticsearch.test_config.reenter_password",
+    "translation": "The Elasticsearch Server URL or Username has changed. Please re-enter the Elasticsearch password to test connection."
+  },
+  {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "Ograniczenia emoji użytkownika niedostępne przy aktualnej licencji. Skontaktuj się z administratorem systemu odnośnie uzyskania licencji typu enterprise."
   },
@@ -3748,6 +4068,14 @@
     "translation": "Strona nie odnaleziona"
   },
   {
+    "id": "jobs.request_cancellation.status.error",
+    "translation": "Could not request cancellation for job that is not in a cancelable state."
+  },
+  {
+    "id": "jobs.set_job_error.update.error",
+    "translation": "Failed to set job status to error"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Nie można znaleźć kanału: %v, przeszukano %v możliwych wyników"
   },
@@ -4116,6 +4444,10 @@
     "translation": "Nieprawidłowy odstęp czasu dla ustawień masowych emaili. Musi składać się z 30 lub więcej znaków."
   },
   {
+    "id": "model.config.is_valid.email_notification_contents_type.app_error",
+    "translation": "Invalid email notification contents type for email settings. Must be one of either 'full' or 'generic'."
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "Nieprawidłowa sól przywracania hasła dla ustawień emaila. Musi składać się z 32 lub więcej znaków."
   },
@@ -4436,6 +4768,22 @@
     "translation": "Nieprawidłowe ID użytkownika"
   },
   {
+    "id": "model.job.is_valid.create_at.app_error",
+    "translation": "Utworzono dnia musi zawierać prawidłowy czas"
+  },
+  {
+    "id": "model.job.is_valid.id.app_error",
+    "translation": "Nieprawidłowy typ"
+  },
+  {
+    "id": "model.job.is_valid.status.app_error",
+    "translation": "Invalid job status"
+  },
+  {
+    "id": "model.job.is_valid.type.app_error",
+    "translation": "Nieprawidłowy typ"
+  },
+  {
     "id": "model.oauth.is_valid.app_id.app_error",
     "translation": "Nieprawidłowe id aplikacji"
   },
@@ -4812,6 +5160,18 @@
     "translation": "Niepoprawna nazwa uzytkownika"
   },
   {
+    "id": "model.user_access_token.is_valid.description.app_error",
+    "translation": "Invalid description, must be 255 or less characters"
+  },
+  {
+    "id": "model.user_access_token.is_valid.token.app_error",
+    "translation": "Nieprawidłowy token dostępu"
+  },
+  {
+    "id": "model.user_access_token.is_valid.user_id.app_error",
+    "translation": "Nieprawidłowy identyfikator użytkownika"
+  },
+  {
     "id": "model.utils.decode_json.app_error",
     "translation": "nie można zdekodować"
   },
@@ -4921,7 +5281,7 @@
   },
   {
     "id": "store.sql.schema_version.critical",
-    "translation": "Schemat bazy danych w wersji %v nie może być zaktualizowany. Nie możesz pominąć wersji."
+    "translation": "Database schema version %v is no longer supported. This Mattermost server supports automatic upgrades from schema version %v through schema version %v. Downgrades are not supported. Please manually upgrade to at least version %v before continuing"
   },
   {
     "id": "store.sql.short_ciphertext",
@@ -5296,23 +5656,23 @@
     "translation": "Nie mogliśmy zapisać informacji o pliku"
   },
   {
-    "id": "store.sql_job_status.delete_by_type.app_error",
+    "id": "store.sql_job.delete.app_error",
     "translation": "Nie mogliśmy usunąć wpisu"
   },
   {
-    "id": "store.sql_job_status.get.app_error",
+    "id": "store.sql_job.get.app_error",
     "translation": "Nie udało się pobrać wiadomości"
   },
   {
-    "id": "store.sql_job_status.get_all.app_error",
+    "id": "store.sql_job.get_all.app_error",
     "translation": "Nie udało się pobrać wiadomości"
   },
   {
-    "id": "store.sql_job_status.save.app_error",
+    "id": "store.sql_job.save.app_error",
     "translation": "Nie udało się zapisać wiadomości"
   },
   {
-    "id": "store.sql_job_status.update.app_error",
+    "id": "store.sql_job.update.app_error",
     "translation": "Nie udało się zaktualizować wiadomości"
   },
   {
@@ -5464,6 +5824,10 @@
     "translation": "Nie można uzyskać wpisów nadrzędnych dla kanału"
   },
   {
+    "id": "store.sql_post.get_posts_batch_for_indexing.get.app_error",
+    "translation": "We couldn't get the posts batch for indexing"
+  },
+  {
     "id": "store.sql_post.get_posts_by_ids.app_error",
     "translation": "Nie udało się pobrać wiadomości"
   },
@@ -6040,6 +6404,26 @@
     "translation": "Unable to update verify email field"
   },
   {
+    "id": "store.sql_user_access_token.delete.app_error",
+    "translation": "Nie można usunąć identyfikatora dostępu"
+  },
+  {
+    "id": "store.sql_user_access_token.get.app_error",
+    "translation": "Nie można usunąć identyfikatora dostępu"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_token.app_error",
+    "translation": "Nie można usunąć identyfikatora dostępu"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_user.app_error",
+    "translation": "Nie można usunąć identyfikatora dostępu"
+  },
+  {
+    "id": "store.sql_user_access_token.save.app_error",
+    "translation": "Nie mogliśmy zapisać identyfikatora dostępu."
+  },
+  {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "Nie udało się policzyć przychodzących webhooków"
   },
@@ -6080,10 +6464,18 @@
     "translation": "Nie udało się pobrać wychodzącego webhooka"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_incoming_by_channel.app_error",
+    "translation": "Nie udało się skasować przychodzącego webhooka"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_incoming_by_user.app_error",
     "translation": "Nie udało się usunąć przychodzącego webhooka"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_outgoing_by_channel.app_error",
+    "translation": "Nie udało się skasować przychodzącego webhooka"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error",
     "translation": "Nie udało się usunąć wychodzącego webhooka (przez użytkownika)"
   },
@@ -6116,6 +6508,10 @@
     "translation": "System"
   },
   {
+    "id": "utils.config.add_client_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  Adding DefaultClientLocale to AvailableLocales."
+  },
+  {
     "id": "utils.config.load_config.decoding.panic",
     "translation": "Błąd podczas rozpakowywania pliku konfiguracyjnego={{.Filename}}, err={{.Error}}"
   },
@@ -6136,8 +6532,12 @@
     "translation": "Błąd w trakcie zapisywania pliku {{.Filename}}"
   },
   {
+    "id": "utils.config.supported_available_locales.app_error",
+    "translation": "Unable to load mattermost configuration file:  AvailableLocales must include DefaultClientLocale. Setting AvailableLocales to all locales as default value."
+  },
+  {
     "id": "utils.config.supported_client_locale.app_error",
-    "translation": "Nie można odczytać pliku konfiguracyjnego mattermost. Domyślny język Klienta musi być wspierany przez ustawienia lokalizacyjne."
+    "translation": "Unable to load mattermost configuration file:  DefaultClientLocale must be one of the supported locales. Setting DefaultClientLocale to en as default value."
   },
   {
     "id": "utils.config.supported_server_locale.app_error",
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 76764fd34..45a432748 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -532,6 +532,90 @@
     "translation": "Cabeçalho do canal atualizado com sucesso."
   },
   {
+    "id": "api.command_channel_purpose.channel.app_error",
+    "translation": "Error ao obter o canal atual."
+  },
+  {
+    "id": "api.command_channel_purpose.desc",
+    "translation": "Editar o propósito do canal"
+  },
+  {
+    "id": "api.command_channel_purpose.direct_group.app_error",
+    "translation": "Não é possível definir o propósito para canal de mensagens diretas. Utilize /header para definir o cabeçalho."
+  },
+  {
+    "id": "api.command_channel_purpose.hint",
+    "translation": "[texto]"
+  },
+  {
+    "id": "api.command_channel_purpose.message.app_error",
+    "translation": "Uma mensagem precisa ser fornecida com o comando /purpose."
+  },
+  {
+    "id": "api.command_channel_purpose.name",
+    "translation": "propósito"
+  },
+  {
+    "id": "api.command_channel_purpose.permission.app_error",
+    "translation": "Você não tem a permissão apropriada para editar o propósito do canal."
+  },
+  {
+    "id": "api.command_channel_purpose.update_channel.app_error",
+    "translation": "Erro ao atualizar o canal atual."
+  },
+  {
+    "id": "api.command_channel_rename.channel.app_error",
+    "translation": "Error ao obter o canal atual."
+  },
+  {
+    "id": "api.command_channel_rename.desc",
+    "translation": "Renomear o canal"
+  },
+  {
+    "id": "api.command_channel_rename.direct_group.app_error",
+    "translation": "Não é possível renomear um canal de mensagens diretas."
+  },
+  {
+    "id": "api.command_channel_rename.hint",
+    "translation": "[texto]"
+  },
+  {
+    "id": "api.command_channel_rename.message.app_error",
+    "translation": "Uma mensagem deve ser fornecida com o comando /rename."
+  },
+  {
+    "id": "api.command_channel_rename.name",
+    "translation": "renomear"
+  },
+  {
+    "id": "api.command_channel_rename.permission.app_error",
+    "translation": "Você não tem a permissão apropriada para renomear o canal."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.app_error",
+    "translation": "Erro ao atualizar o canal atual."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.success",
+    "translation": "Nome do canal atualizado com sucesso."
+  },
+  {
+    "id": "api.command_code.desc",
+    "translation": "Mostrar o texto como bloco de código"
+  },
+  {
+    "id": "api.command_code.hint",
+    "translation": "[texto]"
+  },
+  {
+    "id": "api.command_code.message.app_error",
+    "translation": "Uma mensagem precisa ser fornecida com o comando /code."
+  },
+  {
+    "id": "api.command_code.name",
+    "translation": "código"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "Ativar auto-recolher preview de imagens"
   },
@@ -565,7 +649,7 @@
   },
   {
     "id": "api.command_echo.message.app_error",
-    "translation": "A mensagem precisa ser fornecida com o comando /echo."
+    "translation": "Uma mensagem precisa ser fornecida com o comando /echo."
   },
   {
     "id": "api.command_echo.name",
@@ -624,6 +708,30 @@
     "translation": "Juntou ao canal."
   },
   {
+    "id": "api.command_leave.desc",
+    "translation": "Deixar o canal atual"
+  },
+  {
+    "id": "api.command_leave.fail.app_error",
+    "translation": "Ocorreu um erro enquanto deixava o canal."
+  },
+  {
+    "id": "api.command_leave.list.app_error",
+    "translation": "Ocorreu um erro enquanto listava os canais."
+  },
+  {
+    "id": "api.command_leave.missing.app_error",
+    "translation": "Não foi possível encontrar o canal"
+  },
+  {
+    "id": "api.command_leave.name",
+    "translation": "deixar"
+  },
+  {
+    "id": "api.command_leave.success",
+    "translation": "Deixar o canal."
+  },
+  {
     "id": "api.command_logout.desc",
     "translation": "Faça Logout do Mattermost"
   },
@@ -1009,7 +1117,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
-    "translation": "Mensagem Direta"
+    "translation": "Mensagem Direta de "
   },
   {
     "id": "api.email_batching.render_batched_post.go_to_post",
@@ -1017,7 +1125,11 @@
   },
   {
     "id": "api.email_batching.render_batched_post.group_message",
-    "translation": "Grupo de Mensagem"
+    "translation": "Mensagem em Grupo de "
+  },
+  {
+    "id": "api.email_batching.render_batched_post.notification",
+    "translation": "Notificação de "
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
@@ -1026,8 +1138,8 @@
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
     "translation": {
-      "one": "Você tem uma nova mensagem.",
-      "other": "Você tem {{.Count}} novas mensagens."
+      "one": "Você tem uma nova notificação.",
+      "other": "Você tem {{.Count}} novas notificações."
     }
   },
   {
@@ -1696,22 +1808,10 @@
     "translation": "Falha ao obter equipes quando enviado mensagem direta entre equipes user_id=%v, err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.mention_body",
-    "translation": "Você tem uma nova menção."
-  },
-  {
     "id": "api.post.send_notifications_and_forget.mention_subject",
     "translation": "Nova Menção"
   },
   {
-    "id": "api.post.send_notifications_and_forget.message_body",
-    "translation": "Você tem um nova mensagem."
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.message_subject",
-    "translation": "Nova Mensagem Direta"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.push_image_only",
     "translation": " Enviados um ou mais arquivos em "
   },
@@ -1728,6 +1828,10 @@
     "translation": " você foi mencionado no "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "translation": " mencionou você"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_message",
     "translation": " enviado a você uma mensagem direta"
   },
@@ -1736,6 +1840,10 @@
     "translation": " postado em "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
+    "translation": " postou uma mensagem"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
     "translation": "Falha ao enviar notificação device_id={{.DeviceId}}, err={{.Error}}"
   },
@@ -1873,127 +1981,127 @@
   },
   {
     "id": "api.slackimport.slack_add_bot_user.email_pwd",
-    "translation": "Slack Bot/Integração Importar Posts Usuário: Email, Senha: {{.Email}}, {{.Password}}\r\n"
+    "translation": "O usuário com email {{.Email}} e senha {{.Password}} da Integração/Slack Bot foi importado.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_bot_user.unable_import",
-    "translation": "Não foi possível importar Slack Bot/Integração Importar Posts Usuário: {{.Username}}\r\n"
+    "translation": "Não é possível importar o usuário {{.Username}} da Integração/Slack Bot.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.added",
-    "translation": "\r\n Canal Adicionado \r\n"
+    "translation": "\r\nCanal Adicionado:\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
-    "translation": "Falha ao adicionar o usuário ao canal: {{.Username}}\r\n"
+    "translation": "Não foi possível adicionar o usuário Slack {{.Username}} ao canal.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed",
-    "translation": "Falha ao importar: {{.DisplayName}}\r\n"
+    "translation": "Não foi possível importar o canal Slack {{.DisplayName}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Slack Importer: Falha ao importar o canal: %s"
+    "translation": "Slack Import: Não foi possível importar o canal Slack: %s."
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
-    "translation": "Mesclado com o canal existente: {{.DisplayName}}\r\n"
+    "translation": "O canal Slack {{.DisplayName}} já existe como um canal ativo no Mattermost. Ambos os canais foram mesclados.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_posts.attach_files.error",
-    "translation": "Erro encontrado ao anexar arquivos para postar, post_id=%s, file_ids=%v, err=%v"
+    "translation": "Slack Import: Ocorreu um erro ao anexar arquivos a uma mensagem, post_id=%s, file_ids=%v, err=%v."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot.warn",
-    "translation": "Slack bot posts não foram importados ainda"
+    "translation": "Slack Import: Mensagens do Slack bot não podem ser importadas ainda."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot_user_no_exists.warn",
-    "translation": "Slack Importer: Não importado mensagens do bot usuário bot-importing não existe."
+    "translation": "Slack Import: Não é possível importar a mensagem do bot à medida que o usuário do bot não existe."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
-    "translation": "Comentário do arquivo indefinido"
+    "translation": "Slack Import: Não é possível importar a mensagem à medida que não tem comentários."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_usr.debug",
-    "translation": "Mensagem sem usuário"
+    "translation": "Slack Import: Não é possível importar a mensagem à medida que o campo o user está faltando."
   },
   {
     "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
-    "translation": "Slack Importer: Não importado mensagens do bot devido a falta do campo Botid."
+    "translation": "Slack Import: Não é possível importar a mensagem do bot à medida que o campo BotId está faltando."
   },
   {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
-    "translation": "Tipo de post não suportado: %v, %v"
+    "translation": "Slack Import: Não é possível importar a mensagem à medida que o tipo não é suportado: post_type=%v, post_subtype=%v."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_found.warn",
-    "translation": "Nenhum arquivo encontrado na exportação Slack para o arquivo enviado com ID {{.FileId}}"
+    "translation": "Slack Import: Não é possível importar o arquivo {{.FileId}} à medida que o arquivo está ausente do arquivo zip de exportação do Slack."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_in_json.warn",
-    "translation": "Não é possível importar arquivos para  envio de post sem a seção \"file\" presente na exportação."
+    "translation": "Slack Import: Não é possível anexar o arquivo à publicação, pois este não possui nenhuma seção \"file\" presente na exportação Slack."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_open_failed.warn",
-    "translation": "Não foi possível abrir o arquivo enviado com ID {{.FileId}} no arquivo de exportação com erro: {{.Error}}"
+    "translation": "Slack Import: Não é possível abrir o arquivo {{.FileId}} da exportação Slack: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_upload_failed.warn",
-    "translation": "Envio do arquivo para envio de mensagem com ID do arquivo {{.FileId}} falhou com erro: {{.Error}}"
+    "translation": "Slack Import: Um erro ocorreu enquanto enviava o arquivo {{.FileId}}: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.user_no_exists.debug",
-    "translation": "Usuário %v não existe!"
+    "translation": "Slack Import: Não é possível adicionar a mensagem como o usuário Slack %v não existe no Mattermost."
   },
   {
     "id": "api.slackimport.slack_add_posts.without_user.debug",
-    "translation": "Mensagem sem usuário"
+    "translation": "Slack Import: Não é possível importar a mensagem à medida que o campo do user está faltando."
   },
   {
     "id": "api.slackimport.slack_add_users.created",
-    "translation": "\r\n Usuários Criados\r\n"
+    "translation": "\r\nUsuários criados:\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.email_pwd",
-    "translation": "Email, Senha: {{.Email}}, {{.Password}}\r\n"
+    "translation": "O usuário Slack com e-mail {{.Email}} e a senha {{.Password}} foi importado.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing",
-    "translation": "Mesclado usuário com conta existente: {{.Email}}, {{.Username}}\r\n"
+    "translation": "Usuário Slack mesclado com um usuário Mattermost existente com e-mail correspondente {{.Email}} e nome de usuário {{.Username}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing_failed",
-    "translation": "Tentado mesclar o usuário com a conta existente: {{.Email}}, {{.Username}}, mas houve uma falha ao adicionar o usuário a essa equipe.\r\n"
+    "translation": "Usuário Slack mesclado com um usuário Mattermost existente com e-mail correspondente {{.Email}} e nome de usuário {{.Username}}, mas não foi possível adicionar o usuário a sua equipe.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address",
-    "translation": "O usuário {{.Username}} não possui um endereço de email na exportação do Slack. Utilizando o {{.Email}} no lugar. O usuário deveria atualizar o seu endereço de email assim que se logar no sistema.\r\n"
+    "translation": "Usuário {{.Username}} não possui um endereço de email na exportação do Slack. Utilizado o {{.Email}} no lugar. O usuário deve atualizar o seu endereço de email assim que se logar no sistema.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address.warn",
-    "translation": "O usuário {{.Username}} não possui um endereço de email na exportação do Slack. Utilizando o {{.Email}} no lugar. O usuário deveria atualizar o seu endereço de email assim que se logar no sistema."
+    "translation": "Slack Import: Usuário {{.Username}} não possui um endereço de email na exportação do Slack. Utilizado o {{.Email}} no lugar. O usuário deve atualizar o seu endereço de email assim que se logar no sistema."
   },
   {
     "id": "api.slackimport.slack_add_users.unable_import",
-    "translation": "Não foi possível importar o usuário: {{.Username}}\r\n"
+    "translation": "Não foi possível importar o usuário Slack:{{.Username}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
-    "translation": "Falha ao compilar o !canal correspondendo a expressão regular para o canal Slack {{.ChannelID}} {{.ChannelName}}"
+    "translation": "Slack Import: Não foi possível compilar !channel, correspondendo a expressão regular para o canal Slack {{.ChannelName}} (id={{.ChannelID}})."
   },
   {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
-    "translation": "Data e hora ruim detectada"
+    "translation": "Slack Import: Timestamp inválido."
   },
   {
     "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}}"
+    "translation": "Slack Import: Não é possível compilar @menção, correspondente a expressão regular para o usuário Slack {{.Username}} (id={{.UserID}})."
   },
   {
     "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
-    "translation": "Slack Importer: Falha ao desativar o usuário bot-importing."
+    "translation": "Slack Import: Não é possível desativar a conta do usuário usada para o bot."
   },
   {
     "id": "api.slackimport.slack_import.log",
@@ -2013,11 +2121,11 @@
   },
   {
     "id": "api.slackimport.slack_import.notes",
-    "translation": "\r\n Notas \r\n"
+    "translation": "\r\nNotas:\r\n"
   },
   {
     "id": "api.slackimport.slack_import.open.app_error",
-    "translation": "Não foi possível abrir: {{.Filename}}"
+    "translation": "Não é possível abrir o arquivo: {{.Filename}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_import.team_fail",
@@ -2025,31 +2133,31 @@
   },
   {
     "id": "api.slackimport.slack_import.zip.app_error",
-    "translation": "Não foi possível abrir o arquivo zip"
+    "translation": "Não é possível abrir o arquivo zip de exportação Slack.\r\n"
   },
   {
     "id": "api.slackimport.slack_parse_channels.error",
-    "translation": "Erro ao analisar canais do slack. Importação deve funcionar de qualquer maneira."
+    "translation": "Slack Import: Ocorreu um erro ao analisar alguns canais Slack. A importação pode funcionar de qualquer maneira."
   },
   {
     "id": "api.slackimport.slack_parse_posts.error",
-    "translation": "Erro ao analisar algumas postagens do slack. Importação deve funcionar de qualquer maneira."
+    "translation": "Slack Import: Ocorreu um erro ao analisar algumas postagens do Slack. A importação pode funcionar de qualquer maneira."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack Importer: Canal {{.ChannelName}} tem um nome de exibição muito grande. Será truncado quando importado."
+    "translation": "Slack Import: Canal {{.ChannelName}} nome de exibição excede o tamanho máximo. Será truncado quando importado."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Slack Importer: Canal {{.ChannelName}} tem um cabeçalho que é muito grande. Será truncado quando importado."
+    "translation": "Slack Import: Canal {{.ChannelName}} cabeçalho que excede o tamanho máximo. Será truncado quando importado."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slack Importer: Canal {{.ChannelName}} tem um nome muito grande. Será truncado quando importado."
+    "translation": "Slack Import: Canal {{.ChannelName}} handle excede o tamanho máximo. Será truncado quando importado."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Slack Importer: Canal {{.ChannelName}} tem um propósito muito grande. Será truncado quando importado."
+    "translation": "Slack Import: Canal {{.ChannelName}} propósito excede o tamanho máximo. Será truncado quando importado."
   },
   {
     "id": "api.status.init.debug",
@@ -2332,22 +2440,6 @@
     "translation": "Ir Para o Post"
   },
   {
-    "id": "api.templates.post_body.info",
-    "translation": "CANAL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_channel",
-    "translation": "{{.SubjectText}} em {{.TeamDisplayName}} ({{.ChannelName}}) de {{.Day}} {{.Month}}, {{.Year}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_direct_message",
-    "translation": "{{.SubjectText}} de {{.SenderDisplayName}} em {{.Day}} {{.Month}}, {{.Year}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_group_message",
-    "translation": "Novo grupo de mensagem de {{.SenderDisplayName}} em {{.Day}} {{.Month}}, {{.Year}}"
-  },
-  {
     "id": "api.templates.reset_body.button",
     "translation": "Redefinir senha"
   },
@@ -2404,6 +2496,18 @@
     "translation": "[MATTERMOST] Alterações da sua conta na atualização Mattermost 3.0"
   },
   {
+    "id": "api.templates.user_access_token_body.info",
+    "translation": "Um token de acesso de usuário foi adicionado à sua conta em {{ .SiteURL }}. Eles podem ser usados ​​para acessar {{ .SiteName }} com sua conta.<br>Se essa mudança não foi iniciada por você, entre em contato com o administrador do sistema."
+  },
+  {
+    "id": "api.templates.user_access_token_body.title",
+    "translation": "Token de acesso de usuário adicionado a sua conta"
+  },
+  {
+    "id": "api.templates.user_access_token_subject",
+    "translation": "[{{ .SiteName }}] Token de acesso de usuário foi adicionado a sua conta"
+  },
+  {
     "id": "api.templates.username_change_body.info",
     "translation": "Seu nome de usuário para {{.TeamDisplayName}} foi alterado para {{.NewEmail}}.<br>Se você não fez está mudança, por favor contate o administrador do sistema."
   },
@@ -2760,6 +2864,10 @@
     "translation": "Erro ao enviar atualização de senha por email"
   },
   {
+    "id": "api.user.send_user_access_token.error",
+    "translation": "Falha ao enviar o token de acesso do usuário adicionado e-mail com sucesso"
+  },
+  {
     "id": "api.user.send_verify_email_and_forget.failed.error",
     "translation": "Erro ao enviar verificação de email"
   },
@@ -3072,6 +3180,10 @@
     "translation": "Falha ao obter o canal de grupo"
   },
   {
+    "id": "app.import.import_direct_post.save_preferences.error",
+    "translation": "Erro ao importar a postagem direta. Falha ao salvar as preferências."
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "Usuário do post não existe"
   },
@@ -3108,6 +3220,10 @@
     "translation": "Erro ao importar post. O canal com o nome \"{{.ChannelName}}\" não foi encontrado."
   },
   {
+    "id": "app.import.import_post.save_preferences.error",
+    "translation": "Erro ao importar a postagem. Falha ao salvar as preferências."
+  },
+  {
     "id": "app.import.import_post.team_not_found.error",
     "translation": "Erro ao importar post. A equipe com o nome \"{{.TeamName}}\" não foi encontrada."
   },
@@ -3116,6 +3232,10 @@
     "translation": "Erro ao importar post. O usuário com o nome \"{{.Username}}\" não foi encontrado."
   },
   {
+    "id": "app.import.import_user_channels.save_preferences.error",
+    "translation": "Erro ao importar os membros do canal do usuário. Falha ao salvar as preferências."
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "Canal create_at não pode ser zero se informado."
   },
@@ -3176,6 +3296,10 @@
     "translation": "A lista de membros do canal direto tem muitos itens"
   },
   {
+    "id": "app.import.validate_direct_channel_import_data.unknown_favoriter.error",
+    "translation": "Canal direto só pode ser favoritado por membros. \"{{.Username}}\" não é membro."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
     "translation": "Propriedade obrigatória do post direto não foi informada: channel_members"
   },
@@ -3204,6 +3328,10 @@
     "translation": "Propriedade obrigatória do Post não foi informada: message"
   },
   {
+    "id": "app.import.validate_direct_post_import_data.unknown_flagger.error",
+    "translation": "Postagem só pode ser marcada por membros que estão no canal. \"{{.Username}}\" não é membro."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
     "translation": "Propriedade obrigatória do Post não foi informada: user"
   },
@@ -3292,6 +3420,10 @@
     "translation": "MarkUnread NotifyProps inválido para Usuário Membro do Canal."
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mobile.error",
+    "translation": "Desktop NotifyProps inválido para Usuário Membro do Canal."
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "Função inválida em Usuário Membro do Canal."
   },
@@ -3328,6 +3460,38 @@
     "translation": "O apelido do usuário é muito longo."
   },
   {
+    "id": "app.import.validate_user_import_data.notify_props_channel_trigger_invalid.error",
+    "translation": "Inválido Channel Trigger Notify Prop para o usuário."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_comment_trigger_invalid.error",
+    "translation": "Inválido Comment Trigger Notify Prop para o usuário."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error",
+    "translation": "Valor inválido Duration Notify Prop para o usuário."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_invalid.error",
+    "translation": "Valor inválido Desktop Notify Prop para o usuário."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_sound_invalid.error",
+    "translation": "Valor inválido Sound Notify Prop para o usuário."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_email_invalid.error",
+    "translation": "Valor inválido Email Notify Prop para o usuário."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_invalid.error",
+    "translation": "Valor inválido Mobile Notify Prop para o usuário."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_push_status_invalid.error",
+    "translation": "Inválido Mobile Push Status Notify Prop para o usuário."
+  },
+  {
     "id": "app.import.validate_user_import_data.pasword_length.error",
     "translation": "Senha do Usuário tem comprimento inválido."
   },
@@ -3356,6 +3520,54 @@
     "translation": "Falta nome da equipe em Usuário Membro da Equipe."
   },
   {
+    "id": "app.notification.body.intro.direct.full",
+    "translation": "Você tem uma nova mensagem direta."
+  },
+  {
+    "id": "app.notification.body.intro.direct.generic",
+    "translation": "Você tem uma nova mensagem direta de {{.SenderName}}"
+  },
+  {
+    "id": "app.notification.body.intro.notification.full",
+    "translation": "Você tem uma nova notificação."
+  },
+  {
+    "id": "app.notification.body.intro.notification.generic",
+    "translation": "Você tem uma nova notificação de {{.SenderName}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.full",
+    "translation": "{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}} {{.Month}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full",
+    "translation": "CANAL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}} {{.Month}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}"
+  },
+  {
+    "id": "app.notification.subject.direct.full",
+    "translation": "[{{.SiteName}}] Nova Mensagem Direta de {{.SenderDisplayName}} em {{.Day}} {{.Month}}, {{.Year}}"
+  },
+  {
+    "id": "app.notification.subject.notification.full",
+    "translation": "[{{ .SiteName }}] Notificação em {{ .TeamName}} em {{.Day}} {{.Month}}, {{.Year}}"
+  },
+  {
+    "id": "app.user_access_token.disabled",
+    "translation": "Os tokens de acesso do usuário estão desativados neste servidor. Entre em contato com o administrador do sistema para obter detalhes."
+  },
+  {
+    "id": "app.user_access_token.invalid_or_missing",
+    "translation": "Token inválido ou faltando "
+  },
+  {
     "id": "authentication.permissions.create_group_channel.description",
     "translation": "Capacidade de criar novo canal de grupo de mensagem"
   },
@@ -3364,6 +3576,14 @@
     "translation": "Criar grupo de mensagem"
   },
   {
+    "id": "authentication.permissions.create_post_public.description",
+    "translation": "Capacidade de criar postagens em canais públicos"
+  },
+  {
+    "id": "authentication.permissions.create_post_public.name",
+    "translation": "Criar Postagens em Canais Públicos"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Capacidade de criar novas equipes"
   },
@@ -3372,6 +3592,22 @@
     "translation": "Criar Equipes"
   },
   {
+    "id": "authentication.permissions.create_user_access_token.description",
+    "translation": "Capacidade de criar tokens de acesso de usuário"
+  },
+  {
+    "id": "authentication.permissions.create_user_access_token.name",
+    "translation": "Criar Token de Acesso de Usuário"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.description",
+    "translation": "Capacidade de gerenciar os jobs"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.name",
+    "translation": "Gerenciar Jobs"
+  },
+  {
     "id": "authentication.permissions.manage_team_roles.description",
     "translation": "Capacidade de alterar as funções de um membro da equipe"
   },
@@ -3388,6 +3624,22 @@
     "translation": "Ler Canais Públicos"
   },
   {
+    "id": "authentication.permissions.read_user_access_token.description",
+    "translation": "Capacidade de ler os campos id, description e user_id dos tokens de acesso do usuário"
+  },
+  {
+    "id": "authentication.permissions.read_user_access_token.name",
+    "translation": "Ler Tokens de Acesso de Usuário"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.description",
+    "translation": "Capacidade de revogar tokens de acesso de usuário"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.name",
+    "translation": "Revogar Token de Acesso de Usuário"
+  },
+  {
     "id": "authentication.permissions.team_invite_user.description",
     "translation": "Permissão para convidar usuários para uma equipe"
   },
@@ -3404,6 +3656,46 @@
     "translation": "Usar Comandos Slash"
   },
   {
+    "id": "authentication.roles.system_post_all.description",
+    "translation": "Um papel com a permissão para postar em qualquer canal público, privado ou direto do sistema"
+  },
+  {
+    "id": "authentication.roles.system_post_all.name",
+    "translation": "Postar em Canais Públicos, Privados e Diretos"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.description",
+    "translation": "Um papel com a permissão para postar em qualquer canal do sistema"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.name",
+    "translation": "Postar em Canais Publicos"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.description",
+    "translation": "Um papel com a permissão para criar, ler e revogar tokens de acesso de usuário"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.name",
+    "translation": "Token de Acesso de Usuário"
+  },
+  {
+    "id": "authentication.roles.team_post_all.description",
+    "translation": "Um papel com a permissão para postar em qualquer canal público ou privado da equipe"
+  },
+  {
+    "id": "authentication.roles.team_post_all.name",
+    "translation": "Postar em Canais Públicos e Privados"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.description",
+    "translation": "Um papel com a permissão para postar em qualquer canal público da equipe"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.name",
+    "translation": "Postar em Canais Publicos"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "Funcionalidade requer uma licença enterprise. Entre em contato com o administrador do sistema sobre como atualizar sua licença enterprise."
   },
@@ -3496,38 +3788,62 @@
     "translation": "Exportação da conformidade para tarefa '{{.JobName}}' iniciada no '{{.FilePath}}'"
   },
   {
-    "id": "ent.elasticsearch.search_posts.disabled",
-    "translation": "A busca usando o ElasticSearch foi desativada neste servidor"
+    "id": "ent.elasticsearch.create_client.connect_failed",
+    "translation": "Configuração do Cliente de ElasticSearch Falhou"
   },
   {
-    "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "Não foi possível completar a busca"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_create_failed",
+    "translation": "Não foi possível criar o ElasticSearch index"
   },
   {
-    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
-    "translation": "Falha ao decodificar os resultados da pesquisa"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_exists_failed",
+    "translation": "Não foi possível verificar se o ElasticSearch index existe"
   },
   {
-    "id": "ent.elasticsearch.start.connect_failed",
-    "translation": "Configuração do Cliente de ElasticSearch falhou"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_mapping_failed",
+    "translation": "Não foi possível configurar o ElasticSearch index mapping"
   },
   {
-    "id": "ent.elasticsearch.start.index_create_failed",
-    "translation": "Não foi possível criar o ElasticSearch index"
+    "id": "ent.elasticsearch.delete_post.error",
+    "translation": "Não foi possível apagar o post"
   },
   {
-    "id": "ent.elasticsearch.start.index_exists_failed",
-    "translation": "Não foi possível verificar se o ElasticSearch index existe"
+    "id": "ent.elasticsearch.generic.disabled",
+    "translation": "A busca usando o ElasticSearch não está ativa neste servidor"
   },
   {
-    "id": "ent.elasticsearch.start.index_mapping_failed",
-    "translation": "Não foi possível configurar o ElasticSearch index mapping"
+    "id": "ent.elasticsearch.index_post.error",
+    "translation": "Não foi possível indexar o post"
+  },
+  {
+    "id": "ent.elasticsearch.not_started.error",
+    "translation": "Elasticsearch não foi iniciado"
+  },
+  {
+    "id": "ent.elasticsearch.purge_indexes.delete_failed",
+    "translation": "Não foi possível deletar o ElasticSearch index"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.disabled",
+    "translation": "A busca usando o ElasticSearch foi desativada neste servidor"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.search_failed",
+    "translation": "Não foi possível completar a busca"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
+    "translation": "Falha ao decodificar os resultados da pesquisa"
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Não foi possível configurar as opções do ElasticSearch index"
   },
   {
+    "id": "ent.elasticsearch.test_config.connect_failed",
+    "translation": "Falha na conexão com o Elasticsearch."
+  },
+  {
     "id": "ent.elasticsearch.test_config.indexing_disabled.error",
     "translation": "Elasticsearch está desativado."
   },
@@ -3536,6 +3852,10 @@
     "translation": "Licença não suporta Elasticsearch."
   },
   {
+    "id": "ent.elasticsearch.test_config.reenter_password",
+    "translation": "URL do servidor Elasticsearch ou o nome do usuário mudou. Por favor atualize a senha do Elasticsearch para testar a conexão."
+  },
+  {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "Emoji personalizado desabilitado pela licença atual. Entre em contato com o administrador do sistema sobre como atualizar sua licença enterprise."
   },
@@ -3748,6 +4068,14 @@
     "translation": "Página não encontrada"
   },
   {
+    "id": "jobs.request_cancellation.status.error",
+    "translation": "Não foi possível requisitar o cancelamento para o job que não está em um estado cancelável."
+  },
+  {
+    "id": "jobs.set_job_error.update.error",
+    "translation": "Falha ao configurar o job status para erro"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Não foi possível encontrar o canal %v, procurado %v possibilidades"
   },
@@ -4116,6 +4444,10 @@
     "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_notification_contents_type.app_error",
+    "translation": "Tipo de conteúdo de notificação de email inválido para configurações de email. Deve ser 'full' ou 'generic'."
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "Senha inválida redefinir salt nas configurações de email.  Deve ser de 32 caracteres ou mais."
   },
@@ -4436,6 +4768,22 @@
     "translation": "Id de usuário inválido"
   },
   {
+    "id": "model.job.is_valid.create_at.app_error",
+    "translation": "Create at deve ser uma data válida"
+  },
+  {
+    "id": "model.job.is_valid.id.app_error",
+    "translation": "Job Id inválido"
+  },
+  {
+    "id": "model.job.is_valid.status.app_error",
+    "translation": "Job status inválido"
+  },
+  {
+    "id": "model.job.is_valid.type.app_error",
+    "translation": "Job type inválido"
+  },
+  {
     "id": "model.oauth.is_valid.app_id.app_error",
     "translation": "Id app inválido"
   },
@@ -4812,6 +5160,18 @@
     "translation": "Usuário inválido"
   },
   {
+    "id": "model.user_access_token.is_valid.description.app_error",
+    "translation": "Descrição inválida, deve ter 255 caracteres ou menos"
+  },
+  {
+    "id": "model.user_access_token.is_valid.token.app_error",
+    "translation": "Token de acesso inválido"
+  },
+  {
+    "id": "model.user_access_token.is_valid.user_id.app_error",
+    "translation": "Id do usuário inválido"
+  },
+  {
     "id": "model.utils.decode_json.app_error",
     "translation": "não foi possível decodificar"
   },
@@ -4921,7 +5281,7 @@
   },
   {
     "id": "store.sql.schema_version.critical",
-    "translation": "O esquema do bando de dados da versão %v não pode ser atualizado.  Você precisa pular uma versão."
+    "translation": "A versão do esquema de banco de dados %v não é mais suportada. Este servidor Mattermost suporta atualizações automáticas da versão de esquema %v através da versão de esquema %v. Downgrades não são suportados. Atualize manualmente até pelo menos a versão %v antes de continuar"
   },
   {
     "id": "store.sql.short_ciphertext",
@@ -5296,24 +5656,24 @@
     "translation": "Não foi possível salvar ou atualizar as informações do arquivo"
   },
   {
-    "id": "store.sql_job_status.delete_by_type.app_error",
-    "translation": "Não foi possível deletar o status do job"
+    "id": "store.sql_job.delete.app_error",
+    "translation": "Não foi possível deletar o job"
   },
   {
-    "id": "store.sql_job_status.get.app_error",
-    "translation": "Não foi possível obter o status do job"
+    "id": "store.sql_job.get.app_error",
+    "translation": "Não foi obter o job"
   },
   {
-    "id": "store.sql_job_status.get_all.app_error",
-    "translation": "Não conseguimos pegar todos os status dos jobs"
+    "id": "store.sql_job.get_all.app_error",
+    "translation": "Não foi possível obter os jobs"
   },
   {
-    "id": "store.sql_job_status.save.app_error",
-    "translation": "Não foi possível salvar o status do job"
+    "id": "store.sql_job.save.app_error",
+    "translation": "Não foi possível salvar o job"
   },
   {
-    "id": "store.sql_job_status.update.app_error",
-    "translation": "Não foi possível atualizar o status do job"
+    "id": "store.sql_job.update.app_error",
+    "translation": "Não foi possível atualizar o job"
   },
   {
     "id": "store.sql_license.get.app_error",
@@ -5464,6 +5824,10 @@
     "translation": "Não foi possível obter o post pai para o canal"
   },
   {
+    "id": "store.sql_post.get_posts_batch_for_indexing.get.app_error",
+    "translation": "Não foi possível obter o lote de posts para indexação"
+  },
+  {
     "id": "store.sql_post.get_posts_by_ids.app_error",
     "translation": "Não foi possível obter os posts"
   },
@@ -6040,6 +6404,26 @@
     "translation": "Não foi possível verificar o campo email"
   },
   {
+    "id": "store.sql_user_access_token.delete.app_error",
+    "translation": "Não foi possível remover o token de acesso do usuário"
+  },
+  {
+    "id": "store.sql_user_access_token.get.app_error",
+    "translation": "Não foi possível obter o token de acesso do usuário"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_token.app_error",
+    "translation": "Não foi possível obter o token de acesso do usuário pelo token"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_user.app_error",
+    "translation": "Não foi possível obter o token de acesso do usuário"
+  },
+  {
+    "id": "store.sql_user_access_token.save.app_error",
+    "translation": "Não foi possível salvar o token de acesso do usuário"
+  },
+  {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "Não foi possível contar os webhooks entrada"
   },
@@ -6080,10 +6464,18 @@
     "translation": "Não foi possível obter os webhooks"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_incoming_by_channel.app_error",
+    "translation": "Não foi possível remover o webhook"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_incoming_by_user.app_error",
     "translation": "Nós não podemos deletar o webhook"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_outgoing_by_channel.app_error",
+    "translation": "Não foi possível remover o webhook"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error",
     "translation": "Não foi possível deletar o webhook"
   },
@@ -6116,6 +6508,10 @@
     "translation": "Sistema"
   },
   {
+    "id": "utils.config.add_client_locale.app_error",
+    "translation": "Não é possível carregar o arquivo de configuração do mattermost:  Adicionando DefaultClientLocale ao AvailableLocales."
+  },
+  {
     "id": "utils.config.load_config.decoding.panic",
     "translation": "Erro ao decodificar o arquivo de configuração={{.Filename}}, err={{.Error}}"
   },
@@ -6136,8 +6532,12 @@
     "translation": "Um erro ocorreu durante o salvamento do arquivo {{.Filename}}"
   },
   {
+    "id": "utils.config.supported_available_locales.app_error",
+    "translation": "Unable to load mattermost configuration file:  AvailableLocales must include DefaultClientLocale. Setting AvailableLocales to all locales as default value."
+  },
+  {
     "id": "utils.config.supported_client_locale.app_error",
-    "translation": "Não foi possível carregar o arquivo de configuração do mattermost:  O DefaultClientLocale deve ser um dos idiomas suportados"
+    "translation": "Unable to load mattermost configuration file:  DefaultClientLocale must be one of the supported locales. Setting DefaultClientLocale to en as default value."
   },
   {
     "id": "utils.config.supported_server_locale.app_error",
diff --git a/i18n/ru.json b/i18n/ru.json
index cfbbcff7a..f5384d15f 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "Command with a trigger of '{{.Trigger}}' not found. To send a message beginning with \"/\", try adding an empty space at the beginning of the message."
+    "translation": "Команда с триггером '{{.Trigger}}' не найдена. Чтобы отправить сообщение, начинающееся с «/», попробуйте добавить пустое пространство в начале сообщения."
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -461,7 +461,7 @@
   },
   {
     "id": "api.command.invite_people.invite_off",
-    "translation": "User creation has been disabled on this server, no invite(s) sent"
+    "translation": "На этом сервере отключено создание пользователя, приглашение(я) не отправлено"
   },
   {
     "id": "api.command.invite_people.name",
@@ -501,7 +501,7 @@
   },
   {
     "id": "api.command_channel_header.channel.app_error",
-    "translation": "Error to retrieve the current channel."
+    "translation": "Ошибка получения текущего канала."
   },
   {
     "id": "api.command_channel_header.desc",
@@ -509,11 +509,11 @@
   },
   {
     "id": "api.command_channel_header.hint",
-    "translation": "[text]"
+    "translation": "текст"
   },
   {
     "id": "api.command_channel_header.message.app_error",
-    "translation": "Text must be provided with the /header command."
+    "translation": "Перед сообщение должна быть команда /header."
   },
   {
     "id": "api.command_channel_header.name",
@@ -521,17 +521,101 @@
   },
   {
     "id": "api.command_channel_header.permission.app_error",
-    "translation": "You do not have the appropriate permissions to edit the channel header."
+    "translation": "У вас нет соответствующих прав для редактирования цели канала."
   },
   {
     "id": "api.command_channel_header.update_channel.app_error",
-    "translation": "Error to update the current channel."
+    "translation": "Ошибка получения текущего канала."
   },
   {
     "id": "api.command_channel_header.update_channel.success",
     "translation": "Заголовок канала успешно обновлен."
   },
   {
+    "id": "api.command_channel_purpose.channel.app_error",
+    "translation": "Ошибка получения текущего канала."
+  },
+  {
+    "id": "api.command_channel_purpose.desc",
+    "translation": "Edit the channel purpose"
+  },
+  {
+    "id": "api.command_channel_purpose.direct_group.app_error",
+    "translation": "Cannot set purpose for direct message channels. Use /header to set the header instead."
+  },
+  {
+    "id": "api.command_channel_purpose.hint",
+    "translation": "текст"
+  },
+  {
+    "id": "api.command_channel_purpose.message.app_error",
+    "translation": "Перед сообщение должна быть команда /purpose"
+  },
+  {
+    "id": "api.command_channel_purpose.name",
+    "translation": "Цель"
+  },
+  {
+    "id": "api.command_channel_purpose.permission.app_error",
+    "translation": "У вас нет соответствующих прав для редактирования цели канала."
+  },
+  {
+    "id": "api.command_channel_purpose.update_channel.app_error",
+    "translation": "Ошибка получения текущего канала."
+  },
+  {
+    "id": "api.command_channel_rename.channel.app_error",
+    "translation": "Ошибка получения текущего канала."
+  },
+  {
+    "id": "api.command_channel_rename.desc",
+    "translation": "Rename the channel"
+  },
+  {
+    "id": "api.command_channel_rename.direct_group.app_error",
+    "translation": "Невозможно покинуть канал личных сообщений"
+  },
+  {
+    "id": "api.command_channel_rename.hint",
+    "translation": "текст"
+  },
+  {
+    "id": "api.command_channel_rename.message.app_error",
+    "translation": "Перед сообщение должна быть команда /echo."
+  },
+  {
+    "id": "api.command_channel_rename.name",
+    "translation": "rename"
+  },
+  {
+    "id": "api.command_channel_rename.permission.app_error",
+    "translation": "У вас нет соответствующих прав для редактирования цели канала."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.app_error",
+    "translation": "Ошибка получения текущего канала."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.success",
+    "translation": "Заголовок канала успешно обновлен."
+  },
+  {
+    "id": "api.command_code.desc",
+    "translation": "Display text as a code block"
+  },
+  {
+    "id": "api.command_code.hint",
+    "translation": "текст"
+  },
+  {
+    "id": "api.command_code.message.app_error",
+    "translation": "Перед сообщение должна быть команда /echo."
+  },
+  {
+    "id": "api.command_code.name",
+    "translation": "code"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "Включить сворачивание миниатюр изображений"
   },
@@ -624,6 +708,30 @@
     "translation": "Подключенный канала."
   },
   {
+    "id": "api.command_leave.desc",
+    "translation": "Leave the current channel"
+  },
+  {
+    "id": "api.command_leave.fail.app_error",
+    "translation": "Во время присоединения к каналу произошла ошибка."
+  },
+  {
+    "id": "api.command_leave.list.app_error",
+    "translation": "При перечислении каналов произошла ошибка."
+  },
+  {
+    "id": "api.command_leave.missing.app_error",
+    "translation": "Мы не смогли найти канал"
+  },
+  {
+    "id": "api.command_leave.name",
+    "translation": "leave"
+  },
+  {
+    "id": "api.command_leave.success",
+    "translation": "Left the channel."
+  },
+  {
     "id": "api.command_logout.desc",
     "translation": "Выход из Mattermost"
   },
@@ -713,7 +821,7 @@
   },
   {
     "id": "api.command_search.hint",
-    "translation": "[text]"
+    "translation": "текст"
   },
   {
     "id": "api.command_search.name",
@@ -1009,7 +1117,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
-    "translation": "Личное сообщение"
+    "translation": "Direct Message from "
   },
   {
     "id": "api.email_batching.render_batched_post.go_to_post",
@@ -1017,7 +1125,11 @@
   },
   {
     "id": "api.email_batching.render_batched_post.group_message",
-    "translation": "Групповые Сообщения"
+    "translation": "Group Message from "
+  },
+  {
+    "id": "api.email_batching.render_batched_post.notification",
+    "translation": "Notification from "
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
@@ -1026,8 +1138,8 @@
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
     "translation": {
-      "one": "У вас новое сообщение.",
-      "other": "У вас {{.Count}} новое сообщение."
+      "one": "You have a new notification.",
+      "other": "You have {{.Count}} new notifications."
     }
   },
   {
@@ -1696,22 +1808,10 @@
     "translation": "Не удалось получить команды при отправке кросс-командного личного сообщения user_id=%v, err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.mention_body",
-    "translation": "У вас одно новое упоминание."
-  },
-  {
     "id": "api.post.send_notifications_and_forget.mention_subject",
     "translation": "Новое упоминание"
   },
   {
-    "id": "api.post.send_notifications_and_forget.message_body",
-    "translation": "У вас одно новое сообщение."
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.message_subject",
-    "translation": "Новое личное сообщение"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.push_image_only",
     "translation": " Uploaded one or more files in "
   },
@@ -1728,6 +1828,10 @@
     "translation": " упомянул вас в "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "translation": " упомянул вас в "
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_message",
     "translation": " отправил вам личное сообщение"
   },
@@ -1736,6 +1840,10 @@
     "translation": " опубликовано в "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
+    "translation": " posted a message"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
     "translation": "Не удалось отправить push-уведомление device_id={{.DeviceId}}, err={{.Error}}"
   },
@@ -1873,11 +1981,11 @@
   },
   {
     "id": "api.slackimport.slack_add_bot_user.email_pwd",
-    "translation": "Пользователь для импорта сообщений ботов и интеграций Slack: {{.Email}}, {{.Password}}\r\n"
+    "translation": "The Integration/Slack Bot user with email {{.Email}} and password {{.Password}} has been imported.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_bot_user.unable_import",
-    "translation": "Не удалось импортировать пользователя для импорта сообщений ботов и интеграций Slack: {{.Username}}\r\n"
+    "translation": "Unable to import the Integration/Slack Bot user {{.Username}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.added",
@@ -1885,71 +1993,71 @@
   },
   {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
-    "translation": "Не удалось добавить пользователя в канал: {{.Username}}\r\n"
+    "translation": "Unable to add Slack user {{.Username}} to channel.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed",
-    "translation": "Не удалось импортировать: {{.DisplayName}}\r\n"
+    "translation": "Unable to import Slack channel {{.DisplayName}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Slack Импортер: не удалось импортировать канал: %s"
+    "translation": "Slack Import: Unable to import Slack channel: %s."
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
-    "translation": "Слит с существующим каналом: {{.DisplayName}}\r\n"
+    "translation": "The Slack channel {{.DisplayName}} already exists as an active Mattermost channel. Both channels have been merged.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_posts.attach_files.error",
-    "translation": "Возникла ошибка при приложении файлов к сообщению, post_id=%s, file_ids=%v, err=%v"
+    "translation": "Slack Import: An error occurred when attaching files to a message, post_id=%s, file_ids=%v, err=%v."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot.warn",
-    "translation": "Посты Slack-бота еще не импортированы"
+    "translation": "Slack Import: Slack bot messages cannot be imported yet."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot_user_no_exists.warn",
-    "translation": "Импорт Slack: Не импортируем сообщение бота. Пользователь для импорта ботов не найден."
+    "translation": "Slack Import: Unable to import the bot message as the bot user does not exist."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
-    "translation": "Комментарий к файлу неопределен"
+    "translation": "Slack Import: Unable to import the message as it has no comments."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_usr.debug",
-    "translation": "Сообщение без участия пользователя"
+    "translation": "Slack Import: Unable to import the message as the user field is missing."
   },
   {
     "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
-    "translation": "Импорт Slack: Не импортируем сообщение бота. Отсутствует поле BotId."
+    "translation": "Slack Import: Unable to import bot message as the BotId field is missing."
   },
   {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
-    "translation": "Неподдерживаемый тип сообщения: %v, %v"
+    "translation": "Slack Import: Unable to import the message as its type is not supported: post_type=%v, post_subtype=%v."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_found.warn",
-    "translation": "Не найден файл с идентификатором {{.FileId}} в экспорте из Slack для загрузки сообщения"
+    "translation": "Slack Import: Unable to import file {{.FileId}} as the file is missing from the Slack export zip file."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_in_json.warn",
-    "translation": "Не удается импортировать файл для загрузки сообщения отсутствует секция \"file\"."
+    "translation": "Slack Import: Unable to attach the file to the post as the latter has no \"file\" section present in Slack export."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_open_failed.warn",
-    "translation": "Не удалось открыть загруженный файл с идентификатором {{.FileId}} в архиве экспорта с ошибкой: {{.Error}}"
+    "translation": "Slack Import: Unable to open the file {{.FileId}} from the Slack export: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_upload_failed.warn",
-    "translation": "Загрузка файла с идентификатором {{.FileId}} для загрузки сообщения завершилась с ошибкой: {{.Error}}"
+    "translation": "Slack Import: An error occurred when uploading file {{.FileId}}: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.user_no_exists.debug",
-    "translation": "Пользователь: %v не существует!"
+    "translation": "Slack Import: Unable to add the message as the Slack user %v does not exist in Mattermost."
   },
   {
     "id": "api.slackimport.slack_add_posts.without_user.debug",
-    "translation": "Сообщение без участия пользователя"
+    "translation": "Slack Import: Unable to import the message as the user field is missing."
   },
   {
     "id": "api.slackimport.slack_add_users.created",
@@ -1957,15 +2065,15 @@
   },
   {
     "id": "api.slackimport.slack_add_users.email_pwd",
-    "translation": "Email, Пароль: {{.Email}}, {{.Password}}\r\n"
+    "translation": "Slack user with email {{.Email}} and password {{.Password}} has been imported.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing",
-    "translation": "Пользователь был слит с существующей учетной записью: {{.Email}}, {{.Username}}\r\n"
+    "translation": "Slack user merged with an existing Mattermost user with matching email {{.Email}} and username {{.Username}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing_failed",
-    "translation": "При слиянии с существующим аккаунтом: {{.Email}}, {{.Username}}, возникла ошибка добавления пользователя в команду.\r\n"
+    "translation": "Slack user merged with an existing Mattermost user with matching email {{.Email}} and username {{.Username}}, but was unable to add the user to their team.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address",
@@ -1981,19 +2089,19 @@
   },
   {
     "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
-    "translation": "Не удалось скомпилировать !channel соответствующее регулярное выражение для Slack канала {{.ChannelID}} {{.ChannelName}}"
+    "translation": "Slack Import: Unable to compile the !channel, matching regular expression for the Slack channel {{.ChannelName}} (id={{.ChannelID}})."
   },
   {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
-    "translation": "Обнаружена плохая метка времени"
+    "translation": "Slack Import: Bad timestamp detected."
   },
   {
     "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
-    "translation": "Не удалось составить @упоминание, соответствующее регулярному выражению, для пользователя Slack {{.UserID}} {{.Username}}"
+    "translation": "Slack Import: Unable to compile the @mention, matching regular expression for the Slack user {{.Username}} (id={{.UserID}})."
   },
   {
     "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
-    "translation": "Импорт Slack: Не удалось деактивировать пользователя для импорта ботов."
+    "translation": "Slack Import: Unable to deactivate the user account used for the bot."
   },
   {
     "id": "api.slackimport.slack_import.log",
@@ -2017,7 +2125,7 @@
   },
   {
     "id": "api.slackimport.slack_import.open.app_error",
-    "translation": "Невозможно открыть: {{.Filename}}"
+    "translation": "Unable to open the file: {{.Filename}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_import.team_fail",
@@ -2025,15 +2133,15 @@
   },
   {
     "id": "api.slackimport.slack_import.zip.app_error",
-    "translation": "Невозможно открыть zip-файл"
+    "translation": "Unable to open the Slack export zip file.\r\n"
   },
   {
     "id": "api.slackimport.slack_parse_channels.error",
-    "translation": "Ошибка разбора каналов slack. Несмотря на это, импорт может быть выполнен."
+    "translation": "Slack Import: Error occurred when parsing some Slack channels. Import may work anyway."
   },
   {
     "id": "api.slackimport.slack_parse_posts.error",
-    "translation": "Ошибка разбора некоторых постов slack. Несмотря на это, импорт может быть выполнен."
+    "translation": "Slack Import: Error occurred when parsing some Slack posts. Import may work anyway."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
@@ -2041,7 +2149,7 @@
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Менеджер импорта Slack: Канал {{.ChannelName}} имеет слишком длинный заголовок. Он будет укорочен при импорте."
+    "translation": "Менеджер импорта Slack: Канал {{.ChannelName}} имеет слишком длинное имя. Оно будет укорочено при импорте."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
@@ -2332,22 +2440,6 @@
     "translation": "Перейти к сообщению"
   },
   {
-    "id": "api.templates.post_body.info",
-    "translation": "КАНАЛ: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_channel",
-    "translation": "{{.SubjectText}} в {{.TeamDisplayName}} ({{.ChannelName}}) в {{.Month}} {{.Day}}, {{.Year}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_direct_message",
-    "translation": "{{.SubjectText}} от {{.SenderDisplayName}} в {{.Month}} {{.Day}}, {{.Year}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_group_message",
-    "translation": "Новое групповое сообщение от {{.SenderDisplayName}} в {{.Month}} {{.Day}}, {{.Year}}"
-  },
-  {
     "id": "api.templates.reset_body.button",
     "translation": "Сброс пароля"
   },
@@ -2404,6 +2496,18 @@
     "translation": "[MATTERMOST] Произошли изменения в Вашей учетной записи для обновления до Mattermost 3.0"
   },
   {
+    "id": "api.templates.user_access_token_body.info",
+    "translation": "A user access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.user_access_token_body.title",
+    "translation": "User access token added to your account"
+  },
+  {
+    "id": "api.templates.user_access_token_subject",
+    "translation": "[{{ .SiteName }}] User access token added to your account"
+  },
+  {
     "id": "api.templates.username_change_body.info",
     "translation": "Ваше имя пользователя для {{.TeamDisplayName}} изменено на {{.NewUsername}}.<br>Если Вы не делали эти изменения, пожалуйста, обратитесь к системному администратору."
   },
@@ -2760,6 +2864,10 @@
     "translation": "Не удалось отправить письмо об обновлении пароля"
   },
   {
+    "id": "api.user.send_user_access_token.error",
+    "translation": "Failed to send user access token added email successfully"
+  },
+  {
     "id": "api.user.send_verify_email_and_forget.failed.error",
     "translation": "Не удалось отправить письмо с подтверждением"
   },
@@ -3072,6 +3180,10 @@
     "translation": "Failed to get group channel"
   },
   {
+    "id": "app.import.import_direct_post.save_preferences.error",
+    "translation": "Error importing direct post. Failed to save preferences."
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "Post user does not exist"
   },
@@ -3108,6 +3220,10 @@
     "translation": "Ошибка импорта сообщения. Канал с именем \"{{.ChannelName}}\" не найден."
   },
   {
+    "id": "app.import.import_post.save_preferences.error",
+    "translation": "Error importing post. Failed to save preferences."
+  },
+  {
     "id": "app.import.import_post.team_not_found.error",
     "translation": "Ошибка импорта сообщения. Команда с именем \"{{.TeamName}}\" не найдена."
   },
@@ -3116,6 +3232,10 @@
     "translation": "Ошибка импорта сообщения. Пользователя с именем \"{{.Username}}\" не найден."
   },
   {
+    "id": "app.import.import_user_channels.save_preferences.error",
+    "translation": "Error importing user channel memberships. Failed to save preferences."
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "Если свойство Channel create_at присутствует, то оно не может быть равно 0."
   },
@@ -3176,6 +3296,10 @@
     "translation": "Direct channel members list contains too many items"
   },
   {
+    "id": "app.import.validate_direct_channel_import_data.unknown_favoriter.error",
+    "translation": "Direct channel can only be favorited by members. \"{{.Username}}\" is not a member."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
     "translation": "Отсутствует необходимое поле для Post: create_at."
   },
@@ -3204,6 +3328,10 @@
     "translation": "Отсутствует необходимое поле для Post: Message."
   },
   {
+    "id": "app.import.validate_direct_post_import_data.unknown_flagger.error",
+    "translation": "Direct post can only be flagged by members of the channel it is in. \"{{.Username}}\" is not a member."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
     "translation": "Отсутствует необходимое поле для Post: User."
   },
@@ -3285,11 +3413,15 @@
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
-    "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
+    "translation": "Не правильные роли в «Участие пользователей на каналах»"
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
-    "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
+    "translation": "Не правильные роли в «Участие пользователей на каналах»"
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mobile.error",
+    "translation": "Не правильные роли в «Участие пользователей на каналах»"
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
@@ -3328,6 +3460,38 @@
     "translation": "Псевдоним пользователя слишком длинный."
   },
   {
+    "id": "app.import.validate_user_import_data.notify_props_channel_trigger_invalid.error",
+    "translation": "Invalid Channel Trigger Notify Prop for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_comment_trigger_invalid.error",
+    "translation": "Invalid Comment Trigger Notify Prop for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error",
+    "translation": "Invalid Desktop Duration Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_invalid.error",
+    "translation": "Invalid Desktop Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_sound_invalid.error",
+    "translation": "Invalid Desktop Sound Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_email_invalid.error",
+    "translation": "Invalid Email Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_invalid.error",
+    "translation": "Invalid Mobile Notify Prop value for user."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_push_status_invalid.error",
+    "translation": "Invalid Mobile Push Status Notify Prop for user."
+  },
+  {
     "id": "app.import.validate_user_import_data.pasword_length.error",
     "translation": "User Password has invalid length."
   },
@@ -3356,6 +3520,54 @@
     "translation": "Пропущено имя команды в «Участие пользователей в команде»"
   },
   {
+    "id": "app.notification.body.intro.direct.full",
+    "translation": "У вас новое сообщение."
+  },
+  {
+    "id": "app.notification.body.intro.direct.generic",
+    "translation": "You have a new direct message from {{.SenderName}}"
+  },
+  {
+    "id": "app.notification.body.intro.notification.full",
+    "translation": "You have a new notification."
+  },
+  {
+    "id": "app.notification.body.intro.notification.generic",
+    "translation": "You have a new notification from {{.SenderName}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.full",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full",
+    "translation": "КАНАЛ: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}"
+  },
+  {
+    "id": "app.notification.subject.direct.full",
+    "translation": "Новое групповое сообщение от {{.SenderDisplayName}} в {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
+    "id": "app.notification.subject.notification.full",
+    "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
+    "id": "app.user_access_token.disabled",
+    "translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details."
+  },
+  {
+    "id": "app.user_access_token.invalid_or_missing",
+    "translation": "Invalid or missing token"
+  },
+  {
     "id": "authentication.permissions.create_group_channel.description",
     "translation": "Возможность создания новых групповых каналов сообщений"
   },
@@ -3364,6 +3576,14 @@
     "translation": "Создать Групповое Сообщение"
   },
   {
+    "id": "authentication.permissions.create_post_public.description",
+    "translation": "Ability to create posts in public channels"
+  },
+  {
+    "id": "authentication.permissions.create_post_public.name",
+    "translation": "Create Posts in Public Channels"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Возможность создавать новые команды"
   },
@@ -3372,6 +3592,22 @@
     "translation": "Создание команд"
   },
   {
+    "id": "authentication.permissions.create_user_access_token.description",
+    "translation": "Ability to create personal access tokens"
+  },
+  {
+    "id": "authentication.permissions.create_user_access_token.name",
+    "translation": "Create Personal Access Token"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.description",
+    "translation": "Ability to manage jobs"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.name",
+    "translation": "Manage Jobs"
+  },
+  {
     "id": "authentication.permissions.manage_team_roles.description",
     "translation": "Возможность изменять роли участников команды"
   },
@@ -3388,6 +3624,22 @@
     "translation": "Чтение публичных каналов"
   },
   {
+    "id": "authentication.permissions.read_user_access_token.description",
+    "translation": "Ability to read personal access tokens' id, description and user_id fields"
+  },
+  {
+    "id": "authentication.permissions.read_user_access_token.name",
+    "translation": "Read Personal Access Tokens"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.description",
+    "translation": "Ability to revoke personal access tokens"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.name",
+    "translation": "Revoke Personal Access Token"
+  },
+  {
     "id": "authentication.permissions.team_invite_user.description",
     "translation": "Возможность приглашать пользователей в команду"
   },
@@ -3404,6 +3656,46 @@
     "translation": "Использовать слэш-команды"
   },
   {
+    "id": "authentication.roles.system_post_all.description",
+    "translation": "A role with the permission to post in any public, private or direct channel on the system"
+  },
+  {
+    "id": "authentication.roles.system_post_all.name",
+    "translation": "Post in Public, Private and Direct Channels"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.description",
+    "translation": "A role with the permission to post in any public channel on the system"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.name",
+    "translation": "Post in Public Channels"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.description",
+    "translation": "A role with the permissions to create, read and revoke personal access tokens"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.name",
+    "translation": "Personal Access Token"
+  },
+  {
+    "id": "authentication.roles.team_post_all.description",
+    "translation": "A role with the permission to post in any public or private channel on the team"
+  },
+  {
+    "id": "authentication.roles.team_post_all.name",
+    "translation": "Post in Public and Private Channels"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.description",
+    "translation": "A role with the permission to post in any public channel on the team"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.name",
+    "translation": "Post in Public Channels"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "Функция требует enterprise лицензии. Пожалуйста, обратитесь к системному администратору об обновлении лицензии."
   },
@@ -3496,36 +3788,60 @@
     "translation": "Экспорт комплаенс-листа начат для задачи '{{.JobName}}' в '{{.FilePath}}'"
   },
   {
-    "id": "ent.elasticsearch.search_posts.disabled",
-    "translation": "ElasticSearch searching is disabled on this server"
+    "id": "ent.elasticsearch.create_client.connect_failed",
+    "translation": "Setting up Elasticsearch Client Failed"
   },
   {
-    "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "Search failed to complete"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_create_failed",
+    "translation": "Ошибка создания индекса ElasticSearch"
   },
   {
-    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
-    "translation": "Failed to decode search results"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_exists_failed",
+    "translation": "Failed to establish whether Elasticsearch index exists"
+  },
+  {
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_mapping_failed",
+    "translation": "Failed to setup Elasticsearch index mapping"
+  },
+  {
+    "id": "ent.elasticsearch.delete_post.error",
+    "translation": "Failed to delete the post"
+  },
+  {
+    "id": "ent.elasticsearch.generic.disabled",
+    "translation": "Elasticsearch search is not enabled on this server"
+  },
+  {
+    "id": "ent.elasticsearch.index_post.error",
+    "translation": "Failed to index the post"
   },
   {
-    "id": "ent.elasticsearch.start.connect_failed",
-    "translation": "Setting up ElasticSearch Client Failed"
+    "id": "ent.elasticsearch.not_started.error",
+    "translation": "Elasticsearch is not started"
   },
   {
-    "id": "ent.elasticsearch.start.index_create_failed",
+    "id": "ent.elasticsearch.purge_indexes.delete_failed",
     "translation": "Ошибка создания индекса ElasticSearch"
   },
   {
-    "id": "ent.elasticsearch.start.index_exists_failed",
-    "translation": "Failed to establish whether ElasticSearch index exists"
+    "id": "ent.elasticsearch.search_posts.disabled",
+    "translation": "Elasticsearch searching is disabled on this server"
   },
   {
-    "id": "ent.elasticsearch.start.index_mapping_failed",
-    "translation": "Failed to setup ElasticSearch index mapping"
+    "id": "ent.elasticsearch.search_posts.search_failed",
+    "translation": "Search failed to complete"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
+    "translation": "Failed to decode search results"
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
-    "translation": "Failed to set ElasticSearch index settings"
+    "translation": "Failed to set Elasticsearch index settings"
+  },
+  {
+    "id": "ent.elasticsearch.test_config.connect_failed",
+    "translation": "Connecting to Elasticsearch server failed."
   },
   {
     "id": "ent.elasticsearch.test_config.indexing_disabled.error",
@@ -3536,6 +3852,10 @@
     "translation": "Редакция не поддерживает Elasticsearch."
   },
   {
+    "id": "ent.elasticsearch.test_config.reenter_password",
+    "translation": "The Elasticsearch Server URL or Username has changed. Please re-enter the Elasticsearch password to test connection."
+  },
+  {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "Ограничения на дополнительные эмодзи недоступны при текущей лицензии. Пожалуйста, свяжитесь с системным администратором по поводу улучшения вашей корпоративной лицензии."
   },
@@ -3748,6 +4068,14 @@
     "translation": "Страница не найдена"
   },
   {
+    "id": "jobs.request_cancellation.status.error",
+    "translation": "Could not request cancellation for job that is not in a cancelable state."
+  },
+  {
+    "id": "jobs.set_job_error.update.error",
+    "translation": "Failed to set job status to error"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Невозможно найти канал: %v, найдено похожих %v "
   },
@@ -4116,6 +4444,10 @@
     "translation": "Неверный интервал отправки почтовых объединений в настройках почты.  Должен составлять 30 секунд и более."
   },
   {
+    "id": "model.config.is_valid.email_notification_contents_type.app_error",
+    "translation": "Invalid email notification contents type for email settings. Must be one of either 'full' or 'generic'."
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "Неверная соль сброса пароля в настройках почты. Должна состоять из 32 и более символов."
   },
@@ -4436,6 +4768,22 @@
     "translation": "Некорректный идентификатор пользователя"
   },
   {
+    "id": "model.job.is_valid.create_at.app_error",
+    "translation": "\"Создать в\" должно быть корректным временем"
+  },
+  {
+    "id": "model.job.is_valid.id.app_error",
+    "translation": "Недопустимый тип"
+  },
+  {
+    "id": "model.job.is_valid.status.app_error",
+    "translation": "Invalid job status"
+  },
+  {
+    "id": "model.job.is_valid.type.app_error",
+    "translation": "Недопустимый тип"
+  },
+  {
     "id": "model.oauth.is_valid.app_id.app_error",
     "translation": "Некорректный идентификатор приложения"
   },
@@ -4812,6 +5160,18 @@
     "translation": "Неверное имя пользователя"
   },
   {
+    "id": "model.user_access_token.is_valid.description.app_error",
+    "translation": "Invalid description, must be 255 or less characters"
+  },
+  {
+    "id": "model.user_access_token.is_valid.token.app_error",
+    "translation": "Недопустимый маркер доступа"
+  },
+  {
+    "id": "model.user_access_token.is_valid.user_id.app_error",
+    "translation": "Недопустимый идентификатор пользователя"
+  },
+  {
     "id": "model.utils.decode_json.app_error",
     "translation": "невозможно декодировать"
   },
@@ -4921,7 +5281,7 @@
   },
   {
     "id": "store.sql.schema_version.critical",
-    "translation": "Схема базы данных версии %v не может быть обновлена. Вы не можете пропускать версии."
+    "translation": "Database schema version %v is no longer supported. This Mattermost server supports automatic upgrades from schema version %v through schema version %v. Downgrades are not supported. Please manually upgrade to at least version %v before continuing"
   },
   {
     "id": "store.sql.short_ciphertext",
@@ -5296,23 +5656,23 @@
     "translation": "Не удалсоь сохранить информацию о файле"
   },
   {
-    "id": "store.sql_job_status.delete_by_type.app_error",
+    "id": "store.sql_job.delete.app_error",
     "translation": "Неудачная попытка удалить пост"
   },
   {
-    "id": "store.sql_job_status.get.app_error",
+    "id": "store.sql_job.get.app_error",
     "translation": "Не удалось получить пост"
   },
   {
-    "id": "store.sql_job_status.get_all.app_error",
-    "translation": "Не удалось получить пост"
+    "id": "store.sql_job.get_all.app_error",
+    "translation": "Не удалось получить сообщения"
   },
   {
-    "id": "store.sql_job_status.save.app_error",
+    "id": "store.sql_job.save.app_error",
     "translation": "Не удалось сохранить Пост"
   },
   {
-    "id": "store.sql_job_status.update.app_error",
+    "id": "store.sql_job.update.app_error",
     "translation": "Мы не смогли обновить Пост"
   },
   {
@@ -5464,6 +5824,10 @@
     "translation": "Не удалось получить родительские посты для канала"
   },
   {
+    "id": "store.sql_post.get_posts_batch_for_indexing.get.app_error",
+    "translation": "We couldn't get the posts batch for indexing"
+  },
+  {
     "id": "store.sql_post.get_posts_by_ids.app_error",
     "translation": "Не удалось получить сообщения"
   },
@@ -6040,6 +6404,26 @@
     "translation": "Невозможно обновить поле проверки электронной почты"
   },
   {
+    "id": "store.sql_user_access_token.delete.app_error",
+    "translation": "Неудачная попытка удалить токен доступа"
+  },
+  {
+    "id": "store.sql_user_access_token.get.app_error",
+    "translation": "Неудачная попытка удалить токен доступа"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_token.app_error",
+    "translation": "Неудачная попытка удалить токен доступа"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_user.app_error",
+    "translation": "Неудачная попытка удалить токен доступа"
+  },
+  {
+    "id": "store.sql_user_access_token.save.app_error",
+    "translation": "Мы не смогли сохранить токен."
+  },
+  {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "Не удалось подсчитать входящие вебхуки"
   },
@@ -6080,10 +6464,18 @@
     "translation": "Не удалось получить вебхуки"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_incoming_by_channel.app_error",
+    "translation": "Неудачная попытка удалить вебхук"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_incoming_by_user.app_error",
     "translation": "Неудачная попытка удалить вебхук"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_outgoing_by_channel.app_error",
+    "translation": "Неудачная попытка удалить вебхук"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error",
     "translation": "Неудачная попытка удалить вебхук"
   },
@@ -6116,6 +6508,10 @@
     "translation": "Система"
   },
   {
+    "id": "utils.config.add_client_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  Adding DefaultClientLocale to AvailableLocales."
+  },
+  {
     "id": "utils.config.load_config.decoding.panic",
     "translation": "Ошибка декодирования конфигурационного файла file={{.Filename}}, err={{.Error}}"
   },
@@ -6136,8 +6532,12 @@
     "translation": "Возникла ошибка при сохранении файла в {{.Filename}}"
   },
   {
+    "id": "utils.config.supported_available_locales.app_error",
+    "translation": "Unable to load mattermost configuration file:  AvailableLocales must include DefaultClientLocale. Setting AvailableLocales to all locales as default value."
+  },
+  {
     "id": "utils.config.supported_client_locale.app_error",
-    "translation": "Unable to load mattermost configuration file:  DefaultClientLocale must be one of the supported locales"
+    "translation": "Unable to load mattermost configuration file:  DefaultClientLocale must be one of the supported locales. Setting DefaultClientLocale to en as default value."
   },
   {
     "id": "utils.config.supported_server_locale.app_error",
diff --git a/i18n/tr.json b/i18n/tr.json
index 30274d7ef..50a6de17b 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -532,6 +532,90 @@
     "translation": "Kanal başlığı güncellendi."
   },
   {
+    "id": "api.command_channel_purpose.channel.app_error",
+    "translation": "Geçerli kanal alınırken sorun çıktı."
+  },
+  {
+    "id": "api.command_channel_purpose.desc",
+    "translation": "Kanal amacını düzenle"
+  },
+  {
+    "id": "api.command_channel_purpose.direct_group.app_error",
+    "translation": "Doğrudan ileti kanalları için bir amaç ayarlanamaz. Amaç yerine başlığı ayarlamak için /header komutunu kullanın."
+  },
+  {
+    "id": "api.command_channel_purpose.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_purpose.message.app_error",
+    "translation": "/purpose komutu ile bir ileti yazılmalıdır."
+  },
+  {
+    "id": "api.command_channel_purpose.name",
+    "translation": "amaç"
+  },
+  {
+    "id": "api.command_channel_purpose.permission.app_error",
+    "translation": "Kanal amacını düzenleme izniniz yok."
+  },
+  {
+    "id": "api.command_channel_purpose.update_channel.app_error",
+    "translation": "Geçerli kanal güncellenirken sorun çıktı."
+  },
+  {
+    "id": "api.command_channel_rename.channel.app_error",
+    "translation": "Geçerli kanal alınırken sorun çıktı."
+  },
+  {
+    "id": "api.command_channel_rename.desc",
+    "translation": "Kanalı yeniden adlandır"
+  },
+  {
+    "id": "api.command_channel_rename.direct_group.app_error",
+    "translation": "Doğrudan ileti kanalları yeniden adlandırılamaz."
+  },
+  {
+    "id": "api.command_channel_rename.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_rename.message.app_error",
+    "translation": "/rename komutu ile bir ileti yazılmalıdır."
+  },
+  {
+    "id": "api.command_channel_rename.name",
+    "translation": "yeniden adlandır"
+  },
+  {
+    "id": "api.command_channel_rename.permission.app_error",
+    "translation": "Kanalı yeniden adlandırma izniniz yok."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.app_error",
+    "translation": "Geçerli kanal güncellenirken sorun çıktı."
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.success",
+    "translation": "Kanal adı güncellendi."
+  },
+  {
+    "id": "api.command_code.desc",
+    "translation": "Metin kod bloğu olarak görüntülensin"
+  },
+  {
+    "id": "api.command_code.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_code.message.app_error",
+    "translation": "/code komutu ile bir ileti yazılmalıdır."
+  },
+  {
+    "id": "api.command_code.name",
+    "translation": "kod"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "Görsel önizlemeleri otomatik daraltılsın"
   },
@@ -624,6 +708,30 @@
     "translation": "Kanala katıldı."
   },
   {
+    "id": "api.command_leave.desc",
+    "translation": "Geçerli kanaldan ayrıl"
+  },
+  {
+    "id": "api.command_leave.fail.app_error",
+    "translation": "Kanaldan ayrılırken bir sorun çıktı."
+  },
+  {
+    "id": "api.command_leave.list.app_error",
+    "translation": "Kanallar listelenirken bir sorun çıktı."
+  },
+  {
+    "id": "api.command_leave.missing.app_error",
+    "translation": "Kanal bulunamadı."
+  },
+  {
+    "id": "api.command_leave.name",
+    "translation": "ayrıl"
+  },
+  {
+    "id": "api.command_leave.success",
+    "translation": "Kanaldan ayrıldı."
+  },
+  {
     "id": "api.command_logout.desc",
     "translation": "Mattermosttan Oturumunu Kapat"
   },
@@ -1009,7 +1117,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
-    "translation": "Doğrudan İleti"
+    "translation": "Şu kullanıcıdan doğrudan ileti: "
   },
   {
     "id": "api.email_batching.render_batched_post.go_to_post",
@@ -1017,7 +1125,11 @@
   },
   {
     "id": "api.email_batching.render_batched_post.group_message",
-    "translation": "Grup İletisi"
+    "translation": "Şu gruptan ileti: "
+  },
+  {
+    "id": "api.email_batching.render_batched_post.notification",
+    "translation": "Şuradan bildirim: "
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
@@ -1026,8 +1138,8 @@
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
     "translation": {
-      "one": "1 yeni iletiniz var.",
-      "other": "{{.Count}} yeni iletiniz var."
+      "one": "{{.Count}} yeni bildiriminiz var.",
+      "other": ""
     }
   },
   {
@@ -1696,22 +1808,10 @@
     "translation": "Takımlar arası doğrudan ileti gönderilirken takımlar alınamadı. Kullanıcı Kodu: %v, Hata: %v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.mention_body",
-    "translation": "Yeni bir anmanız var."
-  },
-  {
     "id": "api.post.send_notifications_and_forget.mention_subject",
     "translation": "Yeni Anma"
   },
   {
-    "id": "api.post.send_notifications_and_forget.message_body",
-    "translation": "1 yeni iletiniz var."
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.message_subject",
-    "translation": "Yeni Doğrudan İleti"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.push_image_only",
     "translation": " Şunun içine bir ya da bir kaç dosya yüklendi "
   },
@@ -1728,6 +1828,10 @@
     "translation": " sizi şurada andı "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "translation": " sizi andı "
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_message",
     "translation": " size doğrudan ileti gönderdi"
   },
@@ -1736,6 +1840,10 @@
     "translation": " şuraya gönderildi "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
+    "translation": " bir ileti gönderdi"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
     "translation": "Aygıta ileti gönderilemedi. Aygıt Kodu: {{.DeviceId}}, Hata Kodu: {{.Error}}"
   },
@@ -1873,127 +1981,127 @@
   },
   {
     "id": "api.slackimport.slack_add_bot_user.email_pwd",
-    "translation": "Slack Bot/Bütünleştirme İleti İçe Aktarma Kullanıcısı: E-posta, Parola: {{.Email}}, {{.Password}}\r\n"
+    "translation": "E-posta adresi {{.Email}} parolası {{.Password}} olan Bütünleştirme/Slack Bot kullanıcısı içe aktarıldı.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_bot_user.unable_import",
-    "translation": "Slack Bot/Bütünleştirme İleti İçe Aktarma Kullanıcısı alınamadı: {{.Username}}\r\n"
+    "translation": "{{.Username}} Bütünleştirme/Slack Bot kullanıcısı içe aktarılamadı.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.added",
-    "translation": "\r\n Kanal Eklendi \r\n"
+    "translation": "\r\n Kanallar eklendi:\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
-    "translation": "Kullanıcı kanala eklenemedi: {{.Username}}\r\n"
+    "translation": "{{.Username}} Slack kullanıcısı kanala eklenemedi.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed",
-    "translation": "İçe Aktarılamadı: {{.DisplayName}}\r\n"
+    "translation": "{{.DisplayName}} Slack kanalı içe aktarılamadı.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Slack Alıcı: Kanal içe aktarılamadı: %s"
+    "translation": "Slack İçe Aktarma: Slack kanalı içe aktarılamadı: %s."
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
-    "translation": "Var olan kanal ile birleştirildi: {{.DisplayName}}\r\n"
+    "translation": "{{.DisplayName}} Slack kanalı zaten etkin bir Mattermost kanalı olarak var. İki kanal birleştirilecek.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_posts.attach_files.error",
-    "translation": "Dosyalar iletiye eklenirken sorun çıktı. İleti Kodu: %s, Dosya Kodları: %v, Hata: %v"
+    "translation": "Slack İçe Aktarma: Bir iletiye dosya eklenirken sorun çıktı, ileti kodu: %s, dosya kodları: %v, hata: %v."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot.warn",
-    "translation": "Slack bot iletileri henüz içe aktarılmamış"
+    "translation": "Slack İçe Aktarma: Slack bot iletileri henüz içe aktarılamadı."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot_user_no_exists.warn",
-    "translation": "Slack İçe Aktarıcı: Bot içe aktarma kullanıcısı bulunamadığından bot iletileri içe aktarılamıyor."
+    "translation": "Slack İçe Aktarma: Bot kullanıcısı var olmadığından bot iletisi içe aktarılamadı."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
-    "translation": "Dosya açıklamadı belirtilmemiş"
+    "translation": "Slack İçe Aktarma: Herhangi bir yorum bulunmadığı için ileti içe aktarılamadı."
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_usr.debug",
-    "translation": "İletinin bir kullanıcısı yok"
+    "translation": "Slack İçe Aktarma: Kullanıcı alanı eksik olduğundan ileti içe aktarılamadı."
   },
   {
     "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
-    "translation": "Slack İçe Aktarıcı: BotId alanı eksik olduğundan bot iletisi içe aktarılamadı."
+    "translation": "Slack İçe Aktarma: BotId alanı eksik olduğundan bot iletisi içe aktarılamadı."
   },
   {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
-    "translation": "İleti türü desteklenmiyor: %v, %v"
+    "translation": "Slack İçe Aktarma: İletiler türü desteklenmediğinden içe aktarılamadı: ileti türü: %v ileti alt türü: %v."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_found.warn",
-    "translation": "Slack dışa aktarması için dosya yükleme iletisinde {{.FileId}} kodlu dosya bulunamadı"
+    "translation": "Slack İçe Aktarma: {{.FileId}} dosyası dışa aktarılmış Slack zip dosyası içinde bulunamadığından içe aktarılamadı."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_in_json.warn",
-    "translation": "Dışa aktarılmış verilerde bir \"file\" bölümü bulunmadığından yüklenen iletideki dosya içe aktarılamaz."
+    "translation": "Slack İçe Aktarma: Dışa aktarılmış Slack dosyasında bir \"file\" bölümü bulunamadığından ek dosya iletiye eklenemedi."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_open_failed.warn",
-    "translation": "Dışa aktarılmış veri arşivinden {{.FileId}} koduyla yüklenen dosya açılamadı. Hata: {{.Error}}"
+    "translation": "Slack İçe Aktarma: Dışa aktarılmış Slack dosyasındaki {{.FileId}} dosyası açılamadı: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_upload_failed.warn",
-    "translation": "Yüklenen iletideki {{.FileId}} kodlu dosya yüklenemedi. Hata: {{.Error}}"
+    "translation": "Slack İçe Aktarma: {{.FileId}} dosyası yüklenirken bir sorun çıktı: {{.Error}}."
   },
   {
     "id": "api.slackimport.slack_add_posts.user_no_exists.debug",
-    "translation": "%v kullanıcısı bulunamadı!"
+    "translation": "Slack İçe Aktarma: %v Slack kullanıcısı Mattermost üzerinde var olmadığından ileti eklenemedi."
   },
   {
     "id": "api.slackimport.slack_add_posts.without_user.debug",
-    "translation": "İletinin bir kullanıcısı yok"
+    "translation": "Slack İçe Aktarma: Kullanıcı alanı eksik olduğundan ileti içe aktarılamadı."
   },
   {
     "id": "api.slackimport.slack_add_users.created",
-    "translation": "\r\n Kullanıcı Eklendi\r\n"
+    "translation": "\r\n Kullanıcılar eklendi:\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.email_pwd",
-    "translation": "E-posta, Parola: {{.Email}}, {{.Password}}\r\n"
+    "translation": "E-postası {{.Email}} parolası {{.Password}} olan Slack kullanıcısı içe aktarıldı.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing",
-    "translation": "Kullanıcı var olan bir hesap ile birleştirildi: {{.Email}}, {{.Username}}\r\n"
+    "translation": "E-posta adresi {{.Email}} olan Slack kullanıcısı aynı e-posta adresini kullanan {{.Username}} Mattermost kullanıcısı ile birleştirildi.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing_failed",
-    "translation": "Kullanıcı var olan bir hesap ile birleştirilmeye çalışıldı: {{.Email}}, {{.Username}}, ancak kullanıcı bu takıma eklenemedi.\r\n"
+    "translation": "E-posta adresi {{.Email}} olan Slack kullanıcısı aynı e-posta adresini kullanan {{.Username}} Mattermost kullanıcısı birleştirildi ancak kullanıcı ilgili takıma eklenemedi.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address",
-    "translation": "Dışa aktarılan Slack verileri içinde {{.Username}} kullanıcısının e-posta adresi yok. Yerine {{.Email}} kullanılıyor. Kullanıcının sistemde oturum açtıktan sonra e-posta adresini güncellemesi gerekir.\r\n"
+    "translation": "Dışa aktarılmış Slack verileri içinde {{.Username}} kullanıcısının e-posta adresi yok. Yerine {{.Email}} kullanılıyor. Kullanıcının sistemde oturum açtıktan sonra e-posta adresini güncellemesi gerekir.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address.warn",
-    "translation": "Dışa aktarılan Slack verileri içinde {{.Username}} kullanıcısının e-posta adresi yok. Yerine {{.Email}} kullanılıyor. Kullanıcının sistemde oturum açtıktan sonra e-posta adresini güncellemesi gerekir."
+    "translation": "Slack İçe Aktarma: Dışa aktarılmış Slack verileri içinde {{.Username}} kullanıcısının e-posta adresi yok. Yerine {{.Email}} kullanılıyor. Kullanıcının sistemde oturum açtıktan sonra e-posta adresini güncellemesi gerekir."
   },
   {
     "id": "api.slackimport.slack_add_users.unable_import",
-    "translation": "{{.Username}} kullanıcısı içe aktarılamadı\r\n"
+    "translation": "{{.Username}} Slacks kullanıcısı içe aktarılamadı.\r\n"
   },
   {
     "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
-    "translation": "{{.ChannelID}} {{.ChannelName}} Slack kanalı için !channel ile eşleşen kurallı bir ifade derlenemedi."
+    "translation": "Slack İçe Aktarma: !channel, {{.ChannelName}} Slack kanalı için kurallı ifadeye uygun olarak derlenemedi (Kod:{{.ChannelID}})."
   },
   {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
-    "translation": "Kötü bir zaman damgası algılandı"
+    "translation": "Slack İçe Aktarma: Hatalı zaman damgası algılandı."
   },
   {
     "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
-    "translation": "{{.ChannelID}} {{.ChannelName}} Slack kullanıcısı için !mention ile eşleşen kurallı bir ifade derlenemedi."
+    "translation": "Slack İçe Aktarma: @mention, {{.Username}} Slack kullanıcısı için kurallı ifadeye uygun olarak derlenemedi (Kod:{{.UserID}})."
   },
   {
     "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
-    "translation": "Slack İçe Aktarıcı: Bot içe aktarma kullanıcısı devre dışı bırakılamadı."
+    "translation": "Slack İçe Aktarma: Bot tarafından kullanılan kullanıcı hesabı devre dışı bırakılamadı."
   },
   {
     "id": "api.slackimport.slack_import.log",
@@ -2001,7 +2109,7 @@
   },
   {
     "id": "api.slackimport.slack_import.note1",
-    "translation": "- Alıcı tarafından desteklenmediğinden bazı iletiler içe aktarılmayabilir.\r\n"
+    "translation": "- Bu içe aktarıcı tarafından desteklenmediğinden bazı iletiler içe aktarılamayabilir.\r\n"
   },
   {
     "id": "api.slackimport.slack_import.note2",
@@ -2013,43 +2121,43 @@
   },
   {
     "id": "api.slackimport.slack_import.notes",
-    "translation": "\r\n Notlar \r\n"
+    "translation": "\r\n Notlar:\r\n"
   },
   {
     "id": "api.slackimport.slack_import.open.app_error",
-    "translation": "{{.Filename}} dosyası açılamadı"
+    "translation": "Dosya açılamadı: {{.Filename}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_import.team_fail",
-    "translation": "Takım içe aktarma bilgileri alınamadı.\r\n"
+    "translation": "İçe aktarılacak takımın bilgileri alınamadı.\r\n"
   },
   {
     "id": "api.slackimport.slack_import.zip.app_error",
-    "translation": "ZIP dosyası açılamadı"
+    "translation": "Slack dışa aktarma zip dosyası açılamadı.\r\n"
   },
   {
     "id": "api.slackimport.slack_parse_channels.error",
-    "translation": "Slack kanalları işlenirken sorun çıktı. Gene de içe aktarma işlemi tamamlanabilir."
+    "translation": "Slack İçe Aktarma: Bazı Slack kanalları işlenirken sorun çıktı. Buna rağmen belki içe aktarım yapılabilir."
   },
   {
     "id": "api.slackimport.slack_parse_posts.error",
-    "translation": "Bazı slack iletileri işlenirken sorun çıktı. Gene de içe aktarma işlemi tamamlanabilir."
+    "translation": "Slack İçe Aktarma: Bazı Slack iletileri işlenirken sorun çıktı. Buna rağmen belki içe aktarım yapılabilir."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack İçe Aktarıcı: {{.ChannelName}} kanalının görüntülenecek adı çok uzun. İçe aktarılırken budanarak kısaltılacak."
+    "translation": "Slack İçe Aktarma: {{.ChannelName}} kanalının adı çok uzun. İçe aktarılırken budanarak kısaltılacak."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Slack İçe Aktarıcı: {{.ChannelName}} kanalının başlığı çok uzun. İçe aktarılırken budanarak kısaltılacak."
+    "translation": "Slack İçe Aktarma: {{.ChannelName}} kanalının adı çok uzun. İçe aktarılırken budanarak kısaltılacak."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slack İçe Aktarıcı: {{.ChannelName}} kanalının adı çok uzun. İçe aktarılırken budanarak kısaltılacak."
+    "translation": "Slack İçe Aktarma: {{.ChannelName}} kanalının adı çok uzun. İçe aktarılırken budanarak kısaltılacak."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Slack İçe Aktarıcı: {{.ChannelName}} kanalının amacı çok uzun. İçe aktarılırken budanarak kısaltılacak."
+    "translation": "Slack İçe Aktarma: {{.ChannelName}} kanalının amacı çok uzun. İçe aktarılırken budanarak kısaltılacak."
   },
   {
     "id": "api.status.init.debug",
@@ -2332,22 +2440,6 @@
     "translation": "İletiye Git"
   },
   {
-    "id": "api.templates.post_body.info",
-    "translation": "KANAL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_channel",
-    "translation": "{{.TeamDisplayName}} takımı ({{.ChannelName}}) kanalındaki {{.SubjectText}} konusu {{.Month}} {{.Day}}, {{.Year}} tarihinde"
-  },
-  {
-    "id": "api.templates.post_subject_in_direct_message",
-    "translation": "{{.SenderDisplayName}} kullanıcısından {{.Day}} {{.Month}} {{.Year}} tarihinde {{.SubjectText}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_group_message",
-    "translation": "{{ .SenderDisplayName}} tarafından {{.Month}} {{.Day}}, {{.Year}} tarihinde yeni grup iletisi"
-  },
-  {
     "id": "api.templates.reset_body.button",
     "translation": "Parolayı Sıfırla"
   },
@@ -2404,6 +2496,18 @@
     "translation": "[MATTERMOST] Mattermost 3.0 Yükseltmesi için hesabınızdaki değişiklikler"
   },
   {
+    "id": "api.templates.user_access_token_body.info",
+    "translation": "{{ .SiteURL }} sitesindeki hesabınıza bir kullanıcı erişimi kodu eklendi. Bu kod {{.SiteName}} sitesindeki hesabınıza erişmek için kullanılacak.<br>Bu değişikliği siz yapmadıysanız lütfen sistem yöneticiniz ile görüşün."
+  },
+  {
+    "id": "api.templates.user_access_token_body.title",
+    "translation": "Kullanıcı erişimi kodu hesabınıza eklendi"
+  },
+  {
+    "id": "api.templates.user_access_token_subject",
+    "translation": "[{{ .SiteName }}] kullanıcı erişimi kodu hesabınıza eklendi"
+  },
+  {
     "id": "api.templates.username_change_body.info",
     "translation": "{{.TeamDisplayName}} takımındaki kullanıcı adınız {{.NewUsername}} olarak değiştirildi.<br>Bu değişikliği siz yapmadıysanız sistem yöneticisi ile görüşün."
   },
@@ -2760,6 +2864,10 @@
     "translation": "Parola güncelleme bildirim e-postası gönderilemedi"
   },
   {
+    "id": "api.user.send_user_access_token.error",
+    "translation": "E-postaya eklenen kullanıcı erişim kodu gönderilemedi"
+  },
+  {
     "id": "api.user.send_verify_email_and_forget.failed.error",
     "translation": "Doğrulama e-postası gönderilemedi"
   },
@@ -3072,6 +3180,10 @@
     "translation": "Grup kanalı alınamadı"
   },
   {
+    "id": "app.import.import_direct_post.save_preferences.error",
+    "translation": "Doğrudan ileti içe aktarılırken sorun çıktı. Ayarlar kaydedilemedi."
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "İleti kullanıcısı bulunamadı"
   },
@@ -3108,6 +3220,10 @@
     "translation": "İleti içe aktarılırken sorun çıktı. \"{{.ChannelName}}\" kanalı bulunamadı."
   },
   {
+    "id": "app.import.import_post.save_preferences.error",
+    "translation": "İleti içe aktarılırken sorun çıktı. Ayarlar kaydedilemedi."
+  },
+  {
     "id": "app.import.import_post.team_not_found.error",
     "translation": "İleti içe aktarılırken sorun çıktı. \"{{.TeamName}}\" takımı bulunamadı."
   },
@@ -3116,6 +3232,10 @@
     "translation": "İleti içe aktarılırken sorun çıktı. \"{{.Username}}\" kullanıcı adına sahip kullanıcı bulunamadı."
   },
   {
+    "id": "app.import.import_user_channels.save_preferences.error",
+    "translation": "Kullanıcı kanal üyelikleri içe aktarılırken sorun çıktı. Ayarlar kaydedilemedi."
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "Kanal oluşturulma zamanı belirtilmiş ise 0 olmamalıdır."
   },
@@ -3176,6 +3296,10 @@
     "translation": "Doğrudan kanal üye listesinde çok fazla sayıda öge var"
   },
   {
+    "id": "app.import.validate_direct_channel_import_data.unknown_favoriter.error",
+    "translation": "Doğrudan kanal yalnız üyeleri tarafından sık kullanılanlara eklenebilir. \"{{.Username}}\" bir üye değil."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
     "translation": "Zorunlu doğrudan kanal özelliği eksik: kanal_uyeleri"
   },
@@ -3204,6 +3328,10 @@
     "translation": "Zorunlu doğrudan ileti özelliği eksik: ileti"
   },
   {
+    "id": "app.import.validate_direct_post_import_data.unknown_flagger.error",
+    "translation": "Doğrudan ileti yalnız kanal üyeleri tarafından işaretlenebilir. \"{{.Username}}\" bir üye değil."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
     "translation": "Zorunlu doğrudan ileti özelliği eksik: kullanıcı"
   },
@@ -3292,6 +3420,10 @@
     "translation": "Kullanıcının Kanal Üyeliğinde aksesuar bildirimi okunmamış olarak işaretle geçersiz."
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mobile.error",
+    "translation": "Kullanıcının Kanal Üyeliğinde cep telefonu bildirimi geçersiz."
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "Kullanıcının Kanal Üyeliğindeki roller geçersiz."
   },
@@ -3328,6 +3460,38 @@
     "translation": "Kullanıcının Takma Adı çok uzun."
   },
   {
+    "id": "app.import.validate_user_import_data.notify_props_channel_trigger_invalid.error",
+    "translation": "Kullanıcının kanal tetikleyici bildirimi değeri geçersiz."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_comment_trigger_invalid.error",
+    "translation": "Kullanıcının komut tetikleyici bildirimi değeri geçersiz."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error",
+    "translation": "Kullanıcının masaüstü süresi bildirimi değeri geçersiz."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_invalid.error",
+    "translation": "Kullanıcının masaüstü bildirimi değeri geçersiz."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_sound_invalid.error",
+    "translation": "Kullanıcının masaüstü sesi bildirimi değeri geçersiz."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_email_invalid.error",
+    "translation": "Kullanıcının e-posta bildirimi değeri geçersiz."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_invalid.error",
+    "translation": "Kullanıcının mobil bildirimi değeri geçersiz."
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_push_status_invalid.error",
+    "translation": "Kullanıcının mobil anında durum bildirimi değeri geçersiz."
+  },
+  {
     "id": "app.import.validate_user_import_data.pasword_length.error",
     "translation": "Kullanıcının Parolasının uzunluğu geçersiz."
   },
@@ -3356,6 +3520,54 @@
     "translation": "Kullanıcının Takım Üyeliğinde takım adı eksik."
   },
   {
+    "id": "app.notification.body.intro.direct.full",
+    "translation": "Yeni bir doğrudan iletiniz var."
+  },
+  {
+    "id": "app.notification.body.intro.direct.generic",
+    "translation": "{{.SenderName}} tarafından gönderilen yeni bir doğrudan iletiniz var."
+  },
+  {
+    "id": "app.notification.body.intro.notification.full",
+    "translation": "Yeni bir bildiriminiz var."
+  },
+  {
+    "id": "app.notification.body.intro.notification.generic",
+    "translation": "{{.SenderName}} tarafından gönderilen yeni bir bildiriminiz var."
+  },
+  {
+    "id": "app.notification.body.text.direct.full",
+    "translation": "{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full",
+    "translation": "KANAL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.subject.direct.full",
+    "translation": "[{{.SiteName}}] {{ .SenderDisplayName}} tarafından {{.Month}} {{.Day}}, {{.Year}} tarihinde yeni doğrudan ileti"
+  },
+  {
+    "id": "app.notification.subject.notification.full",
+    "translation": "[{{ .SiteName }}] {{ .TeamName}} takımında {{.Month}} {{.Day}}, {{.Year}} tarihinde yeni bildirim"
+  },
+  {
+    "id": "app.user_access_token.disabled",
+    "translation": "Bu sunucu üzerinde kullanıcı erişim izinleri devre dışı bırakılmış. Lütfen ayrıntılı bilgi almak için sistem yöneticiniz ile görüşün."
+  },
+  {
+    "id": "app.user_access_token.invalid_or_missing",
+    "translation": "Kod geçersiz ya da eksik"
+  },
+  {
     "id": "authentication.permissions.create_group_channel.description",
     "translation": "Yeni grup iletisi kanalları ekleme izni"
   },
@@ -3364,6 +3576,14 @@
     "translation": "Grup İletisi Oluşturma"
   },
   {
+    "id": "authentication.permissions.create_post_public.description",
+    "translation": "Herkese açık kanallarda ileti oluşturabilir"
+  },
+  {
+    "id": "authentication.permissions.create_post_public.name",
+    "translation": "Herkese Açık Kanallarda İleti Oluşturma"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Yeni takımlar ekleme izni"
   },
@@ -3372,6 +3592,22 @@
     "translation": "Takım Ekleme"
   },
   {
+    "id": "authentication.permissions.create_user_access_token.description",
+    "translation": "Kullanıcı erişim kodları oluşturabilir"
+  },
+  {
+    "id": "authentication.permissions.create_user_access_token.name",
+    "translation": "Kullanıcı Erişim Kodu Oluşturma"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.description",
+    "translation": "Görevleri yönetebilme"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.name",
+    "translation": "Görev Yönetimi"
+  },
+  {
     "id": "authentication.permissions.manage_team_roles.description",
     "translation": "Bir takım üyesinin rollerini değiştirme izni"
   },
@@ -3388,6 +3624,22 @@
     "translation": "Herkese Açık Kanalları Okuma"
   },
   {
+    "id": "authentication.permissions.read_user_access_token.description",
+    "translation": "Kullanıcı erişim kodu, açıklaması ve kullanıcı kodu alanları okuyabilir"
+  },
+  {
+    "id": "authentication.permissions.read_user_access_token.name",
+    "translation": "Kullanıcı Erişim Kodlarını Okuma"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.description",
+    "translation": "Kullanıcı erişim kodlarını geçersiz kılabilir"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.name",
+    "translation": "Kullanıcı Erişim Kodlarını Geçersiz Kılma"
+  },
+  {
     "id": "authentication.permissions.team_invite_user.description",
     "translation": "Kullanıcıları bir takıma davet edebilir"
   },
@@ -3404,6 +3656,46 @@
     "translation": "Bölü Komutları Kullanılsın"
   },
   {
+    "id": "authentication.roles.system_post_all.description",
+    "translation": "Sistemdeki herhangi bir herkese açık, özel ya da doğrudan kanala ileti gönderebilen bir rol"
+  },
+  {
+    "id": "authentication.roles.system_post_all.name",
+    "translation": "Herkese Açık, Özel ve Doğrudan Kanallara İleti Gönderme"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.description",
+    "translation": "Sistemdeki herhangi bir herkese açık kanala ileti gönderebilen bir rol"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.name",
+    "translation": "Herkese Açık Kanallara İleti Gönderme"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.description",
+    "translation": "Kullanıcı erişim kodları ekleme, okuma ve geçersiz kılma izinleri olan bir rol"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.name",
+    "translation": "Kullanıcı Erişim Kodu"
+  },
+  {
+    "id": "authentication.roles.team_post_all.description",
+    "translation": "Takımdaki herhangi bir herkese açık ve özel kanala ileti gönderebilen bir rol"
+  },
+  {
+    "id": "authentication.roles.team_post_all.name",
+    "translation": "Herkese Açık ve Özel Kanallara İleti Gönderme"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.description",
+    "translation": "Takımdaki herhangi bir herkese açık kanala ileti gönderebilen bir rol"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.name",
+    "translation": "Herkese Açık Kanallara İleti Gönderme"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "Bu özelliği kullanabilmek için Enterprise sürüm lisansı gereklidir. Lütfen lisansınızı yükseltmek için sistem yöneticisi ile görüşün."
   },
@@ -3496,36 +3788,60 @@
     "translation": "'{{.JobName}}' görevi için '{{.FilePath}}' konumuna uygunluk dışa aktarma işlemi başlatıldı"
   },
   {
-    "id": "ent.elasticsearch.search_posts.disabled",
-    "translation": "ElasticSearch searching is disabled on this server"
+    "id": "ent.elasticsearch.create_client.connect_failed",
+    "translation": "Elasticsearch İstemcisi Kurulamadı"
   },
   {
-    "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "Search failed to complete"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_create_failed",
+    "translation": "Elasticsearch dizini oluşturulamadı"
   },
   {
-    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
-    "translation": "Failed to decode search results"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_exists_failed",
+    "translation": "Elasticsearch dizininin var olup olmadığı anlaşılamadı"
   },
   {
-    "id": "ent.elasticsearch.start.connect_failed",
-    "translation": "Setting up ElasticSearch Client Failed"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_mapping_failed",
+    "translation": "Elasticsearch dizin eşleştirmesi kurulamadı"
   },
   {
-    "id": "ent.elasticsearch.start.index_create_failed",
-    "translation": "Failed to create ElasticSearch index"
+    "id": "ent.elasticsearch.delete_post.error",
+    "translation": "İleti silinemedi"
   },
   {
-    "id": "ent.elasticsearch.start.index_exists_failed",
-    "translation": "Failed to establish whether ElasticSearch index exists"
+    "id": "ent.elasticsearch.generic.disabled",
+    "translation": "Elasticsearch araması bu sunucu üzerinde etkinleştirilmemiş"
   },
   {
-    "id": "ent.elasticsearch.start.index_mapping_failed",
-    "translation": "Failed to setup ElasticSearch index mapping"
+    "id": "ent.elasticsearch.index_post.error",
+    "translation": "İleti dizine eklenemedi"
+  },
+  {
+    "id": "ent.elasticsearch.not_started.error",
+    "translation": "Elasticsearch başlatılmamış"
+  },
+  {
+    "id": "ent.elasticsearch.purge_indexes.delete_failed",
+    "translation": "ElasticSearch dizini silinemedi"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.disabled",
+    "translation": "Elasticsearch araması bu sunucu üzerinde devre dışı bırakılmış"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.search_failed",
+    "translation": "Search failed to complete"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
+    "translation": "Failed to decode search results"
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
-    "translation": "Failed to set ElasticSearch index settings"
+    "translation": "Elasticsearch dizin ayarları yapılamadı"
+  },
+  {
+    "id": "ent.elasticsearch.test_config.connect_failed",
+    "translation": "Elasticsearch sunucusuna bağlanılamadı."
   },
   {
     "id": "ent.elasticsearch.test_config.indexing_disabled.error",
@@ -3536,6 +3852,10 @@
     "translation": "Lisansta Elasticsearch desteklenmiyor."
   },
   {
+    "id": "ent.elasticsearch.test_config.reenter_password",
+    "translation": "Elasticsearch sunucusunun adresi ya da Kullanıcı Adı değişmiş. Bağlantıyı sınamak için lütfen Elasticsearch parolasını yeniden yazın."
+  },
+  {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "Geçerli lisans özel emoji özelliğini desteklemiyor. Lütfen Enterprise sürümüne yükseltmek için sistem yöneticisi ile görüşün."
   },
@@ -3748,6 +4068,14 @@
     "translation": "Sayfa bulunamadı"
   },
   {
+    "id": "jobs.request_cancellation.status.error",
+    "translation": "İş durumu iptal edilebilir olmadığından iptal isteğinde bulunulamadı."
+  },
+  {
+    "id": "jobs.set_job_error.update.error",
+    "translation": "İş durumu hata olarak ayarlanamadı"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "%v kanalı bulunamadı, %v olasılık araştırıldı"
   },
@@ -4116,6 +4444,10 @@
     "translation": "Toplu e-posta aralığı e-posta ayarı geçersiz. 30 saniye ya da üzerinde olmalıdır."
   },
   {
+    "id": "model.config.is_valid.email_notification_contents_type.app_error",
+    "translation": "E-posta ayarları için e-posta bildirim içerikleri türü geçersiz. 'tam' ya da 'genel' olmalıdır."
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "Parola sıfırlama çeşnisi e-posta ayarı geçersiz. 32 ya da daha fazla karakter olmalıdır."
   },
@@ -4436,6 +4768,22 @@
     "translation": "Kullanıcı kodu geçersiz"
   },
   {
+    "id": "model.job.is_valid.create_at.app_error",
+    "translation": "Oluşturulma zamanı geçerli bir zaman olmalıdır"
+  },
+  {
+    "id": "model.job.is_valid.id.app_error",
+    "translation": "Görev kodu geçersiz"
+  },
+  {
+    "id": "model.job.is_valid.status.app_error",
+    "translation": "Görev durumu geçersiz"
+  },
+  {
+    "id": "model.job.is_valid.type.app_error",
+    "translation": "Görev türü geçersiz"
+  },
+  {
     "id": "model.oauth.is_valid.app_id.app_error",
     "translation": "Uygulama kodu geçersiz"
   },
@@ -4812,6 +5160,18 @@
     "translation": "Kullanıcı adı geçersiz"
   },
   {
+    "id": "model.user_access_token.is_valid.description.app_error",
+    "translation": "Açıklama geçersiz, 255 karakterden kısa olmalıdır"
+  },
+  {
+    "id": "model.user_access_token.is_valid.token.app_error",
+    "translation": "Erişim kodu geçersiz"
+  },
+  {
+    "id": "model.user_access_token.is_valid.user_id.app_error",
+    "translation": "Kullanıcı kodu geçersiz"
+  },
+  {
     "id": "model.utils.decode_json.app_error",
     "translation": "kod çözülemedi"
   },
@@ -4921,7 +5281,7 @@
   },
   {
     "id": "store.sql.schema_version.critical",
-    "translation": "Veritabanı şeması %v sürümüne güncellenemez. Aradaki sürümleri atlayamazsınız."
+    "translation": "%v veritabanı şeması sürümü artık desteklenmiyor. Bu Mattermost sunucusu %v şema sürümünden %v şema sürümüne kadar olan otomatik güncellemeleri destekliyor. Sürüm düşürme işlemi desteklenmez. Lütfen devam etmeden önce veritabanı şemasını el ile son %v sürümüne yükseltin."
   },
   {
     "id": "store.sql.short_ciphertext",
@@ -5296,24 +5656,24 @@
     "translation": "We couldn't save or update the file info"
   },
   {
-    "id": "store.sql_job_status.delete_by_type.app_error",
-    "translation": "We couldn't delete the job status"
+    "id": "store.sql_job.delete.app_error",
+    "translation": "İş silinemedi"
   },
   {
-    "id": "store.sql_job_status.get.app_error",
-    "translation": "We couldn't get the job status"
+    "id": "store.sql_job.get.app_error",
+    "translation": "İş alınamadı"
   },
   {
-    "id": "store.sql_job_status.get_all.app_error",
-    "translation": "We couldn't get all job statuses"
+    "id": "store.sql_job.get_all.app_error",
+    "translation": "İşler alınamadı"
   },
   {
-    "id": "store.sql_job_status.save.app_error",
-    "translation": "We couldn't save the job status"
+    "id": "store.sql_job.save.app_error",
+    "translation": "İş kaydedilemedi"
   },
   {
-    "id": "store.sql_job_status.update.app_error",
-    "translation": "We couldn't update the job status"
+    "id": "store.sql_job.update.app_error",
+    "translation": "İş güncellenemedi"
   },
   {
     "id": "store.sql_license.get.app_error",
@@ -5464,6 +5824,10 @@
     "translation": "Kanalın üst iletileri alınamadı"
   },
   {
+    "id": "store.sql_post.get_posts_batch_for_indexing.get.app_error",
+    "translation": "Dizine eklenecek ileti yığını alınamadı"
+  },
+  {
     "id": "store.sql_post.get_posts_by_ids.app_error",
     "translation": "We couldn't get the posts"
   },
@@ -6040,6 +6404,26 @@
     "translation": "E-posta doğrulama alanı güncellenemedi"
   },
   {
+    "id": "store.sql_user_access_token.delete.app_error",
+    "translation": "Kullanıcı erişim kodu silinemedi"
+  },
+  {
+    "id": "store.sql_user_access_token.get.app_error",
+    "translation": "Kullanıcı erişim kodu alınamadı"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_token.app_error",
+    "translation": "Koda göre kullanıcı erişim kodu alınamadı"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_user.app_error",
+    "translation": "Kullanıcıya göre kullanıcı erişim kodları alınamadı"
+  },
+  {
+    "id": "store.sql_user_access_token.save.app_error",
+    "translation": "Kullanıcı erişim kodu kaydedilemedi"
+  },
+  {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "Gelen web bağlantıları sayılamadı"
   },
@@ -6080,10 +6464,18 @@
     "translation": "Web bağlantıları alınamadı"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_incoming_by_channel.app_error",
+    "translation": "Web bağlantısı silinemedi"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_incoming_by_user.app_error",
     "translation": "Web bağlantısı silinemedi"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_outgoing_by_channel.app_error",
+    "translation": "Web bağlantısı silinemedi"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error",
     "translation": "Web bağlantısı silinemedi"
   },
@@ -6116,6 +6508,10 @@
     "translation": "Sistem"
   },
   {
+    "id": "utils.config.add_client_locale.app_error",
+    "translation": "Mattermost yapılandırma dosyası yüklenemedi:  Kullanılabilecek Yerel ayarlara VarsayılanİstemciYereli ekleniyor."
+  },
+  {
     "id": "utils.config.load_config.decoding.panic",
     "translation": "Yapılandırma dosyasının kodu çözülürken sorun çıktı. Dosya: {{.Filename}}, Hata: {{.Error}}"
   },
@@ -6136,8 +6532,12 @@
     "translation": "{{.Filename}} dosyası kaydedilirken bir sorun çıktı"
   },
   {
+    "id": "utils.config.supported_available_locales.app_error",
+    "translation": "Mattermost yapılandırma dosyası yüklenemedi:  Kullanılabilecek Yerel ayarlarda VarsayılanİstemciYereli bulunmalıdır. Tüm yerel ayarlar için varsayılan değer olarak Kullanılabilecek Yerel Ayarlar ayarlanıyor."
+  },
+  {
     "id": "utils.config.supported_client_locale.app_error",
-    "translation": "Mattermost yapılandırma dosyası yüklenemedi: DefaultClientLocale seçeneği desteklenen dillerden biri olmalıdır"
+    "translation": "Mattermost yapılandırma dosyası yüklenemedi:  VarsayılanİstemciYereli desteklenen yerel ayarlardan biri olmalıdır. VarsayılanİstemciYereli varsayılan değer olarak en değerine ayarlanıyor."
   },
   {
     "id": "utils.config.supported_server_locale.app_error",
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index b8770acd2..1119ff643 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -297,7 +297,7 @@
   },
   {
     "id": "api.channel.join_channel.post_and_forget",
-    "translation": "%v 已经加入到该频道。"
+    "translation": "%v 已加入到该频道。"
   },
   {
     "id": "api.channel.leave.default.app_error",
@@ -313,7 +313,7 @@
   },
   {
     "id": "api.channel.leave.left",
-    "translation": "%v 已经退出该频道。"
+    "translation": "%v 已退出该频道。"
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.create_post.error",
@@ -532,6 +532,90 @@
     "translation": "成功更新频道标题。"
   },
   {
+    "id": "api.command_channel_purpose.channel.app_error",
+    "translation": "获取当前频道错误。"
+  },
+  {
+    "id": "api.command_channel_purpose.desc",
+    "translation": "更改频道用途"
+  },
+  {
+    "id": "api.command_channel_purpose.direct_group.app_error",
+    "translation": "无法更改私信频道用途。可使用 /header 修改标题。"
+  },
+  {
+    "id": "api.command_channel_purpose.hint",
+    "translation": "[文字]"
+  },
+  {
+    "id": "api.command_channel_purpose.message.app_error",
+    "translation": "/purpose 命令必须有消息。"
+  },
+  {
+    "id": "api.command_channel_purpose.name",
+    "translation": "用途"
+  },
+  {
+    "id": "api.command_channel_purpose.permission.app_error",
+    "translation": "您没有权限更改频道用途。"
+  },
+  {
+    "id": "api.command_channel_purpose.update_channel.app_error",
+    "translation": "更新当前频道错误。"
+  },
+  {
+    "id": "api.command_channel_rename.channel.app_error",
+    "translation": "获取当前频道错误。"
+  },
+  {
+    "id": "api.command_channel_rename.desc",
+    "translation": "重命名频道"
+  },
+  {
+    "id": "api.command_channel_rename.direct_group.app_error",
+    "translation": "不能重命名私信频道。"
+  },
+  {
+    "id": "api.command_channel_rename.hint",
+    "translation": "[文字]"
+  },
+  {
+    "id": "api.command_channel_rename.message.app_error",
+    "translation": "/name 命令必须有消息。"
+  },
+  {
+    "id": "api.command_channel_rename.name",
+    "translation": "重命名"
+  },
+  {
+    "id": "api.command_channel_rename.permission.app_error",
+    "translation": "您没有权限重命名频道。"
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.app_error",
+    "translation": "更新当前频道错误。"
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.success",
+    "translation": "成功更新频道名。"
+  },
+  {
+    "id": "api.command_code.desc",
+    "translation": "以代码块格式显示文字"
+  },
+  {
+    "id": "api.command_code.hint",
+    "translation": "[文字]"
+  },
+  {
+    "id": "api.command_code.message.app_error",
+    "translation": "/echo 命令必须有消息。"
+  },
+  {
+    "id": "api.command_code.name",
+    "translation": "代码"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "打开图像预览自动折叠"
   },
@@ -624,6 +708,30 @@
     "translation": "已加入频道。"
   },
   {
+    "id": "api.command_leave.desc",
+    "translation": "离开当前频道"
+  },
+  {
+    "id": "api.command_leave.fail.app_error",
+    "translation": "离开频道时发生错误。"
+  },
+  {
+    "id": "api.command_leave.list.app_error",
+    "translation": "列出频道时发生错误。"
+  },
+  {
+    "id": "api.command_leave.missing.app_error",
+    "translation": "我们没有找到该频道"
+  },
+  {
+    "id": "api.command_leave.name",
+    "translation": "离开"
+  },
+  {
+    "id": "api.command_leave.success",
+    "translation": "已离开频道。"
+  },
+  {
     "id": "api.command_logout.desc",
     "translation": "注销Mattermost"
   },
@@ -1009,7 +1117,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
-    "translation": "私信"
+    "translation": "私信来自 "
   },
   {
     "id": "api.email_batching.render_batched_post.go_to_post",
@@ -1017,7 +1125,11 @@
   },
   {
     "id": "api.email_batching.render_batched_post.group_message",
-    "translation": "团体消息"
+    "translation": "群组消息来自 "
+  },
+  {
+    "id": "api.email_batching.render_batched_post.notification",
+    "translation": "通知来自 "
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
@@ -1026,7 +1138,7 @@
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
     "translation": {
-      "one": "你有一条新消息。您有{{.Count}}条新消息。",
+      "one": "您有新通知。您有 {{.Count}} 条新通知。",
       "other": ""
     }
   },
@@ -1696,22 +1808,10 @@
     "translation": "发送跨团队私信时获取团队失败 user_id=%v，err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.mention_body",
-    "translation": "您有一个新的提及。"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.mention_subject",
     "translation": "新的提及"
   },
   {
-    "id": "api.post.send_notifications_and_forget.message_body",
-    "translation": "你有一个新消息。"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.message_subject",
-    "translation": "新私信"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.push_image_only",
     "translation": " 已上传一个或更多个文件在 "
   },
@@ -1728,6 +1828,10 @@
     "translation": " 提到你在 "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "translation": " 提及您 "
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_message",
     "translation": " 发送给你一个私信"
   },
@@ -1736,6 +1840,10 @@
     "translation": "发布在"
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
+    "translation": " 发布消息"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
     "translation": "发送推送失败 device_id={{.DeviceId}}, err={{.Error}}"
   },
@@ -1873,127 +1981,127 @@
   },
   {
     "id": "api.slackimport.slack_add_bot_user.email_pwd",
-    "translation": "Slack 机器人/整合消息导入用户：邮箱地址，密码: {{.Email}}, {{.Password}}\r\n"
+    "translation": "已导入整合/Slack 机器人用户 {{.Email}} 以及密码 {{.Password}}。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_bot_user.unable_import",
-    "translation": "无法导入 Slack 机器人/整合消息导入用户：{{.Username}}\r\n"
+    "translation": "无法导入整合/Slack 机器人用户 {{.Username}}。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.added",
-    "translation": "\r\n 频道已添加 \r\n"
+    "translation": "\r\n频道已添加：\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
-    "translation": "加入频道错误：{{.Username}}\r\n"
+    "translation": "无法添加 Slack 用户 {{.Username}} 到频道。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed",
-    "translation": "导入失败: {{.DisplayName}}\r\n"
+    "translation": "无法导入 Slack 频道 {{.DisplayName}}。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Slack 导入：导入频道失败：%s"
+    "translation": "Slack 导入：无法导入 Slack 频道：%s。"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
-    "translation": "合并现有频道: {{.DisplayName}}\r\n"
+    "translation": "Slack 频道 {{.DisplayName}} 已在 Masttermost 频道存在。已合并两频道。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_posts.attach_files.error",
-    "translation": "附加文件到信息时遇到错误, post_id=%s, file_ids=%v, err=%v"
+    "translation": "Slack Import: An error occurred when attaching files to a message, post_id=%s, file_ids=%v, err=%v."
   },
   {
     "id": "api.slackimport.slack_add_posts.bot.warn",
-    "translation": "Slack 机器人的信息未被导入"
+    "translation": "Slack 导入：Slack 机器人消息暂无法导入。"
   },
   {
     "id": "api.slackimport.slack_add_posts.bot_user_no_exists.warn",
-    "translation": "Slack 导入：未导入机器人消息因为机器人导入用户不存在。"
+    "translation": "Slack 导入：无法导入机器人消息因为机器人用户不存在。"
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
-    "translation": "文件评论未定义"
+    "translation": "Slack 导入：无法导入消息因为它没有评论。"
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_usr.debug",
-    "translation": "未知用户消息"
+    "translation": "Slack 导入：无法导入消息因为缺少用户字段。"
   },
   {
     "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
-    "translation": "Slack 导入：未导入机器人消息因为缺少 BotId 字段。"
+    "translation": "Slack 导入：无法导入机器人消息因为缺少 BotId 字段。"
   },
   {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
-    "translation": "不支持的邮件类型: %v, %v"
+    "translation": "Slack 导入：无法导入消息因为它的类型不支持：post_type=%v, post_subtype=%v。"
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_found.warn",
-    "translation": "没有在 Slack 导出中找到文件上传信息的文件 ID {{.FileId}}"
+    "translation": "Slack 导入：无法导入文件 {{.FileId}} 因为它不存在于 Slack 导出的 zip 文件。"
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_in_json.warn",
-    "translation": "无法导入没有 \"file\" 段的上传信息导出。"
+    "translation": "Slack 导入：无法附件文件到消息因为消息没有 \"file\" 栏。"
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_open_failed.warn",
-    "translation": "无法打开导出归档中的上传文件 ID {{.FileId}}，错误：{{.Error}}"
+    "translation": "Slack 导入：无法从 Slack 导出打开文件 {{.FileId}}：{{.Error}}。"
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_upload_failed.warn",
-    "translation": "上传信息文件 ID {{.FileId}} 失败，错误：{{.Error}}"
+    "translation": "Slack 导入：上传文件 {{.FileId}} 时发送错误：{{.Error}}。"
   },
   {
     "id": "api.slackimport.slack_add_posts.user_no_exists.debug",
-    "translation": "用户：%v 不存在！"
+    "translation": "Slack 导入：无法添加消息因为 Slack 用户 %v 不存在于 Mattermost。"
   },
   {
     "id": "api.slackimport.slack_add_posts.without_user.debug",
-    "translation": "未知用户消息"
+    "translation": "Slack 导入：无法导入消息因为缺少用户字段。"
   },
   {
     "id": "api.slackimport.slack_add_users.created",
-    "translation": "\r\n 用户创建 \r\n"
+    "translation": "\r\n已创建用户：\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.email_pwd",
-    "translation": "Email, 密码: {{.Email}}, {{.Password}}\r\n"
+    "translation": "Slack user with email {{.Email}} and password {{.Password}} has been imported.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing",
-    "translation": "合并用户到现有帐号：{{.Email}}, {{.Username}}\r\n"
+    "translation": "Slack user merged with an existing Mattermost user with matching email {{.Email}} and username {{.Username}}.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing_failed",
-    "translation": "尝试将用户合并到已存在的帐号：{{.Email}}，{{.Username}}，但是无法添加该用户到本团队。\r\n"
+    "translation": "Slack user merged with an existing Mattermost user with matching email {{.Email}} and username {{.Username}}, but was unable to add the user to their team.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address",
-    "translation": "用户 {{.Username}} 在 Slack 导入里没有电子邮箱地址。暂使用 {{.Email}} 代替。用户需要在登入系统后更新他们的邮箱地址。\r\n"
+    "translation": "用户 {{.Username}} 在 Slack 导出里没有电子邮箱地址。暂使用 {{.Email}} 代替。用户需要在登入系统后更新他们的邮箱地址。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address.warn",
-    "translation": "用户 {{.Username}} 在 Slack 导入里没有电子邮箱地址。暂使用 {{.Email}} 代替。用户需要在登入系统后更新他们的邮箱地址。"
+    "translation": "Slack 导入：用户 {{.Username}} 在 Slack 导出里没有电子邮箱地址。暂使用 {{.Email}} 代替。用户需要在登入系统后更新他们的邮箱地址。"
   },
   {
     "id": "api.slackimport.slack_add_users.unable_import",
-    "translation": "不能导入用户: {{.Username}}\r\n"
+    "translation": "不能导入 Slack 用户：{{.Username}}。\r\n"
   },
   {
     "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
-    "translation": "给 Slack 频道 {{.ChannelID}} {{.ChannelName}} 编译 !频道 正规表达式时失败"
+    "translation": "Slack Import: Unable to compile the !channel, matching regular expression for the Slack channel {{.ChannelName}} (id={{.ChannelID}})."
   },
   {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
-    "translation": "检测到错误的时间"
+    "translation": "Slack 导入：检测到不正确的时间戳。"
   },
   {
     "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
-    "translation": "给 Slack 用户 {{.UserID}} {{.Username}} 编译 @提及 正规表达式时失败"
+    "translation": "Slack Import: Unable to compile the @mention, matching regular expression for the Slack user {{.Username}} (id={{.UserID}})."
   },
   {
     "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
-    "translation": "Slack 导入：停用机器人导入用户失败。"
+    "translation": "Slack 导入：无法停用做为机器人的帐号。"
   },
   {
     "id": "api.slackimport.slack_import.log",
@@ -2005,7 +2113,7 @@
   },
   {
     "id": "api.slackimport.slack_import.note2",
-    "translation": "- Slack 机器人信息现在不支持。\r\n"
+    "translation": "- 暂不支持 Slack 机器人信息。\r\n"
   },
   {
     "id": "api.slackimport.slack_import.note3",
@@ -2013,31 +2121,31 @@
   },
   {
     "id": "api.slackimport.slack_import.notes",
-    "translation": "\r\n 注释 \r\n"
+    "translation": "\r\n注释：\r\n"
   },
   {
     "id": "api.slackimport.slack_import.open.app_error",
-    "translation": "不能打开: {{.Filename}}"
+    "translation": "无法打开文件：{{.Filename}}。\r\n"
   },
   {
     "id": "api.slackimport.slack_import.team_fail",
-    "translation": "导入时无法获取团队。\r\n"
+    "translation": "导入时无法获取要导入的团队。\r\n"
   },
   {
     "id": "api.slackimport.slack_import.zip.app_error",
-    "translation": "不能打开zip文件"
+    "translation": "无法打开 Slack 导出的 zip 文件。\r\n"
   },
   {
     "id": "api.slackimport.slack_parse_channels.error",
-    "translation": "解析 slack 频道时出错。导入可能仍然可用。"
+    "translation": "Slack 导入：部分 Slack 频道导入时发送错误。导入可能仍然可用。"
   },
   {
     "id": "api.slackimport.slack_parse_posts.error",
-    "translation": "解析 slack 消息时出错。导入可能仍然可用。"
+    "translation": "Slack 导入：部分 Slack 消息导入时发送错误。导入可能仍然可用。"
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack 导入：频道 {{.ChannelName}} 的显示名过长。导入时会被截断。"
+    "translation": "Slack 导入：频道 {{.ChannelName}} 的名称过长。导入时会被截断。"
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
@@ -2045,11 +2153,11 @@
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slack 导入：频道 {{.ChannelName}} 的名称过长。导入时会被截断。"
+    "translation": "Slack 导入：频道 {{.ChannelName}} 的 Handle 过长。导入时会被截断。"
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Slack 导入：频道 {{.ChannelName}} 的作用过长。导入时会被截断。"
+    "translation": "Slack 导入：频道 {{.ChannelName}} 的用途过长。导入时会被截断。"
   },
   {
     "id": "api.status.init.debug",
@@ -2332,22 +2440,6 @@
     "translation": "转至发文"
   },
   {
-    "id": "api.templates.post_body.info",
-    "translation": "频道: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_channel",
-    "translation": "{{.SubjectText}} 在 {{.TeamDisplayName}} ({{.ChannelName}}) 于 {{.Month}} {{.Day}}, {{.Year}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_direct_message",
-    "translation": "{{.SubjectText}} {{.SenderDisplayName}} 于 {{.Month}} {{.Day}}, {{.Year}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_group_message",
-    "translation": "新团体消息来自 {{ .SenderDisplayName}} 于 {{.Month}} {{.Day}}, {{.Year}}"
-  },
-  {
     "id": "api.templates.reset_body.button",
     "translation": "重设密码"
   },
@@ -2404,6 +2496,18 @@
     "translation": "[MATTERMOST]更改你的账号，以便升级到3.0"
   },
   {
+    "id": "api.templates.user_access_token_body.info",
+    "translation": "A user access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.user_access_token_body.title",
+    "translation": "已添加用户访问令牌到您的帐号"
+  },
+  {
+    "id": "api.templates.user_access_token_subject",
+    "translation": "[{{ .SiteName }}] 已添加用户访问令牌到您的帐号"
+  },
+  {
     "id": "api.templates.username_change_body.info",
     "translation": "您在 {{.TeamDisplayName}} 的用户名已更改为 {{.NewUsername}}。<br>如果这个变更不是由您发起的，请联系系统管理员。"
   },
@@ -2760,6 +2864,10 @@
     "translation": "未能发送更新密码电子邮件成功"
   },
   {
+    "id": "api.user.send_user_access_token.error",
+    "translation": "Failed to send user access token added email successfully"
+  },
+  {
     "id": "api.user.send_verify_email_and_forget.failed.error",
     "translation": "未能发送验证电子邮件成功"
   },
@@ -3072,6 +3180,10 @@
     "translation": "获取组频道失败"
   },
   {
+    "id": "app.import.import_direct_post.save_preferences.error",
+    "translation": "导入消息错误。无法保存偏好。"
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "消息用户不存在"
   },
@@ -3108,6 +3220,10 @@
     "translation": "导入消息失败。无法找到频道 \"{{.ChannelName}}\"。"
   },
   {
+    "id": "app.import.import_post.save_preferences.error",
+    "translation": "导入消息错误。无法保存偏好。"
+  },
+  {
     "id": "app.import.import_post.team_not_found.error",
     "translation": "导入消息失败。无法找到团队 \"{{.TeamName}}\"。"
   },
@@ -3116,6 +3232,10 @@
     "translation": "导入消息失败。无法找到用户 \"{{.Username}}\"。"
   },
   {
+    "id": "app.import.import_user_channels.save_preferences.error",
+    "translation": "导入用户频道成员错误。无法保存偏好。"
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "如果提供频道 create_at 则不能为零。"
   },
@@ -3176,6 +3296,10 @@
     "translation": "私信频道成员列表数量过多"
   },
   {
+    "id": "app.import.validate_direct_channel_import_data.unknown_favoriter.error",
+    "translation": "私信频道只能被成员设为最爱。\"{{.Username}}\" 不是成员。"
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
     "translation": "缺少私信消息必须属性：channel_members"
   },
@@ -3204,6 +3328,10 @@
     "translation": "缺少私信必须属性：message"
   },
   {
+    "id": "app.import.validate_direct_post_import_data.unknown_flagger.error",
+    "translation": "私信频道只能被成员标记。\"{{.Username}}\" 不是成员。"
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
     "translation": "缺少私信必须属性：user"
   },
@@ -3292,6 +3420,10 @@
     "translation": "用户的频道身份的 MarkUnread NotifyProps 无效。"
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mobile.error",
+    "translation": "用户的频道身份的移动设备 NotifyProps 无效。"
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "用户频道成员资格的角色无效。"
   },
@@ -3328,6 +3460,38 @@
     "translation": "用户昵称过长。"
   },
   {
+    "id": "app.import.validate_user_import_data.notify_props_channel_trigger_invalid.error",
+    "translation": "无效用户频道触发 Notify Prop。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_comment_trigger_invalid.error",
+    "translation": "无效用户评论触发 Notify Prop。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error",
+    "translation": "用户的桌面间期 Notify Prop 值无效。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_invalid.error",
+    "translation": "用户的桌面 Notify Prop 值无效。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_sound_invalid.error",
+    "translation": "用户的桌面音效 Notify Prop 值无效。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_email_invalid.error",
+    "translation": "用户的邮件 Notify Prop 值无效。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_invalid.error",
+    "translation": "无效用户移动 Notify Prop 值。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_push_status_invalid.error",
+    "translation": "用户的移动设备推送状态 Notify Prop 无效。"
+  },
+  {
     "id": "app.import.validate_user_import_data.pasword_length.error",
     "translation": "无效的用户密码长度。"
   },
@@ -3356,6 +3520,54 @@
     "translation": "用户的团队成员资格中缺少团队名称。"
   },
   {
+    "id": "app.notification.body.intro.direct.full",
+    "translation": "你有一条新消息。"
+  },
+  {
+    "id": "app.notification.body.intro.direct.generic",
+    "translation": "您有来自 {{.SenderName}} 的新私信"
+  },
+  {
+    "id": "app.notification.body.intro.notification.full",
+    "translation": "您有新通知。"
+  },
+  {
+    "id": "app.notification.body.intro.notification.generic",
+    "translation": "您有来自 {{.SenderName}} 的新通知"
+  },
+  {
+    "id": "app.notification.body.text.direct.full",
+    "translation": "{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full",
+    "translation": "频道: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.subject.direct.full",
+    "translation": "[{{.SiteName}}] 来自 {{ .SenderDisplayName}} 的新私信消息于 {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
+    "id": "app.notification.subject.notification.full",
+    "translation": "[{{ .SiteName }}] 在 [{{ .SiteName }}] 的通知于 {{.Month}} {{.Day}}, {{.Year}}"
+  },
+  {
+    "id": "app.user_access_token.disabled",
+    "translation": "用户访问令牌在本服务器禁用。请联系您的系统管理员了解详情。"
+  },
+  {
+    "id": "app.user_access_token.invalid_or_missing",
+    "translation": "无效或缺少令牌"
+  },
+  {
     "id": "authentication.permissions.create_group_channel.description",
     "translation": "允许新建团体消息频道"
   },
@@ -3364,6 +3576,14 @@
     "translation": "创建团体消息"
   },
   {
+    "id": "authentication.permissions.create_post_public.description",
+    "translation": "允许在公开频道创建消息"
+  },
+  {
+    "id": "authentication.permissions.create_post_public.name",
+    "translation": "在公开频道创建消息"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "能创建新团队"
   },
@@ -3372,6 +3592,22 @@
     "translation": "创建团队"
   },
   {
+    "id": "authentication.permissions.create_user_access_token.description",
+    "translation": "允许创建用户访问令牌"
+  },
+  {
+    "id": "authentication.permissions.create_user_access_token.name",
+    "translation": "创建用户访问令牌"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.description",
+    "translation": "任务管理权限"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.name",
+    "translation": "管理任务"
+  },
+  {
     "id": "authentication.permissions.manage_team_roles.description",
     "translation": "能修改团队成员的角色"
   },
@@ -3388,6 +3624,22 @@
     "translation": "读取公共频道"
   },
   {
+    "id": "authentication.permissions.read_user_access_token.description",
+    "translation": "允许读取用户访问令牌的 id，描述以及 user_id 字段"
+  },
+  {
+    "id": "authentication.permissions.read_user_access_token.name",
+    "translation": "读取用户访问令牌"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.description",
+    "translation": "允许撤销用户访问令牌"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.name",
+    "translation": "撤销用户访问令牌"
+  },
+  {
     "id": "authentication.permissions.team_invite_user.description",
     "translation": "可以邀请用户到团队"
   },
@@ -3404,6 +3656,46 @@
     "translation": "使用斜杠命令"
   },
   {
+    "id": "authentication.roles.system_post_all.description",
+    "translation": "一个允许发送消息到本系统上任何公开、私有或私信频道的角色"
+  },
+  {
+    "id": "authentication.roles.system_post_all.name",
+    "translation": "发送消息到公开、私有以及私信频道"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.description",
+    "translation": "一个允许发送消息到本系统上任何公开频道的角色"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.name",
+    "translation": "发送到公开频道"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.description",
+    "translation": "一个允许创建、查看、撤销用户访问令牌的角色"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.name",
+    "translation": "用户访问令牌"
+  },
+  {
+    "id": "authentication.roles.team_post_all.description",
+    "translation": "一个允许发送消息到本系统上任何公开或私有频道的角色"
+  },
+  {
+    "id": "authentication.roles.team_post_all.name",
+    "translation": "发送消息到公开和私有频道"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.description",
+    "translation": "一个允许发送消息到本团队上任何公开频道的角色"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.name",
+    "translation": "发送到公开频道"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "此功能需要企业授权。请联系您的系统管理员关于升级您的企业许可证。"
   },
@@ -3496,38 +3788,62 @@
     "translation": "导出审核自'{{.FilePath}}'的'{{.JobName}}'任务开始"
   },
   {
-    "id": "ent.elasticsearch.search_posts.disabled",
-    "translation": "ElasticSearch 搜索已在本服务器禁用"
+    "id": "ent.elasticsearch.create_client.connect_failed",
+    "translation": "设置 ElasticSearch 客户端失败"
   },
   {
-    "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "搜索无法完成"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_create_failed",
+    "translation": "创建 ElasticSearch 索引失败"
   },
   {
-    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
-    "translation": "解码搜索结果失败"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_exists_failed",
+    "translation": "无法确认 ElasticSearch 索引是否存在"
   },
   {
-    "id": "ent.elasticsearch.start.connect_failed",
-    "translation": "设置 ElasticSearch 客户端失败"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_mapping_failed",
+    "translation": "无法配置 ElasticSearch 索引映像"
   },
   {
-    "id": "ent.elasticsearch.start.index_create_failed",
-    "translation": "创建 ElasticSearch 索引失败"
+    "id": "ent.elasticsearch.delete_post.error",
+    "translation": "删除消息失败"
   },
   {
-    "id": "ent.elasticsearch.start.index_exists_failed",
-    "translation": "无法确认 ElasticSearch 索引是否存在"
+    "id": "ent.elasticsearch.generic.disabled",
+    "translation": "ElasticSearch 搜索未在本服务器启用"
   },
   {
-    "id": "ent.elasticsearch.start.index_mapping_failed",
-    "translation": "无法配置 ElasticSearch 索引映像"
+    "id": "ent.elasticsearch.index_post.error",
+    "translation": "索引消息失败"
+  },
+  {
+    "id": "ent.elasticsearch.not_started.error",
+    "translation": "ElasticSearch没有启动"
+  },
+  {
+    "id": "ent.elasticsearch.purge_indexes.delete_failed",
+    "translation": "删除 ElasticSearch 索引失败"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.disabled",
+    "translation": "ElasticSearch 搜索已在本服务器禁用"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.search_failed",
+    "translation": "搜索无法完成"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
+    "translation": "解码搜索结果失败"
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "无法设置 ElasticSearch 索引设定"
   },
   {
+    "id": "ent.elasticsearch.test_config.connect_failed",
+    "translation": "连接 Elasticsearch 服务器失败。"
+  },
+  {
     "id": "ent.elasticsearch.test_config.indexing_disabled.error",
     "translation": "Elasticsearch 已停用。"
   },
@@ -3536,6 +3852,10 @@
     "translation": "许可证不支持 Elasticsearch。"
   },
   {
+    "id": "ent.elasticsearch.test_config.reenter_password",
+    "translation": "Elasticsearch 服务端网址或用户名已变更。请重新输入 Elasticsearch 密码测试连接。"
+  },
+  {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "当前许可证禁用了自定义表情符。请联系您的系统管理员关于升级您的企业许可证。"
   },
@@ -3748,6 +4068,14 @@
     "translation": "未找到该页面"
   },
   {
+    "id": "jobs.request_cancellation.status.error",
+    "translation": "无法请求取消任务到不允许取消的任务。"
+  },
+  {
+    "id": "jobs.set_job_error.update.error",
+    "translation": "设置任务状态为错误失败"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "找不到频道：%v，已搜索 %v 可能性"
   },
@@ -4116,6 +4444,10 @@
     "translation": "无效的批量电子邮件间隔设定。必须至少30秒。"
   },
   {
+    "id": "model.config.is_valid.email_notification_contents_type.app_error",
+    "translation": "Invalid email notification contents type for email settings. Must be one of either 'full' or 'generic'."
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "邮箱设定中无效的密码重置盐值。至少32位及以上字符。"
   },
@@ -4436,6 +4768,22 @@
     "translation": "无效用户id"
   },
   {
+    "id": "model.job.is_valid.create_at.app_error",
+    "translation": "创建于必须为有效时间"
+  },
+  {
+    "id": "model.job.is_valid.id.app_error",
+    "translation": "无效任务 Id"
+  },
+  {
+    "id": "model.job.is_valid.status.app_error",
+    "translation": "无效任务状态"
+  },
+  {
+    "id": "model.job.is_valid.type.app_error",
+    "translation": "无效任务类型"
+  },
+  {
     "id": "model.oauth.is_valid.app_id.app_error",
     "translation": "无效应用 id"
   },
@@ -4812,6 +5160,18 @@
     "translation": "无效用户名"
   },
   {
+    "id": "model.user_access_token.is_valid.description.app_error",
+    "translation": "无效描述，必须255字以内"
+  },
+  {
+    "id": "model.user_access_token.is_valid.token.app_error",
+    "translation": "无效的访问令牌"
+  },
+  {
+    "id": "model.user_access_token.is_valid.user_id.app_error",
+    "translation": "无效用户id"
+  },
+  {
     "id": "model.utils.decode_json.app_error",
     "translation": "无法解码"
   },
@@ -4921,7 +5281,7 @@
   },
   {
     "id": "store.sql.schema_version.critical",
-    "translation": "数据库结构版本 %v 不能升级。你不能跳过一个版本。"
+    "translation": "Database schema version %v is no longer supported. This Mattermost server supports automatic upgrades from schema version %v through schema version %v. Downgrades are not supported. Please manually upgrade to at least version %v before continuing"
   },
   {
     "id": "store.sql.short_ciphertext",
@@ -5296,24 +5656,24 @@
     "translation": "我们无法保存或更新文件信息"
   },
   {
-    "id": "store.sql_job_status.delete_by_type.app_error",
-    "translation": "我们不能删除这个作业状态"
+    "id": "store.sql_job.delete.app_error",
+    "translation": "我们无法删除任务"
   },
   {
-    "id": "store.sql_job_status.get.app_error",
-    "translation": "我们无法获取这个作业状态"
+    "id": "store.sql_job.get.app_error",
+    "translation": "我们无法获取任务"
   },
   {
-    "id": "store.sql_job_status.get_all.app_error",
-    "translation": "我们无法获取所有作业状态"
+    "id": "store.sql_job.get_all.app_error",
+    "translation": "我们无法获取任务"
   },
   {
-    "id": "store.sql_job_status.save.app_error",
-    "translation": "我们无法保存这个作业状态"
+    "id": "store.sql_job.save.app_error",
+    "translation": "我们无法保存任务"
   },
   {
-    "id": "store.sql_job_status.update.app_error",
-    "translation": "我们不能更新这个作业状态"
+    "id": "store.sql_job.update.app_error",
+    "translation": "我们无法更新任务"
   },
   {
     "id": "store.sql_license.get.app_error",
@@ -5464,6 +5824,10 @@
     "translation": "我们无法获取这个频道的父信息"
   },
   {
+    "id": "store.sql_post.get_posts_batch_for_indexing.get.app_error",
+    "translation": "我们无法为索引获取批量消息"
+  },
+  {
     "id": "store.sql_post.get_posts_by_ids.app_error",
     "translation": "我们无法获取消息"
   },
@@ -6040,6 +6404,26 @@
     "translation": "无法更新验证电子邮件字段"
   },
   {
+    "id": "store.sql_user_access_token.delete.app_error",
+    "translation": "我们无法删除用户访问令牌"
+  },
+  {
+    "id": "store.sql_user_access_token.get.app_error",
+    "translation": "我们无法获取用户访问令牌"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_token.app_error",
+    "translation": "我们无法从令牌获取用户访问令牌"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_user.app_error",
+    "translation": "我们无法从用户获取用户访问令牌"
+  },
+  {
+    "id": "store.sql_user_access_token.save.app_error",
+    "translation": "我们无法保存用户访问令牌"
+  },
+  {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "我们无法计算传入的 webhooks"
   },
@@ -6080,10 +6464,18 @@
     "translation": "我们不能获取 webhooks"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_incoming_by_channel.app_error",
+    "translation": "我们无法删除 webhook"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_incoming_by_user.app_error",
     "translation": "我们无法删除 webhook"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_outgoing_by_channel.app_error",
+    "translation": "我们无法删除 webhook"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error",
     "translation": "我们无法删除 webhook"
   },
@@ -6116,6 +6508,10 @@
     "translation": "系统"
   },
   {
+    "id": "utils.config.add_client_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  Adding DefaultClientLocale to AvailableLocales."
+  },
+  {
     "id": "utils.config.load_config.decoding.panic",
     "translation": "解码配置出错 file={{.Filename}}, err={{.Error}}"
   },
@@ -6136,8 +6532,12 @@
     "translation": "保存文件时出错 {{.Filename}}"
   },
   {
+    "id": "utils.config.supported_available_locales.app_error",
+    "translation": "Unable to load mattermost configuration file:  AvailableLocales must include DefaultClientLocale. Setting AvailableLocales to all locales as default value."
+  },
+  {
     "id": "utils.config.supported_client_locale.app_error",
-    "translation": "无法加载 Mattermost 配置文件：DefaultClientLocale 必须为支持的区域"
+    "translation": "Unable to load mattermost configuration file:  DefaultClientLocale must be one of the supported locales. Setting DefaultClientLocale to en as default value."
   },
   {
     "id": "utils.config.supported_server_locale.app_error",
diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json
index cb097748b..578009163 100644
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -532,6 +532,90 @@
     "translation": "成功更新頻道標題。"
   },
   {
+    "id": "api.command_channel_purpose.channel.app_error",
+    "translation": "取得當前頻道時錯誤。"
+  },
+  {
+    "id": "api.command_channel_purpose.desc",
+    "translation": "編輯頻道用途"
+  },
+  {
+    "id": "api.command_channel_purpose.direct_group.app_error",
+    "translation": "無法為直接傳訊頻道設定用途。請改用 /header 設定標題。"
+  },
+  {
+    "id": "api.command_channel_purpose.hint",
+    "translation": "[文字]"
+  },
+  {
+    "id": "api.command_channel_purpose.message.app_error",
+    "translation": "使用 /purpose 命令必須提供訊息。"
+  },
+  {
+    "id": "api.command_channel_purpose.name",
+    "translation": "用途"
+  },
+  {
+    "id": "api.command_channel_purpose.permission.app_error",
+    "translation": "權限不足以編輯頻道用途。"
+  },
+  {
+    "id": "api.command_channel_purpose.update_channel.app_error",
+    "translation": "更新當前頻道時錯誤。"
+  },
+  {
+    "id": "api.command_channel_rename.channel.app_error",
+    "translation": "取得當前頻道時錯誤。"
+  },
+  {
+    "id": "api.command_channel_rename.desc",
+    "translation": "更改頻道名稱"
+  },
+  {
+    "id": "api.command_channel_rename.direct_group.app_error",
+    "translation": "無法更改直接訊息頻道名稱。"
+  },
+  {
+    "id": "api.command_channel_rename.hint",
+    "translation": "[文字]"
+  },
+  {
+    "id": "api.command_channel_rename.message.app_error",
+    "translation": "使用 /rename 命令必須提供訊息。"
+  },
+  {
+    "id": "api.command_channel_rename.name",
+    "translation": "改名"
+  },
+  {
+    "id": "api.command_channel_rename.permission.app_error",
+    "translation": "權限不足以更改頻道名稱。"
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.app_error",
+    "translation": "更新當前頻道時錯誤。"
+  },
+  {
+    "id": "api.command_channel_rename.update_channel.success",
+    "translation": "成功更新頻道名稱。"
+  },
+  {
+    "id": "api.command_code.desc",
+    "translation": "以程式碼格式顯示文字"
+  },
+  {
+    "id": "api.command_code.hint",
+    "translation": "[文字]"
+  },
+  {
+    "id": "api.command_code.message.app_error",
+    "translation": "使用 /code 命令必須提供訊息。"
+  },
+  {
+    "id": "api.command_code.name",
+    "translation": "程式碼"
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "開啟圖片預覽的自動折疊功能"
   },
@@ -624,6 +708,30 @@
     "translation": "已加入頻道。"
   },
   {
+    "id": "api.command_leave.desc",
+    "translation": "離開當前頻道"
+  },
+  {
+    "id": "api.command_leave.fail.app_error",
+    "translation": "離開頻道時發生錯誤。"
+  },
+  {
+    "id": "api.command_leave.list.app_error",
+    "translation": "表列頻道時發生錯誤。"
+  },
+  {
+    "id": "api.command_leave.missing.app_error",
+    "translation": "找不到頻道"
+  },
+  {
+    "id": "api.command_leave.name",
+    "translation": "離開"
+  },
+  {
+    "id": "api.command_leave.success",
+    "translation": "已離開頻道。"
+  },
+  {
     "id": "api.command_logout.desc",
     "translation": "登出 Mattermost"
   },
@@ -1009,7 +1117,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
-    "translation": "直接訊息"
+    "translation": "直接傳訊，來自："
   },
   {
     "id": "api.email_batching.render_batched_post.go_to_post",
@@ -1017,7 +1125,11 @@
   },
   {
     "id": "api.email_batching.render_batched_post.group_message",
-    "translation": "群組訊息"
+    "translation": "群組訊息，來自："
+  },
+  {
+    "id": "api.email_batching.render_batched_post.notification",
+    "translation": "通知，來自："
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
@@ -1026,7 +1138,7 @@
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
     "translation": {
-      "one": "您有 1 筆新的訊息。您有 {{.Count}} 筆新的訊息。",
+      "one": "您有新通知。您有 {{.Count}} 個新通知。",
       "other": ""
     }
   },
@@ -1696,22 +1808,10 @@
     "translation": "發送跨團隊直接訊移時無法取得團隊：user_id=%v, err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.mention_body",
-    "translation": "有新的訊息提到您。"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.mention_subject",
     "translation": "新的提及"
   },
   {
-    "id": "api.post.send_notifications_and_forget.message_body",
-    "translation": "您有一筆新的訊息。"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.message_subject",
-    "translation": "新的直接訊息"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.push_image_only",
     "translation": "已上傳一個或更多檔案"
   },
@@ -1728,6 +1828,10 @@
     "translation": " 提及您於 "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "translation": " 提及您 "
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_message",
     "translation": " 已傳送直接訊息給您"
   },
@@ -1736,6 +1840,10 @@
     "translation": " 張貼於 "
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
+    "translation": " 發布了訊息"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
     "translation": "發送推播失敗 device_id={{.DeviceId}}, err={{.Error}}"
   },
@@ -1873,127 +1981,127 @@
   },
   {
     "id": "api.slackimport.slack_add_bot_user.email_pwd",
-    "translation": "Slack 機器人/外部整合發文匯入使用者：電子郵件，密碼：{{.Email}}，{{.Password}}\r\n"
+    "translation": "已匯入外部整合/Slack 機器人帳號，電子郵件為 {{.Email}}，密碼為 {{.Password}}。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_bot_user.unable_import",
-    "translation": "無法匯入Slack 機器人/外部整合發文匯入使用者：{{.Username}}\r\n"
+    "translation": "無法匯入外部整合/Slack 機器人帳號 {{.Username}}。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.added",
-    "translation": "\r\n 頻道已加入 \r\n"
+    "translation": "\r\n已新增頻道：\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
-    "translation": "新增使用者至頻道失敗：{{.Username}}\r\n"
+    "translation": "無法新增 Slack 帳號 {{.Username}} 至頻道。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed",
-    "translation": "匯入失敗：{{.DisplayName}}\r\n"
+    "translation": "無法匯入 Slack 頻道 {{.DisplayName}}。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Slack 匯入：無法匯入頻道：%s"
+    "translation": "匯入 Slack：無法匯入 Slack 頻道：%s。"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
-    "translation": "已與頻道 {{.DisplayName}} 合併\r\n"
+    "translation": "Slack 頻道 {{.DisplayName}} 以存在於現行 Mattermost 中。已合併兩邊頻道。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_posts.attach_files.error",
-    "translation": "附加檔案於文章時遭遇錯誤：post_id=%s, file_ids=%v, err=%v"
+    "translation": "匯入 Slack：附加檔案到訊息上時發生錯誤，post_id=%s, file_ids=%v, err=%v。"
   },
   {
     "id": "api.slackimport.slack_add_posts.bot.warn",
-    "translation": "Slack 機器人的訊息還未被匯入"
+    "translation": "匯入 Slack：還不能匯入Slack 機器人訊息。"
   },
   {
     "id": "api.slackimport.slack_add_posts.bot_user_no_exists.warn",
-    "translation": "Slack 匯入：由於匯入機器人使用者不存在，將不匯入機器人訊息。"
+    "translation": "匯入 Slack：機器人帳號不存在，無法匯入機器人訊息。"
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
-    "translation": "檔案註解未定義"
+    "translation": "匯入 Slack：訊息無註解，無法匯入。"
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_usr.debug",
-    "translation": "訊息沒有使用者"
+    "translation": "匯入 Slack：缺少使用者欄位，無法匯入訊息。"
   },
   {
     "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
-    "translation": "Slack 匯入：BotId 欄位缺失，將不匯入機器人訊息。"
+    "translation": "匯入 Slack：缺少 BotId 欄位，無法匯入機器人訊息。"
   },
   {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
-    "translation": "不支援的文章類型: %v, %v"
+    "translation": "匯入 Slack：訊息類別不支援，無法匯入訊息：post_type=%v, post_subtype=%v。"
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_found.warn",
-    "translation": "由 Slack 匯出的檔案上傳訊息中找不到檔案：檔案 ID {{.Field}}"
+    "translation": "匯入 Slack：Slack 匯出的 zip 檔案中缺少檔案，無法匯入檔案 {{.Field}}。"
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_in_json.warn",
-    "translation": "由於匯出資料中沒有 \"file\" 欄位，無法為上傳訊息匯入檔案。"
+    "translation": "匯入 Slack：Slack 匯出資訊中該訊息缺少\"檔案\"欄位，無法附加檔案於訊息上。"
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_open_failed.warn",
-    "translation": "無法從匯出檔中開啟上傳檔案：檔案 ID {{.Field}}, 錯誤 {{.Error}}"
+    "translation": "匯入 Slack：無法開啟 Slack 匯出中的檔案 {{.Field}}：{{.Error}}。"
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_upload_failed.warn",
-    "translation": "為上傳訊息上傳檔案失敗：檔案 ID {{.Field}}, 錯誤 {{.Error}}"
+    "translation": "匯入 Slack：上傳檔案 {{.Field}} 時發生錯誤：{{.Error}}。"
   },
   {
     "id": "api.slackimport.slack_add_posts.user_no_exists.debug",
-    "translation": "使用者：%v 不存在！"
+    "translation": "匯入 Slack：Mattermost 不存在 Slack 使用者 %v，無法新增訊息。"
   },
   {
     "id": "api.slackimport.slack_add_posts.without_user.debug",
-    "translation": "訊息沒有使用者"
+    "translation": "匯入 Slack：缺少使用者欄位，無法匯入訊息。"
   },
   {
     "id": "api.slackimport.slack_add_users.created",
-    "translation": "\r\n 使用者已建立\r\n"
+    "translation": "\r\n已建立使用者：\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.email_pwd",
-    "translation": "電子郵件，密碼： {{.Email}}，{{.Password}}\r\n"
+    "translation": "已匯入 Slack 帳號，電子郵件為 {{.Email}}，密碼為 {{.Password}}。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing",
-    "translation": "將使用者與現有帳號合併：{{.Email}}，{{.Username}}\r\n"
+    "translation": "由於有相同的電子郵件 {{.Email}} 與使用者名稱 {{.Username}}，Slack 帳號與現有 Mattermost 帳號已合併。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.merge_existing_failed",
-    "translation": "嘗試與現有帳號整合使用者：{{.Email}}、{{.Username}}，但是無法將此使用者加入此團隊。\r\n"
+    "translation": "由於有相同的電子郵件 {{.Email}} 與使用者名稱 {{.Username}}，Slack 帳號與現有 Mattermost 帳號已合併，但無法新增使用者至對應團隊。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address",
-    "translation": "使用者{{.Username}}在Slack匯出資料中沒有電子郵件地址。{{.Email}}將會被用作預留地址。使用者在登入系統後應更新電子郵件地址。\r\n"
+    "translation": "使用者{{.Username}}在 Slack 匯出資料中沒有電子郵件地址。{{.Email}}將會被用作預留地址。使用者在登入系統後應更新電子郵件地址。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address.warn",
-    "translation": "使用者{{.Username}}在Slack匯出資料中沒有電子郵件地址。{{.Email}}將會被用作預留地址。使用者在登入系統後應更新電子郵件地址。"
+    "translation": "匯入 Slack：使用者{{.Username}}在 Slack 匯出資料中沒有電子郵件地址。{{.Email}}將會被用作預留地址。使用者在登入系統後應更新電子郵件地址。"
   },
   {
     "id": "api.slackimport.slack_add_users.unable_import",
-    "translation": "無法匯入使用者： {{.Username}}\r\n"
+    "translation": "無法匯入 Slack 使用者： {{.Username}}\r\n"
   },
   {
     "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
-    "translation": "無法為 Slack 頻道 {{.ChannelD}} {{.ChannelName}} 編譯匹配!頻道的正規表示式"
+    "translation": "匯入 Slack：無法編譯 !channel，比對Slack 頻道 {{.ChannelName}}的正規表示式 (id={{.ChannelID}})。"
   },
   {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
-    "translation": "發現錯誤的時間戳記"
+    "translation": "匯入 Slack：偵測到不正確的時間戳記。"
   },
   {
     "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
-    "translation": "無法為 Slack 使用者 {{.UserID}} {{.Username}} 編譯匹配@提及的正規表示式"
+    "translation": "匯入 Slack：無法編譯 @mention，比對Slack 使用者 {{.Username}}的正規表示式 (id={{.UserID}})。"
   },
   {
     "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
-    "translation": "Slack 匯入：無法停用匯入機器人使用者。"
+    "translation": "匯入 Slack：無法停用作為機器人的使用者帳號。"
   },
   {
     "id": "api.slackimport.slack_import.log",
@@ -2013,27 +2121,27 @@
   },
   {
     "id": "api.slackimport.slack_import.notes",
-    "translation": "\r\n 附註 \r\n"
+    "translation": "\r\n附註：\r\n"
   },
   {
     "id": "api.slackimport.slack_import.open.app_error",
-    "translation": "無法開啟：{{.Filename}}"
+    "translation": "無法開啟檔案：{{.Filename}}。\r\n"
   },
   {
     "id": "api.slackimport.slack_import.team_fail",
-    "translation": "取得團隊以匯入失敗。\r\n"
+    "translation": "無法取得將要匯入的團隊。\r\n"
   },
   {
     "id": "api.slackimport.slack_import.zip.app_error",
-    "translation": "無法開啟 zip 檔案"
+    "translation": "無法開啟 Slack 匯出 zip 檔。\r\n"
   },
   {
     "id": "api.slackimport.slack_parse_channels.error",
-    "translation": "解析 Slack 頻道時發生錯誤。匯入功能有可能照樣運作。"
+    "translation": "匯入 Slack：剖析部份 Slack 頻道時發生錯誤。匯入可能可以繼續運行。"
   },
   {
     "id": "api.slackimport.slack_parse_posts.error",
-    "translation": "解析 Slack 訊息時發生錯誤。匯入功能有可能照樣運作。"
+    "translation": "匯入 Slack：剖析部份 Slack 訊息時發生錯誤。匯入可能可以繼續運行。"
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
@@ -2045,7 +2153,7 @@
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slack 匯入：頻道 {{.ChannelName}} 的名字過長，將會在匯入時被截短。"
+    "translation": "Slack 匯入：頻道 {{.ChannelName}} 的 Handle 過長，將會在匯入時被截短。"
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
@@ -2332,22 +2440,6 @@
     "translation": "前往發文"
   },
   {
-    "id": "api.templates.post_body.info",
-    "translation": "頻道：{{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_channel",
-    "translation": "{{.SubjectText}}，在{{.TeamDisplayName}}團隊，發於 {{.Year}} {{.Month}} {{.Day}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_direct_message",
-    "translation": "{{.SubjectText}}，來自{{.SenderDisplayName}}，發於 {{.Year}} {{.Month}} {{.Day}}"
-  },
-  {
-    "id": "api.templates.post_subject_in_group_message",
-    "translation": "來自 {{.SenderDisplayName}} 的群組訊息，發於 {{.Year}} {{.Month}} {{.Day}}"
-  },
-  {
     "id": "api.templates.reset_body.button",
     "translation": "重設密碼"
   },
@@ -2404,6 +2496,18 @@
     "translation": "[MATTERMOST] 升級至 Mattermost 3.0 後帳號的變更"
   },
   {
+    "id": "api.templates.user_access_token_body.info",
+    "translation": "{{ .SiteURL }} 已新增使用者存取 Token 至帳號。Token 可用於以您的帳號存取 {{.SiteName}}。<br>如果此變更並非來自您，請聯絡系統管理員。"
+  },
+  {
+    "id": "api.templates.user_access_token_body.title",
+    "translation": "已新增使用者存取 Token 至帳號"
+  },
+  {
+    "id": "api.templates.user_access_token_subject",
+    "translation": "[{{ .SiteName }}] 已新增使用者存取 Token 至帳號"
+  },
+  {
     "id": "api.templates.username_change_body.info",
     "translation": "您在{{.TeamDisplayName}}的使用者名稱已變更為{{.NewUsername}}。<br>如果您未進行此變更，請速聯繫系統管理員。"
   },
@@ -2760,6 +2864,10 @@
     "translation": "更新密碼電子郵件傳送失敗"
   },
   {
+    "id": "api.user.send_user_access_token.error",
+    "translation": "寄送成功新增使用者存取 Token 至帳號的通知郵件時失敗"
+  },
+  {
     "id": "api.user.send_verify_email_and_forget.failed.error",
     "translation": "認證電子郵件傳送失敗"
   },
@@ -3072,6 +3180,10 @@
     "translation": "取得群組頻道時失敗"
   },
   {
+    "id": "app.import.import_direct_post.save_preferences.error",
+    "translation": "匯入直接訊息時失敗。無法儲存偏好。"
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "發訊者不存在"
   },
@@ -3108,6 +3220,10 @@
     "translation": "匯入訊息失敗。不存在名字為 \"{{.Channelame}}\" 的頻道。"
   },
   {
+    "id": "app.import.import_post.save_preferences.error",
+    "translation": "匯入訊息時失敗。無法儲存偏好。"
+  },
+  {
     "id": "app.import.import_post.team_not_found.error",
     "translation": "匯入訊息失敗。不存在名字為 \"{{.TeamName}}\" 的團隊。"
   },
@@ -3116,6 +3232,10 @@
     "translation": "匯入訊息失敗。不存在名字為 \"{{.Username}}\" 的使用者。"
   },
   {
+    "id": "app.import.import_user_channels.save_preferences.error",
+    "translation": "匯入使用者頻道成員時失敗。無法儲存偏好。"
+  },
+  {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
     "translation": "如果有提供頻道建立時間，該值不能為 0。"
   },
@@ -3176,6 +3296,10 @@
     "translation": "直接傳訊頻道成員列表的欄位過多"
   },
   {
+    "id": "app.import.validate_direct_channel_import_data.unknown_favoriter.error",
+    "translation": "僅有成員能設直接傳訊頻道為最愛。\"{{.Username}}\"不是成員。"
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
     "translation": "缺少必要的直接訊息屬性：頻道成員。"
   },
@@ -3204,6 +3328,10 @@
     "translation": "缺少必要的直接訊息屬性：訊息。"
   },
   {
+    "id": "app.import.validate_direct_post_import_data.unknown_flagger.error",
+    "translation": "僅有頻道成員能標記直接傳訊。\"{{.Username}}\"不是成員。"
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
     "translation": "缺少必要的直接訊息屬性：使用者。"
   },
@@ -3292,6 +3420,10 @@
     "translation": "使用者頻道成員身份的標注未讀 NotifyProps 無效"
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mobile.error",
+    "translation": "使用者頻道成員身份的行動裝置 NotifyProps 無效。"
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "使用者頻道資料的角色為無效資料。"
   },
@@ -3328,6 +3460,38 @@
     "translation": "使用者暱稱過長。"
   },
   {
+    "id": "app.import.validate_user_import_data.notify_props_channel_trigger_invalid.error",
+    "translation": "使用者的頻道觸發 Notify Props 無效。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_comment_trigger_invalid.error",
+    "translation": "使用者的註解觸發 Notify Props 無效。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error",
+    "translation": "使用者的桌面期間 Notify Props 無效。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_invalid.error",
+    "translation": "使用者的桌面 Notify Props 無效。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_desktop_sound_invalid.error",
+    "translation": "使用者的桌面音效 Notify Props 無效。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_email_invalid.error",
+    "translation": "使用者的電子郵件 Notify Props 無效。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_invalid.error",
+    "translation": "使用者的行動裝置 Notify Props 無效。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.notify_props_mobile_push_status_invalid.error",
+    "translation": "使用者的行動裝置推播狀態 Notify Props 無效。"
+  },
+  {
     "id": "app.import.validate_user_import_data.pasword_length.error",
     "translation": "使用者密碼長度無效。"
   },
@@ -3356,6 +3520,54 @@
     "translation": "使用者團隊資料中缺少團隊名字。"
   },
   {
+    "id": "app.notification.body.intro.direct.full",
+    "translation": "您有 1 筆新的直接傳訊。"
+  },
+  {
+    "id": "app.notification.body.intro.direct.generic",
+    "translation": "您有 1 筆新的直接傳訊，來自{{.SenderName}}。"
+  },
+  {
+    "id": "app.notification.body.intro.notification.full",
+    "translation": "您有一筆新通知。"
+  },
+  {
+    "id": "app.notification.body.intro.notification.generic",
+    "translation": "您有一筆新通知，來自 {{.SenderName}}。"
+  },
+  {
+    "id": "app.notification.body.text.direct.full",
+    "translation": "{{.SenderName}} - {{.Month}} {{.Day}}，{{.Hour}}:{{.Minute}} {{.Timezone}}"
+  },
+  {
+    "id": "app.notification.body.text.direct.generic",
+    "translation": "{{.Month}} {{.Day}}，{{.Hour}}:{{.Minute}} {{.Timezone}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.full",
+    "translation": "頻道：{{.ChannelName}}<br>{{.SenderName}} - {{.Month}} {{.Day}}，{{.Hour}}:{{.Minute}} {{.Timezone}}"
+  },
+  {
+    "id": "app.notification.body.text.notification.generic",
+    "translation": "{{.Month}} {{.Day}}，{{.Hour}}:{{.Minute}} {{.Timezone}}"
+  },
+  {
+    "id": "app.notification.subject.direct.full",
+    "translation": "[{{.SiteName}}] 來自 {{.SenderDisplayName}} 的直接傳訊，發於 {{.Year}} {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.notification.subject.notification.full",
+    "translation": "[{{.SiteName}}] 來自 {{.TeamName}} 的通知，發於 {{.Year}} {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "app.user_access_token.disabled",
+    "translation": "使用者存取 Token 在此伺服器被停用。詳情請洽管理員。"
+  },
+  {
+    "id": "app.user_access_token.invalid_or_missing",
+    "translation": "無效或缺少 Token"
+  },
+  {
     "id": "authentication.permissions.create_group_channel.description",
     "translation": "允許建立新的群組訊息頻道"
   },
@@ -3364,6 +3576,14 @@
     "translation": "建立群組訊息"
   },
   {
+    "id": "authentication.permissions.create_post_public.description",
+    "translation": "允許在公開頻道建立訊息"
+  },
+  {
+    "id": "authentication.permissions.create_post_public.name",
+    "translation": "在公開頻道建立訊息"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "允許建立團隊"
   },
@@ -3372,6 +3592,22 @@
     "translation": "建立團隊"
   },
   {
+    "id": "authentication.permissions.create_user_access_token.description",
+    "translation": "允許建立使用者存取 Token"
+  },
+  {
+    "id": "authentication.permissions.create_user_access_token.name",
+    "translation": "建立使用者存取 Token"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.description",
+    "translation": "允許管理工作"
+  },
+  {
+    "id": "authentication.permissions.manage_jobs.name",
+    "translation": "管理工作"
+  },
+  {
     "id": "authentication.permissions.manage_team_roles.description",
     "translation": "允許改變團隊成員的角色"
   },
@@ -3388,6 +3624,22 @@
     "translation": "讀取公開頻道"
   },
   {
+    "id": "authentication.permissions.read_user_access_token.description",
+    "translation": "允許讀取使用者存取 Token 的 ID、描述與 user_id 欄位"
+  },
+  {
+    "id": "authentication.permissions.read_user_access_token.name",
+    "translation": "讀取使用者存取 Token"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.description",
+    "translation": "允許撤銷使用者 Token"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.name",
+    "translation": "撤銷使用者存取 Token"
+  },
+  {
     "id": "authentication.permissions.team_invite_user.description",
     "translation": "允許邀請使用者至團隊"
   },
@@ -3404,6 +3656,46 @@
     "translation": "使用斜線命令"
   },
   {
+    "id": "authentication.roles.system_post_all.description",
+    "translation": "擁有在公開、私人與直接傳訊頻道發訊權限的角色"
+  },
+  {
+    "id": "authentication.roles.system_post_all.name",
+    "translation": "在公開、私人與直接傳訊頻道發訊"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.description",
+    "translation": "擁有在公開頻道發訊權限的角色"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.name",
+    "translation": "在公開頻道發訊"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.description",
+    "translation": "擁有建立、讀取與撤銷使用者存取 Token 權限的角色"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.name",
+    "translation": "使用者存取 Token"
+  },
+  {
+    "id": "authentication.roles.team_post_all.description",
+    "translation": "擁有在公開與私人頻道發訊權限的角色"
+  },
+  {
+    "id": "authentication.roles.team_post_all.name",
+    "translation": "在公開與私人頻道發訊"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.description",
+    "translation": "擁有在公開頻道發訊權限的角色"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.name",
+    "translation": "在公開頻道發訊"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "此功能需要企業版授權，請聯繫系統管理員將系統升級為企業版授權。"
   },
@@ -3496,36 +3788,60 @@
     "translation": "規範匯出作業 '{{.JobName}}' 開始，匯出到 '{{.FilePath}}'"
   },
   {
-    "id": "ent.elasticsearch.search_posts.disabled",
-    "translation": "ElasticSearch 搜尋在此伺服器上為停用"
+    "id": "ent.elasticsearch.create_client.connect_failed",
+    "translation": "設定 Elasticsearch 用戶端時失敗"
   },
   {
-    "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "無法完成搜尋"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_create_failed",
+    "translation": "建立 Elasticsearch 索引時失敗"
   },
   {
-    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
-    "translation": "無法解碼搜尋結果"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_exists_failed",
+    "translation": "確認 Elasticsearch 索引是否存在時失敗"
   },
   {
-    "id": "ent.elasticsearch.start.connect_failed",
-    "translation": "設定 ElasticSearch 用戶端時失敗"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_mapping_failed",
+    "translation": "設定 Elasticsearch 索引映射時失敗"
   },
   {
-    "id": "ent.elasticsearch.start.index_create_failed",
-    "translation": "建立 ElasticSearch 索引時失敗"
+    "id": "ent.elasticsearch.delete_post.error",
+    "translation": "刪除訊息時失敗"
   },
   {
-    "id": "ent.elasticsearch.start.index_exists_failed",
-    "translation": "確認 ElasticSearch 索引是否存在時失敗"
+    "id": "ent.elasticsearch.generic.disabled",
+    "translation": "Elasticsearch 搜尋在此伺服器上為停用"
   },
   {
-    "id": "ent.elasticsearch.start.index_mapping_failed",
-    "translation": "設定 ElasticSearch 索引映射時失敗"
+    "id": "ent.elasticsearch.index_post.error",
+    "translation": "索引訊息時失敗"
+  },
+  {
+    "id": "ent.elasticsearch.not_started.error",
+    "translation": "Elasticsearch 沒有啟動"
+  },
+  {
+    "id": "ent.elasticsearch.purge_indexes.delete_failed",
+    "translation": "刪除 Elasticsearch 索引時失敗"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.disabled",
+    "translation": "Elasticsearch 搜尋在此伺服器上為停用"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.search_failed",
+    "translation": "無法完成搜尋"
+  },
+  {
+    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
+    "translation": "無法解碼搜尋結果"
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
-    "translation": "設定 ElasticSearch 索引設定時失敗"
+    "translation": "設定 Elasticsearch 索引設定時失敗"
+  },
+  {
+    "id": "ent.elasticsearch.test_config.connect_failed",
+    "translation": "連線至 Elasticsearch 伺服器失敗。"
   },
   {
     "id": "ent.elasticsearch.test_config.indexing_disabled.error",
@@ -3536,6 +3852,10 @@
     "translation": "授權不支援 Elasticsearch。"
   },
   {
+    "id": "ent.elasticsearch.test_config.reenter_password",
+    "translation": "Elasticsearch 伺服器網址或使用者名稱有所變更。請重新輸入 Elasticsearch 密碼以測試連線。"
+  },
+  {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "目前授權不提供限制自訂繪文字，請聯繫系統管理員將系統升級為企業版授權。"
   },
@@ -3748,6 +4068,14 @@
     "translation": "找不到頁面"
   },
   {
+    "id": "jobs.request_cancellation.status.error",
+    "translation": "由於該工作不在可取消狀態中，無法要求取消工作。"
+  },
+  {
+    "id": "jobs.set_job_error.update.error",
+    "translation": "設定工作狀態為錯誤時失敗"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "找不到: %v 頻道，已搜尋 %v 的可能性"
   },
@@ -4116,6 +4444,10 @@
     "translation": "電子郵件設定的批次郵件間隔值無效。必須大於等於30秒。"
   },
   {
+    "id": "model.config.is_valid.email_notification_contents_type.app_error",
+    "translation": "郵件通知內容類型無效。必須是 \"full\" 或是 \"generic\"。"
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "電子郵件設定中的密碼重設 Salt 無效。必須在32個字元以上。"
   },
@@ -4436,6 +4768,22 @@
     "translation": "無效的使用者 ID"
   },
   {
+    "id": "model.job.is_valid.create_at.app_error",
+    "translation": "\"新增時間\"必須是一個有效時間"
+  },
+  {
+    "id": "model.job.is_valid.id.app_error",
+    "translation": "無效的工作 ID"
+  },
+  {
+    "id": "model.job.is_valid.status.app_error",
+    "translation": "無效的工作狀態"
+  },
+  {
+    "id": "model.job.is_valid.type.app_error",
+    "translation": "無效的工作類型"
+  },
+  {
     "id": "model.oauth.is_valid.app_id.app_error",
     "translation": "無效的應用程式 ID"
   },
@@ -4812,6 +5160,18 @@
     "translation": "無效的使用者名稱"
   },
   {
+    "id": "model.user_access_token.is_valid.description.app_error",
+    "translation": "無效的描述，必須少於 255 個字元"
+  },
+  {
+    "id": "model.user_access_token.is_valid.token.app_error",
+    "translation": "無效的存取 Token"
+  },
+  {
+    "id": "model.user_access_token.is_valid.user_id.app_error",
+    "translation": "無效的使用者 ID"
+  },
+  {
     "id": "model.utils.decode_json.app_error",
     "translation": "無法解碼"
   },
@@ -4921,7 +5281,7 @@
   },
   {
     "id": "store.sql.schema_version.critical",
-    "translation": "%v 的資料庫結構描述版本無法升級。請不要跳過中間版本。"
+    "translation": "不再支援資料庫結構版本 %v。此 Mattermost 伺服器對於結構版本 %v 到 %v 之間支援自動升級。不支援降級。在繼續之前請手動升級版本至最少為 %v 。"
   },
   {
     "id": "store.sql.short_ciphertext",
@@ -5296,24 +5656,24 @@
     "translation": "無法儲存或更新檔案訊息"
   },
   {
-    "id": "store.sql_job_status.delete_by_type.app_error",
-    "translation": "無法刪除工作狀態"
+    "id": "store.sql_job.delete.app_error",
+    "translation": "無法刪除工作"
   },
   {
-    "id": "store.sql_job_status.get.app_error",
-    "translation": "無法取得工作狀態"
+    "id": "store.sql_job.get.app_error",
+    "translation": "無法取得工作"
   },
   {
-    "id": "store.sql_job_status.get_all.app_error",
-    "translation": "無法取得全部的工作狀態"
+    "id": "store.sql_job.get_all.app_error",
+    "translation": "無法取得工作"
   },
   {
-    "id": "store.sql_job_status.save.app_error",
-    "translation": "無法儲存工作狀態"
+    "id": "store.sql_job.save.app_error",
+    "translation": "無法儲存工作"
   },
   {
-    "id": "store.sql_job_status.update.app_error",
-    "translation": "無法更新工作狀態"
+    "id": "store.sql_job.update.app_error",
+    "translation": "無法更新工作"
   },
   {
     "id": "store.sql_license.get.app_error",
@@ -5464,6 +5824,10 @@
     "translation": "無法取得該頻道的上層訊息"
   },
   {
+    "id": "store.sql_post.get_posts_batch_for_indexing.get.app_error",
+    "translation": "無法取得文章以建立索引"
+  },
+  {
     "id": "store.sql_post.get_posts_by_ids.app_error",
     "translation": "無法取得訊息"
   },
@@ -6040,6 +6404,26 @@
     "translation": "無法更新驗證電子郵件欄位"
   },
   {
+    "id": "store.sql_user_access_token.delete.app_error",
+    "translation": "無法刪除使用者存取 Token"
+  },
+  {
+    "id": "store.sql_user_access_token.get.app_error",
+    "translation": "無法取得使用者存取 Token"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_token.app_error",
+    "translation": "無法根據 Token 取得使用者存取 Token"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_user.app_error",
+    "translation": "無法根據使用者取得使用者存取 Token"
+  },
+  {
+    "id": "store.sql_user_access_token.save.app_error",
+    "translation": "無法刪除儲存使用者存取 Token"
+  },
+  {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "無法計算傳入的 Webhook"
   },
@@ -6080,10 +6464,18 @@
     "translation": "無法取得 Webhook"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_incoming_by_channel.app_error",
+    "translation": "無法刪除 Webhook"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_incoming_by_user.app_error",
     "translation": "無法刪除 Webhook"
   },
   {
+    "id": "store.sql_webhooks.permanent_delete_outgoing_by_channel.app_error",
+    "translation": "無法刪除 Webhook"
+  },
+  {
     "id": "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error",
     "translation": "無法刪除 Webhook"
   },
@@ -6116,6 +6508,10 @@
     "translation": "系統"
   },
   {
+    "id": "utils.config.add_client_locale.app_error",
+    "translation": "無法讀取 Mattermost 設定檔：增加 DefaultClientLocale 至 AvailableLocales。"
+  },
+  {
     "id": "utils.config.load_config.decoding.panic",
     "translation": "解碼設定時遇到錯誤 file={{.Filename}}, err={{.Error}}"
   },
@@ -6136,8 +6532,12 @@
     "translation": "儲存檔案到 {{.Filename}} 時發生錯誤"
   },
   {
+    "id": "utils.config.supported_available_locales.app_error",
+    "translation": "無法讀取 Mattermost 設定檔： AvailableLocales 必須包含 DefaultClientLocale。設定 AvailableLocales 為全語系當作預設值。"
+  },
+  {
     "id": "utils.config.supported_client_locale.app_error",
-    "translation": "無法讀入 Mattermost 設定檔： DefaultClientLocale 必須為支援的地域"
+    "translation": "無法讀取 Mattermost 設定檔： DefaultClientLocale 必須為支援的語系。設定 DefaultClientLocale 為 en 當作預設值。"
   },
   {
     "id": "utils.config.supported_server_locale.app_error",