Merge branch 'release-3.5'

11 files changed, 534 insertions, 254 deletions

diff --git a/i18n/de.json b/i18n/de.json
index a3cb2494a..d221ecb3b 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -205,7 +205,7 @@
   },
   {
     "id": "api.channel.create_channel.max_channel_limit.app_error",
-    "translation": "Cannot create more than {{.MaxChannelsPerTeam}} channels for current team"
+    "translation": "Es können nicht mehr als {{.MaxChannelsPerTeam}} Kanäle für das aktuelle Team erstellt werden"
   },
   {
     "id": "api.channel.create_default_channels.off_topic",
@@ -629,11 +629,11 @@
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### Mitteilungen\n\nAlt+[Klick auf eine Nachricht]: Eine Nachricht als älteste ungelesene Nachricht im aktuellen Kanal setzen\nEsc: Alle Mitteilungen im aktuellen Kanal als gelesen markieren\nStrg+Hoch (in leerem Eingabefeld): Vorherige Mitteilung oder Slash Befehl anzeigen\nStrg+Runter (in leerem Eingabefeld): Nächste Mitteilung oder Slash Befehl anzeigen\nHoch (in leerem Eingabefeld): Die letzte Nachricht im aktuellen Kanal bearbeiten\n@[Zeichen]+Tab: @Benutzername beginnend mit [Zeichen] vervollständigen\n:[Zeichen]+Tab: Emoji beginnend mit [Zeichen] vervollständigen\n\n"
+    "translation": "#### Mitteilungen\n\nEsc: Alle Mitteilungen im aktuellen Kanal als gelesen markieren\nStrg+Hoch (in leerem Eingabefeld): Vorherige Mitteilung oder Slash Befehl anzeigen\nStrg+Runter (in leerem Eingabefeld): Nächste Mitteilung oder Slash Befehl anzeigen\nHoch (in leerem Eingabefeld): Die letzte Nachricht im aktuellen Kanal bearbeiten\n@[Zeichen]+Tab: @Benutzername beginnend mit [Zeichen] vervollständigen\n#[Zeichen]+Tab: Kanal beginnend mit [Zeichen] vervollständigen\n:[Zeichen]+Tab: Emoji beginnend mit [Zeichen] vervollständigen\n\\\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Nachrichten\n\nAlt+[Klick auf eine Nachricht]: Eine Nachricht als älteste ungelesene Nachricht im aktuellen Kanal setzen\nEsc: Alle Mitteilungen im aktuellen Kanal als gelesen markieren\nCmd+Hoch (in leerem Eingabefeld): Vorherige Mitteilung oder Slash Befehl anzeigen\nCmd+Runter (in leerem Eingabefeld): Nächste Mitteilung oder Slash Befehl anzeigen\nHoch (in leerem Eingabefeld): Ihre letzte Nachricht im aktuellen Kanal bearbeiten\n@[Zeichen]+Tab: @Benutzername beginnend mit [Zeichen] vervollständigen\n:[Zeichen]+Tab: Emoji beginnend mit [Zeichen] vervollständigen\n\n"
+    "translation": "#### Nachrichten\n\nEsc: Alle Mitteilungen im aktuellen Kanal als gelesen markieren\nCmd+Hoch (in leerem Eingabefeld): Vorherige Mitteilung oder Slash Befehl anzeigen\nCmd+Runter (in leerem Eingabefeld): Nächste Mitteilung oder Slash Befehl anzeigen\nHoch (in leerem Eingabefeld): Ihre letzte Nachricht im aktuellen Kanal bearbeiten\n@[Zeichen]+Tab: @Benutzername beginnend mit [Zeichen] vervollständigen\n#[Zeichen]+Tab: Kanal beginnend mit [Zeichen] vervollständigen\n:[Zeichen]+Tab: Emoji beginnend mit [Zeichen] vervollständigen\n\n "
   },
   {
     "id": "api.command_shortcuts.name",
@@ -883,59 +883,59 @@
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.channel.app_error",
-    "translation": "Unable to get channel when migrating post to use FileInfos, post_id=%v, channel_id=%v, err=%v"
+    "translation": "Während der Migration der Nachricht zur Verwendung von FileInfos konnte der Kanal nicht abgerufen werden, post_id=%v, channel_id=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.file_not_found.warn",
-    "translation": "Unable to find file when migrating post to use FileInfos, post_id=%v, filename=%v, path=%v, err=%v"
+    "translation": "Während der Migration der Nachricht zur Verwendung von FileInfos konnte die Datei nicht gefunden werden, post_id=%v, filename=%v, path=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.get_file_infos_again.warn",
-    "translation": "Unable to get FileInfos for post after migratio, post_id=%v, err=%v"
+    "translation": "Die FileInfos für die Nachricht konnten nach der Migration nicht abgerufen werden, post_id=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.get_post_again.warn",
-    "translation": "Unable to get post when migrating to use FileInfos, post_id=%v, err=%v"
+    "translation": "Während der Migration zur Verwendung von FileInfos konnte die Nachricht abgerufen werdne, post_id=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.info.app_error",
-    "translation": "Unable to fully decode file info when migrating post to use FileInfos, post_id=%v, filename=%v, err=%v"
+    "translation": "Während der Migration der Nachricht zur Verwendung von FileInfos konnten die Dateiinformationen nicht vollständig dekodiert werden, post_id=%v, filename=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.migrating_post.debug",
-    "translation": "Migrating post to use FileInfos, post_id=%v, err=%v"
+    "translation": "Migriere Nachricht zur Verwendung von FileInfos, post_id=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.mismatched_filename.warn",
-    "translation": "Found an unusual filename when migrating post to use FileInfos, post_id=%v, channel_id=%v, user_id=%v, filename=%v"
+    "translation": "Es wurde ein ungewöhnlicher Dateiname bei der Migration der Nachricht zur Verwendung von FileInfos gefunden, post_id=%v, channel_id=%v, user_id=%v, filename=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.no_filenames.warn",
-    "translation": "Unable to migrate post to use FileInfos with an empty Filenames field, post_id=%v"
+    "translation": "Konnte Nachricht nicht zur Verwendung von FileInfos mit einem leeren Dateinamensfeld migrieren, post_id=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.not_migrating_post.debug",
-    "translation": "Post already migrated to use FileInfos, post_id=%v, err=%v"
+    "translation": "Nachricht wurde bereits zur Verwendung von FileInfos migriert, post_id=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.save_file_info.warn",
-    "translation": "Unable to save post when migrating post to use FileInfos, post_id=%v, file_id=%v, path=%v, err=%v"
+    "translation": "Während der Migration der Nachricht zur Verwendung von FileInfos konnte die Nachricht nicht gespeichert werden, post_id=%v, file_id=%v, path=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.save_post.warn",
-    "translation": "Unable to save file info when migrating post to use FileInfos, post_id=%v, file_id=%v, filename=%v, err=%v"
+    "translation": "Während der Migration der Nachricht zur Verwendung von FileInfos konnten die Dateiinformationen nicht gespeichert werden, post_id=%v, file_id=%v, filename=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.team_id.app_error",
-    "translation": "Unable to find team for FileInfos, post_id=%v, filenames=%v"
+    "translation": "Konnte Team für FileInfos nicht finden, post_id=%v, filenames=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.teams.app_error",
-    "translation": "Unable to get teams when migrating post to use FileInfos, post_id=%v, err=%v"
+    "translation": "Während der Migration der Nachricht zur Verwendung von FileInfos konnten die Teams nicht abgerufen werden, post_id=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.unexpected_filename.error",
-    "translation": "Unable to decipher filename when migrating post to use FileInfos, post_id=%v, filename=%v"
+    "translation": "Während der Migration der Nachricht zur Verwendung von FileInfos konnte der Dateiname nicht entziffert werden, post_id=%v, filename=%v"
   },
   {
     "id": "api.file.move_file.configured.app_error",
@@ -1263,7 +1263,7 @@
   },
   {
     "id": "api.post.delete_post_files.app_error.warn",
-    "translation": "Encountered error when deleting files for post, post_id=%v, err=%v"
+    "translation": "Es trat ein Fehler beim Löschen von Dateien für die Nachricht auf, post_id=%v, err=%v"
   },
   {
     "id": "api.post.get_message_for_notification.files_sent",
@@ -1274,7 +1274,7 @@
   },
   {
     "id": "api.post.get_message_for_notification.get_files.error",
-    "translation": "Encountered error when getting files for notification message, post_id=%v, err=%v"
+    "translation": "Es trat ein Fehler beim Abruf der Dateien für die Benachrichtigung auf, post_id=%v, err=%v"
   },
   {
     "id": "api.post.get_message_for_notification.images_sent",
@@ -1361,7 +1361,7 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.files.error",
-    "translation": "Failed to get files for post notification post_id=%v, err=%v"
+    "translation": "Die Dateien für die Benachrichtigung konnten nicht abgerufen werden post_id=%v, err=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.get_teams.error",
@@ -1493,7 +1493,7 @@
   },
   {
     "id": "api.server.start_server.rate_limiting_memory_store",
-    "translation": "Unable to initialize rate limiting memory store. Check MemoryStoreSize config setting."
+    "translation": "Konnte Rate Limiting Memory Store nicht initialisieren. Prüfen Sie die MemoryStoreSize Konfigurationseinstellung."
   },
   {
     "id": "api.server.start_server.rate_limiting_rate_limiter",
@@ -1520,6 +1520,14 @@
     "translation": "Stoppe Server..."
   },
   {
+    "id": "api.slackimport.slack_add_bot_user.email_pwd",
+    "translation": "Slack Bot/Integration Nachrichten Import Benutzer: E-Mail, Passwort: {{.Email}}, {{.Password}}\r\n"
+  },
+  {
+    "id": "api.slackimport.slack_add_bot_user.unable_import",
+    "translation": "Konnte Slack Bot/Integration Nachrichten Import Benutzer nicht importieren: {{.Username}}\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_channels.added",
     "translation": "\r\n Kanäle hinzugefügt \r\n"
   },
@@ -1533,7 +1541,7 @@
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Slack Importer: Failed to import channel: %s"
+    "translation": "Slack Importer: Kanal konnte nicht importiert werden: %s"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
@@ -1548,6 +1556,10 @@
     "translation": "Slack Bot Beiträge wurden noch nicht importiert"
   },
   {
+    "id": "api.slackimport.slack_add_posts.bot_user_no_exists.warn",
+    "translation": "Slack Importer: Bot Nachrichten werden nicht importiert da der bot-importing Benutzer nicht existiert."
+  },
+  {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
     "translation": "Dateikommentar undefiniert"
   },
@@ -1556,24 +1568,28 @@
     "translation": "Nachricht ohne Benutzer"
   },
   {
+    "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
+    "translation": "Slack Importer: Bot Nachrichten werden nicht importiert da das BotId Feld fehlt."
+  },
+  {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
     "translation": "Nicht unterstützter Nachrichtentyp: %v, %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": "Es konnte keine Datei einer Datei Mitteilung im Slack Export mit der Datei ID {{.FileId}} gefunden werden"
   },
   {
     "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": "Kann Datei nicht importieren wenn kein \"file\" Bereich im Export existiert."
   },
   {
     "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": "Die Datei mit der ID {{.FileId}} kann nicht aus dem Export Archiv geöffnet werden: {{.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": "Hochladen der Datei für Dateinachricht mit der ID {{.FileId}} ist mit folgendem Fehler fehlgeschlagen: {{.Error}}"
   },
   {
     "id": "api.slackimport.slack_add_posts.user_no_exists.debug",
@@ -1612,6 +1628,10 @@
     "translation": "Konnte Regex Match für @Erwähnung für Slack Benutzer {{.UserID}} {{.Username}} nicht erstellen"
   },
   {
+    "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
+    "translation": "Slack Importer: Konnte bot-importing Benutzer nicht deaktivieren."
+  },
+  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Mattermost Slack Import Log\r\n"
   },
@@ -1652,6 +1672,22 @@
     "translation": "Fehler beim Verarbeiten einiger Slach Nachrichten. Import könnte trotzdem funktionieren."
   },
   {
+    "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."
+  },
+  {
+    "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."
+  },
+  {
+    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
+    "translation": "Slack Importer: Kanal {{.ChannelName}} hat einen zu langen Namen. Er wird beim Import gekürzt."
+  },
+  {
+    "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
+    "translation": "Slack Importer: Kanal {{.ChannelName}} hat einen zu langen Zweck. Er wird beim Import gekürzt."
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "Initialisieren Status-Api-Routen"
   },
@@ -2409,11 +2445,11 @@
   },
   {
     "id": "api.web_hub.start.starting.debug",
-    "translation": "Starting %v websocket hubs"
+    "translation": "Starte %v Websocket Hubs"
   },
   {
     "id": "api.web_hub.start.stopping.debug",
-    "translation": "stopping websocket hub connections"
+    "translation": "Beende Websocket Hub Verbindungen"
   },
   {
     "id": "api.web_socket.connect.error",
@@ -2508,12 +2544,16 @@
     "translation": "Die Berechtigungen für die Erneuerung des Webhooks-Tokens sind ungeeignet"
   },
   {
+    "id": "api.webrtc.disabled.app_error",
+    "translation": "WebRTC ist auf diesem Server nicht aktiviert."
+  },
+  {
     "id": "api.webrtc.init.debug",
     "translation": "Initialisiere WebRTC-API-Routen"
   },
   {
-    "id": "api.webrtc.not_available.app_error",
-    "translation": "WebRTC ist auf diesem Server nicht verfügbar."
+    "id": "api.webrtc.register_token.app_error",
+    "translation": "Es trat ein Fehler auf beim Versuch, den WebRTC-Token zu registrieren"
   },
   {
     "id": "api.websocket_handler.invalid_param.app_error",
@@ -2804,18 +2844,6 @@
     "translation": "Konnte existierenden SAML User nicht aktualisieren. Erlaube login trotzdem. err=%v"
   },
   {
-    "id": "ent.webrtc.disabled.app_error",
-    "translation": "WebRTC ist auf diesem Server nicht aktiviert."
-  },
-  {
-    "id": "ent.webrtc.license_disable.app_error",
-    "translation": "Ihre Lizenz beinhaltet keine Unterstützung für Mattermost WebRTC"
-  },
-  {
-    "id": "ent.webrtc.register_token.app_error",
-    "translation": "Es trat ein Fehler auf beim Versuch, den WebRTC-Token zu registrieren"
-  },
-  {
     "id": "error.generic.link_message",
     "translation": "Gehe zurück zu Mattermost"
   },
@@ -3269,7 +3297,7 @@
   },
   {
     "id": "model.config.is_valid.max_channels.app_error",
-    "translation": "Ungültige maximale Anzahl an Benutzers pro Team in Teameinstellungen.  Muss eine positive Zahl sein."
+    "translation": "Ungültige maximale Anzahl an Kanälen pro Team in Teameinstellungen.  Muss eine positive Zahl sein."
   },
   {
     "id": "model.config.is_valid.max_file_size.app_error",
@@ -3629,7 +3657,7 @@
   },
   {
     "id": "model.team.is_valid.characters.app_error",
-    "translation": "Name muss 2 oder mehr Kleinbuchstaben haben"
+    "translation": "Name muss aus 2 oder mehr Kleinbuchstaben bestehen"
   },
   {
     "id": "model.team.is_valid.company.app_error",
@@ -4645,7 +4673,7 @@
   },
   {
     "id": "store.sql_team.get_member_count.app_error",
-    "translation": "Wir konnten die Kanal Mitglieder nicht finden"
+    "translation": "Die Kanalmitglieder konnten nicht gezählt werden"
   },
   {
     "id": "store.sql_team.get_members.app_error",
@@ -4653,7 +4681,7 @@
   },
   {
     "id": "store.sql_team.get_members_by_ids.app_error",
-    "translation": "Wir konnten die Kanal Mitglieder nicht finden"
+    "translation": "Die Teammitglieder konnten nicht abgerufen werden"
   },
   {
     "id": "store.sql_team.get_teams_for_email.app_error",
@@ -4745,7 +4773,7 @@
   },
   {
     "id": "store.sql_user.get_recently_active_users.app_error",
-    "translation": "We encountered an error while finding the recently active users"
+    "translation": "Es trat ein Fehler beim Abrufen der zuletzt aktiven Benutzer auf"
   },
   {
     "id": "store.sql_user.get_sysadmin_profiles.app_error",
diff --git a/i18n/en.json b/i18n/en.json
index ef321e113..f8163557b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -629,11 +629,11 @@
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n#[character]+TAB: Autocomplete channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n~[character]+TAB: Autocomplete channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n#[character]+TAB: Autocomplete channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n~[character]+TAB: Autocomplete channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -1520,6 +1520,14 @@
     "translation": "Stopping Server..."
   },
   {
+    "id": "api.slackimport.slack_add_bot_user.email_pwd",
+    "translation": "Slack Bot/Integration Posts Import User: Email, Password: {{.Email}}, {{.Password}}\r\n"
+  },
+  {
+    "id": "api.slackimport.slack_add_bot_user.unable_import",
+    "translation": "Unable to import Slack Bot/Integration Posts Import User: {{.Username}}\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_channels.added",
     "translation": "\r\n Channels Added \r\n"
   },
@@ -1608,14 +1616,6 @@
     "translation": "Unable to import user: {{.Username}}\r\n"
   },
   {
-    "id": "api.slackimport.slack_add_bot_user.email_pwd",
-    "translation": "Slack Bot/Integration Posts Import User: Email, Password: {{.Email}}, {{.Password}}\r\n"
-  },
-  {
-    "id": "api.slackimport.slack_add_bot_user.unable_import",
-    "translation": "Unable to import Slack Bot/Integration Posts Import User: {{.Username}}\r\n"
-  },
-  {
     "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
     "translation": "Failed to compile the !channel matching regular expression for Slack channel {{.ChannelID}} {{.ChannelName}}"
   },
diff --git a/i18n/es.json b/i18n/es.json
index dfc00198e..7b63c2664 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -629,11 +629,11 @@
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### Mensajes\n\nALT+[clic en un mensaje]: Marca el mensaje como el último mensaje leído en el canal actual\nESC: Marca todos los mensajes como leídos en el canal actual\nCMD+ARRIBA (con el cuadro de texto vacío): Reimprime el último mensaje o comando de barra que ingresaste\nCMD+ABAJO (con el cuadro de texto vacío): Reimprime el siguiente mensaje o comando de barra que ingresaste\nARRIBA (con el cuadro de texto vacío): Edita tu último mensaje en el canal en el que te encuentras\n@[carácter]+TAB: Auto completa @nombre que comience por [carácter]\n:[carácter]+TAB: Auto completa el emoji que comience por [carácter]\n\n"
+    "translation": "#### Mensajes\n\nESC: Marca todos los mensajes como leídos en el canal actual\nCTRL+ARRIBA (con el cuadro de texto vacío): Reimprime el último mensaje o comando de barra que ingresaste\nCTRL+ABAJO (con el cuadro de texto vacío): Reimprime el siguiente mensaje o comando de barra que ingresaste\nARRIBA (con el cuadro de texto vacío): Edita tu último mensaje en el canal en el que te encuentras\n@[carácter]+TAB: Auto completa @nombre que comience por [carácter]\n~[carácter]+TAB: Autocompleta el canal que comience por [carácter]\n:[carácter]+TAB: Auto completa el emoji que comience por [carácter]\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Mensajes\n\nALT+[clic en un mensaje]: Marca el mensaje como el último mensaje leído en el canal actual\nESC: Marca todos los mensajes como leídos en el canal actual\nCMD+ARRIBA (con el cuadro de texto vacío): Reimprime el último mensaje o comando de barra que ingresaste\nCMD+ABAJO (con el cuadro de texto vacío): Reimprime el siguiente mensaje o comando de barra que ingresaste\nARRIBA (con el cuadro de texto vacío): Edita tu último mensaje en el canal en el que te encuentras\n@[carácter]+TAB: Auto completa @nombre que comience por [carácter]\n:[carácter]+TAB: Auto completa el emoji que comience por [carácter]\n\n"
+    "translation": "#### Mensajes\n\nESC: Marca todos los mensajes como leídos en el canal actual\nCMD+ARRIBA (con el cuadro de texto vacío): Reimprime el último mensaje o comando de barra que ingresaste\nCMD+ABAJO (con el cuadro de texto vacío): Reimprime el siguiente mensaje o comando de barra que ingresaste\nARRIBA (con el cuadro de texto vacío): Edita tu último mensaje en el canal en el que te encuentras\n@[carácter]+TAB: Auto completa @nombre que comience por [carácter]\n~[carácter]+TAB: Autocompleta el canal que comience por [carácter]\n:[carácter]+TAB: Auto completa el emoji que comience por [carácter]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -1520,6 +1520,14 @@
     "translation": "Deteniendo el Servidor..."
   },
   {
+    "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"
+  },
+  {
+    "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"
+  },
+  {
     "id": "api.slackimport.slack_add_channels.added",
     "translation": "\r\n Canales agregados \r\n"
   },
@@ -1548,6 +1556,10 @@
     "translation": "Mensajes del Bot de Slack no han sido importados todavía"
   },
   {
+    "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."
+  },
+  {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
     "translation": "Comentario de archivo indefinido"
   },
@@ -1556,6 +1568,10 @@
     "translation": "Mensaje sin usuario"
   },
   {
+    "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."
+  },
+  {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
     "translation": "Tipo de mensaje no soportado: %v, %v"
   },
@@ -1612,6 +1628,10 @@
     "translation": "No se pudo compilar la coincidencia de la @mención con expresión regular para el usuario de Slack {{.UserID}} {{.Username}}"
   },
   {
+    "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
+    "translation": "Importador de Slack: Falla al desactivar el usuario bot-importing."
+  },
+  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Mattermost Registros de importación de Slack\r\n"
   },
@@ -1652,6 +1672,22 @@
     "translation": "Error en el análisis de los mensajes de slack. Importación puede que funcione de todos modos."
   },
   {
+    "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
+    "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.header_too_long.warn",
+    "translation": "Importador de Slack: El canal: {{.ChannelName}} tiene una cabecera, que es demasiado larga. Se truncará cuando sea importado."
+  },
+  {
+    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
+    "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.purpose_too_long.warn",
+    "translation": "Importador de Slack: El canal: {{.ChannelName}} tiene una propósito que es demasiado largo. Se truncará cuando sea importado."
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "Inicializando rutas del API para los estatus"
   },
@@ -2508,12 +2544,16 @@
     "translation": "Permisos inapropiados para regenerar un token para el Webhook saliente"
   },
   {
+    "id": "api.webrtc.disabled.app_error",
+    "translation": "WebRTC no está habilitado en este servidor."
+  },
+  {
     "id": "api.webrtc.init.debug",
     "translation": "Inicializando rutas del API para WebRTC"
   },
   {
-    "id": "api.webrtc.not_available.app_error",
-    "translation": "WebRTC no está disponible en este servidor."
+    "id": "api.webrtc.register_token.app_error",
+    "translation": "Hemos encontrado un error al intentar registrar el Token de WebRTC"
   },
   {
     "id": "api.websocket_handler.invalid_param.app_error",
@@ -2804,18 +2844,6 @@
     "translation": "No se puede actualizar el usuario SAML existente. Se Permite el inicio de sesión de todos modos. err=%v"
   },
   {
-    "id": "ent.webrtc.disabled.app_error",
-    "translation": "WebRTC no está habilitado en este servidor."
-  },
-  {
-    "id": "ent.webrtc.license_disable.app_error",
-    "translation": "Tu licencia no admite el uso de Mattermost WebRTC"
-  },
-  {
-    "id": "ent.webrtc.register_token.app_error",
-    "translation": "Hemos encontrado un error al intentar registrar el Token de WebRTC"
-  },
-  {
     "id": "error.generic.link_message",
     "translation": "Volver a Mattermost"
   },
diff --git a/i18n/fr.json b/i18n/fr.json
index 9c0b99f7f..9c92c7da9 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -137,7 +137,7 @@
   },
   {
     "id": "api.api.init.parsing_templates.error",
-    "translation": "Impossible d'analyser les gabarits du serveur %v"
+    "translation": "Impossible d'analyser les modèles du serveur %v"
   },
   {
     "id": "api.api.render.error",
@@ -165,7 +165,7 @@
   },
   {
     "id": "api.channel.add_user.to.channel.failed.app_error",
-    "translation": "Échec de l'ajout utilisateur"
+    "translation": "Impossible d'ajouter l'utilisateur au canal"
   },
   {
     "id": "api.channel.add_user.to.channel.failed.deleted.app_error",
@@ -205,7 +205,7 @@
   },
   {
     "id": "api.channel.create_channel.max_channel_limit.app_error",
-    "translation": "Cannot create more than {{.MaxChannelsPerTeam}} channels for current team"
+    "translation": "Impossible de créer plus de {{.MaxChannelsPerTeam}} canaux pour l'équipe actuelle"
   },
   {
     "id": "api.channel.create_default_channels.off_topic",
@@ -233,11 +233,11 @@
   },
   {
     "id": "api.channel.delete_channel.failed_post.error",
-    "translation": "Échec de l'envoi du message archivé %v"
+    "translation": "Impossible d'envoyer le message archivé %v"
   },
   {
     "id": "api.channel.delete_channel.failed_send.app_error",
-    "translation": "Échec de l'envoi du message archivé"
+    "translation": "Impossible d'envoyer le message archivé"
   },
   {
     "id": "api.channel.delete_channel.incoming_webhook.error",
@@ -309,7 +309,7 @@
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.retrieve_user.error",
-    "translation": "Échec du chargement de l'utilisateur lors de l'enregistrement de la mise à jour de l'entête du canal %v"
+    "translation": "Impossible de récupérer l'utilisateur lors de l'enregistrement d'un nouveau message de canal %v"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.updated_from",
@@ -321,7 +321,7 @@
   },
   {
     "id": "api.channel.post_user_add_remove_message_and_forget.error",
-    "translation": "Échec de l'envoi du message joindre/quitter %v"
+    "translation": "Impossible d'envoyer le message joindre/quitter %v"
   },
   {
     "id": "api.channel.remove_member.permissions.app_error",
@@ -337,7 +337,7 @@
   },
   {
     "id": "api.channel.remove_member.user.app_error",
-    "translation": "Impossible de trouver l'utilisateur à ajouter"
+    "translation": "Impossible de trouver l'utilisateur à supprimer"
   },
   {
     "id": "api.channel.remove_user_from_channel.deleted.app_error",
@@ -461,7 +461,7 @@
   },
   {
     "id": "api.command_echo.create.app_error",
-    "translation": "Impossible de créer /echo post, err=%v"
+    "translation": "Impossible de créer le message /echo, err=%v"
   },
   {
     "id": "api.command_echo.delay.app_error",
@@ -629,11 +629,11 @@
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### Messages\n\nALT+[clic sur un message]: Définit un message comme le plus vieux message non lu du canal courant\nESC: Marque tous mes messages du canal courant comme lus\nCTRL+HAUT (dans un champ d'édition vide): Affiche à nouveau le message ou la commande slash précédents que vous avez saisis\nCTRL+BAS (dans un champ d'édition vide): Affiche à nouveau le message ou la commande slash suivants que vous avez saisis\nHAUT (dans un champ d'édition vide): Édite le dernier message que vous avez saisi dans le canal courant\n@[caractère]+TAB: Complète automatiquement le @nom d'utilisateur commençant par [caractère]\n:[caractère]+TAB: Complète automatiquement l'émoticône commençant par [caractère]\n\n"
+    "translation": "#### Messages\n\nESC : Marque tous les messages du canal actuel comme lus\nCTRL+HAUT (dans un champ de saisie vide) : Affiche le message précédent ou la commande slash précédemment saisis\nCTRL+BAS (dans un champ de saisie vide): Affiche le message suivant ou la commande slash que vous avez précédemment saisis\nHAUT (dans un champ de saisie vide): Édite votre dernier message du canal actuel\n@[caractère]+TAB: Complète automatiquement le nom d'@utilisateur commençant par [caractère]\n#[caractère]+TAB: Complète automatiquement le nom de canal commençant par [caractère]\n:[caractère]+TAB: Complète automatiquement l'émoticône commençant par [caractère]\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Messages\n\nALT+[clic sur un message]: Définit un message comme le plus vieux message non lu du canal courant\nESC: Marque tous mes messages du canal courant comme lus\nCMD+HAUT (dans un champ d'édition vide): Affiche à nouveau le message ou la commande slash précédents que vous avez saisis\nCMD+BAS (dans un champ d'édition vide): Affiche à nouveau le message ou la commande slash suivants que vous avez saisis\nHAUT (dans un champ d'édition vide): Édite le dernier message que vous avez saisi dans le canal courant\n@[caractère]+TAB: Complète automatiquement le @nom d'utilisateur commençant par [caractère]\n:[caractère]+TAB: Complète automatiquement l'émoticône commençant par [caractère]\n\n"
+    "translation": "#### Messages\n\nESC : Marque tous les messages du canal actuel comme lus\nCTRL+HAUT (dans un champ de saisie vide) : Affiche le message précédent ou la commande slash précédemment saisis\nCTRL+BAS (dans un champ de saisie vide): Affiche le message suivant ou la commande slash que vous avez précédemment saisis\nHAUT (dans un champ de saisie vide): Édite votre dernier message du canal actuel\n@[caractère]+TAB: Complète automatiquement le nom d'@utilisateur commençant par [caractère]\n#[caractère]+TAB: Complète automatiquement le nom de canal commençant par [caractère]\n:[caractère]+TAB: Complète automatiquement l'émoticône commençant par [caractère]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -677,7 +677,7 @@
   },
   {
     "id": "api.context.last_activity_at.error",
-    "translation": "Échec de la mise à jour de LastActivityAt pour user_id=%v et session_id=%v, err=%v"
+    "translation": "Impossible de mettre à jour le LastActivityAt de user_id=%v et session_id=%v, err=%v"
   },
   {
     "id": "api.context.log.error",
@@ -752,7 +752,7 @@
   },
   {
     "id": "api.email_batching.send_batched_email_notification.send.app_error",
-    "translation": "Echec de l'envoi du courriel groupé à %v: %v"
+    "translation": "Impossible d'envoyer le courriel groupé à %v: %v"
   },
   {
     "id": "api.email_batching.send_batched_email_notification.subject",
@@ -891,11 +891,11 @@
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.get_file_infos_again.warn",
-    "translation": "Unable to get FileInfos for post after migratio, post_id=%v, err=%v"
+    "translation": "Impossible de récupérer le FileInfos du message après la migration, post_id=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.get_post_again.warn",
-    "translation": "Impossible de récupérer les équipes lorsque le message est en cours de migration vers FileInfos, post_id=%v, err=%v"
+    "translation": "Impossible de récupérer le message lors de la migration vers FileInfos, post_id=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.info.app_error",
@@ -903,7 +903,7 @@
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.migrating_post.debug",
-    "translation": "Migrating post to use FileInfos, post_id=%v, err=%v"
+    "translation": "Migration du message vers FileInfos en cours, post_id=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.mismatched_filename.warn",
@@ -915,11 +915,11 @@
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.not_migrating_post.debug",
-    "translation": "Post already migrated to use FileInfos, post_id=%v, err=%v"
+    "translation": "Le message a déjà migré vers FileInfos, post_id=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.save_file_info.warn",
-    "translation": "Impossible de trouver le fichier lorsque le message est en cours de migration vers FileInfos, post_id=%v, channel_id=%v, path=%v, err=%v"
+    "translation": "Impossible de sauvegarder le message lorsque celui-ci est en cours de migration vers FileInfos, post_id=%v, file_id=%v, path=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.save_post.warn",
@@ -1285,7 +1285,7 @@
   },
   {
     "id": "api.post.get_out_of_channel_mentions.regex.error",
-    "translation": "Échec de la compilation @mention regex user_id=%v, err=%v"
+    "translation": "Impossible de compiler la regex de @mention user_id=%v, err=%v"
   },
   {
     "id": "api.post.get_post.permissions.app_error",
@@ -1297,11 +1297,11 @@
   },
   {
     "id": "api.post.handle_post_events_and_forget.members.error",
-    "translation": "Échec de la récupération des membres du canal channel_id=%v err=%v"
+    "translation": "Impossible de récupérer les membres du canal channel_id=%v err=%v"
   },
   {
     "id": "api.post.handle_post_events_and_forget.profiles.error",
-    "translation": "Échec de la récupération des profils utilisateurs team_id=%v, err=%v"
+    "translation": "Impossible de récupérer les profils utilisateurs team_id=%v, err=%v"
   },
   {
     "id": "api.post.handle_post_events_and_forget.team.error",
@@ -1313,7 +1313,7 @@
   },
   {
     "id": "api.post.handle_webhook_events_and_forget.create_post.error",
-    "translation": "Échec de la création du message de réponse , err=%v"
+    "translation": "Impossible de créer le message de réponse, err=%v"
   },
   {
     "id": "api.post.handle_webhook_events_and_forget.event_post.error",
@@ -1493,11 +1493,11 @@
   },
   {
     "id": "api.server.start_server.rate_limiting_memory_store",
-    "translation": "Unable to initialize rate limiting memory store. Check MemoryStoreSize config setting."
+    "translation": "Impossible d'initialiser la limite d'utilisation de mémoire. Veuillez vérifier la valeur MemoryStoreSize dans les paramètres de configuration."
   },
   {
     "id": "api.server.start_server.rate_limiting_rate_limiter",
-    "translation": "Impossible d'initialiser la limite du taux."
+    "translation": "Impossible d'initialiser le taux de limite d'appel sur l'API."
   },
   {
     "id": "api.server.start_server.starting.critical",
@@ -1520,6 +1520,14 @@
     "translation": "Arrêt du serveur..."
   },
   {
+    "id": "api.slackimport.slack_add_bot_user.email_pwd",
+    "translation": "Importation de l'utilisateur pour le Bot Slack/messages d'intégration : adresse email, mot de passe : {{.Email}}, {{.Password}}\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"
+  },
+  {
     "id": "api.slackimport.slack_add_channels.added",
     "translation": "\r\n Canaux ajoutés \r\n"
   },
@@ -1533,7 +1541,7 @@
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Slack Importer: Failed to import channel: %s"
+    "translation": "Importateur Slack : Impossible d'importer le canal: %s"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
@@ -1548,32 +1556,40 @@
     "translation": "Les messages du bot Slack ne sont pas encore importés"
   },
   {
+    "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"
+  },
+  {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
-    "translation": "File comment undefined"
+    "translation": "Commentaire de fichier non défini"
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_usr.debug",
     "translation": "Message sans utilisateur"
   },
   {
+    "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"
+  },
+  {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
     "translation": "Type de message non supporté : %v, %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": "Aucun fichier trouvé dans l'export du message Slack contenant le fichier envoyé portant l'ID {{.FileId}}"
   },
   {
     "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": "Impossible d'importer le fichier car l'exportation de Slack ne comporte pas de section 'file'"
   },
   {
     "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": "Impossible d'ouvrir le fichier portant l'ID {{.FileId}} provenant de l'exportation de Slack car l'erreur suivante s'est produite : {{.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": "L'envoi du message comprenant le fichier ayant l'ID {{.FileId}} a échoué avec l'erreur : {{.Error}}"
   },
   {
     "id": "api.slackimport.slack_add_posts.user_no_exists.debug",
@@ -1612,6 +1628,10 @@
     "translation": "Échec de la compilation de la @mention correspondant à l'expression régulière pour l'utilisateur Slack {{.UserID}} {{.Username}}"
   },
   {
+    "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
+    "translation": "Importateur Slack : Impossible de désactiver l'utilisateur dédié au bot"
+  },
+  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Journal import Slack Mattermost\r\n"
   },
@@ -1652,6 +1672,22 @@
     "translation": "Erreur lors de la lecture de certains messages slack. L'importation peut toutefois quand même fonctionner."
   },
   {
+    "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."
+  },
+  {
+    "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."
+  },
+  {
+    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
+    "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.purpose_too_long.warn",
+    "translation": "Importateur Slack : La description du canal {{.ChannelName}} est trop longue. Elle sera tronquée lors de l'import."
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "Initialisation des routes de l'api des messages"
   },
@@ -2409,11 +2445,11 @@
   },
   {
     "id": "api.web_hub.start.starting.debug",
-    "translation": "Starting %v websocket hubs"
+    "translation": "Lancement de %v concentrateurs websocket"
   },
   {
     "id": "api.web_hub.start.stopping.debug",
-    "translation": "stopping websocket hub connections"
+    "translation": "Arrêt des connexions des concentrateurs websocket"
   },
   {
     "id": "api.web_socket.connect.error",
@@ -2508,12 +2544,16 @@
     "translation": "Droits insuffisants pour regénérer le jeton du webhook sortant"
   },
   {
+    "id": "api.webrtc.disabled.app_error",
+    "translation": "WebRTC n'est pas activé sur ce serveur."
+  },
+  {
     "id": "api.webrtc.init.debug",
     "translation": "Initialisation des routes de l'api WebRTC"
   },
   {
-    "id": "api.webrtc.not_available.app_error",
-    "translation": "WebRTC n'est pas disponible sur ce serveur."
+    "id": "api.webrtc.register_token.app_error",
+    "translation": "Une erreur s'est produite lors de l'enregistrement du jeton WebRTC"
   },
   {
     "id": "api.websocket_handler.invalid_param.app_error",
@@ -2804,18 +2844,6 @@
     "translation": "Impossible de mettre à jour l'utilisateur SAML. Connexion autorisée malgré tout. err=%v"
   },
   {
-    "id": "ent.webrtc.disabled.app_error",
-    "translation": "WebRTC n'est pas activé sur ce serveur."
-  },
-  {
-    "id": "ent.webrtc.license_disable.app_error",
-    "translation": "Votre licence ne supporte pas l'utilisation de Mattermost WebRTC"
-  },
-  {
-    "id": "ent.webrtc.register_token.app_error",
-    "translation": "Une erreur s'est produite lors de l'enregistrement du jeton WebRTC"
-  },
-  {
     "id": "error.generic.link_message",
     "translation": "Retourner sur Mattermost"
   },
@@ -3269,7 +3297,7 @@
   },
   {
     "id": "model.config.is_valid.max_channels.app_error",
-    "translation": "Nombre maximum d'utilisateurs par équipe invalide dans les paramètres d'équipes. Doit être un entier positif."
+    "translation": "Le nombre maximum de canaux par équipe défini dans les paramètres d'équipe est invalide. Doit être un entier positif."
   },
   {
     "id": "model.config.is_valid.max_file_size.app_error",
@@ -3629,7 +3657,7 @@
   },
   {
     "id": "model.team.is_valid.characters.app_error",
-    "translation": "Le nom doit être composé d'au moins 2 caractères alphanumériques en minuscules."
+    "translation": "Le nom doit être composé d'au moins 2 caractères alphanumériques minuscules"
   },
   {
     "id": "model.team.is_valid.company.app_error",
@@ -4645,7 +4673,7 @@
   },
   {
     "id": "store.sql_team.get_member_count.app_error",
-    "translation": "Nous ne pouvons pas obtenir les membres de l'équipe"
+    "translation": "Impossible de récupérer le nombre de membres de l'équipe"
   },
   {
     "id": "store.sql_team.get_members.app_error",
@@ -4653,7 +4681,7 @@
   },
   {
     "id": "store.sql_team.get_members_by_ids.app_error",
-    "translation": "Nous ne pouvons pas obtenir les membres de l'équipe"
+    "translation": "Impossible de récupérer les membres de l'équipe"
   },
   {
     "id": "store.sql_team.get_teams_for_email.app_error",
@@ -4745,7 +4773,7 @@
   },
   {
     "id": "store.sql_user.get_recently_active_users.app_error",
-    "translation": "We encountered an error while finding the recently active users"
+    "translation": "Une erreur s'est produite lors de la recherche des utilisateurs récemment actifs"
   },
   {
     "id": "store.sql_user.get_sysadmin_profiles.app_error",
@@ -4801,7 +4829,7 @@
   },
   {
     "id": "store.sql_user.save.member_count.app_error",
-    "translation": "Échec lors de l'obtention du nombre de membres de l'équipe courante"
+    "translation": "Impossible de récupérer le nombre de membres de l'équipe actuelle"
   },
   {
     "id": "store.sql_user.save.username_exists.app_error",
diff --git a/i18n/ja.json b/i18n/ja.json
index 6a2868f2c..cfb389ca1 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -629,11 +629,11 @@
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### メッセージ\n\nAlt+[メッセージ上でクリック]: 現在のチャンネルで、そのメッセージを最古の未読のメッセージにする\nESC: 現在のチャンネルの全てのメッセージを既読にする\nCTRL+UP (空白の入力欄で): 一つ前に入力したメッセージやスラッシュコマンドを呼び出す\nCTRL+DOWN (空白の入力欄で): 一つ次に入力したメッセージやスラッシュコマンドを呼び出す\nUP (空白の入力欄で): 現在のチャンネルの最新のメッセージを修正する\n@[文字]+TAB: [文字]で始まる@usernameを自動補完する\n:[文字]+TAB: [文字]で始まる絵文字を自動補完する\n\n"
+    "translation": "#### メッセージ\n\nESC: 現在のチャンネルの全てのメッセージを既読にする\nCTRL+UP (空白の入力欄で): 一つ前に入力したメッセージやスラッシュコマンドを呼び出す\nCTRL+DOWN (空白の入力欄で): 一つ次に入力したメッセージやスラッシュコマンドを呼び出す\nUP (空白の入力欄で): 現在のチャンネルの最新のメッセージを修正する\n@[文字]+TAB: [文字]で始まる@usernameを自動補完する\n#[文字]+TAB: [文字]で始まるチャンネルを自動補完する\n:[文字]+TAB: [文字]で始まる絵文字を自動補完する\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### メッセージ\n\nAlt+[メッセージ上でクリック]: 現在のチャンネルで、そのメッセージを最古の未読のメッセージにする\nESC: 現在のチャンネルの全てのメッセージを既読にする\nCMD+UP (空白の入力欄で): 一つ前に入力したメッセージやスラッシュコマンドを呼び出す\nCMD+DOWN (空白の入力欄で): 一つ次に入力したメッセージやスラッシュコマンドを呼び出す\nUP (空白の入力欄で): 現在のチャンネルの最新のメッセージを修正する\n@[文字]+TAB: [文字]で始まる@usernameを自動補完する\n:[文字]+TAB: [文字]で始まる絵文字を自動補完する\n\n"
+    "translation": "#### メッセージ\n\nESC: 現在のチャンネルの全てのメッセージを既読にする\nCMD+UP (空白の入力欄で): 一つ前に入力したメッセージやスラッシュコマンドを呼び出す\nCMD+DOWN (空白の入力欄で): 一つ次に入力したメッセージやスラッシュコマンドを呼び出す\nUP (空白の入力欄で): 現在のチャンネルの最新のメッセージを修正する\n@[文字]+TAB: [文字]で始まる@usernameを自動補完する\n#[文字]+TAB: [文字]で始まるチャンネルを自動補完する\n:[文字]+TAB: [文字]で始まる絵文字を自動補完する\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -1520,6 +1520,14 @@
     "translation": "サーバーを停止しています…"
   },
   {
+    "id": "api.slackimport.slack_add_bot_user.email_pwd",
+    "translation": "Slack Bot/Integration投稿インポートユーザー: 電子メール, パスワード: {{.Email}}, {{.Password}}\r\n"
+  },
+  {
+    "id": "api.slackimport.slack_add_bot_user.unable_import",
+    "translation": "Slack Bot/Integration投稿インポートユーザーをインポートできませんでした: {{.Username}}\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_channels.added",
     "translation": "\r\n チャンネルが追加されました \r\n"
   },
@@ -1533,7 +1541,7 @@
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Slack Importer: Failed to import channel: %s"
+    "translation": "Slack Importer: チャンネルをインポートできませんでした: %s"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
@@ -1548,6 +1556,10 @@
     "translation": "Slack botの投稿はまだインポートされていません"
   },
   {
+    "id": "api.slackimport.slack_add_posts.bot_user_no_exists.warn",
+    "translation": "Slack Importer: botインポートユーザーが存在しないためbotメッセージをインポートしませんでした。"
+  },
+  {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
     "translation": "ファイルコメントが定義されていません"
   },
@@ -1556,6 +1568,10 @@
     "translation": "ユーザーなしのメッセージ"
   },
   {
+    "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
+    "translation": "Slack Importer: 項目BotIdが欠けていたためbotメッセージをインポートしませんでした。"
+  },
+  {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
     "translation": "サポートされていない投稿の形式: %v, %v"
   },
@@ -1612,6 +1628,10 @@
     "translation": "Slackユーザー{{.UserID}} {{.Username}}の@mensionに一致する正規表現のコンパイルに失敗しました。"
   },
   {
+    "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
+    "translation": "Slack Importer: botインポートユーザーを非活性にできませんでした。"
+  },
+  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Mattermost Slackインポートログ\r\n"
   },
@@ -1652,6 +1672,22 @@
     "translation": "Slackの投稿を読み込み中にエラーが発生しました。しかしインポートは継続できます。"
   },
   {
+    "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
+    "translation": "Slack Importer: チャンネル {{.ChannelName}} の表示名が長すぎます。インポートの際に切り詰められます。"
+  },
+  {
+    "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
+    "translation": "Slack Importer: チャンネル {{.ChannelName}}のヘッダーが長すぎます。インポートの際に切り詰められます。"
+  },
+  {
+    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
+    "translation": "Slack Importer: チャンネル {{.ChannelName}}の名前が長すぎます。インポートの際に切り詰められます。"
+  },
+  {
+    "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
+    "translation": "Slack Importer: チャンネル {{.ChannelName}}の目的が長すぎます。インポートの際に切り詰められます。"
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "状態APIルートを初期化しています"
   },
@@ -2508,12 +2544,16 @@
     "translation": "外向きのウェブフックトークンを再生成するのに十分な権限が付与されていません"
   },
   {
+    "id": "api.webrtc.disabled.app_error",
+    "translation": "WebRTCはこのサーバーでは有効化されていません。"
+  },
+  {
     "id": "api.webrtc.init.debug",
     "translation": "WebRTC APIルートを初期化しています"
   },
   {
-    "id": "api.webrtc.not_available.app_error",
-    "translation": "WebRTCはこのサーバーでは利用できません。"
+    "id": "api.webrtc.register_token.app_error",
+    "translation": "WebRTCトークンを登録する際にエラーが発生しました"
   },
   {
     "id": "api.websocket_handler.invalid_param.app_error",
@@ -2804,18 +2844,6 @@
     "translation": "既存のSAMLユーザーをアップデートすることはできません。ログインは有効です。err=%v"
   },
   {
-    "id": "ent.webrtc.disabled.app_error",
-    "translation": "WebRTCはこのサーバーでは有効化されていません。"
-  },
-  {
-    "id": "ent.webrtc.license_disable.app_error",
-    "translation": "あなたのライセンスではMattermost WebRTCを使うことはできません"
-  },
-  {
-    "id": "ent.webrtc.register_token.app_error",
-    "translation": "WebRTCトークンを登録する際にエラーが発生しました"
-  },
-  {
     "id": "error.generic.link_message",
     "translation": "Mattermostに戻る"
   },
diff --git a/i18n/ko.json b/i18n/ko.json
index 939bb7ba2..bd639520a 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -629,11 +629,11 @@
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### Messages\n\nALT+[click on a message]: 현재 채널에서 가장 오래 읽지 않은 매세지로 설정합니다. \nESC: 현재 채널의 모든 메세지를 읽은 상태로 표시합니다.\nCTRL+UP (in empty input field): 이전 메세지나 입력한 슬래쉬 명령어를 다시 표시합니다.\nCTRL+DOWN (in empty input field): 다음 메세지나 입력한 슬래쉬 명령을 다시 표시합니다.\nUP (in empty input field): 현재 채널의 당신의 마지막 메세지를 수정합니다.\n@[character]+TAB: [character]로 시작하는 @유저명을 자동완성합니다.\n:[character]+TAB: [character]로 시작하는 emoji를 자동 완성합니다.\n\n"
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n~[character]+TAB: Autocomplete channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Messages\n\nALT+[click on a message]: 현재 채널에서 가장 오래 읽지 않은 매세지로 설정합니다\nESC: 현재 채널의 모든 메세지를 읽은 상태로 표시합니다\nCMD+UP (in empty input field): 이전 메세지나 입력한 슬래쉬 명령어를 다시 표시합니다.\nCMD+DOWN (in empty input field): 이전 메세지나 입력한 슬래쉬 명령어를 다시 표시합니다.\nUP (in empty input field): 현재 채널의 당신의 마지막 메세지를 수정합니다.\n@[character]+TAB: 현재 채널의 당신의 마지막 메세지를 수정합니다.\n:[character]+TAB: 현재 채널의 당신의 마지막 메세지를 수정합니다.\n\n"
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n~[character]+TAB: Autocomplete channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -1520,6 +1520,14 @@
     "translation": "서버를 정지하는 중..."
   },
   {
+    "id": "api.slackimport.slack_add_bot_user.email_pwd",
+    "translation": "Slack Bot/Integration Posts Import User: Email, Password: {{.Email}}, {{.Password}}\r\n"
+  },
+  {
+    "id": "api.slackimport.slack_add_bot_user.unable_import",
+    "translation": "Unable to import Slack Bot/Integration Posts Import User: {{.Username}}\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_channels.added",
     "translation": "\r\n 채널 추가됨 \r\n"
   },
@@ -1548,6 +1556,10 @@
     "translation": "Slack bot posts are not 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."
+  },
+  {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
     "translation": "파일 코멘트가 정의되지 않았습니다."
   },
@@ -1556,6 +1568,10 @@
     "translation": "작성자 없는 메시지"
   },
   {
+    "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
+    "translation": "Slack Importer: Not importing bot message due to lack of BotId field."
+  },
+  {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
     "translation": "지원되지 않는 글 형식: %v, %v"
   },
@@ -1612,6 +1628,10 @@
     "translation": "Failed to compile the @mention matching regular expression for Slack user {{.UserID}} {{.Username}}"
   },
   {
+    "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
+    "translation": "Slack Importer: Failed to deactivate the bot-importing user."
+  },
+  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Slack에서 가져오기 Log\r\n"
   },
@@ -1652,6 +1672,22 @@
     "translation": "슬랙 글 파싱 중 오류가 발생했습니다. 가져오기는 계속 진행됩니다."
   },
   {
+    "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."
+  },
+  {
+    "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."
+  },
+  {
+    "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."
+  },
+  {
+    "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."
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "상태 API 루트를 초기화 중"
   },
@@ -2508,12 +2544,16 @@
     "translation": "Outgoing webhook 토큰을 재생성할 권한이 없습니다"
   },
   {
+    "id": "api.webrtc.disabled.app_error",
+    "translation": "이 서버에서 WebRTC를 사용할 수 없습니다."
+  },
+  {
     "id": "api.webrtc.init.debug",
     "translation": "WebRTC API 경로 초기화 중"
   },
   {
-    "id": "api.webrtc.not_available.app_error",
-    "translation": "이 서버에서 WebRTC는 사용할 수 없습니다."
+    "id": "api.webrtc.register_token.app_error",
+    "translation": "WebRTC 토큰 등록 중에 에러가 발생하였습니다."
   },
   {
     "id": "api.websocket_handler.invalid_param.app_error",
@@ -2804,18 +2844,6 @@
     "translation": "Unable to update existing SAML user. Allowing login anyway. err=%v"
   },
   {
-    "id": "ent.webrtc.disabled.app_error",
-    "translation": "이 서버에서 WebRTC를 사용할 수 없습니다."
-  },
-  {
-    "id": "ent.webrtc.license_disable.app_error",
-    "translation": "당신의 라이센스는 Mattermost의 WebRTC 사용을 지원하지 않습니다."
-  },
-  {
-    "id": "ent.webrtc.register_token.app_error",
-    "translation": "WebRTC 토큰 등록 중에 에러가 발생하였습니다."
-  },
-  {
     "id": "error.generic.link_message",
     "translation": "Mattermost로 돌아가기"
   },
diff --git a/i18n/nl.json b/i18n/nl.json
index d70200e8b..982f99ebe 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -629,11 +629,11 @@
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### Berichten\n\nALT+[klik op een bericht]: Markeer bericht als oudste ongelezen bericht in het huidige kanaal\nESC: Markeer alle berichten in het huidige kanaal als gelezen\nCTRL+UP (in een leeg invoer veld): Herhaal het vorige bericht of slash commando U heeft gegeven\nCTRL+DOWN (in een leeg invoer veld): Herhaal het volgende bericht of slash commando U heeft gegeven\nUP (in een leeg invoer veld): Bewerk jouw laatste bericht in het huidige kanaal\n@[karakter]+TAB: Autocomplete @gebruikersnaam begint met [karakter]\n:[karakter]+TAB: Autocomplete emoji begint met [karakter]\n\n"
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n~[character]+TAB: Autocomplete channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Berichten\n\nALT+[klik op een bericht]: Markeer bericht als oudste ongelezen bericht in het huidige kanaal\nESC: Markeer alle berichten in het huidige kanaal als gelezen\nCTRL+UP (in een leeg invoer veld): Herhaal het vorige bericht of slash commando U heeft gegeven\nCTRL+DOWN (in een leeg invoer veld): Herhaal het volgende bericht of slash commando U heeft gegeven\nUP (in een leeg invoer veld): Bewerk jouw laatste bericht in het huidige kanaal\n@[karakter]+TAB: Autocomplete @gebruikersnaam begint met [karakter]\n:[karakter]+TAB: Autocomplete emoji begint met [karakter]\n\n"
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n~[character]+TAB: Autocomplete channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -1520,6 +1520,14 @@
     "translation": "Server wordt gestopt..."
   },
   {
+    "id": "api.slackimport.slack_add_bot_user.email_pwd",
+    "translation": "Slack Bot/Integration Posts Import User: Email, Password: {{.Email}}, {{.Password}}\r\n"
+  },
+  {
+    "id": "api.slackimport.slack_add_bot_user.unable_import",
+    "translation": "Unable to import Slack Bot/Integration Posts Import User: {{.Username}}\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_channels.added",
     "translation": "\r\n Kanalen Toegevoegd \r\n"
   },
@@ -1548,6 +1556,10 @@
     "translation": "Slack bot posts zijn nog niet geimporteerd"
   },
   {
+    "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."
+  },
+  {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
     "translation": "File comment undefined"
   },
@@ -1556,6 +1568,10 @@
     "translation": "Bericht zonder gebruiker"
   },
   {
+    "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
+    "translation": "Slack Importer: Not importing bot message due to lack of BotId field."
+  },
+  {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
     "translation": "Niet ondersteund bericht type: %v, %v"
   },
@@ -1612,6 +1628,10 @@
     "translation": "Mislukt om de @vermelding te maken met reguliere expressie voor Slack gebruiker {{.UserID}} {{.Username}}"
   },
   {
+    "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
+    "translation": "Slack Importer: Failed to deactivate the bot-importing user."
+  },
+  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Mattermost Slack importeer log\r\n"
   },
@@ -1652,6 +1672,22 @@
     "translation": "Error 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."
+  },
+  {
+    "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."
+  },
+  {
+    "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."
+  },
+  {
+    "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."
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "Het initialiseren van status api routes"
   },
@@ -2508,12 +2544,16 @@
     "translation": "Ongeldige rechten om tokens voor uitgaande webhooks opnieuw te genereren"
   },
   {
+    "id": "api.webrtc.disabled.app_error",
+    "translation": "WebRTC is niet ingeschakeld op deze server."
+  },
+  {
     "id": "api.webrtc.init.debug",
     "translation": "Initialisatie van de WebRTC api routes"
   },
   {
-    "id": "api.webrtc.not_available.app_error",
-    "translation": "WebRTC is niet beschikbaar op deze server."
+    "id": "api.webrtc.register_token.app_error",
+    "translation": "We encountered an error trying to register the WebRTC Token"
   },
   {
     "id": "api.websocket_handler.invalid_param.app_error",
@@ -2804,18 +2844,6 @@
     "translation": "Kon bestaande SAML gebruiker niet bijwerken. Inloggen toch toestaan. err=%v"
   },
   {
-    "id": "ent.webrtc.disabled.app_error",
-    "translation": "WebRTC is niet ingeschakeld op deze server."
-  },
-  {
-    "id": "ent.webrtc.license_disable.app_error",
-    "translation": "Jouw licentie ondersteund geen gebruik van Mattermost WebRTC"
-  },
-  {
-    "id": "ent.webrtc.register_token.app_error",
-    "translation": "We encountered an error trying to register the WebRTC Token"
-  },
-  {
     "id": "error.generic.link_message",
     "translation": "Ga terug naar Mattermost"
   },
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 568e2f2cb..e6ec2bc51 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -329,7 +329,7 @@
   },
   {
     "id": "api.channel.remove_member.removed",
-    "translation": "%v foi removido do canal"
+    "translation": "%v foi removido do canal."
   },
   {
     "id": "api.channel.remove_member.unable.app_error",
@@ -609,11 +609,11 @@
   },
   {
     "id": "api.command_shortcuts.browser",
-    "translation": "#### Comandos Nativos do Navegador\n\nALT+LEFT: Canal anterior no seu histórico\nALT+RIGHT: Próximo canal no seu histórico\nCTRL+PLUS: Aumenta o tamanho da fonte (zoom in)\nCTRL+MINUS: Diminui o tamanho da fonte (zoom out)\nSHIFT+UP (no campo de entrada): Seleciona o texto até a linha anterior\nSHIFT+DOWN (no campo de entrada): Seleciona o texto até a próxima linha\nSHIFT+ENTER (no campo de entrada): Cria nova linha\n"
+    "translation": "#### Comandos Nativos do Navegador\n\nALT+ESQUERDA: Canal anterior no seu histórico\nALT+DIREITA: Próximo canal no seu histórico\nCTRL+MAIS: Aumenta o tamanho da fonte (zoom in)\nCTRL+MENOS: Diminui o tamanho da fonte (zoom out)\nSHIFT+CIMA (no campo de entrada): Seleciona o texto até a linha anterior\nSHIFT+BAIXO (no campo de entrada): Seleciona o texto até a próxima linha\nSHIFT+ENTER (no campo de entrada): Cria nova linha\n"
   },
   {
     "id": "api.command_shortcuts.browser_mac",
-    "translation": "#### Comandos Nativos do Navegador\n\nCMD+[: Canal anterior no seu histórico\nCMD+]: Próximo canal no seu histórico\nCMD+PLUS: Aumenta o tamanho da fonte (zoom in)\nCMD+MINUS: Diminui o tamanho da fonte (zoom out)\nSHIFT+UP (no campo de entrada): Seleciona o texto até a linha anterior\nSHIFT+DOWN (no campo de entrada): Seleciona o texto até a próxima linha\nSHIFT+ENTER (no campo de entrada): Cria nova linha\n"
+    "translation": "#### Comandos Nativos do Navegador\n\nCMD+[: Canal anterior no seu histórico\nCMD+]: Próximo canal no seu histórico\nCMD+MAIS: Aumenta o tamanho da fonte (zoom in)\nCMD+MENOS: Diminui o tamanho da fonte (zoom out)\nSHIFT+CIMA (no campo de entrada): Seleciona o texto até a linha anterior\nSHIFT+BAIXO (no campo de entrada): Seleciona o texto até a próxima linha\nSHIFT+ENTER (no campo de entrada): Cria nova linha\n"
   },
   {
     "id": "api.command_shortcuts.desc",
@@ -629,11 +629,11 @@
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### Mensagens\n\nALT+[clique na mensagem]: Define a mensagem como a mensagem mais velha não lida no canal atual\nESC: Marca todas as mensagens do canal atual como lida\nCTRL+UP (campo de entrada vazio): Reimprimi a mensagem anterior ou comando slash digitado\nCTRL+DOWN (campo de entrada vazio): Reimprimi a próxima mensagem ou comando slash digitado\nUP (campo de entrada vazio): Editar sua última mensagem no canal atual\n@[caracter]+TAB: Autocompleta @usuário começando com [caracter]\n:[caracter]+TAB: Autocompleta o emoji começando com [caracter]\n\n"
+    "translation": "#### Mensagens\n\nESC: Marcar todas as mensagens do canal atual como lidas\nCTRL+CIMA (no campo de entrada vazio): Mostra a última mensagem ou comando digitado\nCTRL+BAIXO (no campo de entrada vazio): Mostra a próxima mensagem ou comando digitado\nCIMA (no campo de entrada vazio): Edita sua última mensagem no canal atual\n@[caracter]+TAB: Autocompleta @usuário começado com [caracter]\n#[caracter]+TAB: Autocompleta canal começado com [caracter]\n:[caracter]+TAB: Autocompleta emoji começado com [caracter]\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Mensagens\n\nALT+[clique na mensagem]: Define a mensagem como a mensagem mais velha não lida no canal atual\nESC: Marca todas as mensagens do canal atual como lida\nCMD+UP (campo de entrada vazio): Reimprimi a mensagem anterior ou comando slash digitado\nCMD+DOWN (campo de entrada vazio): Reimprimi a próxima mensagem ou comando slash digitado\nUP (campo de entrada vazio): Editar sua última mensagem no canal atual\n@[caracter]+TAB: Autocompleta @usuário começando com [caracter]\n:[caracter]+TAB: Autocompleta o emoji começando com [caracter]\n\n"
+    "translation": "#### Mensagens\n\nESC: Marcar todas as mensagens do canal atual como lidas\nCMD+CIMA (no campo vazio de entrada): Mostra a última mensagem ou comando digitado\nCMD+BAIXO (no campo vazio de entrada): Mostra a próxima mensagem ou comando digitado\nCIMA (no campo vazio de entrada): Edita sua última mensagem no canal atual\n@[caracter]+TAB: Autocompleta @usuário começado com [caracter]\n#[caracter]+TAB: Autocompleta channel começado com [caracter]\n:[caracter]+TAB: Autocompleta emoji começado com [caracter]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -641,11 +641,11 @@
   },
   {
     "id": "api.command_shortcuts.nav",
-    "translation": "### Atalhos do Teclado\n\n#### Navegação\n\nALT+UP: Canal ou mensagem direta anterior na barra lateral esquerda\nALT+DOWN: Próximo canal ou mensagem direta na barra lateral esquerda\nALT+SHIFT+UP: Canal anterior ou mensagem direta na barra lateral esquerda com mensagens não lidas\nALT+SHIFT+DOWN: Próximo canal ou mensagem direta na barra lateral esquerda com mensagens não lidas\nCTRL+K: Abra uma janela de troca rápida de canal\nCTRL+SHIFT+A: Abre as configurações de conta\nCTRL+SHIFT+M: Abre as menções recentes\n\n"
+    "translation": "### Atalhos do Teclado\n\n#### Navegação\n\nALT+CIMA: Canal ou mensagem direta anterior na barra lateral esquerda\nALT+BAIXO: Próximo canal ou mensagem direta na barra lateral esquerda\nALT+SHIFT+CIMA: Canal anterior ou mensagem direta na barra lateral esquerda com mensagens não lidas\nALT+SHIFT+BAIXO: Próximo canal ou mensagem direta na barra lateral esquerda com mensagens não lidas\nCTRL+K: Abra uma janela de troca rápida de canal\nCTRL+SHIFT+A: Abre as configurações de conta\nCTRL+SHIFT+M: Abre as menções recentes\n\n"
   },
   {
     "id": "api.command_shortcuts.nav_mac",
-    "translation": "### Atalhos do Teclado\n\n#### Navegação\n\nALT+UP: Canal ou mensagem direta anterior na barra lateral esquerda\nALT+DOWN: Próximo canal ou mensagem direta na barra lateral esquerda\nALT+SHIFT+UP: Canal anterior ou mensagem direta na barra lateral esquerda com mensagens não lidas\nALT+SHIFT+DOWN: Próximo canal ou mensagem direta na barra lateral esquerda com mensagens não lidas\nCMD+K: Abra uma janela de troca rápida de canal\nCMD+SHIFT+A: Abre as configurações de conta\nCMD+SHIFT+M: Abre as menções recentes\n\n"
+    "translation": "### Atalhos do Teclado\n\n#### Navegação\n\nALT+CIMA: Canal ou mensagem direta anterior na barra lateral esquerda\nALT+BAIXO: Próximo canal ou mensagem direta na barra lateral esquerda\nALT+SHIFT+CIMA: Canal anterior ou mensagem direta na barra lateral esquerda com mensagens não lidas\nALT+SHIFT+BAIXO: Próximo canal ou mensagem direta na barra lateral esquerda com mensagens não lidas\nCMD+K: Abra uma janela de troca rápida de canal\nCMD+SHIFT+A: Abre as configurações de conta\nCMD+SHIFT+M: Abre as menções recentes\n\n"
   },
   {
     "id": "api.command_shrug.desc",
@@ -763,7 +763,7 @@
   },
   {
     "id": "api.email_batching.send_batched_email_notification.user.app_error",
-    "translation": "Não foi possível encontrar o o destinatário para a notificação de e mail em lote"
+    "translation": "Não foi possível encontrar o destinatário para a notificação de email em lote"
   },
   {
     "id": "api.email_batching.start.starting",
@@ -1520,6 +1520,14 @@
     "translation": "Parando o Servidor..."
   },
   {
+    "id": "api.slackimport.slack_add_bot_user.email_pwd",
+    "translation": "Slack Bot/Integração Importar Posts Usuário: Email, Senha: {{.Email}}, {{.Password}}\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"
+  },
+  {
     "id": "api.slackimport.slack_add_channels.added",
     "translation": "\r\n Canal Adicionado \r\n"
   },
@@ -1533,7 +1541,7 @@
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Slack Importer: Failed to import channel: %s"
+    "translation": "Slack Importer: Falha ao importar o canal: %s"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
@@ -1548,6 +1556,10 @@
     "translation": "Slack bot posts não foram importados 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."
+  },
+  {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
     "translation": "Comentário do arquivo indefinido"
   },
@@ -1556,6 +1568,10 @@
     "translation": "Mensagem sem usuário"
   },
   {
+    "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."
+  },
+  {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
     "translation": "Tipo de post não suportado: %v, %v"
   },
@@ -1612,6 +1628,10 @@
     "translation": "Falha ao compilar a @menção correspondendo a expressão regular para o usuário Slack {{.UserID}} {{.Username}}"
   },
   {
+    "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
+    "translation": "Slack Importer: Falha ao desativar o usuário bot-importing."
+  },
+  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Mattermost Log de Importação Slack\r\n"
   },
@@ -1652,6 +1672,22 @@
     "translation": "Erro ao analisar algumas postagens do slack. Importação deve 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."
+  },
+  {
+    "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."
+  },
+  {
+    "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."
+  },
+  {
+    "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."
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "Inicializando status api routes"
   },
@@ -1741,11 +1777,11 @@
   },
   {
     "id": "api.team.invite_members.restricted_system_admin.app_error",
-    "translation": "Convite a novos usuários para uma equipe está restrito para o Administrador do Sistema"
+    "translation": "Convite a novos usuários para uma equipe está restrito para o Administrador do Sistema."
   },
   {
     "id": "api.team.invite_members.restricted_team_admin.app_error",
-    "translation": "Convite a novos usuários para uma equipe está restrito para o Administrador do Sistema e Equipe"
+    "translation": "Convite a novos usuários para uma equipe está restrito para o Administrador do Sistema e Equipe."
   },
   {
     "id": "api.team.invite_members.send.error",
@@ -2508,12 +2544,16 @@
     "translation": "Permissões inadequadas para re-gerar o token do webhook de saída"
   },
   {
+    "id": "api.webrtc.disabled.app_error",
+    "translation": "WebRTC não está ativo neste servidor."
+  },
+  {
     "id": "api.webrtc.init.debug",
     "translation": "Inicializando WebRTC api routes"
   },
   {
-    "id": "api.webrtc.not_available.app_error",
-    "translation": "WebRTC não está disponível neste servidor."
+    "id": "api.webrtc.register_token.app_error",
+    "translation": "Encontrado um erro ao tentar registrar o Token WebRTC"
   },
   {
     "id": "api.websocket_handler.invalid_param.app_error",
@@ -2804,18 +2844,6 @@
     "translation": "Não é possível atualizar o usuário SAML existente. Permitindo o login de qualquer maneira. err=%v"
   },
   {
-    "id": "ent.webrtc.disabled.app_error",
-    "translation": "WebRTC não está ativo neste servidor."
-  },
-  {
-    "id": "ent.webrtc.license_disable.app_error",
-    "translation": "Sua licença não suporta usar Mattermost WebRTC"
-  },
-  {
-    "id": "ent.webrtc.register_token.app_error",
-    "translation": "Encontrado um erro ao tentar registrar o Token WebRTC"
-  },
-  {
     "id": "error.generic.link_message",
     "translation": "Voltar ao Mattermost"
   },
diff --git a/i18n/ru.json b/i18n/ru.json
index 092e51f01..aee7f9e1a 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -629,11 +629,11 @@
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### Сообщения\n\nALT+[клик на сообщение]: Установить сообщение, в текущем канале, как непрочитанное\nESC: Отметить все сообщения в текущем канале как прочитанные\nCMD+UP (в пустом поле ввода): Восстановить предыдущее введенное сообщение или команду\nCMD+DOWN (в пустом поле ввода): Восстановить следующее введенное сообщение или команду\nUP (в пустом поле ввода): Править свое последнее сообщение в текущем канале\n@[character]+TAB: Дополнить имя пользователя @username начинающееся с [character]\n:[character]+TAB: Дополнить эмодзи начинающийся с [character]\n\n"
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n~[character]+TAB: Autocomplete channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Сообщения\n\nALT+[click on a message]: Установить сообщение, в текущем канале, как непрочитанное\nESC: Отметить все сообщения в текущем канале как прочитанные\nCMD+UP (в пустом поле ввода): Восстановить предыдущее введенное сообщение или команду\nCMD+DOWN (в пустом поле ввода): Восстановить следующее введенное сообщение или команду\nUP (в пустом поле ввода): Править свое последнее сообщение в текущем канале\n@[character]+TAB: Дополнить имя пользователя @username начинающееся с [character]\n:[character]+TAB: Дополнить эмодзи начинающийся с [character]\n\n"
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n~[character]+TAB: Autocomplete channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -891,7 +891,7 @@
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.get_file_infos_again.warn",
-    "translation": "Невозможно получить FileInfos из сообщения после миграции, post_id=%v, err=%v"
+    "translation": "Невозможно получить информацию о файлах из сообщения после миграции, post_id=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.get_post_again.warn",
@@ -1520,6 +1520,14 @@
     "translation": "Остановка сервера..."
   },
   {
+    "id": "api.slackimport.slack_add_bot_user.email_pwd",
+    "translation": "Slack Bot/Integration Posts Import User: Email, Password: {{.Email}}, {{.Password}}\r\n"
+  },
+  {
+    "id": "api.slackimport.slack_add_bot_user.unable_import",
+    "translation": "Unable to import Slack Bot/Integration Posts Import User: {{.Username}}\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_channels.added",
     "translation": "\r\n Каналы добавлены \r\n"
   },
@@ -1533,7 +1541,7 @@
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Slack Importer: Failed to import channel: %s"
+    "translation": "Slack Импортер: не удалось импортировать канал: %s"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
@@ -1548,6 +1556,10 @@
     "translation": "Посты Slack-бота еще не импортированы"
   },
   {
+    "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."
+  },
+  {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
     "translation": "Комментарий к файлу неопределен"
   },
@@ -1556,6 +1568,10 @@
     "translation": "Сообщение без участия пользователя"
   },
   {
+    "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
+    "translation": "Slack Importer: Not importing bot message due to lack of BotId field."
+  },
+  {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
     "translation": "Неподдерживаемый тип сообщения: %v, %v"
   },
@@ -1612,6 +1628,10 @@
     "translation": "Не удалось составить @упоминание, соответствующее регулярному выражению, для пользователя Slack {{.UserID}} {{.Username}}"
   },
   {
+    "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
+    "translation": "Slack Importer: Failed to deactivate the bot-importing user."
+  },
+  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Лог импорта Mattermost Slack\r\n"
   },
@@ -1652,6 +1672,22 @@
     "translation": "Ошибка разбора некоторых постов slack. Несмотря на это, импорт может быть выполнен."
   },
   {
+    "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
+    "translation": "Менеджер импорта Slack: Канал {{.ChannelName}} имеет слишком длинное имя. Оно будет укорочено при импорте."
+  },
+  {
+    "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
+    "translation": "Менеджер импорта Slack: Канал {{.ChannelName}} имеет слишком длинный заголовок. Он будет укорочен при импорте."
+  },
+  {
+    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
+    "translation": "Менеджер импорта Slack: Канал {{.ChannelName}} имеет слишком длинное имя. Оно будет укорочено при импорте."
+  },
+  {
+    "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
+    "translation": "Менеджер импорта Slack: Канал {{.ChannelName}} имеет слишком длинное имя. Оно будет укорочено при импорте."
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "Инициализация API"
   },
@@ -2508,12 +2544,16 @@
     "translation": "Несоответствующие права для генерации нового токена для исходящего вебхука"
   },
   {
+    "id": "api.webrtc.disabled.app_error",
+    "translation": "WebRTC не доступен на этом сервере."
+  },
+  {
     "id": "api.webrtc.init.debug",
     "translation": "Инициализация API WebRTC"
   },
   {
-    "id": "api.webrtc.not_available.app_error",
-    "translation": "WebRTC недоступен на этом сервере."
+    "id": "api.webrtc.register_token.app_error",
+    "translation": "Мы столкнулись с неожиданной ошибкой при попытке зарегистрировать токен WebRTC"
   },
   {
     "id": "api.websocket_handler.invalid_param.app_error",
@@ -2804,18 +2844,6 @@
     "translation": "Невозможно обновить существующего пользователя SAML. Несмотря на это, вход разрешен. err=%v"
   },
   {
-    "id": "ent.webrtc.disabled.app_error",
-    "translation": "WebRTC не включен на этом сервере."
-  },
-  {
-    "id": "ent.webrtc.license_disable.app_error",
-    "translation": "Ваша лицензия не поддерживает использование Mattermost WebRTC"
-  },
-  {
-    "id": "ent.webrtc.register_token.app_error",
-    "translation": "Мы столкнулись с неожиданной ошибкой при попытке зарегистрировать WebRTC Токен"
-  },
-  {
     "id": "error.generic.link_message",
     "translation": "Вернуться к Mattermost"
   },
diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index 0f6bc3370..0fd75134e 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -629,11 +629,11 @@
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### 消息\n\nALT+[点击信息]：设信息为您在本频道最早未读信息\nESC：标此频道所有消息为已读\nCMD +向上键 (在空输入框)：重输入您上个输入的消息或斜杠命令\nCMD +向下键 (在空输入框)：重输入您下个输入的消息或斜杠命令\n向上键 (在空输入框)：编辑你在本频道发的上一条消息\n@[字]+TAB：自动完成以[字]开头的 @用户名\n:[字]+TAB: 自动完成以[字]开头的表情符\n\n"
+    "translation": "#### 消息\n\nESC：标当前频道所有消息为已读\nCTRL+向上键 (在空输入栏)：重用您输入的上一条消息或斜杠命令\nCTRL+向下键 (在空输入栏)：重用您输入的下一条消息或斜杠命令\n向上键 (在空输入栏)：修改您当前频道的上一条消息\n@[字符]+TAB：自动完成以[字符]开头的 @用户名\n#[字符]+TAB：自动完成以[字符]开头的频道\n:[字符]+TAB：自动完成以[字符]开头的表情符\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### 消息\n\nALT+[点击信息]：设信息为您在本频道最早未读信息\nESC：标此频道所有消息为已读\nCMD +向上键 (在空输入框)：重输入您上个输入的消息或斜杠命令\nCMD +向下键 (在空输入框)：重输入您下个输入的消息或斜杠命令\n向上键 (在空输入框)：编辑你在本频道发的上一条消息\n@[字]+TAB：自动完成以[字]开头的 @用户名\n:[字]+TAB: 自动完成以[字]开头的表情符\n\n"
+    "translation": "#### 消息\n\nESC：标当前频道所有消息为已读\nCMD+向上键 (在空输入栏)：重用您输入的上一条消息或斜杠命令\nCMD+向下键 (在空输入栏)：重用您输入的下一条消息或斜杠命令\n向上键 (在空输入栏)：修改您当前频道的上一条消息\n@[字符]+TAB：自动完成以[字符]开头的 @用户名\n#[字符]+TAB：自动完成以[字符]开头的频道\n:[字符]+TAB：自动完成以[字符]开头的表情符\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -891,7 +891,7 @@
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.get_file_infos_again.warn",
-    "translation": "转移数据后未能获取 FileInfos, post_id=%v, err=%v"
+    "translation": "转移数据后未能获取消息 FileInfos, post_id=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.get_post_again.warn",
@@ -1520,6 +1520,14 @@
     "translation": "正在停止服务..."
   },
   {
+    "id": "api.slackimport.slack_add_bot_user.email_pwd",
+    "translation": "Slack 机器人/整合消息导入用户：邮箱地址，密码: {{.Email}}, {{.Password}}\r\n"
+  },
+  {
+    "id": "api.slackimport.slack_add_bot_user.unable_import",
+    "translation": "无法导入 Slack 机器人/整合消息导入用户：{{.Username}}\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_channels.added",
     "translation": "\r\n 频道已添加 \r\n"
   },
@@ -1533,7 +1541,7 @@
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Slack Importer: Failed to import channel: %s"
+    "translation": "Slack 导入：导入频道失败：%s"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
@@ -1548,6 +1556,10 @@
     "translation": "Slack 机器人的信息未被导入"
   },
   {
+    "id": "api.slackimport.slack_add_posts.bot_user_no_exists.warn",
+    "translation": "Slack 导入：未导入机器人消息因为机器人导入用户不存在。"
+  },
+  {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
     "translation": "文件评论未定义"
   },
@@ -1556,6 +1568,10 @@
     "translation": "未知用户消息"
   },
   {
+    "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
+    "translation": "Slack 导入：未导入机器人消息因为缺少 BotId 字段。"
+  },
+  {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
     "translation": "不支持的邮件类型: %v, %v"
   },
@@ -1612,6 +1628,10 @@
     "translation": "给 Slack 用户 {{.UserID}} {{.Username}} 编译 @提及 正规表达式时失败"
   },
   {
+    "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
+    "translation": "Slack 导入：停用机器人导入用户失败。"
+  },
+  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Mattermost Slack 导入日志 \r\n"
   },
@@ -1652,6 +1672,22 @@
     "translation": "解析 slack 消息时出错。导入可能仍然可用。"
   },
   {
+    "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
+    "translation": "Slack 导入：频道 {{.ChannelName}} 的显示名过长。导入时会被截断。"
+  },
+  {
+    "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
+    "translation": "Slack 导入：频道 {{.ChannelName}} 的标题过长。导入时会被截断。"
+  },
+  {
+    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
+    "translation": "Slack 导入：频道 {{.ChannelName}} 的名称过长。导入时会被截断。"
+  },
+  {
+    "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
+    "translation": "Slack 导入：频道 {{.ChannelName}} 的作用过长。导入时会被截断。"
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "初始化状态 API 路由"
   },
@@ -2508,12 +2544,16 @@
     "translation": "没有权限重新生成传出webhook令牌"
   },
   {
+    "id": "api.webrtc.disabled.app_error",
+    "translation": "WebRTC 未在本服务器开启。"
+  },
+  {
     "id": "api.webrtc.init.debug",
     "translation": "初始化 WebRTC api 路由中"
   },
   {
-    "id": "api.webrtc.not_available.app_error",
-    "translation": "WebRTC 在本服务器不可用。"
+    "id": "api.webrtc.register_token.app_error",
+    "translation": "我们在注册 WebRTC 令牌时遇到个错误"
   },
   {
     "id": "api.websocket_handler.invalid_param.app_error",
@@ -2804,18 +2844,6 @@
     "translation": "无法更新现有SAML用户。仍允许登入。err=%v"
   },
   {
-    "id": "ent.webrtc.disabled.app_error",
-    "translation": "WebRTC 未在本服务器开启。"
-  },
-  {
-    "id": "ent.webrtc.license_disable.app_error",
-    "translation": "您的许可证不支持使用 Mattermost WebRTC"
-  },
-  {
-    "id": "ent.webrtc.register_token.app_error",
-    "translation": "我们在注册 WebRTC 令牌时遇到个错误"
-  },
-  {
     "id": "error.generic.link_message",
     "translation": "返回到 Mattermost"
   },
diff --git a/i18n/zh_TW.json b/i18n/zh_TW.json
index 97efb1ae8..e0eca19da 100644
--- a/i18n/zh_TW.json
+++ b/i18n/zh_TW.json
@@ -629,11 +629,11 @@
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### 訊息\n\nALT+[按訊息]：設定訊息為目前頻道中最舊的未讀訊息\nESC：將當前頻道所有訊息設為已讀\nCMD+UP (在空的輸入欄)：顯示上一個您輸入的訊息或是斜線命令\nCMD+DOWN (在空的輸入欄)：顯示下一個您輸入的訊息或是斜線命令\nUP (在空的輸入欄)：編輯當前頻道您的上一個訊息\n@[文字]+TAB：自動完成以[文字]起始的@使用者帳號\n:[文字]+TAB：自動完成以[文字]起始的顏文字\n\n"
+    "translation": "#### 訊息\n\nESC：將當前頻道所有訊息設為已讀\nCTRL+UP (在空的輸入欄)：顯示上一個您輸入的訊息或是斜線命令\nCTRL+DOWN (在空的輸入欄)：顯示下一個您輸入的訊息或是斜線命令\nUP (在空的輸入欄)：編輯當前頻道您的上一個訊息\n@[文字]+TAB：自動完成以[文字]起始的@使用者帳號\n#[文字]+TAB：自動完成以[文字]起始的頻道\n:[文字]+TAB：自動完成以[文字]起始的顏文字\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### 訊息\n\nALT+[按訊息]：設定訊息為目前頻道中最舊的未讀訊息\nESC：將當前頻道所有訊息設為已讀\nCMD+UP (在空的輸入欄)：顯示上一個您輸入的訊息或是斜線命令\nCMD+DOWN (在空的輸入欄)：顯示下一個您輸入的訊息或是斜線命令\nUP (在空的輸入欄)：編輯當前頻道您的上一個訊息\n@[文字]+TAB：自動完成以[文字]起始的@使用者帳號\n:[文字]+TAB：自動完成以[文字]起始的顏文字\n\n"
+    "translation": "#### 訊息\n\nESC：將當前頻道所有訊息設為已讀\nCMD+UP (在空的輸入欄)：顯示上一個您輸入的訊息或是斜線命令\nCMD+DOWN (在空的輸入欄)：顯示下一個您輸入的訊息或是斜線命令\nUP (在空的輸入欄)：編輯當前頻道您的上一個訊息\n@[文字]+TAB：自動完成以[文字]起始的@使用者帳號\n#[文字]+TAB：自動完成以[文字]起始的頻道\n:[文字]+TAB：自動完成以[文字]起始的顏文字\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -891,7 +891,7 @@
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.get_file_infos_again.warn",
-    "translation": "轉移成使用 FileInfos 後無法取得文章的 FileInfos 頻道：post_id=%v, err=%v"
+    "translation": "轉移成使用 FileInfos 後無法取得文章的 FileInfos：post_id=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.get_post_again.warn",
@@ -1520,6 +1520,14 @@
     "translation": "正在停止伺服器..."
   },
   {
+    "id": "api.slackimport.slack_add_bot_user.email_pwd",
+    "translation": "Slack 機器人/外部整合發文匯入使用者：電子郵件，密碼：{{.Email}}，{{.Password}}\r\n"
+  },
+  {
+    "id": "api.slackimport.slack_add_bot_user.unable_import",
+    "translation": "無法匯入Slack 機器人/外部整合發文匯入使用者：{{.Username}}\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_channels.added",
     "translation": "\r\n 頻道已加入 \r\n"
   },
@@ -1533,7 +1541,7 @@
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.warn",
-    "translation": "Slack Importer: Failed to import channel: %s"
+    "translation": "Slack 匯入：無法匯入頻道：%s"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
@@ -1548,6 +1556,10 @@
     "translation": "Slack 機器人的訊息還未被匯入"
   },
   {
+    "id": "api.slackimport.slack_add_posts.bot_user_no_exists.warn",
+    "translation": "Slack 匯入：由於匯入機器人使用者不存在，將不匯入機器人訊息。"
+  },
+  {
     "id": "api.slackimport.slack_add_posts.msg_no_comment.debug",
     "translation": "檔案註解未定義"
   },
@@ -1556,6 +1568,10 @@
     "translation": "訊息沒有使用者"
   },
   {
+    "id": "api.slackimport.slack_add_posts.no_bot_id.warn",
+    "translation": "Slack 匯入：BotId 欄位缺失，將不匯入機器人訊息。"
+  },
+  {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
     "translation": "不支援的文章類型: %v, %v"
   },
@@ -1612,6 +1628,10 @@
     "translation": "無法為 Slack 使用者 {{.UserID}} {{.Username}} 編譯匹配@提及的正規表示式"
   },
   {
+    "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
+    "translation": "Slack 匯入：無法停用匯入機器人使用者。"
+  },
+  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Mattermost Slack 匯入記錄\r\n"
   },
@@ -1652,6 +1672,22 @@
     "translation": "解析 Slack 訊息時發生錯誤。匯入功能有可能照樣運作。"
   },
   {
+    "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
+    "translation": "Slack 匯入：頻道 {{.ChannelName}} 的顯示名稱過長，將會在匯入時被截短。"
+  },
+  {
+    "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
+    "translation": "Slack 匯入：頻道 {{.ChannelName}} 的標題過長，將會在匯入時被截短。"
+  },
+  {
+    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
+    "translation": "Slack 匯入：頻道 {{.ChannelName}} 的名字過長，將會在匯入時被截短。"
+  },
+  {
+    "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
+    "translation": "Slack 匯入：頻道 {{.ChannelName}} 的用途過長，將會在匯入時被截短。"
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "正在初始化狀態 API 路徑"
   },
@@ -2508,12 +2544,16 @@
     "translation": "沒有適當的權限重新產生傳出的 Webhook Token"
   },
   {
+    "id": "api.webrtc.disabled.app_error",
+    "translation": "此伺服器未啟用 WebRTC。"
+  },
+  {
     "id": "api.webrtc.init.debug",
     "translation": "正在初始化 WebRTC API 路徑"
   },
   {
-    "id": "api.webrtc.not_available.app_error",
-    "translation": "此伺服器不支援 WebRTC。"
+    "id": "api.webrtc.register_token.app_error",
+    "translation": "嘗試註冊 WebRTC Token時發生錯誤"
   },
   {
     "id": "api.websocket_handler.invalid_param.app_error",
@@ -2804,18 +2844,6 @@
     "translation": "無法更新現有的 SAML 使用者。總之先允許登入。err=%v"
   },
   {
-    "id": "ent.webrtc.disabled.app_error",
-    "translation": "此伺服器未啟用 WebRTC。"
-  },
-  {
-    "id": "ent.webrtc.license_disable.app_error",
-    "translation": "授權不支援 Mattermost WebRTC"
-  },
-  {
-    "id": "ent.webrtc.register_token.app_error",
-    "translation": "嘗試註冊 WebRTC Token時發生錯誤"
-  },
-  {
     "id": "error.generic.link_message",
     "translation": "回到 Mattermost"
   },
@@ -3269,7 +3297,7 @@
   },
   {
     "id": "model.config.is_valid.max_channels.app_error",
-    "translation": "團隊設定中的單一團隊最高使頻道數無效。必須為正數。"
+    "translation": "團隊設定中的單一團隊最高頻道數無效。必須為正數。"
   },
   {
     "id": "model.config.is_valid.max_file_size.app_error",