translations PR 20170710 (#6902)

14 files changed, 1041 insertions, 729 deletions

diff --git a/i18n/de.json b/i18n/de.json
index d7d9f8528..83fcf0344 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "Command with a trigger of '{{.Trigger}}' not found. To send a message beginning with \"/\", try adding an empty space at the beginning of the message."
+    "translation": "Befehl mit dem Auslösewort '{{.Trigger}}' nicht gefunden. Um eine Nachricht mit \"/\" beginnend zu senden, versuchen Sie ein Leerzeichen vor der Nachricht zu setzen."
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -461,7 +461,7 @@
   },
   {
     "id": "api.command.invite_people.invite_off",
-    "translation": "User creation has been disabled on this server, no invite(s) sent"
+    "translation": "Benutzererstellung wurde auf diesem Server deaktiviert, keine Einladung(en) versendet"
   },
   {
     "id": "api.command.invite_people.name",
@@ -501,11 +501,11 @@
   },
   {
     "id": "api.command_channel_header.channel.app_error",
-    "translation": "Error to retrieve the current channel."
+    "translation": "Fehler beim Laden des aktuellen Kanals."
   },
   {
     "id": "api.command_channel_header.desc",
-    "translation": "Edit the channel header"
+    "translation": "Kanalüberschrift bearbeiten"
   },
   {
     "id": "api.command_channel_header.hint",
@@ -513,23 +513,23 @@
   },
   {
     "id": "api.command_channel_header.message.app_error",
-    "translation": "Text must be provided with the /header command."
+    "translation": "Der Befehl /überschrift muss Text beinhalten"
   },
   {
     "id": "api.command_channel_header.name",
-    "translation": "header"
+    "translation": "überschrift"
   },
   {
     "id": "api.command_channel_header.permission.app_error",
-    "translation": "You do not have the appropriate permissions to edit the channel header."
+    "translation": "Sie haben nicht die benötigten Berechtigungen, um die Kanalüberschrift zu bearbeiten."
   },
   {
     "id": "api.command_channel_header.update_channel.app_error",
-    "translation": "Error to update the current channel."
+    "translation": "Fehler beim Aktualisieren des aktuellen Kanals."
   },
   {
     "id": "api.command_channel_header.update_channel.success",
-    "translation": "Channel header successfully updated."
+    "translation": "Kanalüberschrift erfolgreich aktualisiert."
   },
   {
     "id": "api.command_collapse.desc",
@@ -589,11 +589,11 @@
   },
   {
     "id": "api.command_help.desc",
-    "translation": "Open the Mattermost help page"
+    "translation": "Die Mattermost-Hilfeseite öffnen"
   },
   {
     "id": "api.command_help.name",
-    "translation": "help"
+    "translation": "hilfe"
   },
   {
     "id": "api.command_join.desc",
@@ -705,19 +705,35 @@
   },
   {
     "id": "api.command_open.name",
-    "translation": "open"
+    "translation": "öffnen"
+  },
+  {
+    "id": "api.command_search.desc",
+    "translation": "Nach Text in Nachrichten suchen"
+  },
+  {
+    "id": "api.command_search.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_search.name",
+    "translation": "suche"
+  },
+  {
+    "id": "api.command_search.unsupported.app_error",
+    "translation": "Der Suchbefehl wird auf Ihrem Gerät nicht unterstützt"
   },
   {
     "id": "api.command_settings.desc",
-    "translation": "Open the Account Settings dialog"
+    "translation": "Öffnet die Kontoeinstellungen"
   },
   {
     "id": "api.command_settings.name",
-    "translation": "settings"
+    "translation": "einstellungen"
   },
   {
     "id": "api.command_settings.unsupported.app_error",
-    "translation": "The settings command is not supported on your device"
+    "translation": "Der Einstellungen-Befehl wird auf Ihrem Gerät nicht unterstützt"
   },
   {
     "id": "api.command_shortcuts.browser.channel_next",
@@ -960,6 +976,10 @@
     "translation": "Ein unbekannter Fehler ist aufgetreten. Bitte kontaktieren Sie den Support."
   },
   {
+    "id": "api.context.v3_disabled.app_error",
+    "translation": "Die API-Version 3 wurde auf diesem Server deaktiviert. Bitte verwenden Sie API-Version 4. Details unter https://api.mattermost.com."
+  },
+  {
     "id": "api.deprecated.init.debug",
     "translation": "Initialisiere veraltete API-Routen"
   },
@@ -1490,6 +1510,10 @@
     "translation": "Initialisiere OAuth-API-Routen"
   },
   {
+    "id": "api.oauth.invalid_state_token.app_error",
+    "translation": "Ungültiges Status-Token"
+  },
+  {
     "id": "api.oauth.regenerate_secret.app_error",
     "translation": "Ungültige Berechtigungen um den OAuth2 App Schlüssel neu zu generieren"
   },
@@ -3021,19 +3045,11 @@
   },
   {
     "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Failed to get direct channel"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Failed to get direct channel"
+    "translation": "Konnte Direktkanal nicht erstellen"
   },
   {
     "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Failed to get group channel"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Failed to get group channel"
+    "translation": "Konnte Gruppenkanal nicht erstellen"
   },
   {
     "id": "app.import.import_direct_channel.member_not_found.error",
@@ -3041,15 +3057,23 @@
   },
   {
     "id": "app.import.import_direct_channel.update_header_failed.error",
-    "translation": "Failed to update direct channel header"
+    "translation": "Konnte Direktkanalüberschrift nicht aktualisieren"
   },
   {
     "id": "app.import.import_direct_post.channel_member_not_found.error",
     "translation": "Konnte Kanalmitglied beim Import des Direktnachrichtenkanals nicht finden"
   },
   {
+    "id": "app.import.import_direct_post.create_direct_channel.error",
+    "translation": "Konnte Direktkanal nicht erstellen"
+  },
+  {
+    "id": "app.import.import_direct_post.create_group_channel.error",
+    "translation": "Konnte Gruppenkanal nicht erstellen"
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
-    "translation": "Post user does not exist"
+    "translation": "Benutzer der Nachricht existiert nicht"
   },
   {
     "id": "app.import.import_line.null_channel.error",
@@ -3057,11 +3081,11 @@
   },
   {
     "id": "app.import.import_line.null_direct_channel.error",
-    "translation": "Importdatenzeile hat den Typ \"channel\", aber das Kanalobjekt ist null."
+    "translation": "Importdatenzeile hat den Typ \"direct_channel\", aber das direct_channel-Objekt ist null."
   },
   {
     "id": "app.import.import_line.null_direct_post.error",
-    "translation": "Importdatenzeile hat den Typ \"post\", aber das Nachrichtenobjekt ist null."
+    "translation": "Importdatenzeile hat den Typ \"direct_post\", aber das direct_post-Objekt ist null."
   },
   {
     "id": "app.import.import_line.null_post.error",
@@ -3137,51 +3161,51 @@
   },
   {
     "id": "app.import.validate_direct_channel_import_data.header_length.error",
-    "translation": "Direct channel header is too long"
+    "translation": "Direktkanal-Überschrift ist zu lang"
   },
   {
     "id": "app.import.validate_direct_channel_import_data.members_required.error",
-    "translation": "Fehlende erforderliche Kanaleigenschaft: name"
+    "translation": "Fehlende erforderliche Kanaleigenschaft: members"
   },
   {
     "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
-    "translation": "Direct channel members list contains too few items"
+    "translation": "Direktkanalmitgliederliste enthält zu wenige Einträge"
   },
   {
     "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
-    "translation": "Direct channel members list contains too many items"
+    "translation": "Direktkanalmitgliederliste enthält zu viele Einträge"
   },
   {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
-    "translation": "Fehlende erforderliche Nachrichteigenschaft: create_at."
+    "translation": "Fehlende erforderliche Nachrichteigenschaft: channel_members"
   },
   {
     "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
-    "translation": "Direct post channel members list contains too few items"
+    "translation": "Direktnachrichtenkanalmitgliederliste enthält zu wenige Einträge"
   },
   {
     "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
-    "translation": "Direct post channel members list contains too many items"
+    "translation": "Direktnachrichtenkanalmitgliederliste enthält zu viele Einträge"
   },
   {
     "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
-    "translation": "Fehlende erforderliche Nachrichteigenschaft: create_at."
+    "translation": "Fehlende erforderliche Nachrichteigenschaft: create_at"
   },
   {
     "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
-    "translation": "CreateAt must be greater than 0"
+    "translation": "CreateAt muss größer als 0 sein"
   },
   {
     "id": "app.import.validate_direct_post_import_data.message_length.error",
-    "translation": "Message is too long"
+    "translation": "Nachricht ist zu lang"
   },
   {
     "id": "app.import.validate_direct_post_import_data.message_missing.error",
-    "translation": "Fehlende erforderliche Nachrichteigenschaft: Message."
+    "translation": "Fehlende erforderliche Nachrichteigenschaft: message"
   },
   {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
-    "translation": "Fehlende erforderliche Nachrichteigenschaft: User."
+    "translation": "Fehlende erforderliche Nachrichteigenschaft: user"
   },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
@@ -4313,7 +4337,7 @@
   },
   {
     "id": "model.config.is_valid.teammate_name_display.app_error",
-    "translation": "Invalid teammate display.  Must be 'full_name', 'nickname_full_name' or 'username'"
+    "translation": "Ungültige Teammitgliedsanzeige.  Muss entweder 'full_name', 'nickname_full_name' oder 'username' sein"
   },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
@@ -5869,7 +5893,7 @@
   },
   {
     "id": "store.sql_user.get_new_users.app_error",
-    "translation": "Es trat ein Fehler beim Sichen der Einstellungen auf"
+    "translation": "Es trat ein Fehler beim Suchen der neuen Benutzer auf"
   },
   {
     "id": "store.sql_user.get_profiles.app_error",
diff --git a/i18n/en.json b/i18n/en.json
index 6784bcd75..e3f7eaacb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -912,10 +912,6 @@
     "translation": "Sorry, we could not find the page."
   },
   {
-    "id": "api.context.v3_disabled.app_error",
-    "translation": "API version 3 has been disabled on this server. Please use API version 4. See https://api.mattermost.com for details."
-  },
-  {
     "id": "api.context.invalid_body_param.app_error",
     "translation": "Invalid or missing {{.Name}} in request body"
   },
@@ -980,6 +976,10 @@
     "translation": "An unknown error has occurred. Please contact support."
   },
   {
+    "id": "api.context.v3_disabled.app_error",
+    "translation": "API version 3 has been disabled on this server. Please use API version 4. See https://api.mattermost.com for details."
+  },
+  {
     "id": "api.deprecated.init.debug",
     "translation": "Initializing deprecated API routes"
   },
@@ -1510,6 +1510,10 @@
     "translation": "Initializing OAuth API routes"
   },
   {
+    "id": "api.oauth.invalid_state_token.app_error",
+    "translation": "Invalid state token"
+  },
+  {
     "id": "api.oauth.regenerate_secret.app_error",
     "translation": "Invalid permissions to regenerate the OAuth2 App Secret"
   },
@@ -2700,10 +2704,6 @@
     "translation": "You are deleting %v that is a system administrator.  You may need to set another account as the system administrator using the command line tools."
   },
   {
-    "id": "api.oauth.invalid_state_token.app_error",
-    "translation": "Invalid state token"
-  },
-  {
     "id": "api.user.reset_password.invalid_link.app_error",
     "translation": "The reset password link does not appear to be valid"
   },
diff --git a/i18n/es.json b/i18n/es.json
index 801565c52..e32abcdb1 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -708,6 +708,22 @@
     "translation": "abrir"
   },
   {
+    "id": "api.command_search.desc",
+    "translation": "Buscar texto en mensajes"
+  },
+  {
+    "id": "api.command_search.hint",
+    "translation": "[texto]"
+  },
+  {
+    "id": "api.command_search.name",
+    "translation": "buscar"
+  },
+  {
+    "id": "api.command_search.unsupported.app_error",
+    "translation": "El comando de búsqueda no es compatible con tu dispositivo"
+  },
+  {
     "id": "api.command_settings.desc",
     "translation": "Abrir el diálogo Configuración de la Cuenta"
   },
@@ -960,6 +976,10 @@
     "translation": "Ocurrió un error inesperado. Por favor contacta a soporte."
   },
   {
+    "id": "api.context.v3_disabled.app_error",
+    "translation": "API versión 3 ha sido inhabilitado en este servidor. Por favor utiliza la API versión 4. Revisa https://api.mattermost.com para más información. "
+  },
+  {
     "id": "api.deprecated.init.debug",
     "translation": "Inicializando rutas del API marcadas como obsoletas"
   },
@@ -1490,6 +1510,10 @@
     "translation": "Inicializando rutas del API para el OAuth"
   },
   {
+    "id": "api.oauth.invalid_state_token.app_error",
+    "translation": "Estado de token no válido"
+  },
+  {
     "id": "api.oauth.regenerate_secret.app_error",
     "translation": "Permisos inapropiados para regenerar el secreto de la App de OAuth2"
   },
@@ -3021,19 +3045,11 @@
   },
   {
     "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "No se pudo obtener el canal directo"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "No se pudo obtener el canal directo"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "No se pudo obtener el canal de grupo"
+    "translation": "No se pudo crear el canal directo"
   },
   {
     "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "No se pudo obtener el canal de grupo"
+    "translation": "No se pudo crear el canal de grupo"
   },
   {
     "id": "app.import.import_direct_channel.member_not_found.error",
@@ -3048,6 +3064,14 @@
     "translation": "No se pudo encontrar a los miembros del canal, al importar un mensaje en el canal directo"
   },
   {
+    "id": "app.import.import_direct_post.create_direct_channel.error",
+    "translation": "No se pudo obtener el canal directo"
+  },
+  {
+    "id": "app.import.import_direct_post.create_group_channel.error",
+    "translation": "No se pudo obtener el canal de grupo"
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "El usuario que publicó el mensaje no existe"
   },
diff --git a/i18n/fr.json b/i18n/fr.json
index c4fcf4a51..55f288749 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -221,7 +221,7 @@
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
-    "translation": "ID utilisateur invalide pour la création directe du canal"
+    "translation": "ID utilisateur invalide pour la création du canal de messages privés"
   },
   {
     "id": "api.channel.create_group.bad_size.app_error",
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "Command with a trigger of '{{.Trigger}}' not found. To send a message beginning with \"/\", try adding an empty space at the beginning of the message."
+    "translation": "Une commande avec le mot-clé déclencheur '{{.Trigger}}' n'a pas pu être trouvée. Pour envoyer un message commençant par \"/\", ajoutez un espace au début du message."
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -461,7 +461,7 @@
   },
   {
     "id": "api.command.invite_people.invite_off",
-    "translation": "User creation has been disabled on this server, no invite(s) sent"
+    "translation": "La création d'utilisateur a été désactivée sur ce serveur, aucune invitation n'a été envoyée"
   },
   {
     "id": "api.command.invite_people.name",
@@ -501,35 +501,35 @@
   },
   {
     "id": "api.command_channel_header.channel.app_error",
-    "translation": "Error to retrieve the current channel."
+    "translation": "Impossible de récupérer le canal courant."
   },
   {
     "id": "api.command_channel_header.desc",
-    "translation": "Edit the channel header"
+    "translation": "Editer l'entête du canal"
   },
   {
     "id": "api.command_channel_header.hint",
-    "translation": "[text]"
+    "translation": "[texte]"
   },
   {
     "id": "api.command_channel_header.message.app_error",
-    "translation": "Text must be provided with the /header command."
+    "translation": "Du texte doit être fourni avec la commande /header."
   },
   {
     "id": "api.command_channel_header.name",
-    "translation": "header"
+    "translation": "entête"
   },
   {
     "id": "api.command_channel_header.permission.app_error",
-    "translation": "You do not have the appropriate permissions to edit the channel header."
+    "translation": "Vous ne disposez pas des permissions requises pour éditer l'entête du canal."
   },
   {
     "id": "api.command_channel_header.update_channel.app_error",
-    "translation": "Error to update the current channel."
+    "translation": "Une erreur s'est produite lors de la mise à jour du canal."
   },
   {
     "id": "api.command_channel_header.update_channel.success",
-    "translation": "Channel header successfully updated."
+    "translation": "L'entête du canal a été mis à jour avec succès."
   },
   {
     "id": "api.command_collapse.desc",
@@ -589,11 +589,11 @@
   },
   {
     "id": "api.command_help.desc",
-    "translation": "Open the Mattermost help page"
+    "translation": "Ouvrir l'aide de Mattermost"
   },
   {
     "id": "api.command_help.name",
-    "translation": "help"
+    "translation": "aide"
   },
   {
     "id": "api.command_join.desc",
@@ -613,7 +613,7 @@
   },
   {
     "id": "api.command_join.missing.app_error",
-    "translation": "Nous n'avons pas pu trouver le canal"
+    "translation": "Impossible de trouver le canal"
   },
   {
     "id": "api.command_join.name",
@@ -705,19 +705,35 @@
   },
   {
     "id": "api.command_open.name",
-    "translation": "open"
+    "translation": "ouvrir"
+  },
+  {
+    "id": "api.command_search.desc",
+    "translation": "Rechercher du texte dans les messages"
+  },
+  {
+    "id": "api.command_search.hint",
+    "translation": "[texte]"
+  },
+  {
+    "id": "api.command_search.name",
+    "translation": "rechercher"
+  },
+  {
+    "id": "api.command_search.unsupported.app_error",
+    "translation": "La commande de recherche n'est pas supportée sur votre périphérique"
   },
   {
     "id": "api.command_settings.desc",
-    "translation": "Open the Account Settings dialog"
+    "translation": "Ouvrir la page des Paramètres du compte"
   },
   {
     "id": "api.command_settings.name",
-    "translation": "settings"
+    "translation": "paramètres"
   },
   {
     "id": "api.command_settings.unsupported.app_error",
-    "translation": "The settings command is not supported on your device"
+    "translation": "La commande de paramètres n'est pas supportée sur votre périphérique"
   },
   {
     "id": "api.command_shortcuts.browser.channel_next",
@@ -797,7 +813,7 @@
   },
   {
     "id": "api.command_shortcuts.msgs.comp_emoji",
-    "translation": ":[caractère]+TAB: Saisi automatiquement l'émoticône commencant par [caractère]\n\n"
+    "translation": ":[caractère]+TAB: Saisi automatiquement l'émoticône commençant par [caractère]\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs.comp_username",
@@ -960,6 +976,10 @@
     "translation": "Une erreur inconnue est survenue. Veuillez contacter le support."
   },
   {
+    "id": "api.context.v3_disabled.app_error",
+    "translation": "La version 3 de l'API a été désactivée sur ce serveur. Veuillez utilisez la version 4 de l'API. Référez-vous à https://api.mattermost.com pour plus de détails."
+  },
+  {
     "id": "api.deprecated.init.debug",
     "translation": "Initialisation des routes dépréciées de l'API"
   },
@@ -977,11 +997,11 @@
   },
   {
     "id": "api.email_batching.check_pending_emails.status.app_error",
-    "translation": "Impossible de trouver le statut du destinataire pour l'envoi par lot des notifications par e-mail"
+    "translation": "Impossible de trouver le statut du destinataire pour l'envoi par lot des e-mails de notification"
   },
   {
     "id": "api.email_batching.render_batched_post.channel.app_error",
-    "translation": "Impossible de trouver le canal du message pour l'envoi par lot des notifications par e-mail"
+    "translation": "Impossible de trouver le canal du message pour l'envoi par lot des e-mails de notification"
   },
   {
     "id": "api.email_batching.render_batched_post.date",
@@ -1001,7 +1021,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
-    "translation": "Impossible de trouver l’expéditeur du message pour l'envoi d'e-mails groupés"
+    "translation": "Impossible de trouver l’expéditeur du message pour l'envoi par lot d'e-mails de notification"
   },
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
@@ -1012,11 +1032,11 @@
   },
   {
     "id": "api.email_batching.send_batched_email_notification.preferences.app_error",
-    "translation": "Impossible de trouver les préférences d'affichage du destinataire pour l'envoi de e-mails groupés"
+    "translation": "Impossible de trouver les préférences d'affichage du destinataire pour l'envoi par lot d'e-mails de notification"
   },
   {
     "id": "api.email_batching.send_batched_email_notification.send.app_error",
-    "translation": "Impossible d'envoyer l'e-mail groupé à %v : %v"
+    "translation": "Impossible d'envoyer le lot d'e-mails de notification à %v : %v"
   },
   {
     "id": "api.email_batching.send_batched_email_notification.subject",
@@ -1027,7 +1047,7 @@
   },
   {
     "id": "api.email_batching.send_batched_email_notification.user.app_error",
-    "translation": "Impossible de trouver un destinataire pour l'envoi d'e-mails groupés"
+    "translation": "Impossible de trouver un destinataire pour l'envoi du lot d'e-mails de notification"
   },
   {
     "id": "api.email_batching.start.starting",
@@ -1490,6 +1510,10 @@
     "translation": "Initialisation des routes de l'API OAuth"
   },
   {
+    "id": "api.oauth.invalid_state_token.app_error",
+    "translation": "Token d'état invalide"
+  },
+  {
     "id": "api.oauth.regenerate_secret.app_error",
     "translation": "Permissions insuffisantes pour regénérer la clé secrète de l'application OAuth2"
   },
@@ -1689,11 +1713,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " Un ou plusieurs fichiers envoyés "
+    "translation": " A envoyé un ou plusieurs fichiers sur "
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " Uploaded one or more files in a direct message"
+    "translation": " A envoyé un ou plusieurs fichiers dans un message privé"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -1725,7 +1749,7 @@
   },
   {
     "id": "api.post.update_post.find.app_error",
-    "translation": "Nous n'avons pas pu trouver de message existant ou de commentaire à mettre à jour."
+    "translation": "Impossible de trouver le message existant ou commentaire à mettre à jour."
   },
   {
     "id": "api.post.update_post.permissions.app_error",
@@ -2125,7 +2149,7 @@
   },
   {
     "id": "api.team.invite_members.invalid_email.app_error",
-    "translation": "The following email addresses do not belong to an accepted domain: {{.Addresses}}. Please contact your System Administrator for details."
+    "translation": "Les adresses e-mail suivantes ne font pas partie d'un domaine accepté : {{.Addresses}}. Veuillez contacter votre administrateur système pour plus de détails."
   },
   {
     "id": "api.team.invite_members.member",
@@ -2585,7 +2609,7 @@
   },
   {
     "id": "api.user.email_to_ldap.not_available.app_error",
-    "translation": "LDAP n'est pas disponible sur ce serveur"
+    "translation": "AD/LDAP n'est pas disponible sur ce serveur"
   },
   {
     "id": "api.user.generate_mfa_qr.not_available.app_error",
@@ -2605,11 +2629,11 @@
   },
   {
     "id": "api.user.ldap_to_email.not_available.app_error",
-    "translation": "LDAP n'est pas disponible sur ce serveur"
+    "translation": "AD/LDAP n'est pas disponible sur ce serveur"
   },
   {
     "id": "api.user.ldap_to_email.not_ldap_account.app_error",
-    "translation": "Ce compte utilisateur n'utilise pas LDAP"
+    "translation": "Ce compte utilisateur n'utilise pas AD/LDAP"
   },
   {
     "id": "api.user.login.blank_pwd.app_error",
@@ -2653,7 +2677,7 @@
   },
   {
     "id": "api.user.login_ldap.disabled.app_error",
-    "translation": "LDAP n'est pas activé sur ce serveur"
+    "translation": "AD/LDAP n'est pas activé sur ce serveur"
   },
   {
     "id": "api.user.login_ldap.need_id.app_error",
@@ -2661,7 +2685,7 @@
   },
   {
     "id": "api.user.login_ldap.not_available.app_error",
-    "translation": "LDAP n'est pas disponible sur ce serveur"
+    "translation": "AD/LDAP n'est pas disponible sur ce serveur"
   },
   {
     "id": "api.user.oauth_to_email.context.app_error",
@@ -2709,7 +2733,7 @@
   },
   {
     "id": "api.user.send_email_change_username_and_forget.error",
-    "translation": "Impossible d'envoyer l'e-mail de changement de nom d'utilisateur"
+    "translation": "Impossible d'envoyer l'e-mail de notification de changement de nom d'utilisateur"
   },
   {
     "id": "api.user.send_email_change_verify_email_and_forget.error",
@@ -2745,7 +2769,7 @@
   },
   {
     "id": "api.user.update_active.no_deactivate_ldap.app_error",
-    "translation": "Vous ne pouvez pas modifier le statut actif des comptes LDAP. Veuillez désactiver ce compte dans votre serveur LDAP."
+    "translation": "Vous ne pouvez pas modifier le statut actif des comptes AD/LDAP. Veuillez désactiver ce compte dans votre serveur AD/LDAP."
   },
   {
     "id": "api.user.update_active.permissions.app_error",
@@ -3021,35 +3045,35 @@
   },
   {
     "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Failed to get direct channel"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Failed to get direct channel"
+    "translation": "Impossible de créer le canal de messages privés"
   },
   {
     "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Failed to get group channel"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Failed to get group channel"
+    "translation": "Impossible de créer le canal de groupe"
   },
   {
     "id": "app.import.import_direct_channel.member_not_found.error",
-    "translation": "Could not find channel member when importing direct channel"
+    "translation": "Impossible de trouver le membre du canal lors de l'import du canal de messages privés"
   },
   {
     "id": "app.import.import_direct_channel.update_header_failed.error",
-    "translation": "Failed to update direct channel header"
+    "translation": "Impossible de mettre à jour l'entête du canal de messages privés"
   },
   {
     "id": "app.import.import_direct_post.channel_member_not_found.error",
-    "translation": "Could not find channel member when importing direct channel post"
+    "translation": "Impossible de trouver le membre du canal lors de l'import du message du canal de messages privés"
+  },
+  {
+    "id": "app.import.import_direct_post.create_direct_channel.error",
+    "translation": "Impossible de récupérer le canal de messages directs"
+  },
+  {
+    "id": "app.import.import_direct_post.create_group_channel.error",
+    "translation": "Impossible de récupérer le canal de messages de groupe"
   },
   {
     "id": "app.import.import_direct_post.user_not_found.error",
-    "translation": "Post user does not exist"
+    "translation": "Le message de l'utilisateur n'existe pas"
   },
   {
     "id": "app.import.import_line.null_channel.error",
@@ -3057,11 +3081,11 @@
   },
   {
     "id": "app.import.import_line.null_direct_channel.error",
-    "translation": "La ligne de données importée dispose d'un type \"channel\", mais l'objet channel est null."
+    "translation": "La ligne de données importée dispose d'un type \"direct_channel\", mais l'objet direct_channel est null."
   },
   {
     "id": "app.import.import_line.null_direct_post.error",
-    "translation": "La ligne de données importée dispose d'un type \"post\", mais l'objet post est null."
+    "translation": "La ligne de données importée dispose d'un type \"direct_post\", mais l'objet direct_post est null."
   },
   {
     "id": "app.import.import_line.null_post.error",
@@ -3137,51 +3161,51 @@
   },
   {
     "id": "app.import.validate_direct_channel_import_data.header_length.error",
-    "translation": "Direct channel header is too long"
+    "translation": "L'entête du canal de messages privés est trop long"
   },
   {
     "id": "app.import.validate_direct_channel_import_data.members_required.error",
-    "translation": "La propriété de canal requise est manquante : name"
+    "translation": "La propriété requise pour un canal de messages privés est manquante: members"
   },
   {
     "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
-    "translation": "Direct channel members list contains too few items"
+    "translation": "La liste des membres du canal de messages privés contient trop peu d'éléments"
   },
   {
     "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
-    "translation": "Direct channel members list contains too many items"
+    "translation": "La liste des membres du canal de messages privés contient trop d'éléments"
   },
   {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
-    "translation": "La propriété de message requise est manquante : create_at."
+    "translation": "La propriété requise pour un message privé est manquante: channel_members"
   },
   {
     "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
-    "translation": "Direct post channel members list contains too few items"
+    "translation": "La liste des messages des membres du canal de messages privés contient trop peu d'éléments"
   },
   {
     "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
-    "translation": "Direct post channel members list contains too many items"
+    "translation": "La liste des messages des membres du canal de messages privés contient trop d'éléments"
   },
   {
     "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
-    "translation": "La propriété de message requise est manquante : create_at."
+    "translation": "La propriété requise pour un message privé est manquante: create_at"
   },
   {
     "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
-    "translation": "CreateAt must be greater than 0"
+    "translation": "CreateAt doit être plus grand que 0"
   },
   {
     "id": "app.import.validate_direct_post_import_data.message_length.error",
-    "translation": "Message is too long"
+    "translation": "Le message est trop long"
   },
   {
     "id": "app.import.validate_direct_post_import_data.message_missing.error",
-    "translation": "La propriété de message requise est manquante : Message."
+    "translation": "La propriété requise pour un message privé est manquante: message"
   },
   {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
-    "translation": "La propriété de message requise est manquante : User."
+    "translation": "La propriété requise pour un message privé est manquante: user"
   },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
@@ -3409,7 +3433,7 @@
   },
   {
     "id": "ent.cluster.config_changed.info",
-    "translation": "Cluster configuration has changed for id={{ .id }}.  The cluster may become unstable and a restart is required.  To ensure the cluster is configured correctly you should perform a rolling restart immediately."
+    "translation": "La configuration du cluster a changé pour l'id={{ .id }}.  Le cluster peut devenir instable et un redémarrage est nécessaire.  Pour s'assurer que le cluster est configuré correctement, vous devriez effectuer un redémarrage immédiatement."
   },
   {
     "id": "ent.cluster.debug_fail.debug",
@@ -3441,7 +3465,7 @@
   },
   {
     "id": "ent.cluster.save_config.error",
-    "translation": "System Console is set to read-only when High Availability is enabled  unless ReadOnlyConfig is disabled in the configuration file."
+    "translation": "La console système est définie en lecture seule lorsque le mode haute disponibilité est activé  à moins que ReadOnlyConfig est désactivé dans le fichier de configuration. "
   },
   {
     "id": "ent.cluster.starting.info",
@@ -3505,11 +3529,11 @@
   },
   {
     "id": "ent.elasticsearch.test_config.indexing_disabled.error",
-    "translation": "Elasticsearch is disabled."
+    "translation": "Elasticsearch est désactivé."
   },
   {
     "id": "ent.elasticsearch.test_config.license.error",
-    "translation": "License does not support Elasticsearch."
+    "translation": "La licence actuelle ne supporte pas Elasticsearch."
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
@@ -3525,7 +3549,7 @@
   },
   {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
-    "translation": "Impossible de se connecter au serveur LDAP. Vérifiez l'utilisateur et le mot de passe du compte utilisé pour se connecter au serveur LDAP."
+    "translation": "Impossible de se connecter au serveur AD/LDAP. Vérifiez l'utilisateur et le mot de passe du compte utilisé pour se connecter au serveur AD/LDAP."
   },
   {
     "id": "ent.ldap.do_login.invalid_password.app_error",
@@ -3533,7 +3557,7 @@
   },
   {
     "id": "ent.ldap.do_login.licence_disable.app_error",
-    "translation": "Fonctionnalité LDAP désactivée par la licence actuelle. Veuillez contacter votre administrateur système concernant la mise à niveau de votre licence entreprise."
+    "translation": "Fonctionnalité AD/LDAP désactivée par la licence actuelle. Veuillez contacter votre administrateur système concernant la mise à niveau de votre licence entreprise."
   },
   {
     "id": "ent.ldap.do_login.matched_to_many_users.app_error",
@@ -3541,11 +3565,11 @@
   },
   {
     "id": "ent.ldap.do_login.search_ldap_server.app_error",
-    "translation": "Échec de la recherche du serveur LDAP"
+    "translation": "Échec de la recherche du serveur AD/LDAP"
   },
   {
     "id": "ent.ldap.do_login.unable_to_connect.app_error",
-    "translation": "Impossible de se connecter au serveur LDAP"
+    "translation": "Impossible de se connecter au serveur AD/LDAP"
   },
   {
     "id": "ent.ldap.do_login.unable_to_create_user.app_error",
@@ -3553,27 +3577,27 @@
   },
   {
     "id": "ent.ldap.do_login.user_filtered.app_error",
-    "translation": "Votre compte LDAP ne dispose pas des permissions pour utiliser ce serveur Mattermost. Veuillez demander à votre administrateur système de vérifier le filtre des utilisateurs LDAP."
+    "translation": "Votre compte AD/LDAP ne dispose pas des permissions pour utiliser ce serveur Mattermost. Veuillez demander à votre administrateur système de vérifier le filtre des utilisateurs AD/LDAP."
   },
   {
     "id": "ent.ldap.do_login.user_not_registered.app_error",
-    "translation": "Utilisateur non enregistré sur le serveur LDAP"
+    "translation": "Utilisateur non enregistré sur le serveur AD/LDAP"
   },
   {
     "id": "ent.ldap.mattermost_user_update",
-    "translation": "L'utilisateur Mattermost a été mis à jour par le serveur LDAP."
+    "translation": "L'utilisateur Mattermost a été mis à jour par le serveur AD/LDAP."
   },
   {
     "id": "ent.ldap.syncdone.info",
-    "translation": "Synchronisation LDAP terminé"
+    "translation": "Synchronisation AD/LDAP terminé"
   },
   {
     "id": "ent.ldap.syncronize.get_all.app_error",
-    "translation": "Impossible d'obtenir tous les utilisateurs à l'aide de LDAP"
+    "translation": "Impossible d'obtenir tous les utilisateurs à l'aide de AD/LDAP"
   },
   {
     "id": "ent.ldap.validate_filter.app_error",
-    "translation": "Filtre LDAP Invalide"
+    "translation": "Filtre AD/LDAP Invalide"
   },
   {
     "id": "ent.metrics.starting.info",
@@ -3621,11 +3645,11 @@
   },
   {
     "id": "ent.migration.migratetoldap.duplicate_field",
-    "translation": "Impossible de migrer les utilisateurs LDAP avec le champ en question. Doublon détecté. Veuillez supprimer tous les doublons et réessayer."
+    "translation": "Impossible de migrer les utilisateurs AD/LDAP avec le champ en question. Doublon détecté. Veuillez supprimer tous les doublons et réessayer."
   },
   {
     "id": "ent.migration.migratetoldap.user_not_found",
-    "translation": "Impossible de trouver l'utilisateur sur le serveur LDAP : "
+    "translation": "Impossible de trouver l'utilisateur sur le serveur AD/LDAP : "
   },
   {
     "id": "ent.saml.attribute.app_error",
@@ -3905,7 +3929,7 @@
   },
   {
     "id": "model.channel_member.is_valid.email_value.app_error",
-    "translation": "Valeur de la notification e-mail invalide"
+    "translation": "Valeur d'e-mail de notification invalide"
   },
   {
     "id": "model.channel_member.is_valid.notify_level.app_error",
@@ -4141,31 +4165,31 @@
   },
   {
     "id": "model.config.is_valid.ldap_basedn",
-    "translation": "Le champ LDAP \"BaseDN\" est requis."
+    "translation": "Le champ AD/LDAP \"BaseDN\" est requis."
   },
   {
     "id": "model.config.is_valid.ldap_bind_password",
-    "translation": "Le champ LDAP \"Bind Password\" est requis."
+    "translation": "Le champ AD/LDAP \"Bind Password\" est requis."
   },
   {
     "id": "model.config.is_valid.ldap_bind_username",
-    "translation": "Le champ LDAP \"Bind Username\" est requis."
+    "translation": "Le champ AD/LDAP \"Bind Username\" est requis."
   },
   {
     "id": "model.config.is_valid.ldap_email",
-    "translation": "Le champ LDAP \"Email Attribute\" est requis."
+    "translation": "Le champ AD/LDAP \"Email Attribute\" est requis."
   },
   {
     "id": "model.config.is_valid.ldap_firstname",
-    "translation": "L'attribut LDAP \"Prénom\" est obligatoire."
+    "translation": "Le champ AD/LDAP \"First Name Attribute\" est obligatoire."
   },
   {
     "id": "model.config.is_valid.ldap_id",
-    "translation": "L'attribut LDAP \"ID\" est obligatoire."
+    "translation": "Le champ AD/LDAP \"ID Attribute\" est obligatoire."
   },
   {
     "id": "model.config.is_valid.ldap_lastname",
-    "translation": "L'attribut LDAP \"nom\" est obligatoire."
+    "translation": "Le champ AD/LDAP \"Last Name Attribute\" est obligatoire."
   },
   {
     "id": "model.config.is_valid.ldap_max_page_size.app_error",
@@ -4173,11 +4197,11 @@
   },
   {
     "id": "model.config.is_valid.ldap_required.app_error",
-    "translation": "Champ LDAP manquant."
+    "translation": "Champ AD/LDAP manquant."
   },
   {
     "id": "model.config.is_valid.ldap_required.app_error",
-    "translation": "Champ LDAP manquant."
+    "translation": "Champ AD/LDAP manquant."
   },
   {
     "id": "model.config.is_valid.ldap_security.app_error",
@@ -4185,7 +4209,7 @@
   },
   {
     "id": "model.config.is_valid.ldap_server",
-    "translation": "Le champ \"serveur LDAP\" est obligatoire."
+    "translation": "Le champ \"AD/LDAP Server\" est requis."
   },
   {
     "id": "model.config.is_valid.ldap_sync_interval.app_error",
@@ -4193,7 +4217,7 @@
   },
   {
     "id": "model.config.is_valid.ldap_username",
-    "translation": "L'attribut LDAP \"Nom d'utilisateur\" est obligatoire."
+    "translation": "Le champ AD/LDAP \"Username Attribute\" est obligatoire."
   },
   {
     "id": "model.config.is_valid.listen_address.app_error",
@@ -4285,7 +4309,7 @@
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
-    "translation": "Impossible d'activer l'envoi d'e-mails par lot si SiteURL n'est pas défini."
+    "translation": "Impossible d'activer l'envoi d'e-mails par lot si l'URL de site n'est pas définie."
   },
   {
     "id": "model.config.is_valid.sitename_length.app_error",
@@ -4313,7 +4337,7 @@
   },
   {
     "id": "model.config.is_valid.teammate_name_display.app_error",
-    "translation": "Invalid teammate display.  Must be 'full_name', 'nickname_full_name' or 'username'"
+    "translation": "Affichage invalide du coéquipier.  Doit être 'full_name', 'nickname_full_name' ou 'username'"
   },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
@@ -4941,7 +4965,7 @@
   },
   {
     "id": "store.sql_channel.analytics_type_count.app_error",
-    "translation": "Nous n'avons pas pu obtenir le nombre de type de canaux"
+    "translation": "Impossible d'obtenir le nombre de type de canaux"
   },
   {
     "id": "store.sql_channel.check_open_channel_permissions.app_error",
@@ -4957,7 +4981,7 @@
   },
   {
     "id": "store.sql_channel.delete.channel.app_error",
-    "translation": "Nous n'avons pas pu supprimer le canal"
+    "translation": "Impossible de supprimer le canal"
   },
   {
     "id": "store.sql_channel.extra_updated.app_error",
@@ -4965,7 +4989,7 @@
   },
   {
     "id": "store.sql_channel.get.existing.app_error",
-    "translation": "Nous n'avons pas pu trouver le canal existant"
+    "translation": "Impossible de trouver le canal existant"
   },
   {
     "id": "store.sql_channel.get.find.app_error",
@@ -4973,11 +4997,11 @@
   },
   {
     "id": "store.sql_channel.get_all.app_error",
-    "translation": "Nous n'avons pas pu charger tous les canaux"
+    "translation": "Impossible de charger tous les canaux"
   },
   {
     "id": "store.sql_channel.get_by_name.existing.app_error",
-    "translation": "Nous n'avons pas pu trouver le canal existant"
+    "translation": "Impossible de trouver le canal existant"
   },
   {
     "id": "store.sql_channel.get_by_name.missing.app_error",
@@ -4985,11 +5009,11 @@
   },
   {
     "id": "store.sql_channel.get_channel_counts.get.app_error",
-    "translation": "Nous n'avons pas pu obtenir le nombre de canaux"
+    "translation": "Impossible d'obtenir le nombre de canaux"
   },
   {
     "id": "store.sql_channel.get_channels.get.app_error",
-    "translation": "Nous n'avons pas pu obtenir les canaux"
+    "translation": "Impossible d'obtenir les canaux"
   },
   {
     "id": "store.sql_channel.get_channels.not_found.app_error",
@@ -5013,7 +5037,7 @@
   },
   {
     "id": "store.sql_channel.get_extra_members.app_error",
-    "translation": "Nous n'avons pas pu charger les informations supplémentaires sur les membres du canal"
+    "translation": "Impossible de charger les informations supplémentaires sur les membres du canal"
   },
   {
     "id": "store.sql_channel.get_for_post.app_error",
@@ -5021,7 +5045,7 @@
   },
   {
     "id": "store.sql_channel.get_member.app_error",
-    "translation": "Nous n'avons pas pu obtenir les membres du canal"
+    "translation": "Impossible d'obtenir le membre du canal"
   },
   {
     "id": "store.sql_channel.get_member.missing.app_error",
@@ -5029,7 +5053,7 @@
   },
   {
     "id": "store.sql_channel.get_member_count.app_error",
-    "translation": "Nous n'avons pas pu obtenir le nombre de membres du canal"
+    "translation": "Impossible d'obtenir le nombre de membres du canal"
   },
   {
     "id": "store.sql_channel.get_member_for_post.app_error",
@@ -5037,7 +5061,7 @@
   },
   {
     "id": "store.sql_channel.get_members.app_error",
-    "translation": "Nous n'avons pas pu obtenir les membres du canal"
+    "translation": "Impossible d'obtenir les membres du canal"
   },
   {
     "id": "store.sql_channel.get_members_by_ids.app_error",
@@ -5045,7 +5069,7 @@
   },
   {
     "id": "store.sql_channel.get_more_channels.get.app_error",
-    "translation": "Nous n'avons pas pu obtenir les canaux"
+    "translation": "Impossible d'obtenir les canaux"
   },
   {
     "id": "store.sql_channel.get_public_channels.get.app_error",
@@ -5057,7 +5081,7 @@
   },
   {
     "id": "store.sql_channel.increment_mention_count.app_error",
-    "translation": "Nous n'avons pas pu incrémenter le nombre de mentions"
+    "translation": "Impossible d'incrémenter le nombre de mentions"
   },
   {
     "id": "store.sql_channel.permanent_delete.app_error",
@@ -5065,11 +5089,11 @@
   },
   {
     "id": "store.sql_channel.permanent_delete_by_team.app_error",
-    "translation": "Nous n'avons pas pu supprimer les canaux"
+    "translation": "Impossible de supprimer les canaux"
   },
   {
     "id": "store.sql_channel.permanent_delete_members_by_user.app_error",
-    "translation": "Nous n'avons pas pu retirer le membre du canal"
+    "translation": "Impossible de retirer le membre du canal"
   },
   {
     "id": "store.sql_channel.pinned_posts.app_error",
@@ -5077,7 +5101,7 @@
   },
   {
     "id": "store.sql_channel.remove_member.app_error",
-    "translation": "Nous n'avons pas pu retirer le membre du canal"
+    "translation": "Impossible de retirer le membre du canal"
   },
   {
     "id": "store.sql_channel.save.commit_transaction.app_error",
@@ -5113,7 +5137,7 @@
   },
   {
     "id": "store.sql_channel.save_channel.save.app_error",
-    "translation": "Nous n'avons pas pu enregistrer ce canal"
+    "translation": "Impossible d'enregistrer ce canal"
   },
   {
     "id": "store.sql_channel.save_direct_channel.add_members.app_error",
@@ -5145,7 +5169,7 @@
   },
   {
     "id": "store.sql_channel.save_member.save.app_error",
-    "translation": "Nous n'avons pas pu enregistrer le membre du canal"
+    "translation": "Impossible d'enregistrer le membre du canal"
   },
   {
     "id": "store.sql_channel.search.app_error",
@@ -5153,11 +5177,11 @@
   },
   {
     "id": "store.sql_channel.set_last_viewed_at.app_error",
-    "translation": "Nous n'avons pas pu mettre à jour la date de dernier affichage."
+    "translation": "Impossible de mettre à jour la date de dernier affichage"
   },
   {
     "id": "store.sql_channel.update.app_error",
-    "translation": "Nous n'avons pas pu mettre à jour le canal"
+    "translation": "Impossible de mettre à jour le canal"
   },
   {
     "id": "store.sql_channel.update.exists.app_error",
@@ -5173,7 +5197,7 @@
   },
   {
     "id": "store.sql_channel.update_last_viewed_at.app_error",
-    "translation": "Nous n'avons pas pu mettre à jour la date de dernier affichage."
+    "translation": "Impossible de mettre à jour la date de dernier affichage"
   },
   {
     "id": "store.sql_channel.update_member.app_error",
@@ -5181,27 +5205,27 @@
   },
   {
     "id": "store.sql_command.analytics_command_count.app_error",
-    "translation": "Nous n'avons pas pu compter les commandes"
+    "translation": "Impossible de compter les commandes"
   },
   {
     "id": "store.sql_command.save.delete.app_error",
-    "translation": "Nous n'avons pas pu supprimer la commande"
+    "translation": "Impossible de supprimer la commande"
   },
   {
     "id": "store.sql_command.save.delete_perm.app_error",
-    "translation": "Nous n'avons pas pu supprimer la commande"
+    "translation": "Impossible de supprimer la commande"
   },
   {
     "id": "store.sql_command.save.get.app_error",
-    "translation": "Nous n'avons pas pu obtenir la commande"
+    "translation": "Impossible d'obtenir la commande"
   },
   {
     "id": "store.sql_command.save.get_team.app_error",
-    "translation": "Nous n'avons pas pu obtenir les commandes"
+    "translation": "Impossible d'obtenir les commandes"
   },
   {
     "id": "store.sql_command.save.saving.app_error",
-    "translation": "Nous n'avons pas pu enregistrer la commande"
+    "translation": "Impossible d'enregistrer la commande"
   },
   {
     "id": "store.sql_command.save.saving_overwrite.app_error",
@@ -5221,27 +5245,27 @@
   },
   {
     "id": "store.sql_emoji.delete.app_error",
-    "translation": "Nous n'avons pas pu supprimer votre emoji"
+    "translation": "Impossible de supprimer l'émoticône"
   },
   {
     "id": "store.sql_emoji.delete.no_results",
-    "translation": "Nous n'avons pas trouvé l' emoji à supprimer"
+    "translation": "Impossible de trouver l'émoticône à supprimer"
   },
   {
     "id": "store.sql_emoji.get.app_error",
-    "translation": "Nous n'avons pas pu obtenir l'emoji"
+    "translation": "Impossible d'obtenir l'émoticône"
   },
   {
     "id": "store.sql_emoji.get_all.app_error",
-    "translation": "Nous n'avons pas pu obtenir l'emoji"
+    "translation": "Impossible de récupérer l'émoticône"
   },
   {
     "id": "store.sql_emoji.get_by_name.app_error",
-    "translation": "Impossible de récupérer l'Emoji"
+    "translation": "Impossible de récupérer l'émoticône"
   },
   {
     "id": "store.sql_emoji.save.app_error",
-    "translation": "Nous n'avons pas pu enregistrer l'Emoji"
+    "translation": "Impossible de sauvegarder l'émoticône"
   },
   {
     "id": "store.sql_file_info.attach_to_post.app_error",
@@ -5329,11 +5353,11 @@
   },
   {
     "id": "store.sql_oauth.get_app.find.app_error",
-    "translation": "Nous n'avons pas pu trouver l'application"
+    "translation": "Impossible de trouver l'application"
   },
   {
     "id": "store.sql_oauth.get_app.finding.app_error",
-    "translation": "Nous n'avons pas pu trouver l'application"
+    "translation": "Impossible de trouver l'application"
   },
   {
     "id": "store.sql_oauth.get_app_by_user.find.app_error",
@@ -5345,7 +5369,7 @@
   },
   {
     "id": "store.sql_oauth.get_auth_data.find.app_error",
-    "translation": "Nous n'avons pas pu trouver le code d'autorisation existant"
+    "translation": "Impossible de trouver le code d'autorisation existant"
   },
   {
     "id": "store.sql_oauth.get_auth_data.finding.app_error",
@@ -5357,19 +5381,19 @@
   },
   {
     "id": "store.sql_oauth.permanent_delete_auth_data_by_user.app_error",
-    "translation": "Nous n'avons pas supprimer le code d'autorisation"
+    "translation": "Impossible de supprimer le code d'autorisation"
   },
   {
     "id": "store.sql_oauth.remove_access_data.app_error",
-    "translation": "Nous n'avons pas pu retirer le jeton d'accès"
+    "translation": "Impossible de retirer le jeton d'accès"
   },
   {
     "id": "store.sql_oauth.remove_auth_data.app_error",
-    "translation": "Nous n'avons pas pu retirer le code d'autorisation"
+    "translation": "Impossible de retirer le code d'autorisation"
   },
   {
     "id": "store.sql_oauth.save_access_data.app_error",
-    "translation": "Nous n'avons pas pu enregistrer le jeton d'accès."
+    "translation": "Impossible d'enregistrer le jeton d'accès."
   },
   {
     "id": "store.sql_oauth.save_app.existing.app_error",
@@ -5377,11 +5401,11 @@
   },
   {
     "id": "store.sql_oauth.save_app.save.app_error",
-    "translation": "Nous n'avons pas pu enregistrer l'application."
+    "translation": "Impossible d'enregistrer l'application."
   },
   {
     "id": "store.sql_oauth.save_auth_data.app_error",
-    "translation": "Nous n'avons pas pu enregistrer le code d'autorisation."
+    "translation": "Impossible d'enregistrer le code d'autorisation."
   },
   {
     "id": "store.sql_oauth.update_access_data.app_error",
@@ -5389,7 +5413,7 @@
   },
   {
     "id": "store.sql_oauth.update_app.find.app_error",
-    "translation": "Nous n'avons pas pu trouver d'application existante à mettre à jour"
+    "translation": "Impossible de trouver d'application existante à mettre à jour"
   },
   {
     "id": "store.sql_oauth.update_app.finding.app_error",
@@ -5397,7 +5421,7 @@
   },
   {
     "id": "store.sql_oauth.update_app.update.app_error",
-    "translation": "Nous n'avons pas pu mettre à jour l'application"
+    "translation": "Impossible de mettre à jour l'application"
   },
   {
     "id": "store.sql_oauth.update_app.updating.app_error",
@@ -5405,27 +5429,27 @@
   },
   {
     "id": "store.sql_post.analytics_posts_count.app_error",
-    "translation": "Nous n'avons pas pu obtenir le nombre de messages"
+    "translation": "Impossible d'obtenir le nombre de messages"
   },
   {
     "id": "store.sql_post.analytics_posts_count_by_day.app_error",
-    "translation": "Nous n'avons pas pu obtenir le nombre de messages par jour"
+    "translation": "Impossible d'obtenir le nombre de messages par jour"
   },
   {
     "id": "store.sql_post.analytics_user_counts_posts_by_day.app_error",
-    "translation": "Nous n'avons pas pu obtenir le nombre d'utilisateur avec des messages"
+    "translation": "Impossible d'obtenir le nombre d'utilisateur avec des messages"
   },
   {
     "id": "store.sql_post.delete.app_error",
-    "translation": "Nous n'avons pas pu supprimer le message"
+    "translation": "Impossible de supprimer le message"
   },
   {
     "id": "store.sql_post.get.app_error",
-    "translation": "Nous n'avons pas pu obtenir le message"
+    "translation": "Impossible d'obtenir le message"
   },
   {
     "id": "store.sql_post.get_parents_posts.app_error",
-    "translation": "Nous n'avons pas pu obtenir le message parent pour le canal"
+    "translation": "Impossible d'obtenir le message parent pour le canal"
   },
   {
     "id": "store.sql_post.get_posts.app_error",
@@ -5433,11 +5457,11 @@
   },
   {
     "id": "store.sql_post.get_posts_around.get.app_error",
-    "translation": "Nous n'avons pas pu obtenir les messages pour le canal"
+    "translation": "Impossible d'obtenir les messages pour le canal"
   },
   {
     "id": "store.sql_post.get_posts_around.get_parent.app_error",
-    "translation": "Nous n'avons pas pu obtenir les messages parent pour le canal"
+    "translation": "Impossible d'obtenir les messages parent pour le canal"
   },
   {
     "id": "store.sql_post.get_posts_by_ids.app_error",
@@ -5449,11 +5473,11 @@
   },
   {
     "id": "store.sql_post.get_posts_since.app_error",
-    "translation": "Nous n'avons pas pu obtenir les messages pour le canal"
+    "translation": "Impossible d'obtenir les messages pour le canal"
   },
   {
     "id": "store.sql_post.get_root_posts.app_error",
-    "translation": "Nous n'avons pas pu obtenir les messages pour le canal"
+    "translation": "Impossible d'obtenir les messages pour le canal"
   },
   {
     "id": "store.sql_post.overwrite.app_error",
@@ -5461,11 +5485,11 @@
   },
   {
     "id": "store.sql_post.permanent_delete.app_error",
-    "translation": "Nous n'avons pas pu supprimer le message"
+    "translation": "Impossible de supprimer le message"
   },
   {
     "id": "store.sql_post.permanent_delete_all_comments_by_user.app_error",
-    "translation": "Nous n'avons pas supprimer les commentaires de l'utilisateur"
+    "translation": "Impossible de supprimer les commentaires de l'utilisateur"
   },
   {
     "id": "store.sql_post.permanent_delete_by_channel.app_error",
@@ -5473,15 +5497,15 @@
   },
   {
     "id": "store.sql_post.permanent_delete_by_user.app_error",
-    "translation": "Nous n'avons pas pu sélectionner les messages à supprimer pour l'utilisateur"
+    "translation": "Impossible de sélectionner les messages à supprimer pour l'utilisateur"
   },
   {
     "id": "store.sql_post.permanent_delete_by_user.too_many.app_error",
-    "translation": "Nous n'avons pas pu sélectionner les messages à effacer pour l'utilisateur (trop nombreux), veuillez relancer"
+    "translation": "Impossible de sélectionner les messages à effacer pour l'utilisateur (trop nombreux), veuillez relancer"
   },
   {
     "id": "store.sql_post.save.app_error",
-    "translation": "Nous n'avons pas pu enregistrer le message"
+    "translation": "Impossible d'enregistrer le message"
   },
   {
     "id": "store.sql_post.save.existing.app_error",
@@ -5497,7 +5521,7 @@
   },
   {
     "id": "store.sql_post.update.app_error",
-    "translation": "Nous n'avons pas pu mettre à jour le message"
+    "translation": "Impossible de mettre à jour le message"
   },
   {
     "id": "store.sql_preference.delete.app_error",
@@ -5525,7 +5549,7 @@
   },
   {
     "id": "store.sql_preference.insert.save.app_error",
-    "translation": "Nous n'avons pas pu enregistrer les préférences"
+    "translation": "Impossible d'enregistrer les préférences"
   },
   {
     "id": "store.sql_preference.is_feature_enabled.app_error",
@@ -5557,7 +5581,7 @@
   },
   {
     "id": "store.sql_preference.update.app_error",
-    "translation": "Nous n'avons pas pu mettre à jour les préférences"
+    "translation": "Impossible de mettre à jour les préférences"
   },
   {
     "id": "store.sql_reaction.delete.begin.app_error",
@@ -5601,7 +5625,7 @@
   },
   {
     "id": "store.sql_session.analytics_session_count.app_error",
-    "translation": "Nous n'avons pas pu compter les sessions"
+    "translation": "Impossible de compter les sessions"
   },
   {
     "id": "store.sql_session.cleanup_expired_sessions.app_error",
@@ -5621,19 +5645,19 @@
   },
   {
     "id": "store.sql_session.permanent_delete_sessions_by_user.app_error",
-    "translation": "Nous n'avons pas pu supprimer toutes les sessions de l'utilisateur"
+    "translation": "Impossible de supprimer toutes les sessions de l'utilisateur"
   },
   {
     "id": "store.sql_session.remove.app_error",
-    "translation": "Nous n'avons pas pu supprimer la session"
+    "translation": "Impossible de supprimer la session"
   },
   {
     "id": "store.sql_session.remove_all_sessions_for_team.app_error",
-    "translation": "Nous n'avons pas pu supprimer toutes les sessions de l'équipe"
+    "translation": "Impossible de supprimer toutes les sessions de l'équipe"
   },
   {
     "id": "store.sql_session.save.app_error",
-    "translation": "Nous n'avons pas pu enregistrer la session"
+    "translation": "Impossible d'enregistrer la session"
   },
   {
     "id": "store.sql_session.save.cleanup.error",
@@ -5645,15 +5669,15 @@
   },
   {
     "id": "store.sql_session.update_device_id.app_error",
-    "translation": "Nous n'avons pas pu mettre à jour l'id de l'appareil"
+    "translation": "Impossible de mettre à jour l'id de l'appareil"
   },
   {
     "id": "store.sql_session.update_last_activity.app_error",
-    "translation": "Nous n'avons pas pu mettre à jour last_activity_at"
+    "translation": "Impossible de mettre à jour last_activity_at"
   },
   {
     "id": "store.sql_session.update_roles.app_error",
-    "translation": "Nous n'avons pas pu mettre à jour les rôles"
+    "translation": "Impossible de mettre à jour les rôles"
   },
   {
     "id": "store.sql_status.get.app_error",
@@ -5677,7 +5701,7 @@
   },
   {
     "id": "store.sql_status.get_total_active_users_count.app_error",
-    "translation": "Nous n'avons pas pu compter les utilisateurs"
+    "translation": "Impossible de compter les utilisateurs actifs"
   },
   {
     "id": "store.sql_status.reset_all.app_error",
@@ -5713,11 +5737,11 @@
   },
   {
     "id": "store.sql_team.analytics_team_count.app_error",
-    "translation": "Nous n'avons pas pu compter les équipes"
+    "translation": "Impossible de compter les équipes"
   },
   {
     "id": "store.sql_team.get.find.app_error",
-    "translation": "Nous n'avons pas pu trouver d'équipe existante"
+    "translation": "Impossible de trouver l'équipe existante"
   },
   {
     "id": "store.sql_team.get.finding.app_error",
@@ -5725,23 +5749,23 @@
   },
   {
     "id": "store.sql_team.get_all.app_error",
-    "translation": "Nous n'avons pas pu obtenir toutes les équipes"
+    "translation": "Impossible d'obtenir toutes les équipes"
   },
   {
     "id": "store.sql_team.get_all_team_listing.app_error",
-    "translation": "Nous n'avons pas pu obtenir toutes les équipes"
+    "translation": "Impossible d'obtenir toutes les équipes"
   },
   {
     "id": "store.sql_team.get_by_invite_id.find.app_error",
-    "translation": "Nous n'avons pas pu trouver d'équipe existante"
+    "translation": "Impossible de trouver l'équipe existante"
   },
   {
     "id": "store.sql_team.get_by_invite_id.finding.app_error",
-    "translation": "Nous n'avons pas pu trouver d'équipe existante"
+    "translation": "Impossible de trouver l'équipe existante"
   },
   {
     "id": "store.sql_team.get_by_name.app_error",
-    "translation": "Nous n'avons pas pu trouver d'équipe existante"
+    "translation": "Impossible de trouver l'équipe existante"
   },
   {
     "id": "store.sql_team.get_member.app_error",
@@ -5773,15 +5797,15 @@
   },
   {
     "id": "store.sql_team.permanent_delete.app_error",
-    "translation": "Nous n'avons pas pu supprimer l'équipe existante"
+    "translation": "Impossible de supprimer l'équipe existante"
   },
   {
     "id": "store.sql_team.remove_member.app_error",
-    "translation": "Nous n'avons pas pu retirer le membre de l'équipe"
+    "translation": "Impossible de retirer le membre de l'équipe"
   },
   {
     "id": "store.sql_team.save.app_error",
-    "translation": "Nous n'avons pas pu enregistrer l'équipe"
+    "translation": "Impossible d'enregistrer l'équipe"
   },
   {
     "id": "store.sql_team.save.domain_exists.app_error",
@@ -5797,7 +5821,7 @@
   },
   {
     "id": "store.sql_team.save_member.save.app_error",
-    "translation": "Nous n'avons pas pu enregistrer le membre du canal"
+    "translation": "Impossible d'enregistrer le membre du canal"
   },
   {
     "id": "store.sql_team.search_all_team.app_error",
@@ -5809,11 +5833,11 @@
   },
   {
     "id": "store.sql_team.update.app_error",
-    "translation": "Nous n'avons pas pu mettre à jour l'équipe"
+    "translation": "Impossible de mettre à jour l'équipe"
   },
   {
     "id": "store.sql_team.update.find.app_error",
-    "translation": "Nous n'avons pas pu trouver d'équipe existante à mettre à jour"
+    "translation": "Impossible de trouver l'équipe existante à mettre à jour"
   },
   {
     "id": "store.sql_team.update.finding.app_error",
@@ -5825,7 +5849,7 @@
   },
   {
     "id": "store.sql_team.update_display_name.app_error",
-    "translation": "Nous n'avons pas pu mettre à jour le nom de l'équipe"
+    "translation": "Impossible de mettre à jour le nom de l'équipe"
   },
   {
     "id": "store.sql_user.analytics_get_inactive_users_count.app_error",
@@ -5837,7 +5861,7 @@
   },
   {
     "id": "store.sql_user.analytics_unique_user_count.app_error",
-    "translation": "Nous n'avons pas pu obtenir le nombre d'utilisateurs uniques"
+    "translation": "Impossible d'obtenir le nombre d'utilisateurs uniques"
   },
   {
     "id": "store.sql_user.get.app_error",
@@ -5849,7 +5873,7 @@
   },
   {
     "id": "store.sql_user.get_by_auth.missing_account.app_error",
-    "translation": "Nous n'avons pas pu trouver un compte existant correspondant à votre type d'authentification pour cette équipe. Cette équipe nécessite peut-être une invitation de la part du propriétaire pour pouvoir la rejoindre."
+    "translation": "Impossible de trouver un compte existant correspondant à votre type d'authentification pour cette équipe. Cette équipe nécessite peut-être une invitation de la part du propriétaire pour pouvoir la rejoindre."
   },
   {
     "id": "store.sql_user.get_by_auth.other.app_error",
@@ -5857,11 +5881,11 @@
   },
   {
     "id": "store.sql_user.get_by_username.app_error",
-    "translation": "Nous n'avons pas pu trouver un compte existant correspondant à votre nom d'utilisateur pour cette équipe. Cette équipe nécessite peut-être une invitation de la part du propriétaire pour pouvoir la rejoindre."
+    "translation": "Impossible de trouver un compte existant correspondant à votre nom d'utilisateur pour cette équipe. Cette équipe nécessite peut-être une invitation de la part du propriétaire pour pouvoir la rejoindre."
   },
   {
     "id": "store.sql_user.get_for_login.app_error",
-    "translation": "Nous n'avons pas pu trouver un compte existant correspondant à votre nom d'utilisateur pour cette équipe. Cette équipe nécessite peut-être une invitation de la part du propriétaire pour pouvoir la rejoindre."
+    "translation": "Impossible de trouver un compte existant correspondant à votre nom d'utilisateur pour cette équipe. Cette équipe nécessite peut-être une invitation de la part du propriétaire pour pouvoir la rejoindre."
   },
   {
     "id": "store.sql_user.get_for_login.multiple_users",
@@ -5869,7 +5893,7 @@
   },
   {
     "id": "store.sql_user.get_new_users.app_error",
-    "translation": "Nous avons rencontré une erreur durant la recherche des préférences"
+    "translation": "Une erreur s'est produite lors de la recherche de nouveaux utilisateurs"
   },
   {
     "id": "store.sql_user.get_profiles.app_error",
@@ -5885,15 +5909,15 @@
   },
   {
     "id": "store.sql_user.get_total_users_count.app_error",
-    "translation": "Nous n'avons pas pu compter les utilisateurs"
+    "translation": "Impossible de compter les utilisateurs"
   },
   {
     "id": "store.sql_user.get_unread_count.app_error",
-    "translation": "Nous n'avons pas pu compter le nombre de messages non lus pour l'utilisateur"
+    "translation": "Impossible de compter le nombre de messages non lus pour l'utilisateur"
   },
   {
     "id": "store.sql_user.get_unread_count_for_channel.app_error",
-    "translation": "Nous n'avons pas pu compter le nombre de messages non lus pour l'utilisateur"
+    "translation": "Impossible de compter le nombre de messages non lus pour l'utilisateur et le canal"
   },
   {
     "id": "store.sql_user.migrate_theme.critical",
@@ -5905,11 +5929,11 @@
   },
   {
     "id": "store.sql_user.permanent_delete.app_error",
-    "translation": "Nous n'avons pas pu supprimer le compte existant"
+    "translation": "Impossible de supprimer le compte existant"
   },
   {
     "id": "store.sql_user.save.app_error",
-    "translation": "Nous n'avons pas pu enregistrer le compte."
+    "translation": "Impossible d'enregistrer le compte."
   },
   {
     "id": "store.sql_user.save.email_exists.app_error",
@@ -5917,7 +5941,7 @@
   },
   {
     "id": "store.sql_user.save.email_exists.ldap_app_error",
-    "translation": "Ce compte n'utilise pas l'authentification LDAP. Veuillez vous connecter avec votre adresse e-mail et votre mot de passe."
+    "translation": "Ce compte n'utilise pas l'authentification AD/LDAP. Veuillez vous connecter avec votre adresse e-mail et votre mot de passe."
   },
   {
     "id": "store.sql_user.save.email_exists.saml_app_error",
@@ -5949,11 +5973,11 @@
   },
   {
     "id": "store.sql_user.update.app_error",
-    "translation": "Nous n'avons pas pu mettre à jour le compte"
+    "translation": "Impossible de mettre à jour le compte"
   },
   {
     "id": "store.sql_user.update.can_not_change_ldap.app_error",
-    "translation": "Vous ne pouvez pas modifier les champs définis par LDAP"
+    "translation": "Vous ne pouvez pas modifier les champs définis par AD/LDAP"
   },
   {
     "id": "store.sql_user.update.email_taken.app_error",
@@ -5961,7 +5985,7 @@
   },
   {
     "id": "store.sql_user.update.find.app_error",
-    "translation": "Nous n'avons pas pu trouver de compte existant à mettre à jour"
+    "translation": "Impossible de trouver de compte existant à mettre à jour"
   },
   {
     "id": "store.sql_user.update.finding.app_error",
@@ -5977,7 +6001,7 @@
   },
   {
     "id": "store.sql_user.update_auth_data.app_error",
-    "translation": "Nous n'avons pas pu mettre à jour les données d'authentification"
+    "translation": "Impossible de mettre à jour les données d'authentification"
   },
   {
     "id": "store.sql_user.update_auth_data.email_exists.app_error",
@@ -5985,19 +6009,19 @@
   },
   {
     "id": "store.sql_user.update_failed_pwd_attempts.app_error",
-    "translation": "Nous n'avons pas pu mettre à jour failed_attempts"
+    "translation": "Impossible de mettre à jour failed_attempts"
   },
   {
     "id": "store.sql_user.update_last_activity.app_error",
-    "translation": "Nous n'avons pas pu mettre à jour last_activity_at"
+    "translation": "Impossible de mettre à jour last_activity_at"
   },
   {
     "id": "store.sql_user.update_last_picture_update.app_error",
-    "translation": "Nous n'avons pas pu mettre à jour update_at"
+    "translation": "Impossible de mettre à jour update_at"
   },
   {
     "id": "store.sql_user.update_last_ping.app_error",
-    "translation": "Nous n'avons pas pu mettre à jour last_ping_at"
+    "translation": "Impossible de mettre à jour last_ping_at"
   },
   {
     "id": "store.sql_user.update_mfa_active.app_error",
@@ -6009,7 +6033,7 @@
   },
   {
     "id": "store.sql_user.update_password.app_error",
-    "translation": "Nous n'avons pas pu mettre à jour le mot de passe de l'utilisateur"
+    "translation": "Impossible de mettre à jour le mot de passe de l'utilisateur"
   },
   {
     "id": "store.sql_user.verify_email.app_error",
@@ -6017,55 +6041,55 @@
   },
   {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
-    "translation": "Nous n'avons pas pu compter les webhooks entrants"
+    "translation": "Impossible de compter les webhooks entrants"
   },
   {
     "id": "store.sql_webhooks.analytics_outgoing_count.app_error",
-    "translation": "Nous n'avons pas pu compter les webhooks sortants"
+    "translation": "Impossible de compter les webhooks sortants"
   },
   {
     "id": "store.sql_webhooks.delete_incoming.app_error",
-    "translation": "Nous n'avons pas pu supprimer le webhook"
+    "translation": "Impossible de supprimer le webhook"
   },
   {
     "id": "store.sql_webhooks.delete_outgoing.app_error",
-    "translation": "Nous n'avons pas pu supprimer le webhook"
+    "translation": "Impossible de supprimer le webhook"
   },
   {
     "id": "store.sql_webhooks.get_incoming.app_error",
-    "translation": "Nous n'avons pas pu obtenir le webhook"
+    "translation": "Impossible d'obtenir le webhook"
   },
   {
     "id": "store.sql_webhooks.get_incoming_by_channel.app_error",
-    "translation": "Nous n'avons pas pu obtenir les webhooks"
+    "translation": "Impossible d'obtenir les webhooks"
   },
   {
     "id": "store.sql_webhooks.get_incoming_by_user.app_error",
-    "translation": "Nous n'avons pas pu obtenir le webhook"
+    "translation": "Impossible d'obtenir le webhook"
   },
   {
     "id": "store.sql_webhooks.get_outgoing.app_error",
-    "translation": "Nous n'avons pas pu obtenir le webhook"
+    "translation": "Impossible d'obtenir le webhook"
   },
   {
     "id": "store.sql_webhooks.get_outgoing_by_channel.app_error",
-    "translation": "Nous n'avons pas pu obtenir les webhooks"
+    "translation": "Impossible d'obtenir les webhooks"
   },
   {
     "id": "store.sql_webhooks.get_outgoing_by_team.app_error",
-    "translation": "Nous n'avons pas pu obtenir les webhooks"
+    "translation": "Impossible d'obtenir les webhooks"
   },
   {
     "id": "store.sql_webhooks.permanent_delete_incoming_by_user.app_error",
-    "translation": "Nous n'avons pas pu supprimer le webhook"
+    "translation": "Impossible de supprimer le webhook"
   },
   {
     "id": "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error",
-    "translation": "Nous n'avons pas pu supprimer le webhook"
+    "translation": "Impossible de supprimer le webhook"
   },
   {
     "id": "store.sql_webhooks.save_incoming.app_error",
-    "translation": "Nous n'avons pas pu enregistrer le IncomongWebhook"
+    "translation": "Impossible d'enregistrer le IncomingWebhook"
   },
   {
     "id": "store.sql_webhooks.save_incoming.existing.app_error",
@@ -6073,7 +6097,7 @@
   },
   {
     "id": "store.sql_webhooks.save_outgoing.app_error",
-    "translation": "Nous n'avons pas pu enregistrer le OutgoingWebhook"
+    "translation": "Impossible d'enregistrer le OutgoingWebhook"
   },
   {
     "id": "store.sql_webhooks.save_outgoing.override.app_error",
@@ -6085,7 +6109,7 @@
   },
   {
     "id": "store.sql_webhooks.update_outgoing.app_error",
-    "translation": "Nous n'avons pas pu mettre à jour le webhook"
+    "translation": "Impossible de mettre à jour le webhook"
   },
   {
     "id": "system.message.name",
@@ -6273,7 +6297,7 @@
   },
   {
     "id": "web.incoming_webhook.channel.app_error",
-    "translation": "Nous n'avons pas pu trouver le canal"
+    "translation": "Impossible de trouver le canal"
   },
   {
     "id": "web.incoming_webhook.disabled.app_error",
diff --git a/i18n/it.json b/i18n/it.json
index 0adf4b036..75c891d50 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -101,7 +101,7 @@
   },
   {
     "id": "api.admin.test_email.reenter_password",
-    "translation": "Il server SMTP, la porta o lo username sono cambiati. Per favore reinserisci la password SMTP per testare la connessione"
+    "translation": "Il server SMTP, la porta o lo username sono cambiati. Per favore reinserisci la password SMTP per testare la connessione."
   },
   {
     "id": "api.admin.test_email.subject",
@@ -185,7 +185,7 @@
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "La creazione e amministrazione di canali privati è limitata all'amministratore di sistema"
+    "translation": "La creazione e amministrazione di canali privati è limitata all'amministratore di sistema."
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
@@ -193,15 +193,15 @@
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
-    "translation": "La creazione e amministrazione di Canali Pubblici è limitata all'Amministratore del Sistema"
+    "translation": "La creazione e amministrazione di Canali Pubblici è limitata all'Amministratore di Sistema."
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
-    "translation": "La creazione e amministrazione di Canali Pubblici è limitata all'Amministratore del Sistema e di gruppo"
+    "translation": "La creazione e amministrazione di Canali Pubblici è limitata all'Amministratore di Sistema e di gruppo."
   },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
-    "translation": "Bisogna usare il servizio createDirectChannel api per la creazione dei messaggi diretti nel canale"
+    "translation": "Bisogna usare il servizio createDirectChannel API per la creazione dei messaggi diretti nel canale"
   },
   {
     "id": "api.channel.create_channel.invalid_character.app_error",
@@ -253,11 +253,11 @@
   },
   {
     "id": "api.channel.delete_channel.incoming_webhook.error",
-    "translation": "Errore nell'eliminazione del WebHook in entrata, id=%v"
+    "translation": "Errore nell'eliminazione del webhook in entrata, id=%v"
   },
   {
     "id": "api.channel.delete_channel.outgoing_webhook.error",
-    "translation": "Errore nell'eliminazione del WebHook in uscita, id=%v"
+    "translation": "Errore nell'eliminazione del webhook in uscita, id=%v"
   },
   {
     "id": "api.channel.delete_channel.permissions.app_error",
@@ -321,7 +321,7 @@
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.retrieve_user.error",
-    "translation": "Errore nel caricamento dell'utente durante l' aggiornamento del titolo del canale"
+    "translation": "Errore nel caricamento dell'utente durante l'aggiornamento del titolo del canale"
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.updated_from",
@@ -405,7 +405,7 @@
   },
   {
     "id": "api.command.disabled.app_error",
-    "translation": "I comandi sono stati disabilitati dall'amministratore del sistema."
+    "translation": "I comandi sono stati disabilitati dall'amministratore di sistema."
   },
   {
     "id": "api.command.duplicate_trigger.app_error",
@@ -449,11 +449,11 @@
   },
   {
     "id": "api.command.invite_people.email_off",
-    "translation": "Le Email non sono state configurate, quindi nessun invito(i) è stato inviato"
+    "translation": "Le email non sono state configurate, quindi nessun invito è stato inviato"
   },
   {
     "id": "api.command.invite_people.fail",
-    "translation": "Errore durante l' invio degli inviti via email"
+    "translation": "Errore durante l'invio degli inviti via email"
   },
   {
     "id": "api.command.invite_people.hint",
@@ -473,7 +473,7 @@
   },
   {
     "id": "api.command.invite_people.sent",
-    "translation": "Email di invito(i) inviata"
+    "translation": "Email di invito inviata"
   },
   {
     "id": "api.command.regen.app_error",
@@ -493,11 +493,11 @@
   },
   {
     "id": "api.command_away.name",
-    "translation": "Assente"
+    "translation": "assente"
   },
   {
     "id": "api.command_away.success",
-    "translation": "Ora sei \"Assente\""
+    "translation": "Ora sei assente"
   },
   {
     "id": "api.command_channel_header.channel.app_error",
@@ -585,7 +585,7 @@
   },
   {
     "id": "api.command_expand_collapse.fail.app_error",
-    "translation": "Errore durante l' espansione delle anteprime"
+    "translation": "Errore durante l'espansione delle anteprime"
   },
   {
     "id": "api.command_help.desc",
@@ -601,7 +601,7 @@
   },
   {
     "id": "api.command_join.fail.app_error",
-    "translation": "Si è verificato un errore durante l' entrata nel canale."
+    "translation": "Si è verificato un errore durante l'entrata nel canale."
   },
   {
     "id": "api.command_join.hint",
@@ -669,7 +669,7 @@
   },
   {
     "id": "api.command_msg.missing.app_error",
-    "translation": "Non è stato possibile trovare l' utente"
+    "translation": "Non è stato possibile trovare l'utente"
   },
   {
     "id": "api.command_msg.name",
@@ -681,11 +681,11 @@
   },
   {
     "id": "api.command_offline.desc",
-    "translation": "Imposta lo stato in \"Assente\""
+    "translation": "Imposta lo stato in assente"
   },
   {
     "id": "api.command_offline.name",
-    "translation": "Assente"
+    "translation": "assente"
   },
   {
     "id": "api.command_offline.success",
@@ -693,19 +693,35 @@
   },
   {
     "id": "api.command_online.desc",
-    "translation": "Imposta lo stato in \"In linea\"."
+    "translation": "Imposta lo stato in linea"
   },
   {
     "id": "api.command_online.name",
-    "translation": "Collegato"
+    "translation": "online"
   },
   {
     "id": "api.command_online.success",
-    "translation": "Ora sei \"Collegato\""
+    "translation": "Ora sei in linea"
   },
   {
     "id": "api.command_open.name",
-    "translation": "Apri"
+    "translation": "apri"
+  },
+  {
+    "id": "api.command_search.desc",
+    "translation": "Cerca testo nei messaggi"
+  },
+  {
+    "id": "api.command_search.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_search.name",
+    "translation": "cerca"
+  },
+  {
+    "id": "api.command_search.unsupported.app_error",
+    "translation": "Il comando di ricerca non è disponibile sul tuo dispositivo"
   },
   {
     "id": "api.command_settings.desc",
@@ -753,7 +769,7 @@
   },
   {
     "id": "api.command_shortcuts.browser.header",
-    "translation": "#### Comandi Browser \n\n"
+    "translation": "#### Comandi Browser\n\n"
   },
   {
     "id": "api.command_shortcuts.browser.highlight_next",
@@ -960,6 +976,10 @@
     "translation": "Un errore sconosciuto è accaduto. Per favore contatta il supporto."
   },
   {
+    "id": "api.context.v3_disabled.app_error",
+    "translation": "La versione 3 delle API è stata disattivata su questo server. Per favore usare la versione 4 delle API. vedere https://api.mattermost.com per ulteriori dettagli."
+  },
+  {
     "id": "api.deprecated.init.debug",
     "translation": "Inizializzazione delle API routes deprecate"
   },
@@ -1051,7 +1071,7 @@
   },
   {
     "id": "api.emoji.delete.delete_reactions.app_error",
-    "translation": "Impossibile cancellare le reazioni durante la cancellazione dell'Emoji %v"
+    "translation": "Impossibile cancellare le reazioni durante la cancellazione dell'emoji %v"
   },
   {
     "id": "api.emoji.delete.permissions.app_error",
@@ -1059,7 +1079,7 @@
   },
   {
     "id": "api.emoji.disabled.app_error",
-    "translation": "Le emoji personalizzate sono state disabilitate dall'amministratore del sistema."
+    "translation": "Le emoji personalizzate sono state disabilitate dall'amministratore di sistema."
   },
   {
     "id": "api.emoji.get_image.decode.app_error",
@@ -1071,11 +1091,11 @@
   },
   {
     "id": "api.emoji.init.debug",
-    "translation": "Inizializzazione delle API Routes per le emoji."
+    "translation": "Inizializzazione delle API Routes per le emoji"
   },
   {
     "id": "api.emoji.init.debug",
-    "translation": "Inizializzazione delle API Routes per le emoji."
+    "translation": "Inizializzazione delle API Routes per le emoji"
   },
   {
     "id": "api.emoji.storage.app_error",
@@ -1107,7 +1127,7 @@
   },
   {
     "id": "api.file.get_file.public_disabled.app_error",
-    "translation": "I collegamenti pubblici sono stati disabilitati dall'Amministratore di Sistema"
+    "translation": "I collegamenti pubblici sono stati disabilitati dall'amministratore di sistema"
   },
   {
     "id": "api.file.get_file.public_invalid.app_error",
@@ -1151,11 +1171,11 @@
   },
   {
     "id": "api.file.handle_images_forget.encode_jpeg.error",
-    "translation": "Impossibile codificare l'immagine come JPEG path=%v err=%v"
+    "translation": "Impossibile codificare l'immagine come jpeg path=%v err=%v"
   },
   {
     "id": "api.file.handle_images_forget.encode_preview.error",
-    "translation": "Impossibile codificare l'immagine come anteprima JPEG path=%v err=%v"
+    "translation": "Impossibile codificare l'immagine come anteprima jpeg path=%v err=%v"
   },
   {
     "id": "api.file.handle_images_forget.upload_preview.error",
@@ -1203,7 +1223,7 @@
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.not_migrating_post.debug",
-    "translation": "pubblicazione già migrata per usare FileInfos, post_id=%v, err=%v"
+    "translation": "Pubblicazione già migrata per usare FileInfos, post_id=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.save_file_info.warn",
@@ -1315,7 +1335,7 @@
   },
   {
     "id": "api.import.import_user.join_team.error",
-    "translation": "Impossibile entrare in un gruppo durante l' importazione err=%v"
+    "translation": "Impossibile entrare in un gruppo durante l'importazione err=%v"
   },
   {
     "id": "api.import.import_user.joining_default.error",
@@ -1331,7 +1351,7 @@
   },
   {
     "id": "api.incoming_webhook.disabled.app_errror",
-    "translation": "I webhooks in ingresso sono stati disabilitati dall'amministratore del sistema."
+    "translation": "I webhooks in ingresso sono stati disabilitati dall'amministratore di sistema."
   },
   {
     "id": "api.ldap.init.debug",
@@ -1355,7 +1375,7 @@
   },
   {
     "id": "api.license.add_license.no_file.app_error",
-    "translation": "Nessun file per il campo \"licenza\" nella richiesta"
+    "translation": "Nessun file per il campo 'licenza' nella richiesta"
   },
   {
     "id": "api.license.add_license.open.app_error",
@@ -1371,7 +1391,7 @@
   },
   {
     "id": "api.license.add_license.unique_users.app_error",
-    "translation": "La licensa supporta solo {{.Users}} utenti, il tuo sistema ha {{.Count}} utenti unici.Gli utenti unici sono contati in base al indirizzo email. Puoi vedere il conteggio totale degli utenti in Rapporti Sito -> Statistiche."
+    "translation": "La licensa supporta solo {{.Users}} utenti, il tuo sistema ha {{.Count}} utenti unici.Gli utenti unici sono contati in base all'indirizzo email. Puoi vedere il conteggio totale degli utenti in Rapporti Sito -> Statistiche."
   },
   {
     "id": "api.license.client.old_format.app_error",
@@ -1407,11 +1427,11 @@
   },
   {
     "id": "api.oauth.allow_oauth.turn_off.app_error",
-    "translation": "L' amministratore di sistema ha disabilitato l' OAuth2."
+    "translation": "L'amministratore di sistema ha disabilitato l'OAuth2."
   },
   {
     "id": "api.oauth.authorize_oauth.disabled.app_error",
-    "translation": "L' amministratore di sistema ha disabilitato l' OAuth2."
+    "translation": "L'amministratore di sistema ha disabilitato l'OAuth2."
   },
   {
     "id": "api.oauth.authorize_oauth.missing.app_error",
@@ -1431,11 +1451,11 @@
   },
   {
     "id": "api.oauth.get_access_token.bad_client_secret.app_error",
-    "translation": "invalid_request: secret_client mancante"
+    "translation": "invalid_request: Secret_client mancante"
   },
   {
     "id": "api.oauth.get_access_token.bad_grant.app_error",
-    "translation": "invalid_request: grant_type non valido"
+    "translation": "invalid_request: Grant_type non valido"
   },
   {
     "id": "api.oauth.get_access_token.credentials.app_error",
@@ -1443,7 +1463,7 @@
   },
   {
     "id": "api.oauth.get_access_token.disabled.app_error",
-    "translation": "L' amministratore di sistema ha disabilitato l' OAuth2."
+    "translation": "L'amministratore di sistema ha disabilitato l'OAuth2."
   },
   {
     "id": "api.oauth.get_access_token.expired_code.app_error",
@@ -1471,7 +1491,7 @@
   },
   {
     "id": "api.oauth.get_access_token.missing_refresh_token.app_error",
-    "translation": "invalid_request: refresh_token mancante"
+    "translation": "invalid_request: Refresh_token mancante"
   },
   {
     "id": "api.oauth.get_access_token.redirect_uri.app_error",
@@ -1479,7 +1499,7 @@
   },
   {
     "id": "api.oauth.get_access_token.refresh_token.app_error",
-    "translation": "invalid_grant: refresh token non valido"
+    "translation": "invalid_grant: Refresh token non valido"
   },
   {
     "id": "api.oauth.get_auth_data.find.error",
@@ -1490,12 +1510,16 @@
     "translation": "Inizializzazione delle API Routes per OAUTH"
   },
   {
+    "id": "api.oauth.invalid_state_token.app_error",
+    "translation": "Token di stato non valido"
+  },
+  {
     "id": "api.oauth.regenerate_secret.app_error",
     "translation": "Permessi non validi per la rigenerazione del Secret dell'App OAuth2"
   },
   {
     "id": "api.oauth.register_oauth_app.turn_off.app_error",
-    "translation": "L'amministratore di sistema ha disabilitato l'OAuth Service Provider."
+    "translation": "L'amministratore di sistema ha disabilitato il servizio per l'autenticazione OAuth 2.0."
   },
   {
     "id": "api.oauth.revoke_access_token.del_session.app_error",
@@ -1523,7 +1547,7 @@
   },
   {
     "id": "api.opengraph.init.debug",
-    "translation": "Inizializzazione API routes protocollo open graph"
+    "translation": "Inizializzazione api routes protocollo open graph"
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
@@ -1633,7 +1657,7 @@
   },
   {
     "id": "api.post.link_preview_disabled.app_error",
-    "translation": "Le anteprime dei collegamenti sono state disabilitate dall'Amministratore di Sistema"
+    "translation": "Le anteprime dei collegamenti sono state disabilitate dall'amministratore di sistema."
   },
   {
     "id": "api.post.make_direct_channel_visible.get_2_members.error",
@@ -1705,7 +1729,7 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_message",
-    "translation": "ti ha inviato un messaggio diretto"
+    "translation": " ti ha inviato un messaggio diretto"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_non_mention",
@@ -1777,7 +1801,7 @@
   },
   {
     "id": "api.reaction.init.debug",
-    "translation": "Inizializzazione API Routes delle reazioni"
+    "translation": "Inizializzazione api routes delle reazioni"
   },
   {
     "id": "api.reaction.list_reactions.mismatched_channel_id.app_error",
@@ -1857,7 +1881,7 @@
   },
   {
     "id": "api.slackimport.slack_add_channels.added",
-    "translation": "\r\nCanale Aggiunto \r\n"
+    "translation": "\r\n Canale Aggiunto \r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
@@ -1881,7 +1905,7 @@
   },
   {
     "id": "api.slackimport.slack_add_posts.bot.warn",
-    "translation": "Le pubblicazioni Slack bot non sono ancora importati"
+    "translation": "Le pubblicazioni slack bot non sono ancora importate"
   },
   {
     "id": "api.slackimport.slack_add_posts.bot_user_no_exists.warn",
@@ -1901,7 +1925,7 @@
   },
   {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
-    "translation": "pubblicazione non supportata: %v, %v"
+    "translation": "Pubblicazione non supportata: %v, %v"
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_found.warn",
@@ -1929,7 +1953,7 @@
   },
   {
     "id": "api.slackimport.slack_add_users.created",
-    "translation": "\r\nUtente Creato\r\n"
+    "translation": "\r\n Utente Creato\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.email_pwd",
@@ -1961,7 +1985,7 @@
   },
   {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
-    "translation": "Rilevato Timestamp incorretto"
+    "translation": "Rilevato timestamp incorretto"
   },
   {
     "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
@@ -1981,7 +2005,7 @@
   },
   {
     "id": "api.slackimport.slack_import.note2",
-    "translation": "- Le pubblicazioni dei bot di Slack non sono al momento supportate.\r\n"
+    "translation": "- Le pubblicazioni dei bot di slack non sono al momento supportate.\r\n"
   },
   {
     "id": "api.slackimport.slack_import.note3",
@@ -1989,7 +2013,7 @@
   },
   {
     "id": "api.slackimport.slack_import.notes",
-    "translation": "\r\nNote \r\n"
+    "translation": "\r\n Note \r\n"
   },
   {
     "id": "api.slackimport.slack_import.open.app_error",
@@ -2057,11 +2081,11 @@
   },
   {
     "id": "api.team.create_team.email_disabled.app_error",
-    "translation": "L' iscrizione al gruppo con email è disabilitata."
+    "translation": "L'iscrizione al gruppo con email è disabilitata."
   },
   {
     "id": "api.team.create_team_from_signup.email_disabled.app_error",
-    "translation": "L' accesso con email è disabilitato."
+    "translation": "L'accesso con email è disabilitato."
   },
   {
     "id": "api.team.create_team_from_signup.expired_link.app_error",
@@ -2073,7 +2097,7 @@
   },
   {
     "id": "api.team.create_team_from_signup.unavailable.app_error",
-    "translation": "L' URL non è disponibile. Provane un altro."
+    "translation": "L'URL non è disponibile. Provane un altro."
   },
   {
     "id": "api.team.email_teams.sending.error",
@@ -2081,7 +2105,7 @@
   },
   {
     "id": "api.team.get_invite_info.not_open_team",
-    "translation": "L' invito non è valido a causa del fatto che il gruppo non è aperto."
+    "translation": "L'invito non è valido a causa del fatto che il gruppo non è aperto."
   },
   {
     "id": "api.team.import_team.admin.app_error",
@@ -2089,7 +2113,7 @@
   },
   {
     "id": "api.team.import_team.array.app_error",
-    "translation": "Lista vuota per il campo \"file\""
+    "translation": "Lista vuota per il campo 'file'"
   },
   {
     "id": "api.team.import_team.integer.app_error",
@@ -2125,7 +2149,7 @@
   },
   {
     "id": "api.team.invite_members.invalid_email.app_error",
-    "translation": "I seguenti indirizzi eMail non appartengono ad un dominio accettato: {{.Addresses}}. Contattare l'amministratore del sistema per maggiori dettagli."
+    "translation": "I seguenti indirizzi email non appartengono ad un dominio accettato: {{.Addresses}}. Contattare l'amministratore di sistema per maggiori dettagli."
   },
   {
     "id": "api.team.invite_members.member",
@@ -2141,7 +2165,7 @@
   },
   {
     "id": "api.team.invite_members.restricted_team_admin.app_error",
-    "translation": "L'invito di nuovi utenti nel gruppo è limitato all'Amministratore di Sistema e del gruppo. "
+    "translation": "L'invito di nuovi utenti nel gruppo è limitato all'Amministratore di Sistema e del gruppo."
   },
   {
     "id": "api.team.invite_members.send.error",
@@ -2205,7 +2229,7 @@
   },
   {
     "id": "api.templates.email_change_verify_body.info",
-    "translation": "Per completare l' aggiornamento del tuo indirizzo email per {{.TeamDisplayName}}, segui il collegamento sottostante per confermare che l'indirizzo sia corretto."
+    "translation": "Per completare l'aggiornamento del tuo indirizzo email per {{.TeamDisplayName}}, segui il collegamento sottostante per confermare che l'indirizzo sia corretto."
   },
   {
     "id": "api.templates.email_change_verify_body.title",
@@ -2221,11 +2245,11 @@
   },
   {
     "id": "api.templates.email_info",
-    "translation": "Qualsiasi domanda, mandaci una mail: <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>Cordiali Saluti,<br>Il Team  {{.SiteName}}<br>"
+    "translation": "Qualsiasi domanda, mandaci una mail: <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>Cordiali Saluti,<br>Il Team {{.SiteName}}<br>"
   },
   {
     "id": "api.templates.email_organization",
-    "translation": "Spedito da"
+    "translation": "Spedito da "
   },
   {
     "id": "api.templates.error.link",
@@ -2313,7 +2337,7 @@
   },
   {
     "id": "api.templates.post_subject_in_channel",
-    "translation": "{{.SubjectText}} su {{.TeamDisplayName}} ({{.ChannelName}}) il  {{.Day}} {{.Month}} {{.Year}}"
+    "translation": "{{.SubjectText}} su {{.TeamDisplayName}} ({{.ChannelName}}) il {{.Day}} {{.Month}} {{.Year}}"
   },
   {
     "id": "api.templates.post_subject_in_direct_message",
@@ -2377,7 +2401,7 @@
   },
   {
     "id": "api.templates.upgrade_30_subject.info",
-    "translation": "[MATTERMOST] Cambiamenti al tuo account per l' upgrade a Mattermost 3.0"
+    "translation": "[MATTERMOST] Cambiamenti al tuo account per l'upgrade a Mattermost 3.0"
   },
   {
     "id": "api.templates.username_change_body.info",
@@ -2405,7 +2429,7 @@
   },
   {
     "id": "api.templates.verify_subject",
-    "translation": "[{{ .SiteName }}]  Verifica Email"
+    "translation": "[{{ .SiteName }}] Verifica Email"
   },
   {
     "id": "api.templates.welcome_body.app_download_info",
@@ -2469,7 +2493,7 @@
   },
   {
     "id": "api.user.authorize_oauth_user.token_failed.app_error",
-    "translation": "Richiesta Token fallita"
+    "translation": "Richiesta token fallita"
   },
   {
     "id": "api.user.authorize_oauth_user.unsupported.app_error",
@@ -2525,7 +2549,7 @@
   },
   {
     "id": "api.user.create_profile_image.encode.app_error",
-    "translation": "Impossibile codificare l' immagine di profilo di default"
+    "translation": "Impossibile codificare l'immagine di profilo di default"
   },
   {
     "id": "api.user.create_profile_image.initial.app_error",
@@ -2533,7 +2557,7 @@
   },
   {
     "id": "api.user.create_user.accepted_domain.app_error",
-    "translation": "L'indirizzo email fornito non appartiene ai domini accettati. Contattare l'amministratore del sistema oppure utilizzare una email differente."
+    "translation": "L'indirizzo email fornito non appartiene ai domini accettati. Contattare l'amministratore di sistema oppure utilizzare una email differente."
   },
   {
     "id": "api.user.create_user.disabled.app_error",
@@ -2557,11 +2581,11 @@
   },
   {
     "id": "api.user.create_user.save.error",
-    "translation": "Impossibile salvare l' ultente err=%v"
+    "translation": "Impossibile salvare l'utente err=%v"
   },
   {
     "id": "api.user.create_user.signup_email_disabled.app_error",
-    "translation": "L' iscrizione al gruppo con email è disabilitata."
+    "translation": "L'iscrizione al gruppo con email è disabilitata."
   },
   {
     "id": "api.user.create_user.signup_link_expired.app_error",
@@ -2613,7 +2637,7 @@
   },
   {
     "id": "api.user.login.blank_pwd.app_error",
-    "translation": "Il campo Password non può essere bianco"
+    "translation": "Il campo password non può essere bianco"
   },
   {
     "id": "api.user.login.inactive.app_error",
@@ -2621,7 +2645,7 @@
   },
   {
     "id": "api.user.login.invalid_credentials",
-    "translation": "User ID o password non corretta"
+    "translation": "User ID o password non corretta."
   },
   {
     "id": "api.user.login.not_provided.app_error",
@@ -2697,11 +2721,11 @@
   },
   {
     "id": "api.user.reset_password.wrong_team.app_error",
-    "translation": "Provando a resettare la password per l' utente su un gruppo sbagliato."
+    "translation": "Provando a resettare la password per l'utente su un gruppo sbagliato."
   },
   {
     "id": "api.user.saml.not_available.app_error",
-    "translation": "SAML non configurato o supportato su questo server"
+    "translation": "SAML non configurato o supportato su questo server."
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -2761,7 +2785,7 @@
   },
   {
     "id": "api.user.update_password.context.app_error",
-    "translation": "Aggiornamento password fallito perchè contesto user_id non coincide con user id"
+    "translation": "Aggiornamento password fallito perché contesto user_id non coincide con user id"
   },
   {
     "id": "api.user.update_password.failed.app_error",
@@ -2773,11 +2797,11 @@
   },
   {
     "id": "api.user.update_password.menu",
-    "translation": "usando il menù dei settaggi"
+    "translation": "usando il menù impostazioni"
   },
   {
     "id": "api.user.update_password.oauth.app_error",
-    "translation": "Aggiornamento della password fallito perche l' utente è loggato tramite servizio OAuth"
+    "translation": "Aggiornamento della password fallito perché l'utente è loggato tramite servizio OAuth"
   },
   {
     "id": "api.user.update_password.valid_account.app_error",
@@ -2805,11 +2829,11 @@
   },
   {
     "id": "api.user.upload_profile_user.array.app_error",
-    "translation": "Lista vuota per il campo \"image\" nella richiesta"
+    "translation": "Lista vuota per il campo 'image' nella richiesta"
   },
   {
     "id": "api.user.upload_profile_user.decode.app_error",
-    "translation": "Impossibile caricare l' immagine di profilo"
+    "translation": "Impossibile caricare l'immagine di profilo"
   },
   {
     "id": "api.user.upload_profile_user.decode_config.app_error",
@@ -2821,7 +2845,7 @@
   },
   {
     "id": "api.user.upload_profile_user.no_file.app_error",
-    "translation": "Nessun file per il campo \"immagine\" nella richiesta"
+    "translation": "Nessun file per il campo 'immagine' nella richiesta"
   },
   {
     "id": "api.user.upload_profile_user.open.app_error",
@@ -2841,7 +2865,7 @@
   },
   {
     "id": "api.user.upload_profile_user.upload_profile.app_error",
-    "translation": "Impossibile caricare l' immagine di profilo"
+    "translation": "Impossibile caricare l'immagine di profilo"
   },
   {
     "id": "api.user.verify_email.bad_link.app_error",
@@ -2853,7 +2877,7 @@
   },
   {
     "id": "api.web_hub.start.stopping.debug",
-    "translation": "Chiusura delle connessioni hub websocket"
+    "translation": "chiusura delle connessioni hub websocket"
   },
   {
     "id": "api.web_socket.connect.error",
@@ -2881,11 +2905,11 @@
   },
   {
     "id": "api.webhook.create_outgoing.disabled.app_error",
-    "translation": "I webhooks in uscita sono stati disabilitati dall'amministratore del sistema."
+    "translation": "I webhooks in uscita sono stati disabilitati dall'amministratore di sistema."
   },
   {
     "id": "api.webhook.create_outgoing.intersect.app_error",
-    "translation": "Outgoing webhooks dallo stesso canale non possono avere lo stesso trigger/callback URLs"
+    "translation": "Outgoing webhooks dallo stesso canale non possono avere lo stesso trigger/callback URLs."
   },
   {
     "id": "api.webhook.create_outgoing.not_open.app_error",
@@ -2897,11 +2921,11 @@
   },
   {
     "id": "api.webhook.create_outgoing.triggers.app_error",
-    "translation": "Almeno una tra trigger_words o channel_id deve essere configurata."
+    "translation": "Almeno una tra trigger_words o channel_id deve essere configurata"
   },
   {
     "id": "api.webhook.delete_incoming.disabled.app_error",
-    "translation": "I webook in ingresso sono stati disabilitati dall'amministratore del sistema."
+    "translation": "I webook in ingresso sono stati disabilitati dall'amministratore di sistema."
   },
   {
     "id": "api.webhook.delete_incoming.permissions.app_error",
@@ -2909,11 +2933,11 @@
   },
   {
     "id": "api.webhook.delete_outgoing.disabled.app_error",
-    "translation": "Outgoing webhooks sono stati disabilitati dall'amministratore del sistema."
+    "translation": "Outgoing webhooks sono stati disabilitati dall'amministratore di sistema."
   },
   {
     "id": "api.webhook.delete_outgoing.permissions.app_error",
-    "translation": "Permessi inappropriati per eliminare il webhook in uscita."
+    "translation": "Permessi inappropriati per eliminare il webhook in uscita"
   },
   {
     "id": "api.webhook.incoming.debug",
@@ -2929,7 +2953,7 @@
   },
   {
     "id": "api.webhook.regen_outgoing_token.permissions.app_error",
-    "translation": "Permessi inappropriati per rigenerare il token del webhook in uscita."
+    "translation": "Permessi inappropriati per rigenerare il token del webhook in uscita"
   },
   {
     "id": "api.webhook.team_mismatch.app_error",
@@ -2937,7 +2961,7 @@
   },
   {
     "id": "api.webhook.update_incoming.disabled.app_error",
-    "translation": "I webhook in ingresso sono stati disabilitati dall'amministratore del sistema."
+    "translation": "I webhook in ingresso sono stati disabilitati dall'amministratore di sistema."
   },
   {
     "id": "api.webhook.update_incoming.permissions.app_error",
@@ -2945,11 +2969,11 @@
   },
   {
     "id": "api.webhook.update_outgoing.disabled.app_error",
-    "translation": "I webhook in uscita sono stati disabilitati dall'amministratore del sistema."
+    "translation": "I webhook in uscita sono stati disabilitati dall'amministratore di sistema."
   },
   {
     "id": "api.webhook.update_outgoing.intersect.app_error",
-    "translation": "I webhooks dallo stesso canale non possono avere gli stessi URL innesco/callback"
+    "translation": "I webhooks dallo stesso canale non possono avere gli stessi URL innesco/callback."
   },
   {
     "id": "api.webhook.update_outgoing.not_open.app_error",
@@ -2961,7 +2985,7 @@
   },
   {
     "id": "api.webhook.update_outgoing.triggers.app_error",
-    "translation": "Almeno una tra trigger_words o channel_id deve essere configurata."
+    "translation": "Almeno una tra trigger_words o channel_id deve essere configurata"
   },
   {
     "id": "api.webrtc.disabled.app_error",
@@ -3021,19 +3045,11 @@
   },
   {
     "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Errore durante la ricerca del canale diretto"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Errore durante la ricerca del canale diretto"
+    "translation": "Impossibile creare il canale diretto"
   },
   {
     "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Errore durante la ricerca del canale di gruppo"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Errore durante la ricerca del canale di gruppo"
+    "translation": "Impossibile creare il canale di gruppo"
   },
   {
     "id": "app.import.import_direct_channel.member_not_found.error",
@@ -3048,6 +3064,14 @@
     "translation": "Errore nella ricerca del membro del canale durante l'importazione della pubblicazione sul canale diretto"
   },
   {
+    "id": "app.import.import_direct_post.create_direct_channel.error",
+    "translation": "Canale diretto non trovato"
+  },
+  {
+    "id": "app.import.import_direct_post.create_group_channel.error",
+    "translation": "Canale di gruppo non trovato"
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "L'utente della pubblicazione non esiste"
   },
@@ -3101,7 +3125,7 @@
   },
   {
     "id": "app.import.validate_channel_import_data.display_name_missing.error",
-    "translation": "Manca la proprietà del canale richiesta: display_name."
+    "translation": "Manca la proprietà del canale richiesta: display_name"
   },
   {
     "id": "app.import.validate_channel_import_data.header_length.error",
@@ -3133,7 +3157,7 @@
   },
   {
     "id": "app.import.validate_channel_import_data.type_missing.error",
-    "translation": "Manca una proprietà richiesta del canale: tipo"
+    "translation": "Manca una proprietà richiesta del canale: tipo."
   },
   {
     "id": "app.import.validate_direct_channel_import_data.header_length.error",
@@ -3285,11 +3309,11 @@
   },
   {
     "id": "app.import.validate_user_import_data.email_length.error",
-    "translation": "Il campo Email dell'utente ha una lunghezza non valida."
+    "translation": "Il campo email dell'utente ha una lunghezza non valida."
   },
   {
     "id": "app.import.validate_user_import_data.email_missing.error",
-    "translation": "Proprietà dell'utente mancante: Email."
+    "translation": "Proprietà dell'utente mancante: email."
   },
   {
     "id": "app.import.validate_user_import_data.first_name_length.error",
@@ -3301,7 +3325,7 @@
   },
   {
     "id": "app.import.validate_user_import_data.nickname_length.error",
-    "translation": "Il campo Soprannome dell'utente è troppo lungo."
+    "translation": "Il campo soprannome dell'utente è troppo lungo."
   },
   {
     "id": "app.import.validate_user_import_data.pasword_length.error",
@@ -3401,11 +3425,11 @@
   },
   {
     "id": "ent.brand.save_brand_image.save_image.app_error",
-    "translation": "Impossibile salvare l' immagine"
+    "translation": "Impossibile salvare l'immagine"
   },
   {
     "id": "ent.brand.save_brand_image.too_large.app_error",
-    "translation": "Impossibile aprire l' immagine. Immagine tropppo larga."
+    "translation": "Impossibile aprire l'immagine. Immagine troppo larga."
   },
   {
     "id": "ent.cluster.config_changed.info",
@@ -3441,7 +3465,7 @@
   },
   {
     "id": "ent.cluster.save_config.error",
-    "translation": "La console di Sistema è configurata in sola lettura quando l'Alta Disponibilità è attiva a meno che il parametro ReadOnlyConfig non sia disattivato nel file di configurazione."
+    "translation": "La console di Sistema è configurata in sola lettura quando l'Alta Disponibilità è attiva    a meno che il parametro ReadOnlyConfig non sia disattivato nel file di configurazione."
   },
   {
     "id": "ent.cluster.starting.info",
@@ -3465,7 +3489,7 @@
   },
   {
     "id": "ent.compliance.run_limit.warning",
-    "translation": "Allerta esportazione di conformità per l'attività  '{{.JobName}} troppe righe ritornate limitato a 30,000 in '{{.FilePath}}'"
+    "translation": "Allerta esportazione di conformità per l'attività '{{.JobName}} troppe righe ritornate limitato a 30,000 in '{{.FilePath}}'"
   },
   {
     "id": "ent.compliance.run_started.info",
@@ -3537,7 +3561,7 @@
   },
   {
     "id": "ent.ldap.do_login.matched_to_many_users.app_error",
-    "translation": "L'Username fornito corrisponde a più utenti"
+    "translation": "L'username fornito corrisponde a più utenti"
   },
   {
     "id": "ent.ldap.do_login.search_ldap_server.app_error",
@@ -3593,11 +3617,11 @@
   },
   {
     "id": "ent.mfa.activate.save_active.app_erro",
-    "translation": "Impossibile aggiornare lo stato MFA attivo per l' utente"
+    "translation": "Impossibile aggiornare lo stato MFA attivo per l'utente"
   },
   {
     "id": "ent.mfa.deactivate.save_active.app_erro",
-    "translation": "Impossibile aggiornare lo stato MFA attivo per l' utente"
+    "translation": "Impossibile aggiornare lo stato MFA attivo per l'utente"
   },
   {
     "id": "ent.mfa.deactivate.save_secret.app_error",
@@ -3613,7 +3637,7 @@
   },
   {
     "id": "ent.mfa.license_disable.app_error",
-    "translation": "La tua licenza non supporta l' autenticazione multifattore"
+    "translation": "La tua licenza non supporta l'autenticazione multifattore"
   },
   {
     "id": "ent.mfa.validate_token.authenticate.app_error",
@@ -3625,7 +3649,7 @@
   },
   {
     "id": "ent.migration.migratetoldap.user_not_found",
-    "translation": "Impossible trovare l'utente sul server AD/LDAP."
+    "translation": "Impossible trovare l'utente sul server AD/LDAP: "
   },
   {
     "id": "ent.saml.attribute.app_error",
@@ -3737,7 +3761,7 @@
   },
   {
     "id": "manaultesting.manual_test.parse.app_error",
-    "translation": "Impossibile analizzare l' URL"
+    "translation": "Impossibile analizzare l'URL"
   },
   {
     "id": "manaultesting.manual_test.setup.info",
@@ -3749,7 +3773,7 @@
   },
   {
     "id": "manaultesting.test_autolink.info",
-    "translation": "Manual Auto Link Test"
+    "translation": "Prova manualmente auto link"
   },
   {
     "id": "manaultesting.test_autolink.unable.app_error",
@@ -3773,7 +3797,7 @@
   },
   {
     "id": "mattermost.load_license.find.warn",
-    "translation": "Per sbloccare le funzioni enterprise è necessario un codice licenza ricevuto da https://mattermost.com "
+    "translation": "Per sbloccare le funzioni enterprise è necessario un codice licenza ricevuto da https://mattermost.com."
   },
   {
     "id": "mattermost.security_bulletin.error",
@@ -3809,11 +3833,11 @@
   },
   {
     "id": "model.access.is_valid.client_id.app_error",
-    "translation": "ID client non valido"
+    "translation": "Id client non valido"
   },
   {
     "id": "model.access.is_valid.redirect_uri.app_error",
-    "translation": "URI di redirect invalido"
+    "translation": "Uri di redirect invalido"
   },
   {
     "id": "model.access.is_valid.refresh_token.app_error",
@@ -3821,7 +3845,7 @@
   },
   {
     "id": "model.access.is_valid.user_id.app_error",
-    "translation": "ID utente non valido"
+    "translation": "Id utente non valido"
   },
   {
     "id": "model.authorize.is_valid.auth_code.app_error",
@@ -3829,7 +3853,7 @@
   },
   {
     "id": "model.authorize.is_valid.client_id.app_error",
-    "translation": "ID clienta sbagliato"
+    "translation": "Id client non valido"
   },
   {
     "id": "model.authorize.is_valid.create_at.app_error",
@@ -3841,7 +3865,7 @@
   },
   {
     "id": "model.authorize.is_valid.redirect_uri.app_error",
-    "translation": "URI di redirezione non valida"
+    "translation": "Uri di redirect non valido"
   },
   {
     "id": "model.authorize.is_valid.response_type.app_error",
@@ -3857,7 +3881,7 @@
   },
   {
     "id": "model.authorize.is_valid.user_id.app_error",
-    "translation": "ID utente non valido"
+    "translation": "Id utente non valido"
   },
   {
     "id": "model.channel.is_valid.2_or_more.app_error",
@@ -3901,11 +3925,11 @@
   },
   {
     "id": "model.channel_member.is_valid.channel_id.app_error",
-    "translation": "ID canale non valido"
+    "translation": "Id canale non valido"
   },
   {
     "id": "model.channel_member.is_valid.email_value.app_error",
-    "translation": "Valore Email della notifica non valido"
+    "translation": "Valore email della notifica non valido"
   },
   {
     "id": "model.channel_member.is_valid.notify_level.app_error",
@@ -3925,11 +3949,11 @@
   },
   {
     "id": "model.channel_member.is_valid.user_id.app_error",
-    "translation": "ID utente non valido"
+    "translation": "Id utente non valido"
   },
   {
     "id": "model.client.connecting.app_error",
-    "translation": "E' stato riscontrato un errore durente la connessione al server"
+    "translation": "E' stato riscontrato un errore durante la connessione al server"
   },
   {
     "id": "model.client.create_emoji.emoji.app_error",
@@ -3961,7 +3985,7 @@
   },
   {
     "id": "model.client.set_profile_user.no_file.app_error",
-    "translation": "Nessun file per il campo \"immagine\" nella richiesta"
+    "translation": "Nessun file per il campo 'immagine' nella richiesta"
   },
   {
     "id": "model.client.set_profile_user.writer.app_error",
@@ -4037,7 +4061,7 @@
   },
   {
     "id": "model.command.is_valid.user_id.app_error",
-    "translation": "ID utente non valido"
+    "translation": "Id utente non valido"
   },
   {
     "id": "model.compliance.is_valid.create_at.app_error",
@@ -4101,7 +4125,7 @@
   },
   {
     "id": "model.config.is_valid.email_security.app_error",
-    "translation": "Sicurezza connesione email non valida.  Deve essere \",'TLS', or 'STARTTLS'"
+    "translation": "Sicurezza della connessione email non valida.   Deve essere '','TLS', or 'STARTTLS'"
   },
   {
     "id": "model.config.is_valid.encrypt_sql.app_error",
@@ -4129,7 +4153,7 @@
   },
   {
     "id": "model.config.is_valid.file_salt.app_error",
-    "translation": "Salt per il collegamento pubblico non valido per le impostazioni file.  Deve essere maggiore o uguale a 32 caratteri"
+    "translation": "Salt per il collegamento pubblico non valido per le impostazioni file.  Deve essere maggiore o uguale a 32 caratteri."
   },
   {
     "id": "model.config.is_valid.file_thumb_height.app_error",
@@ -4181,7 +4205,7 @@
   },
   {
     "id": "model.config.is_valid.ldap_security.app_error",
-    "translation": "Impostazione di sicurezza connessione AD/LDAP non valida.  Deve essere \",'TLS', or 'STARTTLS'"
+    "translation": "Impostazione di sicurezza connessione AD/LDAP non valida.  Deve essere '','TLS', or 'STARTTLS'"
   },
   {
     "id": "model.config.is_valid.ldap_server",
@@ -4261,19 +4285,19 @@
   },
   {
     "id": "model.config.is_valid.saml_idp_descriptor_url.app_error",
-    "translation": "L'URL Login Fornitore Identità deve essere un URL valido ed iniziare con http:// o https://. "
+    "translation": "L'URL Login Fornitore Identità deve essere un URL valido ed iniziare con http:// o https://."
   },
   {
     "id": "model.config.is_valid.saml_idp_url.app_error",
-    "translation": "L'URL SAML SSO deve essere un URL valido ed iniziare con http:// o https://. "
+    "translation": "L'URL SAML SSO deve essere un URL valido ed iniziare con http:// o https://."
   },
   {
     "id": "model.config.is_valid.saml_private_key.app_error",
-    "translation": "Chiave Privata Fornitore Servizio mancante. Hai dimenticato di effettuare il caricamento dello stesso? "
+    "translation": "Chiave Privata Fornitore Servizio mancante. Hai dimenticato di effettuare il caricamento dello stesso?"
   },
   {
     "id": "model.config.is_valid.saml_public_cert.app_error",
-    "translation": "Certificato Pubblico Fornitore Servizio mancante. Hai dimenticato di effettuare il caricamento dello stesso? "
+    "translation": "Certificato Pubblico Fornitore Servizio mancante. Hai dimenticato di effettuare il caricamento dello stesso?"
   },
   {
     "id": "model.config.is_valid.saml_username_attribute.app_error",
@@ -4313,7 +4337,7 @@
   },
   {
     "id": "model.config.is_valid.teammate_name_display.app_error",
-    "translation": "Invalid teammate display.  Must be 'full_name', 'nickname_full_name' or 'username'"
+    "translation": "Nome collega non valido.  Deve essere 'nome_utente', 'soprannome_nome_utente' o 'username'"
   },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
@@ -4329,7 +4353,7 @@
   },
   {
     "id": "model.config.is_valid.webrtc_gateway_ws_url.app_error",
-    "translation": "L'URL per il Websocket del WebRTC Gateway deve essere valido ed iniziare con ws:// o wss://. "
+    "translation": "L'URL per il Websocket del WebRTC Gateway deve essere valido ed iniziare con ws:// o wss://."
   },
   {
     "id": "model.config.is_valid.webrtc_stun_uri.app_error",
@@ -4365,7 +4389,7 @@
   },
   {
     "id": "model.emoji.id.app_error",
-    "translation": "id emoji non valido"
+    "translation": "Id emoji non valido"
   },
   {
     "id": "model.emoji.name.app_error",
@@ -4381,7 +4405,7 @@
   },
   {
     "id": "model.incoming_hook.channel_id.app_error",
-    "translation": "ID canale non valido"
+    "translation": "Id canale non valido"
   },
   {
     "id": "model.incoming_hook.create_at.app_error",
@@ -4409,11 +4433,11 @@
   },
   {
     "id": "model.incoming_hook.user_id.app_error",
-    "translation": "User ID non valido"
+    "translation": "User id non valido"
   },
   {
     "id": "model.oauth.is_valid.app_id.app_error",
-    "translation": "App ID non valido"
+    "translation": "App id non valido"
   },
   {
     "id": "model.oauth.is_valid.callback.app_error",
@@ -4429,7 +4453,7 @@
   },
   {
     "id": "model.oauth.is_valid.creator_id.app_error",
-    "translation": "Creatore ID non valido"
+    "translation": "Id creatore non valido"
   },
   {
     "id": "model.oauth.is_valid.description.app_error",
@@ -4457,7 +4481,7 @@
   },
   {
     "id": "model.outgoing_hook.is_valid.channel_id.app_error",
-    "translation": "ID canale non valido"
+    "translation": "Id canale non valido"
   },
   {
     "id": "model.outgoing_hook.is_valid.create_at.app_error",
@@ -4505,7 +4529,7 @@
   },
   {
     "id": "model.post.is_valid.channel_id.app_error",
-    "translation": "ID canale non valido"
+    "translation": "Id canale non valido"
   },
   {
     "id": "model.post.is_valid.create_at.app_error",
@@ -4533,11 +4557,11 @@
   },
   {
     "id": "model.post.is_valid.original_id.app_error",
-    "translation": "ID originale non valido"
+    "translation": "Id originale non valido"
   },
   {
     "id": "model.post.is_valid.parent_id.app_error",
-    "translation": "ID genitore non valido"
+    "translation": "Id genitore non valido"
   },
   {
     "id": "model.post.is_valid.props.app_error",
@@ -4545,7 +4569,7 @@
   },
   {
     "id": "model.post.is_valid.root_id.app_error",
-    "translation": "ID radice non valido"
+    "translation": "Id radice non valido"
   },
   {
     "id": "model.post.is_valid.root_parent.app_error",
@@ -4561,7 +4585,7 @@
   },
   {
     "id": "model.post.is_valid.user_id.app_error",
-    "translation": "ID utente non valido"
+    "translation": "Id utente non valido"
   },
   {
     "id": "model.preference.is_valid.category.app_error",
@@ -4569,7 +4593,7 @@
   },
   {
     "id": "model.preference.is_valid.id.app_error",
-    "translation": "ID utente non valido"
+    "translation": "Id utente non valido"
   },
   {
     "id": "model.preference.is_valid.name.app_error",
@@ -4597,7 +4621,7 @@
   },
   {
     "id": "model.reaction.is_valid.user_id.app_error",
-    "translation": "ID utente non valido"
+    "translation": "Id utente non valido"
   },
   {
     "id": "model.team.is_valid.characters.app_error",
@@ -4633,7 +4657,7 @@
   },
   {
     "id": "model.team.is_valid.reserved.app_error",
-    "translation": "L' URL non è disponibile. Provane un altro."
+    "translation": "L'URL non è disponibile. Provane un altro."
   },
   {
     "id": "model.team.is_valid.type.app_error",
@@ -4657,7 +4681,7 @@
   },
   {
     "id": "model.team_member.is_valid.user_id.app_error",
-    "translation": "User ID invalido"
+    "translation": "Id utente non valido"
   },
   {
     "id": "model.token.is_valid.expiry",
@@ -4693,7 +4717,7 @@
   },
   {
     "id": "model.user.is_valid.id.app_error",
-    "translation": "ID utente non valido"
+    "translation": "Id utente non valido"
   },
   {
     "id": "model.user.is_valid.last_name.app_error",
@@ -4741,7 +4765,7 @@
   },
   {
     "id": "model.user.is_valid.pwd_lowercase_uppercase_number_symbol.app_error",
-    "translation": "La tua password deve contenere almeno {{.Min}} caratteri e deve essere composta da almeno una lettera minuscola, almeno una lettera maiuscola, almeno un numero ed almeno un simbolo (es.: \"~!@#$%^&*()\")"
+    "translation": "La tua password deve contenere almeno {{.Min}} caratteri e deve essere composta da almeno una lettera minuscola, almeno una lettera maiuscola, almeno un numero ed almeno un simbolo (es.: \"~!@#$%^&*()\")."
   },
   {
     "id": "model.user.is_valid.pwd_lowercase_uppercase_symbol.app_error",
@@ -4753,11 +4777,11 @@
   },
   {
     "id": "model.user.is_valid.pwd_number_symbol.app_error",
-    "translation": "La tua password deve contenere almeno {{.Min}} caratteri e deve essere composta da almeno un numero ed almeno un simbolo (es.: \"~!@#$%^&*()\")"
+    "translation": "La tua password deve contenere almeno {{.Min}} caratteri e deve essere composta da almeno un numero ed almeno un simbolo (es.: \"~!@#$%^&*()\")."
   },
   {
     "id": "model.user.is_valid.pwd_symbol.app_error",
-    "translation": "La tua password deve contenere almeno {{.Min}} caratteri e deve essere composta da almeno un simbolo (es.: \"~!@#$%^&*()\")"
+    "translation": "La tua password deve contenere almeno {{.Min}} caratteri e deve essere composta da almeno un simbolo (es.: \"~!@#$%^&*()\")."
   },
   {
     "id": "model.user.is_valid.pwd_uppercase.app_error",
@@ -4873,7 +4897,7 @@
   },
   {
     "id": "store.sql.read_replicas_not_licensed.critical",
-    "translation": "Più di una funzionalità disabilitata dalla licenza in uso. Per favore contatta il tuo amministratore di sistema informandolo di aggiornare la licenza enterprise."
+    "translation": "Più di 1 funzionalità di lettura in replica disabilitata dalla licenza in uso. Per favore contatta il tuo amministratore di sistema informandolo di aggiornare la licenza enterprise."
   },
   {
     "id": "store.sql.remove_index.critical",
@@ -5233,7 +5257,7 @@
   },
   {
     "id": "store.sql_emoji.get_all.app_error",
-    "translation": "Non è stato possibile Impossibile recuperare l'emoji"
+    "translation": "Non è stato possibile recuperare l'emoji"
   },
   {
     "id": "store.sql_emoji.get_by_name.app_error",
@@ -5377,11 +5401,11 @@
   },
   {
     "id": "store.sql_oauth.save_app.save.app_error",
-    "translation": "Non è possibile salvare l' app."
+    "translation": "Non è possibile salvare l'app."
   },
   {
     "id": "store.sql_oauth.save_auth_data.app_error",
-    "translation": "Non è stato possibile salvare il codice di autorizzazione"
+    "translation": "Non è stato possibile salvare il codice di autorizzazione."
   },
   {
     "id": "store.sql_oauth.update_access_data.app_error",
@@ -5397,7 +5421,7 @@
   },
   {
     "id": "store.sql_oauth.update_app.update.app_error",
-    "translation": "Non è possibile aggiornare l' app"
+    "translation": "Non è possibile aggiornare l'app"
   },
   {
     "id": "store.sql_oauth.update_app.updating.app_error",
@@ -5697,7 +5721,7 @@
   },
   {
     "id": "store.sql_system.get_by_name.app_error",
-    "translation": "Non è stato possibile trovare la variabile di sistema"
+    "translation": "Non è stato possibile trovare la variabile di sistema."
   },
   {
     "id": "store.sql_system.get_version.app_error",
@@ -5845,7 +5869,7 @@
   },
   {
     "id": "store.sql_user.get_all_using_auth_service.other.app_error",
-    "translation": "Errore riscontrato durante la ricerca di tutti gli account che utilizzano il tipo di autenticazione specificato. "
+    "translation": "Errore riscontrato durante la ricerca di tutti gli account che utilizzano il tipo di autenticazione specificato."
   },
   {
     "id": "store.sql_user.get_by_auth.missing_account.app_error",
@@ -5869,7 +5893,7 @@
   },
   {
     "id": "store.sql_user.get_new_users.app_error",
-    "translation": "Errore riscontrato durante la ricerca delle preferenze"
+    "translation": "Errore riscontrato durante la ricerca dei nuovi utenti"
   },
   {
     "id": "store.sql_user.get_profiles.app_error",
@@ -6301,11 +6325,11 @@
   },
   {
     "id": "web.incoming_webhook.user.app_error",
-    "translation": "Non è stato possibile trovare l' utente"
+    "translation": "Non è stato possibile trovare l'utente"
   },
   {
     "id": "web.init.debug",
-    "translation": "Inizializzazione delle API Routes di amministrazione"
+    "translation": "Inizializzazione delle api routes di amministrazione"
   },
   {
     "id": "web.login.error",
diff --git a/i18n/ja.json b/i18n/ja.json
index d5584ee3a..cb33cb133 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -708,6 +708,22 @@
     "translation": "開く"
   },
   {
+    "id": "api.command_search.desc",
+    "translation": "メッセージ内のテキストを検索する"
+  },
+  {
+    "id": "api.command_search.hint",
+    "translation": "[テキスト]"
+  },
+  {
+    "id": "api.command_search.name",
+    "translation": "検索"
+  },
+  {
+    "id": "api.command_search.unsupported.app_error",
+    "translation": "このデバイスでは検索コマンドはサポートされていません"
+  },
+  {
     "id": "api.command_settings.desc",
     "translation": "アカウント設定ダイアログを開く"
   },
@@ -960,6 +976,10 @@
     "translation": "詳細不明なエラーが発生しました。サポートに問い合わせしてください。"
   },
   {
+    "id": "api.context.v3_disabled.app_error",
+    "translation": "APIバージョン3はこのサーバーでは無効化されています。APIバージョン4を使用してください。詳しくは https://api.mattermost.com を参照してください。"
+  },
+  {
     "id": "api.deprecated.init.debug",
     "translation": "非推奨APIルートを初期化しています"
   },
@@ -1490,6 +1510,10 @@
     "translation": "OAuth APIルートを初期化しています"
   },
   {
+    "id": "api.oauth.invalid_state_token.app_error",
+    "translation": "不正な状態トークン"
+  },
+  {
     "id": "api.oauth.regenerate_secret.app_error",
     "translation": "OAuth2アプリケーションの秘密情報の再生成に必要な権限が付与されていません"
   },
@@ -3021,19 +3045,11 @@
   },
   {
     "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "ダイレクトチャンネルを取得できませんでした"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "ダイレクトチャンネルを取得できませんでした"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "グループチャンネルを取得できませんでした"
+    "translation": "ダイレクトチャンネルを作成できませんでした"
   },
   {
     "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "グループチャンネルを取得できませんでした"
+    "translation": "グループチャンネルを作成できませんでした"
   },
   {
     "id": "app.import.import_direct_channel.member_not_found.error",
@@ -3048,6 +3064,14 @@
     "translation": "ダイレクトチャンネルの投稿をインポートする際にチャンネルメンバーが見つかりませんでした"
   },
   {
+    "id": "app.import.import_direct_post.create_direct_channel.error",
+    "translation": "ダイレクトチャンネルを取得できませんでした"
+  },
+  {
+    "id": "app.import.import_direct_post.create_group_channel.error",
+    "translation": "グループチャンネルを取得できませんでした"
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "投稿ユーザーが存在しません"
   },
diff --git a/i18n/ko.json b/i18n/ko.json
index c550f632c..73a60c36b 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -49,19 +49,19 @@
   },
   {
     "id": "api.admin.add_certificate.no_file.app_error",
-    "translation": "요청의 'certificate' 항목에 파일이 없습니다."
+    "translation": "요청된 '인증서' 항목의 파일이 없습니다."
   },
   {
     "id": "api.admin.add_certificate.open.app_error",
-    "translation": "인증서를 열 수 없습니다."
+    "translation": "인증서 파일을 열 수 없습니다."
   },
   {
     "id": "api.admin.add_certificate.saving.app_error",
-    "translation": "인증서를 저장할 수 없습니다"
+    "translation": "인증서 파일을 저장할 수 없습니다."
   },
   {
     "id": "api.admin.file_read_error",
-    "translation": "로그 파일을 읽는데 오류가 발생했습니다"
+    "translation": "로그 파일을 읽는데 오류가 발생했습니다."
   },
   {
     "id": "api.admin.get_brand_image.not_available.app_error",
@@ -77,7 +77,7 @@
   },
   {
     "id": "api.admin.recycle_db_end.warn",
-    "translation": "DB 연결 재사용 완료"
+    "translation": "DB 연결 재사용을 완료했습니다."
   },
   {
     "id": "api.admin.recycle_db_start.warn",
@@ -89,7 +89,7 @@
   },
   {
     "id": "api.admin.saml.metadata.app_error",
-    "translation": "An error occurred while building Service Provider Metadata."
+    "translation": "서비스 제공 메타 데이터를 만드는 중 오류가 발생하였습니다."
   },
   {
     "id": "api.admin.test_email.body",
@@ -185,11 +185,11 @@
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "공개 채널 생성, 관리는 시스템 관리자 권한이 필요합니다."
+    "translation": "공개 채널의 생성 및 관리는 시스템 관리자 권한이 필요합니다."
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "공개 채널 생성, 관리는 팀 관리자 또는 시스템 관리자 권한이 필요합니다."
+    "translation": "비공개 채널 생성 및 관리 권한은 팀 관리자 및 시스템 관리자에게만 주어집니다."
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
@@ -225,11 +225,11 @@
   },
   {
     "id": "api.channel.create_group.bad_size.app_error",
-    "translation": "Group message channels must contain at least 3 and no more than 8 users"
+    "translation": "그룹 메세지 채널은 최소 3명에서 최대 8명까지의 사용자를 포함해야 합니다."
   },
   {
     "id": "api.channel.create_group.bad_user.app_error",
-    "translation": "One of the provided users does not exist"
+    "translation": "제공된 사용자 중 존재하지 않는 사용자가 있습니다."
   },
   {
     "id": "api.channel.delete_channel.archived",
@@ -393,7 +393,7 @@
   },
   {
     "id": "api.cluster.init.debug",
-    "translation": "사용자 API 경로 초기화 중"
+    "translation": "클러스터 API 경로 초기화 중"
   },
   {
     "id": "api.command.admin_only.app_error",
@@ -461,7 +461,7 @@
   },
   {
     "id": "api.command.invite_people.invite_off",
-    "translation": "User creation has been disabled on this server, no invite(s) sent"
+    "translation": "이 서버의 사용자 생성는 중지되어 있습니다. 초대가 보내지지 않습니다"
   },
   {
     "id": "api.command.invite_people.name",
@@ -501,11 +501,11 @@
   },
   {
     "id": "api.command_channel_header.channel.app_error",
-    "translation": "Error to retrieve the current channel."
+    "translation": "현재 채널을 찾는 중 오류가 발생하였습니다."
   },
   {
     "id": "api.command_channel_header.desc",
-    "translation": "Edit the channel header"
+    "translation": "채널 머릿말 수정"
   },
   {
     "id": "api.command_channel_header.hint",
@@ -513,7 +513,7 @@
   },
   {
     "id": "api.command_channel_header.message.app_error",
-    "translation": "Text must be provided with the /header command."
+    "translation": "문장은 /header 명령과 함께 입력되어야 합니다."
   },
   {
     "id": "api.command_channel_header.name",
@@ -521,15 +521,15 @@
   },
   {
     "id": "api.command_channel_header.permission.app_error",
-    "translation": "You do not have the appropriate permissions to edit the channel header."
+    "translation": "당신은 채널 머릿말을 수정할 권한을 가지고 있지 않습니다."
   },
   {
     "id": "api.command_channel_header.update_channel.app_error",
-    "translation": "Error to update the current channel."
+    "translation": "현재 채널의 업데이트에 실패하였습니다."
   },
   {
     "id": "api.command_channel_header.update_channel.success",
-    "translation": "Channel header successfully updated."
+    "translation": "채널 머릿말이 성공적으로 업데이트되었습니다."
   },
   {
     "id": "api.command_collapse.desc",
@@ -589,7 +589,7 @@
   },
   {
     "id": "api.command_help.desc",
-    "translation": "Open the Mattermost help page"
+    "translation": "Mattermost 도움말 페이지 열기"
   },
   {
     "id": "api.command_help.name",
@@ -705,11 +705,27 @@
   },
   {
     "id": "api.command_open.name",
-    "translation": "open"
+    "translation": "열기"
+  },
+  {
+    "id": "api.command_search.desc",
+    "translation": "메세지에서 문장 찾기"
+  },
+  {
+    "id": "api.command_search.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_search.name",
+    "translation": "search"
+  },
+  {
+    "id": "api.command_search.unsupported.app_error",
+    "translation": "당신의 기기에서는 검색 명령을 지원하지 않습니다"
   },
   {
     "id": "api.command_settings.desc",
-    "translation": "Open the Account Settings dialog"
+    "translation": "계정 설정 화면 열기"
   },
   {
     "id": "api.command_settings.name",
@@ -717,7 +733,7 @@
   },
   {
     "id": "api.command_settings.unsupported.app_error",
-    "translation": "The settings command is not supported on your device"
+    "translation": "당신의 기기에서는 설정 명령을 지원하지 않습니다"
   },
   {
     "id": "api.command_shortcuts.browser.channel_next",
@@ -817,7 +833,7 @@
   },
   {
     "id": "api.command_shortcuts.msgs.reply",
-    "translation": "SHIFT+UP (in empty input field): Reply to the most recent message in the current channel\n"
+    "translation": "SHIFT+UP (빈 입력창에서):현재 채널의 가장 마지막 메세지에 대답\n"
   },
   {
     "id": "api.command_shortcuts.msgs.reprint_next",
@@ -833,7 +849,7 @@
   },
   {
     "id": "api.command_shortcuts.nav.direct_messages_menu",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+K: Open direct messages menu\n"
+    "translation": "{{.CmdOrCtrl}}+SHIFT+K: Direct 메세지 메뉴 열기\n"
   },
   {
     "id": "api.command_shortcuts.nav.header",
@@ -889,7 +905,7 @@
   },
   {
     "id": "api.config.client.old_format.app_error",
-    "translation": "New format for the client configuration is not supported yet. Please specify format=old in the query string."
+    "translation": "사용자 설정을 위한 새로운 형식은 아직 지원되지 않습니다. 명령문에서 format=old 를 명시해 주세요."
   },
   {
     "id": "api.context.404.app_error",
@@ -960,6 +976,10 @@
     "translation": "알 수 없는 오류가 발생했습니다. 지원 서비스에 연락하시기 바랍니다."
   },
   {
+    "id": "api.context.v3_disabled.app_error",
+    "translation": "API 버전 3은 이 서버에서 비활성화 되어 있습니다. API 버전 4를 이용하십시오. 자세한 내용은 다음을 참고하세요 : https://api.mattermost.com "
+  },
+  {
     "id": "api.deprecated.init.debug",
     "translation": "명령어 API 경로 초기화 중"
   },
@@ -997,7 +1017,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.group_message",
-    "translation": "Group Message"
+    "translation": "그룹 메세지"
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
@@ -1095,15 +1115,15 @@
   },
   {
     "id": "api.emoji.upload.large_image.gif_decode_error",
-    "translation": "이모티콘을 생성할 수 없습니다. 이미지 디코딩 시도 중 오류가 발생했습니다."
+    "translation": "이모지를 만들 수 없습니다. GIF 디코딩 중 오류가 발생했습니다."
   },
   {
     "id": "api.emoji.upload.large_image.gif_encode_error",
-    "translation": "이모티콘을 생성할 수 없습니다. 이미지 인코딩 시도 중 오류가 발생했습니다."
+    "translation": "이모지를 만들 수 없습니다. GIF 인코딩 중 오류가 발생했습니다."
   },
   {
     "id": "api.file.attachments.disabled.app_error",
-    "translation": "File attachments have been disabled on this server."
+    "translation": "이 서버는 파일 첨부가 비활성화 되어 있습니다."
   },
   {
     "id": "api.file.get_file.public_disabled.app_error",
@@ -1271,7 +1291,7 @@
   },
   {
     "id": "api.file.upload_file.bad_parse.app_error",
-    "translation": "Unable to upload file. Header cannot be parsed."
+    "translation": "파일을 업로드 할 수 없습니다. 머릿말 파싱에 실패하였습니다."
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
@@ -1375,7 +1395,7 @@
   },
   {
     "id": "api.license.client.old_format.app_error",
-    "translation": "New format for the client license is not supported yet. Please specify format=old in the query string."
+    "translation": "사용자 설정을 위한 새로운 형식은 아직 지원되지 않습니다. 명령문에서 format=old 를 명시해 주세요."
   },
   {
     "id": "api.license.init.debug",
@@ -1490,6 +1510,10 @@
     "translation": "oauth API 경로 초기화 중"
   },
   {
+    "id": "api.oauth.invalid_state_token.app_error",
+    "translation": "Invalid state token"
+  },
+  {
     "id": "api.oauth.regenerate_secret.app_error",
     "translation": "OAuth2 앱의 Secret를 재생성하기에 부적절한 권합니다."
   },
@@ -1637,7 +1661,7 @@
   },
   {
     "id": "api.post.make_direct_channel_visible.get_2_members.error",
-    "translation": "다이렉트 채널의 두명의 구성원을 가져올 수 없습니다. channel_id=%v"
+    "translation": "다이렉트 채널에 2명의 구성원을 가져올 수 없습니다. channel_id={{.ChannelId}}"
   },
   {
     "id": "api.post.make_direct_channel_visible.get_members.error",
@@ -2185,7 +2209,7 @@
   },
   {
     "id": "api.templates.channel_name.group",
-    "translation": "Group Message"
+    "translation": "그룹 메세지"
   },
   {
     "id": "api.templates.email_change_body.info",
@@ -3021,19 +3045,11 @@
   },
   {
     "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Failed to get direct channel"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Failed to get direct channel"
+    "translation": "Failed to create direct channel"
   },
   {
     "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Failed to get group channel"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Failed to get group channel"
+    "translation": "Failed to create group channel"
   },
   {
     "id": "app.import.import_direct_channel.member_not_found.error",
@@ -3048,6 +3064,14 @@
     "translation": "Could not find channel member when importing direct channel post"
   },
   {
+    "id": "app.import.import_direct_post.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_post.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "Post user does not exist"
   },
diff --git a/i18n/nl.json b/i18n/nl.json
index 3d47011ba..a3989aae1 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -708,6 +708,22 @@
     "translation": "open"
   },
   {
+    "id": "api.command_search.desc",
+    "translation": "Search text in messages"
+  },
+  {
+    "id": "api.command_search.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_search.name",
+    "translation": "search"
+  },
+  {
+    "id": "api.command_search.unsupported.app_error",
+    "translation": "The search command is not supported on your device"
+  },
+  {
     "id": "api.command_settings.desc",
     "translation": "Open the Account Settings dialog"
   },
@@ -960,6 +976,10 @@
     "translation": "Een onbekende fout is opgetreden. Neem contact op met support."
   },
   {
+    "id": "api.context.v3_disabled.app_error",
+    "translation": "API version 3 has been disabled on this server. Please use API version 4. See https://api.mattermost.com for details."
+  },
+  {
     "id": "api.deprecated.init.debug",
     "translation": "Initialisatie van de opdracht API routes"
   },
@@ -1490,6 +1510,10 @@
     "translation": "Initialisatie van de oauth api"
   },
   {
+    "id": "api.oauth.invalid_state_token.app_error",
+    "translation": "Invalid state token"
+  },
+  {
     "id": "api.oauth.regenerate_secret.app_error",
     "translation": "Onvoldoende rechten voor het hergenereren van de OAuth2 Applicatie Secret"
   },
@@ -3021,19 +3045,11 @@
   },
   {
     "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Failed to get direct channel"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Failed to get direct channel"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Failed to get group channel"
+    "translation": "Failed to create direct channel"
   },
   {
     "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Failed to get group channel"
+    "translation": "Failed to create group channel"
   },
   {
     "id": "app.import.import_direct_channel.member_not_found.error",
@@ -3048,6 +3064,14 @@
     "translation": "Could not find channel member when importing direct channel post"
   },
   {
+    "id": "app.import.import_direct_post.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_post.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "Post user does not exist"
   },
diff --git a/i18n/pl.json b/i18n/pl.json
index dadd736b3..9ba0d6dbe 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -501,11 +501,11 @@
   },
   {
     "id": "api.command_channel_header.channel.app_error",
-    "translation": "Error to retrieve the current channel."
+    "translation": "Błąd aktualizacji bieżącego kanału."
   },
   {
     "id": "api.command_channel_header.desc",
-    "translation": "Edit the channel header"
+    "translation": "Edycja nagłówka kanału"
   },
   {
     "id": "api.command_channel_header.hint",
@@ -513,7 +513,7 @@
   },
   {
     "id": "api.command_channel_header.message.app_error",
-    "translation": "Text must be provided with the /header command."
+    "translation": "Tekst powinien być dostarczony za pomocą polecenia /header."
   },
   {
     "id": "api.command_channel_header.name",
@@ -521,11 +521,11 @@
   },
   {
     "id": "api.command_channel_header.permission.app_error",
-    "translation": "You do not have the appropriate permissions to edit the channel header."
+    "translation": "Nie posiadasz odpowiednich uprawnień do edycji nagłówka kanału."
   },
   {
     "id": "api.command_channel_header.update_channel.app_error",
-    "translation": "Error to update the current channel."
+    "translation": "Błąd aktualizacji bieżącego kanału."
   },
   {
     "id": "api.command_channel_header.update_channel.success",
@@ -589,7 +589,7 @@
   },
   {
     "id": "api.command_help.desc",
-    "translation": "Open the Mattermost help page"
+    "translation": "Otwórz stronę pomocy Mattermost"
   },
   {
     "id": "api.command_help.name",
@@ -708,6 +708,22 @@
     "translation": "otwórz"
   },
   {
+    "id": "api.command_search.desc",
+    "translation": "Wyszukiwanie tekstu w wiadomościach"
+  },
+  {
+    "id": "api.command_search.hint",
+    "translation": "[tekst]"
+  },
+  {
+    "id": "api.command_search.name",
+    "translation": "search"
+  },
+  {
+    "id": "api.command_search.unsupported.app_error",
+    "translation": "Polecenie wyszukiwania nie jest wspierana na Twoim urządzeniu"
+  },
+  {
     "id": "api.command_settings.desc",
     "translation": "Otwórz dialog ustawień konta"
   },
@@ -960,6 +976,10 @@
     "translation": "Wystąpił nieznany błąd. Prosimy o kontakt z pomocą techniczną."
   },
   {
+    "id": "api.context.v3_disabled.app_error",
+    "translation": "API w wersji 3 zostało wyłączone na tym serwerze. Użyj API w wersji 4. Odwiedź https://api.mattermost.com w celu uzyskania szczegółowych informacji."
+  },
+  {
     "id": "api.deprecated.init.debug",
     "translation": "Inicjalizowanie przestarzałych tras API"
   },
@@ -1490,6 +1510,10 @@
     "translation": "Inicjalizowaine wywołań OAuth API"
   },
   {
+    "id": "api.oauth.invalid_state_token.app_error",
+    "translation": "Invalid state token"
+  },
+  {
     "id": "api.oauth.regenerate_secret.app_error",
     "translation": "Nieodpowiednie uprawnienia aby odtworzyć prywany klucz aplikacji OAuth2 "
   },
@@ -1689,7 +1713,7 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": "Wysłał jeden albo więcej plików"
+    "translation": " Wyślij jeden albo więcej plików w "
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only_dm",
@@ -3021,35 +3045,35 @@
   },
   {
     "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Failed to get direct channel"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Failed to get direct channel"
+    "translation": "Nie udało się stworzyć bezpośredniego kanału"
   },
   {
     "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Failed to get group channel"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Failed to get group channel"
+    "translation": "Wyświetlanie nazwy zespołu:"
   },
   {
     "id": "app.import.import_direct_channel.member_not_found.error",
-    "translation": "Could not find channel member when importing direct channel"
+    "translation": "Nie udało się znaleźć członków kanału podczas importowania bezpośredniego kanału"
   },
   {
     "id": "app.import.import_direct_channel.update_header_failed.error",
-    "translation": "Failed to update direct channel header"
+    "translation": "Nie udało się zaktualizować tytułu bezpośredniego kanału"
   },
   {
     "id": "app.import.import_direct_post.channel_member_not_found.error",
-    "translation": "Could not find channel member when importing direct channel post"
+    "translation": "Nie udało się znaleźć członków kanału podczas importowania bezpośredniego kanału"
+  },
+  {
+    "id": "app.import.import_direct_post.create_direct_channel.error",
+    "translation": "Nie udało się uzyskać bezpośredniego kanału"
+  },
+  {
+    "id": "app.import.import_direct_post.create_group_channel.error",
+    "translation": "Nie udało się uzyskać kanału grupowego"
   },
   {
     "id": "app.import.import_direct_post.user_not_found.error",
-    "translation": "Post user does not exist"
+    "translation": "Post użytkownika nie istnieje"
   },
   {
     "id": "app.import.import_line.null_channel.error",
@@ -3057,11 +3081,11 @@
   },
   {
     "id": "app.import.import_line.null_direct_channel.error",
-    "translation": "Dane wejściowe mają typ \"channel\", ale obiekt channel jest null."
+    "translation": "Dane wejściowe mają typ \"direct_channel\", ale obiekt direct_channel jest null."
   },
   {
     "id": "app.import.import_line.null_direct_post.error",
-    "translation": "Dane wejściowe mają typ \"post\" ale obiekt post jest null."
+    "translation": "Dane wejściowe mają typ \"direct_post\" ale obiekt direct_post jest null."
   },
   {
     "id": "app.import.import_line.null_post.error",
@@ -3137,31 +3161,31 @@
   },
   {
     "id": "app.import.validate_direct_channel_import_data.header_length.error",
-    "translation": "Direct channel header is too long"
+    "translation": "Tytuł bezpośredniego kanału jest zbyt długi"
   },
   {
     "id": "app.import.validate_direct_channel_import_data.members_required.error",
-    "translation": "Brak wymaganej właściwości kanału: name"
+    "translation": "Brak wymaganej właściwości kanału: użytkownicy"
   },
   {
     "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
-    "translation": "Direct channel members list contains too few items"
+    "translation": "Lista bezpośrednich uczestników kanału zawiera zbyt mało szczegółów"
   },
   {
     "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
-    "translation": "Direct channel members list contains too many items"
+    "translation": "Lista bezpośrednich uczestników kanału zawiera zbyt wiele elementów"
   },
   {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
-    "translation": "Brak wymaganej właściwości Post: create_at."
+    "translation": "Brak wymaganej właściwości Post: channel_members."
   },
   {
     "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
-    "translation": "Direct post channel members list contains too few items"
+    "translation": "Lista bezpośrednich uczestników kanału zawiera zbyt mało szczegółów"
   },
   {
     "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
-    "translation": "Direct post channel members list contains too many items"
+    "translation": "Lista bezpośrednich uczestników kanału zawiera zbyt wiele elementów"
   },
   {
     "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
@@ -3173,15 +3197,15 @@
   },
   {
     "id": "app.import.validate_direct_post_import_data.message_length.error",
-    "translation": "Message is too long"
+    "translation": "Wiadomość jest za długa"
   },
   {
     "id": "app.import.validate_direct_post_import_data.message_missing.error",
-    "translation": "Brak wymaganej właściwości Post: Message."
+    "translation": "Brak wymaganej właściwości Post: message."
   },
   {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
-    "translation": "Brak wymaganej właściwości Post: User."
+    "translation": "Brak wymaganej właściwości Post: user."
   },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
@@ -3493,23 +3517,23 @@
   },
   {
     "id": "ent.elasticsearch.start.index_exists_failed",
-    "translation": "Failed to establish whether ElasticSearch index exists"
+    "translation": "Nie udało się ustalić, czy indeks elasticsearch istnieje"
   },
   {
     "id": "ent.elasticsearch.start.index_mapping_failed",
-    "translation": "Failed to setup ElasticSearch index mapping"
+    "translation": "Nie można ustawić wyświetlanie indeksu elasticsearch"
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
-    "translation": "Failed to set ElasticSearch index settings"
+    "translation": "Nie udało się określić ustawienia indeks elasticsearch"
   },
   {
     "id": "ent.elasticsearch.test_config.indexing_disabled.error",
-    "translation": "Elasticsearch is disabled."
+    "translation": "Elasticsearch jest wyłączony"
   },
   {
     "id": "ent.elasticsearch.test_config.license.error",
-    "translation": "License does not support Elasticsearch."
+    "translation": "Licencja nie obsługuje elasticsearch."
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
@@ -5805,7 +5829,7 @@
   },
   {
     "id": "store.sql_team.search_open_team.app_error",
-    "translation": "Napotkaliśmy błąd szukając kanału"
+    "translation": "Napotkaliśmy błąd szukając otwartych zespołów"
   },
   {
     "id": "store.sql_team.update.app_error",
@@ -5817,11 +5841,11 @@
   },
   {
     "id": "store.sql_team.update.finding.app_error",
-    "translation": "Napotkaliśmy błąd szukając kanału"
+    "translation": "Napotkaliśmy błąd szukając zespołu"
   },
   {
     "id": "store.sql_team.update.updating.app_error",
-    "translation": "Napotkaliśmy błąd zapisując audyty"
+    "translation": "Napotkaliśmy błąd aktualizując zespół"
   },
   {
     "id": "store.sql_team.update_display_name.app_error",
@@ -5841,7 +5865,7 @@
   },
   {
     "id": "store.sql_user.get.app_error",
-    "translation": "Napotkaliśmy błąd szukając audytów"
+    "translation": "Napotkaliśmy błąd szukając konta"
   },
   {
     "id": "store.sql_user.get_all_using_auth_service.other.app_error",
@@ -5877,11 +5901,11 @@
   },
   {
     "id": "store.sql_user.get_recently_active_users.app_error",
-    "translation": "Wystąpił błąd w trakcie pobierania ustawień"
+    "translation": "Wystąpił błąd podczas wyszukiwania ostatnio aktywnych użytkowników"
   },
   {
     "id": "store.sql_user.get_sysadmin_profiles.app_error",
-    "translation": "Napotkaliśmy błąd podczas odczytu pliku"
+    "translation": "Wystąpił błąd podczas wyszukiwania profili użytkowników"
   },
   {
     "id": "store.sql_user.get_total_users_count.app_error",
@@ -5889,15 +5913,15 @@
   },
   {
     "id": "store.sql_user.get_unread_count.app_error",
-    "translation": "We could not get the unread message count for the user"
+    "translation": "Nie mogliśmy uzyskać nieprzeczytanych wiadomości do użytkownika"
   },
   {
     "id": "store.sql_user.get_unread_count_for_channel.app_error",
-    "translation": "We could not get the unread message count for the user and channel"
+    "translation": "Nie mogliśmy uzyskać nieprzeczytanych wiadomości do użytkownika i kanału"
   },
   {
     "id": "store.sql_user.migrate_theme.critical",
-    "translation": "Failed to migrate User.ThemeProps to Preferences table %v"
+    "translation": "Nie udało się wykonać migracji użytkowników.ThemeProps na tabele Preferences %v"
   },
   {
     "id": "store.sql_user.missing_account.const",
@@ -5905,7 +5929,7 @@
   },
   {
     "id": "store.sql_user.permanent_delete.app_error",
-    "translation": "Nie odnaleziono kanału"
+    "translation": "Nie możemy usunąć istniejącego konta"
   },
   {
     "id": "store.sql_user.save.app_error",
@@ -5925,7 +5949,7 @@
   },
   {
     "id": "store.sql_user.save.existing.app_error",
-    "translation": "Wymagana aktualizacja zespołu"
+    "translation": "Należy wywołać aktualizacja dla dotychczasowych użytkowników"
   },
   {
     "id": "store.sql_user.save.max_accounts.app_error",
@@ -5953,7 +5977,7 @@
   },
   {
     "id": "store.sql_user.update.can_not_change_ldap.app_error",
-    "translation": "Can not change fields set by AD/LDAP"
+    "translation": "Nie można zmienić pola ustawioneg przez AD/LDAP"
   },
   {
     "id": "store.sql_user.update.email_taken.app_error",
@@ -5989,7 +6013,7 @@
   },
   {
     "id": "store.sql_user.update_last_activity.app_error",
-    "translation": "Nie udało się zaktualizować pola last_ping_at"
+    "translation": "Nie udało się zaktualizować pola last_activity_at"
   },
   {
     "id": "store.sql_user.update_last_picture_update.app_error",
@@ -6093,19 +6117,19 @@
   },
   {
     "id": "utils.config.load_config.decoding.panic",
-    "translation": "Error decoding config file={{.Filename}}, err={{.Error}}"
+    "translation": "Błąd podczas rozpakowywania pliku konfiguracyjnego={{.Filename}}, err={{.Error}}"
   },
   {
     "id": "utils.config.load_config.getting.panic",
-    "translation": "Error getting config info file={{.Filename}}, err={{.Error}}"
+    "translation": "Błąd podczas pobierania konfiguracji plik info={{.Filename}}, err={{.Error}}"
   },
   {
     "id": "utils.config.load_config.opening.panic",
-    "translation": "Error opening config file={{.Filename}}, err={{.Error}}"
+    "translation": "Błąd podczas otwierania pliku konfiguracyjnego={{.Filename}}, err={{.Error}}"
   },
   {
     "id": "utils.config.load_config.validating.panic",
-    "translation": "Error validating config file={{.Filename}}, err={{.Error}}"
+    "translation": "Błąd podczas sprawdzania pliku konfiguracyjnego={{.Filename}}, err={{.Error}}"
   },
   {
     "id": "utils.config.save_config.saving.app_error",
@@ -6121,11 +6145,11 @@
   },
   {
     "id": "utils.config.validate_locale.app_error",
-    "translation": "Unable to load mattermost configuration file:  AvailableLocales must include DefaultClientLocale"
+    "translation": "Nie udało się pobrać pliku konfiguracyjnego mattermost: AvailableLocales musi zawierać DefaultClientLocale"
   },
   {
     "id": "utils.diagnostic.analytics_not_found.app_error",
-    "translation": "Analytics not initialized"
+    "translation": "Analytics nie zainicjowany"
   },
   {
     "id": "utils.i18n.loaded",
@@ -6133,7 +6157,7 @@
   },
   {
     "id": "utils.iru.with_evict",
-    "translation": "Must provide a positive size"
+    "translation": "Należy podać dodatni rozmiar"
   },
   {
     "id": "utils.license.load_license.invalid.warn",
@@ -6145,11 +6169,11 @@
   },
   {
     "id": "utils.license.validate_license.decode.error",
-    "translation": "Encountered error decoding license, err=%v"
+    "translation": "Wystąpił błąd autoryzacji licencji, err=%v"
   },
   {
     "id": "utils.license.validate_license.invalid.error",
-    "translation": "Invalid signature, err=%v"
+    "translation": "Nieprawidłowa sygnatura, err=%v"
   },
   {
     "id": "utils.license.validate_license.not_long.error",
@@ -6157,11 +6181,11 @@
   },
   {
     "id": "utils.license.validate_license.signing.error",
-    "translation": "Encountered error signing license, err=%v"
+    "translation": "Wystąpił błąd autoryzacji licencji, err=%v"
   },
   {
     "id": "utils.mail.connect_smtp.helo.app_error",
-    "translation": "Failed to set HELO"
+    "translation": "Nie udało się ustawić HELO"
   },
   {
     "id": "utils.mail.connect_smtp.open.app_error",
@@ -6193,11 +6217,11 @@
   },
   {
     "id": "utils.mail.send_mail.msg.app_error",
-    "translation": "Failed to write email message"
+    "translation": "Nie można napisać wiadomość"
   },
   {
     "id": "utils.mail.send_mail.msg_data.app_error",
-    "translation": "Failed to add email message data"
+    "translation": "Błąd podczas dodawania danych wiadomości e-mail"
   },
   {
     "id": "utils.mail.send_mail.sending.debug",
@@ -6217,7 +6241,7 @@
   },
   {
     "id": "web.admin_console.title",
-    "translation": "Admin Console"
+    "translation": "Konsola Administracyjna"
   },
   {
     "id": "web.authorize_oauth.title",
@@ -6237,15 +6261,15 @@
   },
   {
     "id": "web.claim_account.user.error",
-    "translation": "Couldn't find user teamid=%v, email=%v, err=%v"
+    "translation": "Nie można znaleźć użytkownika teamid=%vv e-mail=%v, err=%v"
   },
   {
     "id": "web.create_dir.error",
-    "translation": "Failed to create directory watcher %v"
+    "translation": "Nie udało się utworzyć stróża katalogu %v"
   },
   {
     "id": "web.dir_fail.error",
-    "translation": "Failed in directory watcher %v"
+    "translation": "Nie udało się utworzyć stróża katalogu %v"
   },
   {
     "id": "web.do_load_channel.error",
@@ -6293,7 +6317,7 @@
   },
   {
     "id": "web.incoming_webhook.text.app_error",
-    "translation": "No text specified"
+    "translation": "Tekst nie jest określony"
   },
   {
     "id": "web.incoming_webhook.text.length.app_error",
@@ -6305,7 +6329,7 @@
   },
   {
     "id": "web.init.debug",
-    "translation": "Inicjalizowanie tras api administracyjnego"
+    "translation": "Inicjalizacja web routes"
   },
   {
     "id": "web.login.error",
@@ -6361,11 +6385,11 @@
   },
   {
     "id": "web.signup_team_complete.title",
-    "translation": "Complete Team Sign Up"
+    "translation": "Utwórzono konto użytkownika"
   },
   {
     "id": "web.signup_team_confirm.title",
-    "translation": "Signup Email Sent"
+    "translation": "E-Mail rejestracyjny wysłany"
   },
   {
     "id": "web.signup_user_complete.link_expired.app_error",
@@ -6381,7 +6405,7 @@
   },
   {
     "id": "web.signup_user_complete.title",
-    "translation": "Complete User Sign Up"
+    "translation": "Utwórzono konto użytkownika"
   },
   {
     "id": "web.singup_with_oauth.invalid_team.app_error",
@@ -6389,7 +6413,7 @@
   },
   {
     "id": "web.watcher_fail.error",
-    "translation": "Failed to add directory to watcher %v"
+    "translation": "Nie udało się utworzyć stróża katalogu %v"
   },
   {
     "id": "wsapi.status.init.debug",
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index ad52b377d..76764fd34 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -708,6 +708,22 @@
     "translation": "abrir"
   },
   {
+    "id": "api.command_search.desc",
+    "translation": "Pesquisar texto nas mensagens"
+  },
+  {
+    "id": "api.command_search.hint",
+    "translation": "[texto]"
+  },
+  {
+    "id": "api.command_search.name",
+    "translation": "pesquisar"
+  },
+  {
+    "id": "api.command_search.unsupported.app_error",
+    "translation": "O comando de busca não é suportado no seu equipamento"
+  },
+  {
     "id": "api.command_settings.desc",
     "translation": "Abrir a janela de Configurações de Conta"
   },
@@ -960,6 +976,10 @@
     "translation": "Ocorreu um erro desconhecido. Por favor contato com o suporte."
   },
   {
+    "id": "api.context.v3_disabled.app_error",
+    "translation": "API versão 3 foi desabilitada neste servidor. Por favor use a API versão 4. Veja https://api.mattermost.com para mais detalhes"
+  },
+  {
     "id": "api.deprecated.init.debug",
     "translation": "Inicializando as rotas da API que serão descontinuadas"
   },
@@ -1490,6 +1510,10 @@
     "translation": "Inicializando as rotas de API oauth"
   },
   {
+    "id": "api.oauth.invalid_state_token.app_error",
+    "translation": "State token inválido"
+  },
+  {
     "id": "api.oauth.regenerate_secret.app_error",
     "translation": "Permissões inadequadas para gerar novo OAuth2 App Secret"
   },
@@ -3021,19 +3045,11 @@
   },
   {
     "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Falha ao buscar o canal direto"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Falha ao buscar o canal direto"
+    "translation": "Falha ao criar o canal direto"
   },
   {
     "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Falha ao buscar o canal de grupo"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Falha ao buscar o canal de grupo"
+    "translation": "Falha ao criar o canal de grupo"
   },
   {
     "id": "app.import.import_direct_channel.member_not_found.error",
@@ -3048,6 +3064,14 @@
     "translation": "Não foi possível achar o membro do canal enquanto importava os posts do canal direto"
   },
   {
+    "id": "app.import.import_direct_post.create_direct_channel.error",
+    "translation": "Falha ao obter o canal direto"
+  },
+  {
+    "id": "app.import.import_direct_post.create_group_channel.error",
+    "translation": "Falha ao obter o canal de grupo"
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "Usuário do post não existe"
   },
diff --git a/i18n/ru.json b/i18n/ru.json
index 42bb6ae50..cfbbcff7a 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -505,7 +505,7 @@
   },
   {
     "id": "api.command_channel_header.desc",
-    "translation": "Edit the channel header"
+    "translation": "Редактировать заголовок канала"
   },
   {
     "id": "api.command_channel_header.hint",
@@ -517,7 +517,7 @@
   },
   {
     "id": "api.command_channel_header.name",
-    "translation": "header"
+    "translation": "заголовок"
   },
   {
     "id": "api.command_channel_header.permission.app_error",
@@ -529,7 +529,7 @@
   },
   {
     "id": "api.command_channel_header.update_channel.success",
-    "translation": "Channel header successfully updated."
+    "translation": "Заголовок канала успешно обновлен."
   },
   {
     "id": "api.command_collapse.desc",
@@ -593,7 +593,7 @@
   },
   {
     "id": "api.command_help.name",
-    "translation": "Помощь"
+    "translation": "помощь"
   },
   {
     "id": "api.command_join.desc",
@@ -705,15 +705,31 @@
   },
   {
     "id": "api.command_open.name",
-    "translation": "open"
+    "translation": "открыть"
+  },
+  {
+    "id": "api.command_search.desc",
+    "translation": "Искать текст в сообщениях"
+  },
+  {
+    "id": "api.command_search.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_search.name",
+    "translation": "поиск"
+  },
+  {
+    "id": "api.command_search.unsupported.app_error",
+    "translation": "The search command is not supported on your device"
   },
   {
     "id": "api.command_settings.desc",
-    "translation": "Open the Account Settings dialog"
+    "translation": "Открыть диалог настроек аккаунта"
   },
   {
     "id": "api.command_settings.name",
-    "translation": "settings"
+    "translation": "настройки"
   },
   {
     "id": "api.command_settings.unsupported.app_error",
@@ -960,6 +976,10 @@
     "translation": "Произошла неизвестная ошибка. Пожалуйста, свяжитесь с поддержкой."
   },
   {
+    "id": "api.context.v3_disabled.app_error",
+    "translation": "API version 3 has been disabled on this server. Please use API version 4. See https://api.mattermost.com for details."
+  },
+  {
     "id": "api.deprecated.init.debug",
     "translation": "Инициализация устаревших маршрутов API"
   },
@@ -1490,8 +1510,12 @@
     "translation": "Инициализация OAuth API"
   },
   {
+    "id": "api.oauth.invalid_state_token.app_error",
+    "translation": "Invalid state token"
+  },
+  {
     "id": "api.oauth.regenerate_secret.app_error",
-    "translation": "Несоответствующие права для создания новой секретной строки приложения OAuth2"
+    "translation": "Отсутствуют права на пересоздание OAuth2 App Secret"
   },
   {
     "id": "api.oauth.register_oauth_app.turn_off.app_error",
@@ -2549,7 +2573,7 @@
   },
   {
     "id": "api.user.create_user.missing_invite_id.app_error",
-    "translation": "Missing Invite Id."
+    "translation": "Отсутствует Invite Id."
   },
   {
     "id": "api.user.create_user.no_open_server",
@@ -3021,19 +3045,11 @@
   },
   {
     "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Failed to get direct channel"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Failed to get direct channel"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Failed to get group channel"
+    "translation": "Failed to create direct channel"
   },
   {
     "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Failed to get group channel"
+    "translation": "Failed to create group channel"
   },
   {
     "id": "app.import.import_direct_channel.member_not_found.error",
@@ -3048,6 +3064,14 @@
     "translation": "Could not find channel member when importing direct channel post"
   },
   {
+    "id": "app.import.import_direct_post.create_direct_channel.error",
+    "translation": "Failed to get direct channel"
+  },
+  {
+    "id": "app.import.import_direct_post.create_group_channel.error",
+    "translation": "Failed to get group channel"
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "Post user does not exist"
   },
@@ -3169,11 +3193,11 @@
   },
   {
     "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
-    "translation": "CreateAt must be greater than 0"
+    "translation": "CreateAt должно быть больше 0"
   },
   {
     "id": "app.import.validate_direct_post_import_data.message_length.error",
-    "translation": "Message is too long"
+    "translation": "Сообщение слишком длинное"
   },
   {
     "id": "app.import.validate_direct_post_import_data.message_missing.error",
@@ -3505,11 +3529,11 @@
   },
   {
     "id": "ent.elasticsearch.test_config.indexing_disabled.error",
-    "translation": "Elasticsearch is disabled."
+    "translation": "Elasticsearch отключён."
   },
   {
     "id": "ent.elasticsearch.test_config.license.error",
-    "translation": "License does not support Elasticsearch."
+    "translation": "Редакция не поддерживает Elasticsearch."
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
@@ -6129,7 +6153,7 @@
   },
   {
     "id": "utils.i18n.loaded",
-    "translation": "Загружены системные перевода для '%v' от '%v'"
+    "translation": "Загружен перевод системы на '%v' из '%v'"
   },
   {
     "id": "utils.iru.with_evict",
@@ -6389,7 +6413,7 @@
   },
   {
     "id": "web.watcher_fail.error",
-    "translation": "Не удалось добавить каталог к наблюдателю %v"
+    "translation": "Не удалось добавить директорию к наблюдателю %v"
   },
   {
     "id": "wsapi.status.init.debug",
diff --git a/i18n/tr.json b/i18n/tr.json
index cd6233f7e..30274d7ef 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -708,6 +708,22 @@
     "translation": "açık"
   },
   {
+    "id": "api.command_search.desc",
+    "translation": "İletilerde aranacak metin"
+  },
+  {
+    "id": "api.command_search.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_search.name",
+    "translation": "ara"
+  },
+  {
+    "id": "api.command_search.unsupported.app_error",
+    "translation": "Arama komutu aygıtınız için desteklenmiyor"
+  },
+  {
     "id": "api.command_settings.desc",
     "translation": "Hesap Ayarları Penceresini Aç"
   },
@@ -960,6 +976,10 @@
     "translation": "Bilinmeyen bir sorun çıktı. Lütfen destek ekibi ile görüşün."
   },
   {
+    "id": "api.context.v3_disabled.app_error",
+    "translation": "Bu sunucu üzerinde 3. API sürümü devre dışı bırakıldı. Lütfen 4. API sürümünü kullanın. Ayrıntılı bilgi almak için https://api.mattermost.com adresine bakın."
+  },
+  {
     "id": "api.deprecated.init.debug",
     "translation": "Kullanımdan kaldırılmaış API rotaları hazırlanıyor"
   },
@@ -1490,6 +1510,10 @@
     "translation": "OAuth API rotaları hazırlanıyor"
   },
   {
+    "id": "api.oauth.invalid_state_token.app_error",
+    "translation": "Durum kodu geçersiz"
+  },
+  {
     "id": "api.oauth.regenerate_secret.app_error",
     "translation": "OAuth2 Uygulama Parolasını yeniden oluşturmak için izinleriniz yeterli değil"
   },
@@ -3021,19 +3045,11 @@
   },
   {
     "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Doğrudan kanal alınamadı"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Doğrudan kanal alınamadı"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Grup kanalı alınamadı"
+    "translation": "Doğrudan kanal oluşturulamadı"
   },
   {
     "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Grup kanalı alınamadı"
+    "translation": "Grup kanalı oluşturulamadı"
   },
   {
     "id": "app.import.import_direct_channel.member_not_found.error",
@@ -3048,6 +3064,14 @@
     "translation": "Doğrudan kanal iletisi içe aktarılırken kanal üyesi bulunamadı"
   },
   {
+    "id": "app.import.import_direct_post.create_direct_channel.error",
+    "translation": "Doğrudan kanal alınamadı"
+  },
+  {
+    "id": "app.import.import_direct_post.create_group_channel.error",
+    "translation": "Grup kanalı alınamadı"
+  },
+  {
     "id": "app.import.import_direct_post.user_not_found.error",
     "translation": "İleti kullanıcısı bulunamadı"
   },
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index 051cbd2ea..b8770acd2 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "Command with a trigger of '{{.Trigger}}' not found. To send a message beginning with \"/\", try adding an empty space at the beginning of the message."
+    "translation": "未找到拥有触发 '{{.Trigger}}' 的命令。如果像发送以 \"/\" 开头的消息，请在前面加个空格。"
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -461,7 +461,7 @@
   },
   {
     "id": "api.command.invite_people.invite_off",
-    "translation": "User creation has been disabled on this server, no invite(s) sent"
+    "translation": "本服务器已经禁止创建用户，未发送任何邀请"
   },
   {
     "id": "api.command.invite_people.name",
@@ -501,35 +501,35 @@
   },
   {
     "id": "api.command_channel_header.channel.app_error",
-    "translation": "Error to retrieve the current channel."
+    "translation": "获取当前频道错误。"
   },
   {
     "id": "api.command_channel_header.desc",
-    "translation": "Edit the channel header"
+    "translation": "修改频道标题"
   },
   {
     "id": "api.command_channel_header.hint",
-    "translation": "[text]"
+    "translation": "[文字]"
   },
   {
     "id": "api.command_channel_header.message.app_error",
-    "translation": "Text must be provided with the /header command."
+    "translation": "比如提供 /header 命令的文字。"
   },
   {
     "id": "api.command_channel_header.name",
-    "translation": "header"
+    "translation": "标题"
   },
   {
     "id": "api.command_channel_header.permission.app_error",
-    "translation": "You do not have the appropriate permissions to edit the channel header."
+    "translation": "您没有权限更改频道标题。"
   },
   {
     "id": "api.command_channel_header.update_channel.app_error",
-    "translation": "Error to update the current channel."
+    "translation": "更新当前频道错误。"
   },
   {
     "id": "api.command_channel_header.update_channel.success",
-    "translation": "Channel header successfully updated."
+    "translation": "成功更新频道标题。"
   },
   {
     "id": "api.command_collapse.desc",
@@ -589,7 +589,7 @@
   },
   {
     "id": "api.command_help.desc",
-    "translation": "Open the Mattermost help page"
+    "translation": "打开 Mattermost 帮助页面"
   },
   {
     "id": "api.command_help.name",
@@ -708,6 +708,22 @@
     "translation": "打开"
   },
   {
+    "id": "api.command_search.desc",
+    "translation": "在消息中搜索文字"
+  },
+  {
+    "id": "api.command_search.hint",
+    "translation": "[文字]"
+  },
+  {
+    "id": "api.command_search.name",
+    "translation": "搜索"
+  },
+  {
+    "id": "api.command_search.unsupported.app_error",
+    "translation": "您的设备不支持搜索命令"
+  },
+  {
     "id": "api.command_settings.desc",
     "translation": "打开账户设置对话框"
   },
@@ -960,6 +976,10 @@
     "translation": "发生未知错误。请联系我们。"
   },
   {
+    "id": "api.context.v3_disabled.app_error",
+    "translation": "API 版本 3 已在本服务器停用。请使用 API 版本 4。详情见 https://api.mattermost.com。"
+  },
+  {
     "id": "api.deprecated.init.debug",
     "translation": "正在初始化已弃用 API 路由"
   },
@@ -1490,6 +1510,10 @@
     "translation": "正在初始化 OAuth API 路由"
   },
   {
+    "id": "api.oauth.invalid_state_token.app_error",
+    "translation": "无效状态令牌"
+  },
+  {
     "id": "api.oauth.regenerate_secret.app_error",
     "translation": "无效重新生成 OAuth2 应用秘钥权限"
   },
@@ -1689,11 +1713,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " 已上传一个或更多个文件 "
+    "translation": " 已上传一个或更多个文件在 "
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " Uploaded one or more files in a direct message"
+    "translation": " 在私信里上传一个或更多个文件"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -2125,7 +2149,7 @@
   },
   {
     "id": "api.team.invite_members.invalid_email.app_error",
-    "translation": "The following email addresses do not belong to an accepted domain: {{.Addresses}}. Please contact your System Administrator for details."
+    "translation": "以下邮箱地址不在允许的域名范围内：{{.Addresses}}。请联系您的系统管理员了解详情。"
   },
   {
     "id": "api.team.invite_members.member",
@@ -3021,35 +3045,35 @@
   },
   {
     "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Failed to get direct channel"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Failed to get direct channel"
+    "translation": "船舰私信组频道失败"
   },
   {
     "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Failed to get group channel"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Failed to get group channel"
+    "translation": "创建群频道失败"
   },
   {
     "id": "app.import.import_direct_channel.member_not_found.error",
-    "translation": "Could not find channel member when importing direct channel"
+    "translation": "导入私信频道时无法找到频道成员"
   },
   {
     "id": "app.import.import_direct_channel.update_header_failed.error",
-    "translation": "Failed to update direct channel header"
+    "translation": "更新私信频道标题失败"
   },
   {
     "id": "app.import.import_direct_post.channel_member_not_found.error",
-    "translation": "Could not find channel member when importing direct channel post"
+    "translation": "导入私信频道消息时无法找到频道成员"
+  },
+  {
+    "id": "app.import.import_direct_post.create_direct_channel.error",
+    "translation": "获取私信频道失败"
+  },
+  {
+    "id": "app.import.import_direct_post.create_group_channel.error",
+    "translation": "获取组频道失败"
   },
   {
     "id": "app.import.import_direct_post.user_not_found.error",
-    "translation": "Post user does not exist"
+    "translation": "消息用户不存在"
   },
   {
     "id": "app.import.import_line.null_channel.error",
@@ -3057,11 +3081,11 @@
   },
   {
     "id": "app.import.import_line.null_direct_channel.error",
-    "translation": "导入数据行有类型 \"channel\" 但频道对象是无。"
+    "translation": "导入数据行有类型 \"direct_channel\" 但 direct_channel 对象为 null。"
   },
   {
     "id": "app.import.import_line.null_direct_post.error",
-    "translation": "导入数据行有类型 \"post\" 但消息对象是无。"
+    "translation": "导入数据行有类型 \"direct_post\" 但 direct_post 对象为 null。"
   },
   {
     "id": "app.import.import_line.null_post.error",
@@ -3137,51 +3161,51 @@
   },
   {
     "id": "app.import.validate_direct_channel_import_data.header_length.error",
-    "translation": "Direct channel header is too long"
+    "translation": "私信频道标题过长"
   },
   {
     "id": "app.import.validate_direct_channel_import_data.members_required.error",
-    "translation": "缺少频道必须属性：name"
+    "translation": "缺少私信频道必须属性：members"
   },
   {
     "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
-    "translation": "Direct channel members list contains too few items"
+    "translation": "私信频道成员列表数量过少"
   },
   {
     "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
-    "translation": "Direct channel members list contains too many items"
+    "translation": "私信频道成员列表数量过多"
   },
   {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
-    "translation": "缺少消息必须属性：create_at。"
+    "translation": "缺少私信消息必须属性：channel_members"
   },
   {
     "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
-    "translation": "Direct post channel members list contains too few items"
+    "translation": "私信频道成员列表数量过少"
   },
   {
     "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
-    "translation": "Direct post channel members list contains too many items"
+    "translation": "私信频道成员列表数量过多"
   },
   {
     "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
-    "translation": "缺少消息必须属性：create_at。"
+    "translation": "缺少私信消息必须属性：create_at"
   },
   {
     "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
-    "translation": "CreateAt must be greater than 0"
+    "translation": "CreateAt 比如大于 0"
   },
   {
     "id": "app.import.validate_direct_post_import_data.message_length.error",
-    "translation": "Message is too long"
+    "translation": "消息过长"
   },
   {
     "id": "app.import.validate_direct_post_import_data.message_missing.error",
-    "translation": "缺少消息必须属性：Message。"
+    "translation": "缺少私信必须属性：message"
   },
   {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
-    "translation": "缺少消息必须属性：User。"
+    "translation": "缺少私信必须属性：user"
   },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
@@ -3409,7 +3433,7 @@
   },
   {
     "id": "ent.cluster.config_changed.info",
-    "translation": "Cluster configuration has changed for id={{ .id }}.  The cluster may become unstable and a restart is required.  To ensure the cluster is configured correctly you should perform a rolling restart immediately."
+    "translation": "机群设定 id={{ .id }} 已更改。机群可能不稳定并且需要重启。为了确保机群配置正确您应该立刻逐进重启。"
   },
   {
     "id": "ent.cluster.debug_fail.debug",
@@ -3441,7 +3465,7 @@
   },
   {
     "id": "ent.cluster.save_config.error",
-    "translation": "System Console is set to read-only when High Availability is enabled  unless ReadOnlyConfig is disabled in the configuration file."
+    "translation": "当高可用性模式开启时，系统控制台将设为只读且只能通过修改配置文件进行改动除非禁止配置文件里的 ReadOnlyConfig。"
   },
   {
     "id": "ent.cluster.starting.info",
@@ -3505,11 +3529,11 @@
   },
   {
     "id": "ent.elasticsearch.test_config.indexing_disabled.error",
-    "translation": "Elasticsearch is disabled."
+    "translation": "Elasticsearch 已停用。"
   },
   {
     "id": "ent.elasticsearch.test_config.license.error",
-    "translation": "License does not support Elasticsearch."
+    "translation": "许可证不支持 Elasticsearch。"
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
@@ -4313,7 +4337,7 @@
   },
   {
     "id": "model.config.is_valid.teammate_name_display.app_error",
-    "translation": "Invalid teammate display.  Must be 'full_name', 'nickname_full_name' or 'username'"
+    "translation": "无效的团员显示。必须为 'full_name'，'nickname_full_name' 或 'username'"
   },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
@@ -5869,7 +5893,7 @@
   },
   {
     "id": "store.sql_user.get_new_users.app_error",
-    "translation": "我们在查找偏好设置时遇到了一个错误"
+    "translation": "我们在查找新用户时发生错误"
   },
   {
     "id": "store.sql_user.get_profiles.app_error",
diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json
index 55e0968a5..cb097748b 100644
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -429,7 +429,7 @@
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "Command with a trigger of '{{.Trigger}}' not found. To send a message beginning with \"/\", try adding an empty space at the beginning of the message."
+    "translation": "找不到觸發為'{{.Trigger}}'的指令。請在訊息開頭增加空白來發送以\"/\"起始的訊息。"
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -461,7 +461,7 @@
   },
   {
     "id": "api.command.invite_people.invite_off",
-    "translation": "User creation has been disabled on this server, no invite(s) sent"
+    "translation": "本伺服器禁止建立使用者，不寄送邀請。"
   },
   {
     "id": "api.command.invite_people.name",
@@ -501,19 +501,19 @@
   },
   {
     "id": "api.command_channel_header.channel.app_error",
-    "translation": "Error to retrieve the current channel."
+    "translation": "取得當前頻道時錯誤。"
   },
   {
     "id": "api.command_channel_header.desc",
-    "translation": "Edit the channel header"
+    "translation": "編輯頻道標題"
   },
   {
     "id": "api.command_channel_header.hint",
-    "translation": "[text]"
+    "translation": "[文字]"
   },
   {
     "id": "api.command_channel_header.message.app_error",
-    "translation": "Text must be provided with the /header command."
+    "translation": "/header 指令必須帶有文字"
   },
   {
     "id": "api.command_channel_header.name",
@@ -521,15 +521,15 @@
   },
   {
     "id": "api.command_channel_header.permission.app_error",
-    "translation": "You do not have the appropriate permissions to edit the channel header."
+    "translation": "權限不足以編輯頻道標題。"
   },
   {
     "id": "api.command_channel_header.update_channel.app_error",
-    "translation": "Error to update the current channel."
+    "translation": "更新當前頻道時錯誤。"
   },
   {
     "id": "api.command_channel_header.update_channel.success",
-    "translation": "Channel header successfully updated."
+    "translation": "成功更新頻道標題。"
   },
   {
     "id": "api.command_collapse.desc",
@@ -589,7 +589,7 @@
   },
   {
     "id": "api.command_help.desc",
-    "translation": "Open the Mattermost help page"
+    "translation": "開啟 Mattermost 說明頁面"
   },
   {
     "id": "api.command_help.name",
@@ -708,8 +708,24 @@
     "translation": "open"
   },
   {
+    "id": "api.command_search.desc",
+    "translation": "從訊息中搜尋文字"
+  },
+  {
+    "id": "api.command_search.hint",
+    "translation": "[文字]"
+  },
+  {
+    "id": "api.command_search.name",
+    "translation": "search"
+  },
+  {
+    "id": "api.command_search.unsupported.app_error",
+    "translation": "當前裝置不支援搜尋命令"
+  },
+  {
     "id": "api.command_settings.desc",
-    "translation": "Open the Account Settings dialog"
+    "translation": "開啟帳號設定對話框"
   },
   {
     "id": "api.command_settings.name",
@@ -717,7 +733,7 @@
   },
   {
     "id": "api.command_settings.unsupported.app_error",
-    "translation": "The settings command is not supported on your device"
+    "translation": "當前裝置不支援設定命令"
   },
   {
     "id": "api.command_shortcuts.browser.channel_next",
@@ -797,7 +813,7 @@
   },
   {
     "id": "api.command_shortcuts.msgs.comp_emoji",
-    "translation": ":[文字]+TAB：自動完成以[文字]起始的顏文字\n\n"
+    "translation": ":[文字]+TAB：自動完成以[文字]起始的繪文字\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs.comp_username",
@@ -960,6 +976,10 @@
     "translation": "發生未知的錯誤。請聯繫支援單位。"
   },
   {
+    "id": "api.context.v3_disabled.app_error",
+    "translation": "此伺服器已停用 API 版本 3，請用 API 版本 4。如需詳細資訊，請參閱 https://api.mattermost.com"
+  },
+  {
     "id": "api.deprecated.init.debug",
     "translation": "正在初始化已被取代的 API 路徑"
   },
@@ -1490,6 +1510,10 @@
     "translation": "正在初始化 OAuth API 路徑"
   },
   {
+    "id": "api.oauth.invalid_state_token.app_error",
+    "translation": "無效的狀態 Token"
+  },
+  {
     "id": "api.oauth.regenerate_secret.app_error",
     "translation": "權限不足以重新產生 OAuth2 應用程式密碼"
   },
@@ -1689,11 +1713,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " Uploaded one or more files in "
+    "translation": "已上傳一個或更多檔案"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " Uploaded one or more files in a direct message"
+    "translation": "在直接傳訊中已上傳一個或更多檔案"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
@@ -2125,7 +2149,7 @@
   },
   {
     "id": "api.team.invite_members.invalid_email.app_error",
-    "translation": "The following email addresses do not belong to an accepted domain: {{.Addresses}}. Please contact your System Administrator for details."
+    "translation": "這些電子郵件地址的網域不被接受：{{.Addresses}}。詳情請聯絡系統管理員。"
   },
   {
     "id": "api.team.invite_members.member",
@@ -3021,35 +3045,35 @@
   },
   {
     "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Failed to get direct channel"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_direct_channel.error",
-    "translation": "Failed to get direct channel"
+    "translation": "建立直接傳訊頻道時失敗"
   },
   {
     "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Failed to get group channel"
-  },
-  {
-    "id": "app.import.import_direct_channel.create_group_channel.error",
-    "translation": "Failed to get group channel"
+    "translation": "建立群組頻道時失敗"
   },
   {
     "id": "app.import.import_direct_channel.member_not_found.error",
-    "translation": "Could not find channel member when importing direct channel"
+    "translation": "匯入直接傳訊頻道時找不到頻道成員"
   },
   {
     "id": "app.import.import_direct_channel.update_header_failed.error",
-    "translation": "Failed to update direct channel header"
+    "translation": "更新直接傳訊頻道標題時失敗"
   },
   {
     "id": "app.import.import_direct_post.channel_member_not_found.error",
-    "translation": "Could not find channel member when importing direct channel post"
+    "translation": "匯入直接傳訊頻道訊息時找不到頻道成員"
+  },
+  {
+    "id": "app.import.import_direct_post.create_direct_channel.error",
+    "translation": "取得直接傳訊頻道時失敗"
+  },
+  {
+    "id": "app.import.import_direct_post.create_group_channel.error",
+    "translation": "取得群組頻道時失敗"
   },
   {
     "id": "app.import.import_direct_post.user_not_found.error",
-    "translation": "Post user does not exist"
+    "translation": "發訊者不存在"
   },
   {
     "id": "app.import.import_line.null_channel.error",
@@ -3057,11 +3081,11 @@
   },
   {
     "id": "app.import.import_line.null_direct_channel.error",
-    "translation": "匯入資料行資料型別為\"頻道\"但頻道物件為 null"
+    "translation": "匯入資料行資料型別為\"直接傳訊頻道\"但直接傳訊頻道物件為 null"
   },
   {
     "id": "app.import.import_line.null_direct_post.error",
-    "translation": "匯入資料行資料型別為\"訊息\"但訊息物件為 null"
+    "translation": "匯入資料行資料型別為\"直接訊息\"但直接訊息物件為 null"
   },
   {
     "id": "app.import.import_line.null_post.error",
@@ -3137,51 +3161,51 @@
   },
   {
     "id": "app.import.validate_direct_channel_import_data.header_length.error",
-    "translation": "Direct channel header is too long"
+    "translation": "直接傳訊頻道標題過長"
   },
   {
     "id": "app.import.validate_direct_channel_import_data.members_required.error",
-    "translation": "缺少必要的頻道屬性：名字。"
+    "translation": "缺少必要的直接傳訊頻道屬性：成員。"
   },
   {
     "id": "app.import.validate_direct_channel_import_data.members_too_few.error",
-    "translation": "Direct channel members list contains too few items"
+    "translation": "直接傳訊頻道成員列表的欄位過少"
   },
   {
     "id": "app.import.validate_direct_channel_import_data.members_too_many.error",
-    "translation": "Direct channel members list contains too many items"
+    "translation": "直接傳訊頻道成員列表的欄位過多"
   },
   {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
-    "translation": "缺少必要的訊息屬性：建立日期。"
+    "translation": "缺少必要的直接訊息屬性：頻道成員。"
   },
   {
     "id": "app.import.validate_direct_post_import_data.channel_members_too_few.error",
-    "translation": "Direct post channel members list contains too few items"
+    "translation": "直接訊息頻道成員列表的欄位過少"
   },
   {
     "id": "app.import.validate_direct_post_import_data.channel_members_too_many.error",
-    "translation": "Direct post channel members list contains too many items"
+    "translation": "直接訊息頻道成員列表的欄位過多"
   },
   {
     "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
-    "translation": "缺少必要的訊息屬性：建立日期。"
+    "translation": "缺少必要的直接訊息屬性：建立日期。"
   },
   {
     "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
-    "translation": "CreateAt must be greater than 0"
+    "translation": "建立日期必須大於零"
   },
   {
     "id": "app.import.validate_direct_post_import_data.message_length.error",
-    "translation": "Message is too long"
+    "translation": "訊息過長"
   },
   {
     "id": "app.import.validate_direct_post_import_data.message_missing.error",
-    "translation": "缺少必要的訊息屬性：訊息。"
+    "translation": "缺少必要的直接訊息屬性：訊息。"
   },
   {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
-    "translation": "缺少必要的訊息屬性：使用者。"
+    "translation": "缺少必要的直接訊息屬性：使用者。"
   },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
@@ -3409,7 +3433,7 @@
   },
   {
     "id": "ent.cluster.config_changed.info",
-    "translation": "Cluster configuration has changed for id={{ .id }}.  The cluster may become unstable and a restart is required.  To ensure the cluster is configured correctly you should perform a rolling restart immediately."
+    "translation": "叢集設定已改變 id={{ .id }}。此叢集可能不穩定，需要重新啟動。為了確保叢集被正確的設定，您應該馬上進行漸進式重啟。"
   },
   {
     "id": "ent.cluster.debug_fail.debug",
@@ -3441,7 +3465,7 @@
   },
   {
     "id": "ent.cluster.save_config.error",
-    "translation": "System Console is set to read-only when High Availability is enabled  unless ReadOnlyConfig is disabled in the configuration file."
+    "translation": "啟用高可用性時系統控制台將被設定成唯讀模式，在設定檔當中停用 ReadOnlyConfig 以停止此行為。"
   },
   {
     "id": "ent.cluster.starting.info",
@@ -3505,11 +3529,11 @@
   },
   {
     "id": "ent.elasticsearch.test_config.indexing_disabled.error",
-    "translation": "Elasticsearch is disabled."
+    "translation": "Elasticsearch 已停用。"
   },
   {
     "id": "ent.elasticsearch.test_config.license.error",
-    "translation": "License does not support Elasticsearch."
+    "translation": "授權不支援 Elasticsearch。"
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
@@ -4313,7 +4337,7 @@
   },
   {
     "id": "model.config.is_valid.teammate_name_display.app_error",
-    "translation": "Invalid teammate display.  Must be 'full_name', 'nickname_full_name' or 'username'"
+    "translation": "團隊成員顯示設定值無效。必須為'full_name'、'nickname_full_name'或'username'"
   },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
@@ -5869,7 +5893,7 @@
   },
   {
     "id": "store.sql_user.get_new_users.app_error",
-    "translation": "尋找偏好設定時遇到錯誤"
+    "translation": "尋找新使用者時遇到錯誤"
   },
   {
     "id": "store.sql_user.get_profiles.app_error",