translations PR 20171023 (#7699)

14 files changed, 880 insertions, 152 deletions

diff --git a/i18n/de.json b/i18n/de.json
index 760986963..2b9acd0e8 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -716,6 +716,10 @@
     "translation": "Kanal beigetreten."
   },
   {
+    "id": "api.command_kick.name",
+    "translation": "kick"
+  },
+  {
     "id": "api.command_leave.desc",
     "translation": "Den aktuellen Kanal verlassen"
   },
@@ -824,6 +828,38 @@
     "translation": "öffnen"
   },
   {
+    "id": "api.command_remove.desc",
+    "translation": "Remove a member from the channel"
+  },
+  {
+    "id": "api.command_remove.direct_group.app_error",
+    "translation": "You can't remove someone from a direct message channel."
+  },
+  {
+    "id": "api.command_remove.hint",
+    "translation": "@[username]"
+  },
+  {
+    "id": "api.command_remove.message.app_error",
+    "translation": "Es muss eine Nachricht für den Befehl /umbenennen angegeben werden."
+  },
+  {
+    "id": "api.command_remove.missing.app_error",
+    "translation": "Der Benutzer konnte nicht gefunden werden"
+  },
+  {
+    "id": "api.command_remove.name",
+    "translation": "remove"
+  },
+  {
+    "id": "api.command_remove.permission.app_error",
+    "translation": "Sie haben nicht die nötigen Berechtigungen, um den Kanal umzubenennen."
+  },
+  {
+    "id": "api.command_remove.user_not_in_channel",
+    "translation": "{{.Username}} is not a member of this channel."
+  },
+  {
     "id": "api.command_search.desc",
     "translation": "Nach Text in Nachrichten suchen"
   },
@@ -1518,12 +1554,20 @@
     "translation": "Fehlende Datei in multipart/form-Anfrage"
   },
   {
+    "id": "api.post.check_for_out_of_channel_mentions.link.private",
+    "translation": "add them to this private channel"
+  },
+  {
+    "id": "api.post.check_for_out_of_channel_mentions.link.public",
+    "translation": "add them to the channel"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
-    "translation": "{{.Usernames}} und {{.LastUsername}} wurden erwähnt, aber sie haben keine Benachrichtigung erhalten, weil sie nicht im Kanal sind."
+    "translation": "@{{.Usernames}} and @{{.LastUsername}} were mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "{{.Username}} wurde erwähnt, aber hat keine Benachrichtigung erhalten, da kein Kanalmitglied."
+    "translation": "@{{.Username}} was mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
   {
     "id": "api.post.create_post.attach_files.error",
@@ -3772,10 +3816,18 @@
     "translation": "Konnte Suchergebnisse nicht dekodieren"
   },
   {
+    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
+    "translation": "Failed to create Elasticsearch bulk processor"
+  },
+  {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Konnte ElasticSearch-Index-Einstellungen nicht setzen"
   },
   {
+    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
+    "translation": "Failed to start Elasticsearch bulk processor"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Verbindung zum Elasticsearch-Server fehlgeschlagen."
   },
@@ -4396,6 +4448,10 @@
     "translation": "ElasticSearch-Einstellung IndexingEnabled muss angegeben sein, wenn Elastic-Search-Indizierung aktiviert ist."
   },
   {
+    "id": "model.config.is_valid.elastic_search.live_indexing_batch_size.app_error",
+    "translation": "Elasticsearch Live Indexing Batch Size must be at least 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.password.app_error",
     "translation": "ElasticSearch-Einstellung Passwort muss angegeben sein, wenn Elastic-Search-Indizierung aktiviert ist."
   },
diff --git a/i18n/en.json b/i18n/en.json
index 4a37757af..23500d2ed 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -583,42 +583,6 @@
     "id": "api.command_channel_purpose.update_channel.app_error",
     "translation": "Error to update the current channel."
   },
-    {
-    "id": "api.command_remove.message.app_error",
-    "translation": "A message must be provided with the /remove or /kick command."
-  },
-  {
-    "id": "api.command_remove.missing.app_error",
-    "translation": "We couldn't find the user"
-  },
-  {
-    "id": "api.command_remove.permission.app_error",
-    "translation": "You do not have the appropriate permissions to remove the member."
-  },
-  {
-    "id": "api.command_remove.direct_group.app_error",
-    "translation": "You can't remove someone from a direct message channel."
-  },
-  {
-    "id": "api.command_remove.name",
-    "translation": "remove"
-  },
-  {
-    "id": "api.command_remove.hint",
-    "translation": "@[username]"
-  },
-  {
-    "id": "api.command_remove.desc",
-    "translation": "Remove a member from the channel"
-  },
-  {
-    "id": "api.command_remove.user_not_in_channel",
-    "translation": "{{.Username}} is not a member of this channel."
-  },
-  {
-    "id": "api.command_kick.name",
-    "translation": "kick"
-  },
   {
     "id": "api.command_channel_rename.channel.app_error",
     "translation": "Error to retrieve the current channel."
@@ -772,6 +736,10 @@
     "translation": "Joined channel."
   },
   {
+    "id": "api.command_kick.name",
+    "translation": "kick"
+  },
+  {
     "id": "api.command_leave.desc",
     "translation": "Leave the current channel"
   },
@@ -880,6 +848,38 @@
     "translation": "open"
   },
   {
+    "id": "api.command_remove.desc",
+    "translation": "Remove a member from the channel"
+  },
+  {
+    "id": "api.command_remove.direct_group.app_error",
+    "translation": "You can't remove someone from a direct message channel."
+  },
+  {
+    "id": "api.command_remove.hint",
+    "translation": "@[username]"
+  },
+  {
+    "id": "api.command_remove.message.app_error",
+    "translation": "A message must be provided with the /remove or /kick command."
+  },
+  {
+    "id": "api.command_remove.missing.app_error",
+    "translation": "We couldn't find the user"
+  },
+  {
+    "id": "api.command_remove.name",
+    "translation": "remove"
+  },
+  {
+    "id": "api.command_remove.permission.app_error",
+    "translation": "You do not have the appropriate permissions to remove the member."
+  },
+  {
+    "id": "api.command_remove.user_not_in_channel",
+    "translation": "{{.Username}} is not a member of this channel."
+  },
+  {
     "id": "api.command_search.desc",
     "translation": "Search text in messages"
   },
@@ -1574,14 +1574,14 @@
     "translation": "Missing file in multipart/form request"
   },
   {
-    "id": "api.post.check_for_out_of_channel_mentions.link.public",
-    "translation": "add them to the channel"
-  },
-  {
     "id": "api.post.check_for_out_of_channel_mentions.link.private",
     "translation": "add them to this private channel"
   },
   {
+    "id": "api.post.check_for_out_of_channel_mentions.link.public",
+    "translation": "add them to the channel"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
     "translation": "@{{.Usernames}} and @{{.LastUsername}} were mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
@@ -3772,14 +3772,6 @@
     "translation": "License does not support Data Retention."
   },
   {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Failed to create Elasticsearch bulk processor"
-  },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Failed to start Elasticsearch bulk processor"
-  },
-  {
     "id": "ent.elasticsearch.aggregator_worker.create_index_job.error",
     "translation": "Elasticsearch aggregator worker failed to create the indexing job"
   },
@@ -3860,10 +3852,18 @@
     "translation": "Failed to decode search results"
   },
   {
+    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
+    "translation": "Failed to create Elasticsearch bulk processor"
+  },
+  {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Failed to set Elasticsearch index settings"
   },
   {
+    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
+    "translation": "Failed to start Elasticsearch bulk processor"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Connecting to Elasticsearch server failed."
   },
@@ -4496,6 +4496,10 @@
     "translation": "Elastic Search IndexingEnabled setting must be set to true when Elastic Search SearchEnabled is set to true."
   },
   {
+    "id": "model.config.is_valid.elastic_search.live_indexing_batch_size.app_error",
+    "translation": "Elasticsearch Live Indexing Batch Size must be at least 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.password.app_error",
     "translation": "Elastic Search Password setting must be provided when Elastic Search indexing is enabled."
   },
@@ -4508,10 +4512,6 @@
     "translation": "Elastic Search Username setting must be provided when Elastic Search indexing is enabled."
   },
   {
-    "id": "model.config.is_valid.elastic_search.live_indexing_batch_size.app_error",
-    "translation": "Elasticsearch Live Indexing Batch Size must be at least 1"
-  },
-  {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
     "translation": "Invalid email batching buffer size for email settings.  Must be zero or a positive number."
   },
diff --git a/i18n/es.json b/i18n/es.json
index 9b1a82b32..bb11e810d 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -716,6 +716,10 @@
     "translation": "Te uniste al canal."
   },
   {
+    "id": "api.command_kick.name",
+    "translation": "patear"
+  },
+  {
     "id": "api.command_leave.desc",
     "translation": "Abandonar el canal actual"
   },
@@ -824,6 +828,38 @@
     "translation": "abrir"
   },
   {
+    "id": "api.command_remove.desc",
+    "translation": "Remueve a un miembro del canal"
+  },
+  {
+    "id": "api.command_remove.direct_group.app_error",
+    "translation": "No se puede remover a alguien de un canal de mensajes directos."
+  },
+  {
+    "id": "api.command_remove.hint",
+    "translation": "@[nombre de usuario]"
+  },
+  {
+    "id": "api.command_remove.message.app_error",
+    "translation": "Un mensaje debe ser proporcionado con el comando /remove o /kick."
+  },
+  {
+    "id": "api.command_remove.missing.app_error",
+    "translation": "No pudimos encontrar el usuario"
+  },
+  {
+    "id": "api.command_remove.name",
+    "translation": "remover"
+  },
+  {
+    "id": "api.command_remove.permission.app_error",
+    "translation": "No tienes los permisos adecuados para remover al miembro."
+  },
+  {
+    "id": "api.command_remove.user_not_in_channel",
+    "translation": "{{.Username}} no es un miembro de este canal."
+  },
+  {
     "id": "api.command_search.desc",
     "translation": "Buscar texto en mensajes"
   },
@@ -1518,12 +1554,20 @@
     "translation": "Falta el archivo en la solicitud multipart/form"
   },
   {
+    "id": "api.post.check_for_out_of_channel_mentions.link.private",
+    "translation": "agregalos al canal privado"
+  },
+  {
+    "id": "api.post.check_for_out_of_channel_mentions.link.public",
+    "translation": "agregalos al canal"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
-    "translation": "{{.Usernames}} y {{.LastUsername}} fueron mencionados, pero no recibieron una notificación porque no pertenecen a este canal."
+    "translation": "@{{.Usernames}} and @{{.LastUsername}} fueron mencionados pero no son parte del canal. ¿Quisieras {{.Phrase}}? Tendrán acceso a todo el historial de mensajes."
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "{{.Username}} fue mencionado, pero no recibió una notificación porque no pertenece a este canal."
+    "translation": "@{{.Username}} fue mencionado pero no es parte del canal. ¿Quisieras {{.Phrase}}? Tendrá acceso a todo el historial de mensajes."
   },
   {
     "id": "api.post.create_post.attach_files.error",
@@ -3772,10 +3816,18 @@
     "translation": "No pudo decodificar los resultados de búsqueda"
   },
   {
+    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
+    "translation": "No se pudo crear el procesador a granel de Elasticsearch"
+  },
+  {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "No se pudo establecer el índice de configuración de Elasticsearch"
   },
   {
+    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
+    "translation": "No se pudo iniciar procesador a granel de Elasticsearch"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "La conexión al servidor Elasticsearch no pudo establecer."
   },
@@ -4396,6 +4448,10 @@
     "translation": "El valor de Elastic Search IndexingEnabled debe ser verdadero cuando el valor de Elastic Search SearchEnabled es verdadero."
   },
   {
+    "id": "model.config.is_valid.elastic_search.live_indexing_batch_size.app_error",
+    "translation": "El tamaño del lote de la indexación en tiempo real de Elasticsearch debe ser de al menos 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.password.app_error",
     "translation": "El valor de Elastic Search Password debe ser proporcionado cuando está habilitado la indización de Elastic Search."
   },
diff --git a/i18n/fr.json b/i18n/fr.json
index 890e16ac2..6abe0933f 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -716,6 +716,10 @@
     "translation": "Canal rejoint."
   },
   {
+    "id": "api.command_kick.name",
+    "translation": "kick"
+  },
+  {
     "id": "api.command_leave.desc",
     "translation": "Quitte le canal courant"
   },
@@ -824,6 +828,38 @@
     "translation": "ouvrir"
   },
   {
+    "id": "api.command_remove.desc",
+    "translation": "Remove a member from the channel"
+  },
+  {
+    "id": "api.command_remove.direct_group.app_error",
+    "translation": "You can't remove someone from a direct message channel."
+  },
+  {
+    "id": "api.command_remove.hint",
+    "translation": "@[username]"
+  },
+  {
+    "id": "api.command_remove.message.app_error",
+    "translation": "Un message doit être spécifié avec la commande /rename."
+  },
+  {
+    "id": "api.command_remove.missing.app_error",
+    "translation": "Utilisateur introuvable"
+  },
+  {
+    "id": "api.command_remove.name",
+    "translation": "remove"
+  },
+  {
+    "id": "api.command_remove.permission.app_error",
+    "translation": "Vous ne disposez pas des permissions requises pour renommer le canal."
+  },
+  {
+    "id": "api.command_remove.user_not_in_channel",
+    "translation": "{{.Username}} is not a member of this channel."
+  },
+  {
     "id": "api.command_search.desc",
     "translation": "Recherche du texte dans les messages"
   },
@@ -1518,12 +1554,20 @@
     "translation": "Fichier manquant dans la requête multipart/form"
   },
   {
+    "id": "api.post.check_for_out_of_channel_mentions.link.private",
+    "translation": "add them to this private channel"
+  },
+  {
+    "id": "api.post.check_for_out_of_channel_mentions.link.public",
+    "translation": "add them to the channel"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
-    "translation": "{{.Usernames}} et {{.LastUsername}} ont été mentionnés, mais, ne faisant pas partie de ce canal, ils ne recevront pas de notifications."
+    "translation": "@{{.Usernames}} and @{{.LastUsername}} were mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "{{.Username}} a été mentionné(e), mais, ne faisant pas partie de ce canal, ne recevra pas de notification."
+    "translation": "@{{.Username}} was mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
   {
     "id": "api.post.create_post.attach_files.error",
@@ -2689,7 +2733,7 @@
   },
   {
     "id": "api.user.saml.not_available.app_error",
-    "translation": "SAML n'est pas configuré ou supporté sur ce serveur."
+    "translation": "SAML 2.0 n'est pas configuré ou supporté sur ce serveur."
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -2725,7 +2769,7 @@
   },
   {
     "id": "api.user.send_user_access_token.error",
-    "translation": "Impossible d'envoyer par e-mail les jetons d'accès utilisateur"
+    "translation": "Impossible d'envoyer l'email indiquant que le jeton d'accès personnel a été ajouté"
   },
   {
     "id": "api.user.send_verify_email_and_forget.failed.error",
@@ -2821,7 +2865,7 @@
   },
   {
     "id": "api.user.upload_profile_user.parse.app_error",
-    "translation": "Impossible de parser le formulaire (multipart form)"
+    "translation": "Impossible d'interpréter le formulaire composite (multipart form)"
   },
   {
     "id": "api.user.upload_profile_user.storage.app_error",
@@ -2981,7 +3025,7 @@
   },
   {
     "id": "app.channel.move_channel.members_do_not_match.error",
-    "translation": "Cannot move a channel unless all its members are already members of the destination team."
+    "translation": "Impossible de déplacer un canal à moins que tous ses membres ne soient déjà membres de l'équipe de destination."
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
@@ -3425,39 +3469,39 @@
   },
   {
     "id": "app.plugin.activate.app_error",
-    "translation": "Unable to activate extracted plugin. Plugin may already exist and be activated."
+    "translation": "Impossible d'activer le plugin extrait. Il se peut qu'il existe déjà et soit déjà activé."
   },
   {
     "id": "app.plugin.deactivate.app_error",
-    "translation": "Impossible de supprimer la réaction"
+    "translation": "Impossible de désactiver le plugin"
   },
   {
     "id": "app.plugin.disabled.app_error",
-    "translation": "Plugins have been disabled by the system admin or the server has not been restarted since they were enabled."
+    "translation": "Les plugins ont été désactivés par l'administrateur système ou le serveur n'a pas encore été redémarré depuis leur activation."
   },
   {
     "id": "app.plugin.extract.app_error",
-    "translation": "Encountered error extracting plugin"
+    "translation": "Une erreur s'est produite lors de l'extraction du plugin"
   },
   {
     "id": "app.plugin.filesystem.app_error",
-    "translation": "Encountered filesystem error"
+    "translation": "Une erreur de système de fichier s'est produite"
   },
   {
     "id": "app.plugin.get_plugins.app_error",
-    "translation": "Impossible de supprimer la réaction"
+    "translation": "Impossible de récupérer les plugins actifs"
   },
   {
     "id": "app.plugin.manifest.app_error",
-    "translation": "Unable to find manifest for extracted plugin"
+    "translation": "Impossible de trouver le manifeste pour le plugin extrait"
   },
   {
     "id": "app.plugin.mvdir.app_error",
-    "translation": "Unable to move plugin from temporary directory to final destination"
+    "translation": "Impossible de déplacer le plugin de son emplacement temporaire à sa destination finale"
   },
   {
     "id": "app.plugin.remove.app_error",
-    "translation": "Impossible de supprimer la réaction"
+    "translation": "Impossible de supprimer le plugin"
   },
   {
     "id": "app.user_access_token.disabled",
@@ -3597,7 +3641,7 @@
   },
   {
     "id": "cli.license.critical",
-    "translation": "Feature requires an upgrade to Enterprise Edition and the inclusion of a license key. Please contact your System Administrator."
+    "translation": "La fonctionnalité requiert une mise à niveau vers la version entreprise et l'installation d'une clé de licence. Veuillez contacter votre administrateur système."
   },
   {
     "id": "ent.brand.save_brand_image.decode.app_error",
@@ -3689,23 +3733,23 @@
   },
   {
     "id": "ent.data_retention.generic.license.error",
-    "translation": "License does not support Data Retention."
+    "translation": "La licence ne supporte pas la conservation des données."
   },
   {
     "id": "ent.elasticsearch.aggregator_worker.create_index_job.error",
-    "translation": "Elasticsearch aggregator worker failed to create the indexing job"
+    "translation": "Le système d’agrégation Elasticsearch n'a pas pu créer le job d'indexation"
   },
   {
     "id": "ent.elasticsearch.aggregator_worker.delete_indexes.error",
-    "translation": "Elasticsearch aggregator worker failed to delete the indexes"
+    "translation": "Le système d’agrégation Elasticsearch n'a pas pu supprimer les index."
   },
   {
     "id": "ent.elasticsearch.aggregator_worker.get_indexes.error",
-    "translation": "Elasticsearch aggregator worker failed to get indexes"
+    "translation": "Le système d’agrégation Elasticsearch n'a pas pu récupérer les index."
   },
   {
     "id": "ent.elasticsearch.aggregator_worker.index_job_failed.error",
-    "translation": "Elasticsearch aggregator worker failed due to the indexing job failing"
+    "translation": "Le système d’agrégation Elasticsearch a échoué à cause du job d'indexation qui a lui-même échoué"
   },
   {
     "id": "ent.elasticsearch.create_client.connect_failed",
@@ -3725,11 +3769,11 @@
   },
   {
     "id": "ent.elasticsearch.data_retention_delete_indexes.delete_index.error",
-    "translation": "Impossible de supprimer l'index d'Elasticsearch"
+    "translation": "Impossible de supprimer l'index Elasticsearch"
   },
   {
     "id": "ent.elasticsearch.data_retention_delete_indexes.get_indexes.error",
-    "translation": "Impossible de créer l'index d'Elasticsearch"
+    "translation": "Impossible de récupérer les index Elasticsearch"
   },
   {
     "id": "ent.elasticsearch.delete_post.error",
@@ -3745,11 +3789,11 @@
   },
   {
     "id": "ent.elasticsearch.indexer.do_job.parse_end_time.error",
-    "translation": "Elasticsearch indexing worker failed to parse the end time"
+    "translation": "Le système d’agrégation Elasticsearch n'a pas pu analyser l'heure de fin"
   },
   {
     "id": "ent.elasticsearch.indexer.do_job.parse_start_time.error",
-    "translation": "Elasticsearch indexing worker failed to parse the start time"
+    "translation": "Le système d’agrégation Elasticsearch n'a pas pu interpréter l'heure de début"
   },
   {
     "id": "ent.elasticsearch.not_started.error",
@@ -3772,10 +3816,18 @@
     "translation": "Impossible de décoder les résultats de recherche"
   },
   {
+    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
+    "translation": "Failed to create Elasticsearch bulk processor"
+  },
+  {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Impossible de définir les paramètres de l'index d'Elasticsearch"
   },
   {
+    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
+    "translation": "Failed to start Elasticsearch bulk processor"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Impossible de se connecter au serveur Elasticsearch."
   },
@@ -3845,11 +3897,11 @@
   },
   {
     "id": "ent.ldap.sync.index_job_failed.error",
-    "translation": "LDAP sync worker failed due to the sync job failing"
+    "translation": "Le système de synchronisation LDAP a échoué à cause du job de synchronisation qui a lui-même échoué"
   },
   {
     "id": "ent.ldap.sync_worker.create_index_job.error",
-    "translation": "LDAP sync worker failed to create the sync job"
+    "translation": "Le système de synchronisation LDAP n'a pas pu créer le job de synchronisation"
   },
   {
     "id": "ent.ldap.syncdone.info",
@@ -3981,7 +4033,7 @@
   },
   {
     "id": "ent.saml.service_disable.app_error",
-    "translation": "SAML n'est pas configuré ou supporté sur ce serveur."
+    "translation": "SAML 2.0 n'est pas configuré ou supporté sur ce serveur."
   },
   {
     "id": "ent.saml.update_saml_user.unable_error",
@@ -4265,7 +4317,7 @@
   },
   {
     "id": "model.client.writer.app_error",
-    "translation": "Unable to build multipart request"
+    "translation": "Impossible construire la requête composite (multipart)"
   },
   {
     "id": "model.command.is_valid.create_at.app_error",
@@ -4317,31 +4369,31 @@
   },
   {
     "id": "model.command_hook.channel_id.app_error",
-    "translation": "Id canal invalide"
+    "translation": "Id de canal invalide"
   },
   {
     "id": "model.command_hook.command_id.app_error",
-    "translation": "Invalid command id"
+    "translation": "Id de commande invalide"
   },
   {
     "id": "model.command_hook.create_at.app_error",
-    "translation": "La date de création doit être une date valide"
+    "translation": "Create at doit être une date valide"
   },
   {
     "id": "model.command_hook.id.app_error",
-    "translation": "Invalid command hook id"
+    "translation": "Id de hook de commande invalide"
   },
   {
     "id": "model.command_hook.parent_id.app_error",
-    "translation": "Id parent invalide"
+    "translation": "Id de parent invalide"
   },
   {
     "id": "model.command_hook.root_id.app_error",
-    "translation": "Id racine invalide"
+    "translation": "Id de racine invalide"
   },
   {
     "id": "model.command_hook.user_id.app_error",
-    "translation": "Id utilisateur invalide"
+    "translation": "Id d'utilisateur invalide"
   },
   {
     "id": "model.compliance.is_valid.create_at.app_error",
@@ -4373,19 +4425,19 @@
   },
   {
     "id": "model.config.is_valid.data_retention.deletion_job_start_time.app_error",
-    "translation": "Data retention job start time must be a 24-hour time stamp in the form HH:MM."
+    "translation": "L'heure de début du job de rétention des données doit être un horodatage de 24 heures sous le format HH:MM."
   },
   {
     "id": "model.config.is_valid.data_retention.file_retention_days_too_low.app_error",
-    "translation": "File retention must be one day or longer."
+    "translation": "La politique de conservation de fichiers doit être de un jour ou plus."
   },
   {
     "id": "model.config.is_valid.data_retention.message_retention_days_too_low.app_error",
-    "translation": "Message retention must be one day or longer."
+    "translation": "La politique de rétention de message doit être un jour ou plus."
   },
   {
     "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
-    "translation": "Elasticsearch AggregatePostsAfterDays setting must be a number greater than or equal to 1"
+    "translation": "Le paramètre Elasticsearch AggregatePostsAfterDays doit être un nombre plus grand ou égal à 1"
   },
   {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
@@ -4396,12 +4448,16 @@
     "translation": "Le paramètre IndexingEnabled d'ElasticSearch doit être activé lorsque la propriété SearchEnabled d'ElasticSearch est activée."
   },
   {
+    "id": "model.config.is_valid.elastic_search.live_indexing_batch_size.app_error",
+    "translation": "Elasticsearch Live Indexing Batch Size must be at least 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.password.app_error",
     "translation": "Le paramètre Password d'ElasticSearch doit être spécifié lorsque l'indexation avec ElasticSearch est activée."
   },
   {
     "id": "model.config.is_valid.elastic_search.posts_aggregator_job_start_time.app_error",
-    "translation": "Elasticsearch PostsAggregatorJobStartTime setting must be a time in the format \"hh:mm\""
+    "translation": "Le paramètre Elasticsearch PostsAggregatorJobStartTime doit être une heure au format \"hh:mm\""
   },
   {
     "id": "model.config.is_valid.elastic_search.username.app_error",
@@ -4529,7 +4585,7 @@
   },
   {
     "id": "model.config.is_valid.localization.available_locales.app_error",
-    "translation": "Available Languages must contain Default Client Language"
+    "translation": "Parmi les langues disponibles doit se trouver la langue par défaut du client"
   },
   {
     "id": "model.config.is_valid.login_attempts.app_error",
@@ -5153,7 +5209,7 @@
   },
   {
     "id": "plugin.rpcplugin.invocation.error",
-    "translation": "Error invoking plugin RPC"
+    "translation": "Une erreur s'est produite lors de l'invocation du plugin RPC"
   },
   {
     "id": "store.sql.alter_column_type.critical",
@@ -5293,7 +5349,7 @@
   },
   {
     "id": "store.sql_audit.permanent_delete_batch.app_error",
-    "translation": "We encountered an error permanently deleting the batch of audits"
+    "translation": "Une erreur s'est produite lors de la suppression définitive du lot d'audits"
   },
   {
     "id": "store.sql_audit.permanent_delete_by_user.app_error",
@@ -5589,15 +5645,15 @@
   },
   {
     "id": "store.sql_command_webhooks.save.app_error",
-    "translation": "Impossible d'enregistrer le IncomingWebhook"
+    "translation": "Impossible d'enregistrer le webhook de commande"
   },
   {
     "id": "store.sql_command_webhooks.save.existing.app_error",
-    "translation": "You cannot update an existing CommandWebhook"
+    "translation": "Impossible de mettre à niveau un webhook de commande existant"
   },
   {
     "id": "store.sql_command_webhooks.try_use.app_error",
-    "translation": "Unable to use the webhook"
+    "translation": "Impossible d'utiliser le webhook"
   },
   {
     "id": "store.sql_command_webhooks.try_use.invalid.app_error",
@@ -5657,11 +5713,11 @@
   },
   {
     "id": "store.sql_file_info.permanent_delete.app_error",
-    "translation": "We couldn't permanently delete the file info"
+    "translation": "Impossible de supprimer définitivement les informations du fichier"
   },
   {
     "id": "store.sql_file_info.permanent_delete_batch.app_error",
-    "translation": "We encountered an error permanently deleting the batch of file infos"
+    "translation": "Une erreur s'est produite lors de la suppression définitive du lot d'informations de fichier"
   },
   {
     "id": "store.sql_file_info.save.app_error",
@@ -5685,11 +5741,11 @@
   },
   {
     "id": "store.sql_job.get_count_by_status_and_type.app_erro",
-    "translation": "We couldn't get the job count by status and type"
+    "translation": "Impossible de récupérere le nombre de job par statut et par type"
   },
   {
     "id": "store.sql_job.get_newest_job_by_status_and_type.app_error",
-    "translation": "We couldn't get the newest job by status and type"
+    "translation": "Impossible de récupérer le job le plus récent par statut et par type"
   },
   {
     "id": "store.sql_job.save.app_error",
@@ -5881,11 +5937,11 @@
   },
   {
     "id": "store.sql_post.permanent_delete_batch.app_error",
-    "translation": "We encountered an error permanently deleting the batch of posts"
+    "translation": "Une erreur s'est produite lors de la suppression définitive du lot de messages"
   },
   {
     "id": "store.sql_post.permanent_delete_batch.app_error",
-    "translation": "We encountered an error permanently deleting the batch of posts"
+    "translation": "Une erreur s'est produite lors de la suppression définitive du lot de messages"
   },
   {
     "id": "store.sql_post.permanent_delete_by_channel.app_error",
@@ -5921,7 +5977,7 @@
   },
   {
     "id": "store.sql_preference.cleanup_flags_batch.app_error",
-    "translation": "We encountered an error cleaning up the batch of flags"
+    "translation": "Une erreur s'est produite lors du nettoyage du lot des indicateurs"
   },
   {
     "id": "store.sql_preference.delete.app_error",
@@ -6013,7 +6069,7 @@
   },
   {
     "id": "store.sql_reaction.permanent_delete_batch.app_error",
-    "translation": "We encountered an error permanently deleting the batch of reactions"
+    "translation": "Une erreur s'est produite lors de la suppression définitive du lot de réactions"
   },
   {
     "id": "store.sql_reaction.save.begin.app_error",
@@ -6593,39 +6649,39 @@
   },
   {
     "id": "utils.file.list_directory.configured.app_error",
-    "translation": "Le stockage de fichier n'est pas configuré correctement. Veuillez le paramétrer soit pour utiliser S3 soit le système de fichier local du serveur."
+    "translation": "Le stockage de fichier n'est pas configuré correctement. Veuillez le configurer pour soit utiliser S3 soit le système de fichier local du serveur."
   },
   {
     "id": "utils.file.list_directory.local.app_error",
-    "translation": "Une erreur est survenue lors de la lecture depuis le stockage local du serveur"
+    "translation": "Une erreur s'est produite lors de l'affichage du répertoire du système de fichier local du serveur."
   },
   {
     "id": "utils.file.list_directory.s3.app_error",
-    "translation": "Encountered an error listing directory from S3."
+    "translation": "Une erreur s'est produite lors de l'affichage du répertoire S3."
   },
   {
     "id": "utils.file.remove_directory.configured.app_error",
-    "translation": "Le stockage de fichier n'est pas configuré correctement. Veuillez le paramétrer soit pour utiliser S3 soit le système de fichier local du serveur."
+    "translation": "Le stockage de fichier n'est pas configuré correctement. Veuillez le configurer pour utiliser soit S3 soit le système de fichier local du serveur."
   },
   {
     "id": "utils.file.remove_directory.local.app_error",
-    "translation": "Une erreur est survenue lors de la lecture depuis le stockage local du serveur"
+    "translation": "Une erreur s'est produite lors de la suppression du répertoire du stockage local du serveur."
   },
   {
     "id": "utils.file.remove_directory.s3.app_error",
-    "translation": "Encountered an error removing directory from S3."
+    "translation": "Une erreur s'est produite lors de la suppression du répertoire de S3."
   },
   {
     "id": "utils.file.remove_file.configured.app_error",
-    "translation": "Le stockage de fichier n'est pas configuré correctement. Veuillez le paramétrer soit pour utiliser S3 soit le système de fichier local du serveur."
+    "translation": "Le stockage de fichier n'est pas configuré correctement. Veuillez le configurer pour utiliser soit S3 soit le système de fichier local du serveur."
   },
   {
     "id": "utils.file.remove_file.local.app_error",
-    "translation": "Une erreur est survenue lors de la lecture depuis le stockage local du serveur"
+    "translation": "Une erreur s'est produite lors de la suppression du fichier du stockage local du serveur."
   },
   {
     "id": "utils.file.remove_file.s3.app_error",
-    "translation": "Encountered an error removing file from S3."
+    "translation": "Une erreur s'est produite lors de la suppression du fichier de S3."
   },
   {
     "id": "utils.i18n.loaded",
@@ -6737,7 +6793,7 @@
   },
   {
     "id": "web.command_webhook.command.app_error",
-    "translation": "Impossible de trouver le canal"
+    "translation": "Impossible de trouver la commande"
   },
   {
     "id": "web.command_webhook.invalid.app_error",
@@ -6745,7 +6801,7 @@
   },
   {
     "id": "web.command_webhook.parse.app_error",
-    "translation": "Impossible d'analyser les données entrantes"
+    "translation": "Impossible d'interpréter les données entrantes"
   },
   {
     "id": "web.create_dir.error",
@@ -6789,11 +6845,11 @@
   },
   {
     "id": "web.error.unsupported_browser.message",
-    "translation": "Your current browser is not supported. Please upgrade to one of the following browsers:"
+    "translation": "Votre navigateur n'est pas supporté. Veuillez vous mettre à niveau vers l'un des navigateurs suivants :"
   },
   {
     "id": "web.error.unsupported_browser.title",
-    "translation": "Unsupported Browser"
+    "translation": "Navigateur non supporté"
   },
   {
     "id": "web.find_team.title",
diff --git a/i18n/it.json b/i18n/it.json
index 04657ff6d..7ab9c2757 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -716,6 +716,10 @@
     "translation": "Entrato nel canale."
   },
   {
+    "id": "api.command_kick.name",
+    "translation": "calcio"
+  },
+  {
     "id": "api.command_leave.desc",
     "translation": "Esci dal canale corrente"
   },
@@ -824,6 +828,38 @@
     "translation": "apri"
   },
   {
+    "id": "api.command_remove.desc",
+    "translation": "Rimuove un membro dal canale"
+  },
+  {
+    "id": "api.command_remove.direct_group.app_error",
+    "translation": "Non puoi rimuovere qualcuno da un canale diretto."
+  },
+  {
+    "id": "api.command_remove.hint",
+    "translation": "@[username]"
+  },
+  {
+    "id": "api.command_remove.message.app_error",
+    "translation": "Con il comando /remove o /kick è necessario fornire un messaggio."
+  },
+  {
+    "id": "api.command_remove.missing.app_error",
+    "translation": "Non è stato possibile trovare l'utente"
+  },
+  {
+    "id": "api.command_remove.name",
+    "translation": "rimuovi"
+  },
+  {
+    "id": "api.command_remove.permission.app_error",
+    "translation": "Non si dispone dei permessi necessari per cancellare il membro."
+  },
+  {
+    "id": "api.command_remove.user_not_in_channel",
+    "translation": "{{.Username}} non è un membro di questo canale."
+  },
+  {
     "id": "api.command_search.desc",
     "translation": "Cerca testo nei messaggi"
   },
@@ -1518,12 +1554,20 @@
     "translation": "File mancante nella richiesta multipart/form"
   },
   {
+    "id": "api.post.check_for_out_of_channel_mentions.link.private",
+    "translation": "add them to this private channel"
+  },
+  {
+    "id": "api.post.check_for_out_of_channel_mentions.link.public",
+    "translation": "add them to the channel"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
-    "translation": "{{.Usernames}} e {{.LastUsername}} sono stati citati, ma non riceveranno notifiche in quanto non appartengono più a questo canale."
+    "translation": "@{{.Usernames}} and @{{.LastUsername}} were mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "{{.Username}} è stato citato, ma non riceverà notifiche in quanto non appartiene più a questo canale."
+    "translation": "@{{.Username}} was mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
   {
     "id": "api.post.create_post.attach_files.error",
@@ -3772,10 +3816,18 @@
     "translation": "Impossibile decodificare i risultati della ricerca"
   },
   {
+    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
+    "translation": "Impossibile creare il processore massivo Elasticsearch"
+  },
+  {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Impossibile salvare le impostazioni dell'index Elasticsearch"
   },
   {
+    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
+    "translation": "Impossibile avviare il processore massivo Elasticsearch"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Connessione al server Elasticsearch fallita."
   },
@@ -4396,6 +4448,10 @@
     "translation": "L'impostazione Elastich Search IndexingEnabled deve essere abilitata quando l'impostazione Elastic Search SearchEnabled è abilitata."
   },
   {
+    "id": "model.config.is_valid.elastic_search.live_indexing_batch_size.app_error",
+    "translation": "La coda di indicizzazione in tempo reale di Elasticsearch deve contenere almeno 1 elemento"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.password.app_error",
     "translation": "La Password di Elastic Search deve essere fornita quando l'indicizzazione Elastic Search è abilitata."
   },
diff --git a/i18n/ja.json b/i18n/ja.json
index 8cffb4ec3..4a6318206 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -716,6 +716,10 @@
     "translation": "チャンネルに参加しました。"
   },
   {
+    "id": "api.command_kick.name",
+    "translation": "退出"
+  },
+  {
     "id": "api.command_leave.desc",
     "translation": "現在のチャンネルを脱退する"
   },
@@ -824,6 +828,38 @@
     "translation": "開く"
   },
   {
+    "id": "api.command_remove.desc",
+    "translation": "チャンネルからメンバーを削除する"
+  },
+  {
+    "id": "api.command_remove.direct_group.app_error",
+    "translation": "ダイレクトメッセージチャンネルからメンバーを削除することはできません。"
+  },
+  {
+    "id": "api.command_remove.hint",
+    "translation": "@[ユーザー名]"
+  },
+  {
+    "id": "api.command_remove.message.app_error",
+    "translation": "/remove もしくは /kick コマンドはメッセージを指定しなくてはいけません。"
+  },
+  {
+    "id": "api.command_remove.missing.app_error",
+    "translation": "ユーザーが見付かりませんでした"
+  },
+  {
+    "id": "api.command_remove.name",
+    "translation": "削除"
+  },
+  {
+    "id": "api.command_remove.permission.app_error",
+    "translation": "あなたにはメンバーを削除するのに必要な権限が付与されていません。"
+  },
+  {
+    "id": "api.command_remove.user_not_in_channel",
+    "translation": "{{.Username}} はこのチャンネルのメンバーではありません。"
+  },
+  {
     "id": "api.command_search.desc",
     "translation": "メッセージ内のテキストを検索する"
   },
@@ -1518,12 +1554,20 @@
     "translation": "multipart/formリクエストにファイルが存在しません"
   },
   {
+    "id": "api.post.check_for_out_of_channel_mentions.link.private",
+    "translation": "彼らを非公開チャンネルに追加する"
+  },
+  {
+    "id": "api.post.check_for_out_of_channel_mentions.link.public",
+    "translation": "彼らをチャンネルに追加する"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
-    "translation": "{{.Usernames}}と{{.LastUsername}}が投稿に現れましたが、彼らはこのチャンネルには属していません。"
+    "translation": "@{{.Usernames}} と @{{.LastUsername}} についての投稿が行われましたが、彼らはチャンネルにいません。{{.Phrase}}しますか? 彼らは全てのメッセージ履歴にアクセスできるようになります。"
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "{{.Usernames}}が投稿に現れましたが、このチャンネルには属していません。"
+    "translation": "@{{.Username}} についての投稿が行われましたが、彼らはチャンネルにいません。{{.Phrase}}しますか?彼らは全てのメッセージにアクセスできるようになります。"
   },
   {
     "id": "api.post.create_post.attach_files.error",
@@ -3772,10 +3816,18 @@
     "translation": "検索結果をデコードできませんでした"
   },
   {
+    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
+    "translation": "Elasticsearch一括処理器を生成することが出来ませんでした"
+  },
+  {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Elasticsearchインデックス設定を設定できませんでした"
   },
   {
+    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
+    "translation": "Elasticsearch一括処理器を開始することが出来ませんでした"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Elasticsearchサーバーへ接続できませんでした"
   },
@@ -4396,6 +4448,10 @@
     "translation": "Elastic Search検索有効化に有効が設定されている場合、Elastic Searchインデックス有効化設定は有効でなければなりません。"
   },
   {
+    "id": "model.config.is_valid.elastic_search.live_indexing_batch_size.app_error",
+    "translation": "Elasticsearchライブインデックス処理バッチのサイズは1以上でなければなりません"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.password.app_error",
     "translation": "Elastic Searchインデックスが有効な場合、Elastic Searchパスワード設定は必須です。"
   },
@@ -5553,7 +5609,7 @@
   },
   {
     "id": "store.sql_command.get_by_trigger.app_error",
-    "translation": "コマンドが取得できませんでした"
+    "translation": "コマンドを取得できませんでした"
   },
   {
     "id": "store.sql_command.save.delete.app_error",
@@ -5565,11 +5621,11 @@
   },
   {
     "id": "store.sql_command.save.get.app_error",
-    "translation": "コマンドが取得できませんでした"
+    "translation": "コマンドを取得できませんでした"
   },
   {
     "id": "store.sql_command.save.get_team.app_error",
-    "translation": "コマンドが取得できませんでした"
+    "translation": "コマンドを取得できませんでした"
   },
   {
     "id": "store.sql_command.save.saving.app_error",
diff --git a/i18n/ko.json b/i18n/ko.json
index 7baf1545d..df5f62804 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -65,7 +65,7 @@
   },
   {
     "id": "api.admin.get_brand_image.not_available.app_error",
-    "translation": "커스텀 브랜딩을 설정하지 않았거나 서버에서 지원하지 않습니다"
+    "translation": "커스텀 브랜딩을 설정하지 않았거나 서버에서 지원하지 않습니다."
   },
   {
     "id": "api.admin.get_brand_image.storage.app_error",
@@ -73,7 +73,7 @@
   },
   {
     "id": "api.admin.init.debug",
-    "translation": "관리자 API 경로 초기화 중"
+    "translation": "관리자 API 경로 초기화 중입니다."
   },
   {
     "id": "api.admin.recycle_db_end.warn",
@@ -81,7 +81,7 @@
   },
   {
     "id": "api.admin.recycle_db_start.warn",
-    "translation": "DB 연결을 재사용하려고 시도 중"
+    "translation": "DB 연결을 재사용하려고 시도 중."
   },
   {
     "id": "api.admin.remove_certificate.delete.app_error",
@@ -716,6 +716,10 @@
     "translation": "참가한 채널"
   },
   {
+    "id": "api.command_kick.name",
+    "translation": "kick"
+  },
+  {
     "id": "api.command_leave.desc",
     "translation": "Leave the current channel"
   },
@@ -824,6 +828,38 @@
     "translation": "열기"
   },
   {
+    "id": "api.command_remove.desc",
+    "translation": "Remove a member from the channel"
+  },
+  {
+    "id": "api.command_remove.direct_group.app_error",
+    "translation": "You can't remove someone from a direct message channel."
+  },
+  {
+    "id": "api.command_remove.hint",
+    "translation": "@[username]"
+  },
+  {
+    "id": "api.command_remove.message.app_error",
+    "translation": "메시지는 /echo 명령어와 함께 제공되어야 합니다."
+  },
+  {
+    "id": "api.command_remove.missing.app_error",
+    "translation": "사용자를 찾을 수 없습니다"
+  },
+  {
+    "id": "api.command_remove.name",
+    "translation": "remove"
+  },
+  {
+    "id": "api.command_remove.permission.app_error",
+    "translation": "당신은 채널 머릿말을 수정할 권한을 가지고 있지 않습니다."
+  },
+  {
+    "id": "api.command_remove.user_not_in_channel",
+    "translation": "{{.Username}} is not a member of this channel."
+  },
+  {
     "id": "api.command_search.desc",
     "translation": "메세지에서 문장 찾기"
   },
@@ -1518,12 +1554,20 @@
     "translation": "Missing file in multipart/form request"
   },
   {
+    "id": "api.post.check_for_out_of_channel_mentions.link.private",
+    "translation": "add them to this private channel"
+  },
+  {
+    "id": "api.post.check_for_out_of_channel_mentions.link.public",
+    "translation": "add them to the channel"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
-    "translation": "{{.Usernames}}, {{.LastUsername}} 이 멘션되었으나, 그들은 이 채널에 속하지 않기 때문에 알림을 받지 못했습니다."
+    "translation": "@{{.Usernames}} and @{{.LastUsername}} were mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "{{.Username}}이 멘션되었으나, 그는 이 채널에 속하지 않기 때문에 알림을 받지 못했습니다."
+    "translation": "@{{.Username}} was mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
   {
     "id": "api.post.create_post.attach_files.error",
@@ -3772,10 +3816,18 @@
     "translation": "Failed to decode search results"
   },
   {
+    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
+    "translation": "Failed to create Elasticsearch bulk processor"
+  },
+  {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Failed to set Elasticsearch index settings"
   },
   {
+    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
+    "translation": "Failed to start Elasticsearch bulk processor"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Connecting to Elasticsearch server failed."
   },
@@ -4396,6 +4448,10 @@
     "translation": "Elastic Search IndexingEnabled setting must be set to true when Elastic Search SearchEnabled is set to true."
   },
   {
+    "id": "model.config.is_valid.elastic_search.live_indexing_batch_size.app_error",
+    "translation": "Elasticsearch Live Indexing Batch Size must be at least 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.password.app_error",
     "translation": "Elastic Search Password setting must be provided when Elastic Search indexing is enabled."
   },
diff --git a/i18n/nl.json b/i18n/nl.json
index 223a2731f..c451e2aef 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -716,6 +716,10 @@
     "translation": "Deelnemen aan het kanaal."
   },
   {
+    "id": "api.command_kick.name",
+    "translation": "kick"
+  },
+  {
     "id": "api.command_leave.desc",
     "translation": "Leave the current channel"
   },
@@ -824,6 +828,38 @@
     "translation": "open"
   },
   {
+    "id": "api.command_remove.desc",
+    "translation": "Remove a member from the channel"
+  },
+  {
+    "id": "api.command_remove.direct_group.app_error",
+    "translation": "You can't remove someone from a direct message channel."
+  },
+  {
+    "id": "api.command_remove.hint",
+    "translation": "@[username]"
+  },
+  {
+    "id": "api.command_remove.message.app_error",
+    "translation": "Een bericht moet worden opgegeven met het /echo commando."
+  },
+  {
+    "id": "api.command_remove.missing.app_error",
+    "translation": "De gebruiker kan niet gevonden worden"
+  },
+  {
+    "id": "api.command_remove.name",
+    "translation": "remove"
+  },
+  {
+    "id": "api.command_remove.permission.app_error",
+    "translation": "You do not have the appropriate permissions to remove the member."
+  },
+  {
+    "id": "api.command_remove.user_not_in_channel",
+    "translation": "{{.Username}} is not a member of this channel."
+  },
+  {
     "id": "api.command_search.desc",
     "translation": "Search text in messages"
   },
@@ -1518,12 +1554,20 @@
     "translation": "Missing file in multipart/form request"
   },
   {
+    "id": "api.post.check_for_out_of_channel_mentions.link.private",
+    "translation": "add them to this private channel"
+  },
+  {
+    "id": "api.post.check_for_out_of_channel_mentions.link.public",
+    "translation": "add them to the channel"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
-    "translation": "{{.Usernames}} en {{.LastUsername}} zijn genoemd, maar ze hebben geen notificatie gekregen, omdat ze niet deelnemen aan dit kanaal."
+    "translation": "@{{.Usernames}} and @{{.LastUsername}} were mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "{{.Username}} zijn genoemd, maar ze hebben geen notificatie gekregen, omdat ze niet deelnemen aan dit kanaal."
+    "translation": "@{{.Username}} was mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
   {
     "id": "api.post.create_post.attach_files.error",
@@ -3772,10 +3816,18 @@
     "translation": "Failed to decode search results"
   },
   {
+    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
+    "translation": "Failed to create Elasticsearch bulk processor"
+  },
+  {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Failed to set Elasticsearch index settings"
   },
   {
+    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
+    "translation": "Failed to start Elasticsearch bulk processor"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Connecting to Elasticsearch server failed."
   },
@@ -4396,6 +4448,10 @@
     "translation": "Elastic Search IndexingEnabled setting must be set to true when Elastic Search SearchEnabled is set to true."
   },
   {
+    "id": "model.config.is_valid.elastic_search.live_indexing_batch_size.app_error",
+    "translation": "Elasticsearch Live Indexing Batch Size must be at least 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.password.app_error",
     "translation": "Elastic Search Password setting must be provided when Elastic Search indexing is enabled."
   },
diff --git a/i18n/pl.json b/i18n/pl.json
index ceecaeb76..95d4fc8d1 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -716,6 +716,10 @@
     "translation": "Dołączono do kanału."
   },
   {
+    "id": "api.command_kick.name",
+    "translation": "kick"
+  },
+  {
     "id": "api.command_leave.desc",
     "translation": "Opuść bieżący kanał"
   },
@@ -824,6 +828,38 @@
     "translation": "otwórz"
   },
   {
+    "id": "api.command_remove.desc",
+    "translation": "Remove a member from the channel"
+  },
+  {
+    "id": "api.command_remove.direct_group.app_error",
+    "translation": "You can't remove someone from a direct message channel."
+  },
+  {
+    "id": "api.command_remove.hint",
+    "translation": "@[username]"
+  },
+  {
+    "id": "api.command_remove.message.app_error",
+    "translation": "Dla polecenia /rename musi zostać podana wiadomość."
+  },
+  {
+    "id": "api.command_remove.missing.app_error",
+    "translation": "Nie odnaleziono użytkownika"
+  },
+  {
+    "id": "api.command_remove.name",
+    "translation": "remove"
+  },
+  {
+    "id": "api.command_remove.permission.app_error",
+    "translation": "Nie posiadasz odpowiednich uprawnień do zmiany nazwy kanału."
+  },
+  {
+    "id": "api.command_remove.user_not_in_channel",
+    "translation": "{{.Username}} is not a member of this channel."
+  },
+  {
     "id": "api.command_search.desc",
     "translation": "Wyszukiwanie tekstu w wiadomościach"
   },
@@ -1518,12 +1554,20 @@
     "translation": "Brakujący plik w żądaniu multipart/form"
   },
   {
+    "id": "api.post.check_for_out_of_channel_mentions.link.private",
+    "translation": "add them to this private channel"
+  },
+  {
+    "id": "api.post.check_for_out_of_channel_mentions.link.public",
+    "translation": "add them to the channel"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
-    "translation": "Wymieniono użytkowników {{.Usernames}} oraz {{.LastUsername}} ale nie otrzymali powiadomień ponieważ nie należą do tego kanału."
+    "translation": "@{{.Usernames}} and @{{.LastUsername}} were mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "Wspomniano o użytkowniku {{.Username}}, ale nie otrzymał powiadomienia ponieważ nie należy do tego kanału."
+    "translation": "@{{.Username}} was mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
   {
     "id": "api.post.create_post.attach_files.error",
@@ -1949,7 +1993,7 @@
   },
   {
     "id": "api.slackimport.slack_add_users.missing_email_address.warn",
-    "translation": "Użytkownik {{.Username}} nie posiada adresu email w Slack export. Użyto zastępczo {{.Email}}. Użytkownik powinien zaktualizować swój adres email po zalogowaniu do systemu."
+    "translation": "Slack Import: Użytkownik {{.Username}} nie posiada adresu email w Slack export. Użyto zastępczo {{.Email}}. Użytkownik powinien zaktualizować swój adres email po zalogowaniu do systemu."
   },
   {
     "id": "api.slackimport.slack_add_users.unable_import",
@@ -1989,7 +2033,7 @@
   },
   {
     "id": "api.slackimport.slack_import.notes",
-    "translation": "\r\n Uwagi \r\n"
+    "translation": "\r\nUwagi: \r\n"
   },
   {
     "id": "api.slackimport.slack_import.open.app_error",
@@ -3772,10 +3816,18 @@
     "translation": "Błąd w dekodowaniu wyników wyszukiwania."
   },
   {
+    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
+    "translation": "Failed to create Elasticsearch bulk processor"
+  },
+  {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Nie udało się określić ustawienia indeks elasticsearch"
   },
   {
+    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
+    "translation": "Failed to start Elasticsearch bulk processor"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Connecting to Elasticsearch server failed."
   },
@@ -4396,6 +4448,10 @@
     "translation": "Elastic Search IndexingEnabled setting must be set to true when Elastic Search SearchEnabled is set to true."
   },
   {
+    "id": "model.config.is_valid.elastic_search.live_indexing_batch_size.app_error",
+    "translation": "Elasticsearch Live Indexing Batch Size must be at least 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.password.app_error",
     "translation": "Aby włączyć indeksowanie Elastic Search, należy ustawić hasło dla Elastic Search"
   },
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index d4b66e90c..fcf905cb1 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -716,6 +716,10 @@
     "translation": "Juntou ao canal."
   },
   {
+    "id": "api.command_kick.name",
+    "translation": "kick"
+  },
+  {
     "id": "api.command_leave.desc",
     "translation": "Deixar o canal atual"
   },
@@ -824,6 +828,38 @@
     "translation": "abrir"
   },
   {
+    "id": "api.command_remove.desc",
+    "translation": "Remover um membro do canal"
+  },
+  {
+    "id": "api.command_remove.direct_group.app_error",
+    "translation": "Você não pode remover a pessoa de um canal de mensagens diretas"
+  },
+  {
+    "id": "api.command_remove.hint",
+    "translation": "@[nome do usuário]"
+  },
+  {
+    "id": "api.command_remove.message.app_error",
+    "translation": "Uma mensagem deve ser fornecida com o comando /rename ou /kick."
+  },
+  {
+    "id": "api.command_remove.missing.app_error",
+    "translation": "Não foi possível encontrar o usuário"
+  },
+  {
+    "id": "api.command_remove.name",
+    "translation": "remover"
+  },
+  {
+    "id": "api.command_remove.permission.app_error",
+    "translation": "Você não tem a permissão apropriada para remover o usuário."
+  },
+  {
+    "id": "api.command_remove.user_not_in_channel",
+    "translation": "{{.Username}} não é um membro deste canal."
+  },
+  {
     "id": "api.command_search.desc",
     "translation": "Pesquisar texto nas mensagens"
   },
@@ -1518,12 +1554,20 @@
     "translation": "Arquivo faltando na requisição multipart/form"
   },
   {
+    "id": "api.post.check_for_out_of_channel_mentions.link.private",
+    "translation": "adicione-os ao canal privado"
+  },
+  {
+    "id": "api.post.check_for_out_of_channel_mentions.link.public",
+    "translation": "adicione-os ao canal"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
-    "translation": "{{.Usernames}} e {{.LastUsername}} foram mencionados, mas eles não receberam notificação porque eles não pertencem a este canal."
+    "translation": "@{{.Usernames}} e @{{.LastUsername}} foram mencionados mas não estão no canal. Você gostaria que {{.Phrase}}? Eles terão acesso o histórico de mensagens."
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "{{.Username}} foi mencionado, mas eles não receberam uma notificação porque eles não pertencem a este canal."
+    "translation": "@{{.Username}} foi mencionado mas não está no canal. Você gostaria de {{.Phrase}}? Ele terá acesso a todo o histórico de mensagens."
   },
   {
     "id": "api.post.create_post.attach_files.error",
@@ -3772,10 +3816,18 @@
     "translation": "Falha ao decodificar os resultados da pesquisa"
   },
   {
+    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
+    "translation": "Erro ao criar o bulk processor do Elastisearch"
+  },
+  {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Não foi possível configurar as opções do ElasticSearch index"
   },
   {
+    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
+    "translation": "Erro ao iniciar o bulk processor do Elasticsearch"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Falha na conexão com o Elasticsearch."
   },
@@ -4396,6 +4448,10 @@
     "translation": "O opção ElasticSearch IndexingEnabled deve ser configurada para verdadeiro quando o ElasticSearch SearchEnabled estiver configurado como verdadeiro."
   },
   {
+    "id": "model.config.is_valid.elastic_search.live_indexing_batch_size.app_error",
+    "translation": "Elasticsearch Live Indexing Batch Size deve ser pelo menos 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.password.app_error",
     "translation": "A senha do ElasticSearch deve ser fornecida quando o ElasticSearch indexing está ativo."
   },
diff --git a/i18n/ru.json b/i18n/ru.json
index 8adb44b16..c553e2bc8 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -716,6 +716,10 @@
     "translation": "Подключенный канала."
   },
   {
+    "id": "api.command_kick.name",
+    "translation": "kick"
+  },
+  {
     "id": "api.command_leave.desc",
     "translation": "Покинуть текущий канал"
   },
@@ -824,6 +828,38 @@
     "translation": "открыть"
   },
   {
+    "id": "api.command_remove.desc",
+    "translation": "Remove a member from the channel"
+  },
+  {
+    "id": "api.command_remove.direct_group.app_error",
+    "translation": "You can't remove someone from a direct message channel."
+  },
+  {
+    "id": "api.command_remove.hint",
+    "translation": "@[username]"
+  },
+  {
+    "id": "api.command_remove.message.app_error",
+    "translation": "Перед сообщение должна быть команда /rename."
+  },
+  {
+    "id": "api.command_remove.missing.app_error",
+    "translation": "Мы не смогли найти пользователя"
+  },
+  {
+    "id": "api.command_remove.name",
+    "translation": "remove"
+  },
+  {
+    "id": "api.command_remove.permission.app_error",
+    "translation": "У вас нет прав для переименовании канала."
+  },
+  {
+    "id": "api.command_remove.user_not_in_channel",
+    "translation": "{{.Username}} is not a member of this channel."
+  },
+  {
     "id": "api.command_search.desc",
     "translation": "Искать текст в сообщениях"
   },
@@ -1518,12 +1554,20 @@
     "translation": "Отсутствует файл в запросе типа multipart/form"
   },
   {
+    "id": "api.post.check_for_out_of_channel_mentions.link.private",
+    "translation": "add them to this private channel"
+  },
+  {
+    "id": "api.post.check_for_out_of_channel_mentions.link.public",
+    "translation": "add them to the channel"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
-    "translation": "{{.Usernames}} и {{.LastUsername}} были упомянуты, но они не получили уведомлений поскольку не состоят в этом канале."
+    "translation": "@{{.Usernames}} and @{{.LastUsername}} were mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "{{.Username}} были упомянуты, но они не получили уведомлений поскольку не состоят в этом канале."
+    "translation": "@{{.Username}} was mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
   {
     "id": "api.post.create_post.attach_files.error",
@@ -3772,10 +3816,18 @@
     "translation": "Failed to decode search results"
   },
   {
+    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
+    "translation": "Failed to create Elasticsearch bulk processor"
+  },
+  {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Не удалось создать индекс Elasticsearch"
   },
   {
+    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
+    "translation": "Failed to start Elasticsearch bulk processor"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Connecting to Elasticsearch server failed."
   },
@@ -4396,6 +4448,10 @@
     "translation": "Elastic Search IndexingEnabled setting must be set to true when Elastic Search SearchEnabled is set to true."
   },
   {
+    "id": "model.config.is_valid.elastic_search.live_indexing_batch_size.app_error",
+    "translation": "Elasticsearch Live Indexing Batch Size must be at least 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.password.app_error",
     "translation": "Elastic Search Password setting must be provided when Elastic Search indexing is enabled."
   },
diff --git a/i18n/tr.json b/i18n/tr.json
index 77a9cb689..a9a1f7938 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -716,6 +716,10 @@
     "translation": "Kanala katıldı."
   },
   {
+    "id": "api.command_kick.name",
+    "translation": "kov"
+  },
+  {
     "id": "api.command_leave.desc",
     "translation": "Geçerli kanaldan ayrıl"
   },
@@ -824,6 +828,38 @@
     "translation": "açık"
   },
   {
+    "id": "api.command_remove.desc",
+    "translation": "Kanaldan bir üyeyi çıkar"
+  },
+  {
+    "id": "api.command_remove.direct_group.app_error",
+    "translation": "Bir kişiyi doğrudan ileti kanalından çıkaramazsınız."
+  },
+  {
+    "id": "api.command_remove.hint",
+    "translation": "@[username]"
+  },
+  {
+    "id": "api.command_remove.message.app_error",
+    "translation": "/remove ya da /kick komutu ile bir ileti yazılmalıdır."
+  },
+  {
+    "id": "api.command_remove.missing.app_error",
+    "translation": "Kullanıcı bulunamadı"
+  },
+  {
+    "id": "api.command_remove.name",
+    "translation": "çıkar"
+  },
+  {
+    "id": "api.command_remove.permission.app_error",
+    "translation": "Üyeyi çıkarma izniniz yok."
+  },
+  {
+    "id": "api.command_remove.user_not_in_channel",
+    "translation": "{{.Username}} bu kanalın bir üyesi değil."
+  },
+  {
     "id": "api.command_search.desc",
     "translation": "İletilerde aranacak metin"
   },
@@ -1518,12 +1554,20 @@
     "translation": "Multipart/form isteğindeki dosya eksik"
   },
   {
+    "id": "api.post.check_for_out_of_channel_mentions.link.private",
+    "translation": "kullanıcıları bu özel kanala ekle"
+  },
+  {
+    "id": "api.post.check_for_out_of_channel_mentions.link.public",
+    "translation": "kullanıcıları kanala ekle"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
-    "translation": "{{.Usernames}} ve {{.LastUsername}} anıldı, ancak bu kanalın üyesi olmadıklarından bildirimleri almayacaklar."
+    "translation": "@{{.Usernames}} ve @{{.LastUsername}} anıldı ancak kanalda değiller. {{.Phrase}} ister misiniz? Eklenen kullanıcılar tüm ileti geçmişini görebilirler."
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "{{.Usernames}} anıldı, ancak bu kanalın üyesi olmadıklarından bildirimleri almayacaklar."
+    "translation": "@{{.Username}} anıldı ancak kanalda değil. {{.Phrase}} ister misiniz? Eklenen kullanıcı tüm ileti geçmişini görebilir."
   },
   {
     "id": "api.post.create_post.attach_files.error",
@@ -3772,10 +3816,18 @@
     "translation": "Failed to decode search results"
   },
   {
+    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
+    "translation": "Elasticsearch toplu işlemi oluşturulamadı"
+  },
+  {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "Elasticsearch dizin ayarları yapılamadı"
   },
   {
+    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
+    "translation": "Elasticsearch toplu işlemi başlatılamadı"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "Elasticsearch sunucusuna bağlanılamadı."
   },
@@ -4396,6 +4448,10 @@
     "translation": "Elastic Search IndexingEnabled setting must be set to true when Elastic Search SearchEnabled is set to true."
   },
   {
+    "id": "model.config.is_valid.elastic_search.live_indexing_batch_size.app_error",
+    "translation": "Elasticsearch Live dizin işlemi boyutu en az 1 olmalıdır"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.password.app_error",
     "translation": "Elastic Search Password setting must be provided when Elastic Search indexing is enabled."
   },
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index 820e0a1fb..f90d91d0c 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -716,6 +716,10 @@
     "translation": "已加入频道。"
   },
   {
+    "id": "api.command_kick.name",
+    "translation": "kick"
+  },
+  {
     "id": "api.command_leave.desc",
     "translation": "离开当前频道"
   },
@@ -824,6 +828,38 @@
     "translation": "打开"
   },
   {
+    "id": "api.command_remove.desc",
+    "translation": "Remove a member from the channel"
+  },
+  {
+    "id": "api.command_remove.direct_group.app_error",
+    "translation": "You can't remove someone from a direct message channel."
+  },
+  {
+    "id": "api.command_remove.hint",
+    "translation": "@[username]"
+  },
+  {
+    "id": "api.command_remove.message.app_error",
+    "translation": "/name 命令必须有消息。"
+  },
+  {
+    "id": "api.command_remove.missing.app_error",
+    "translation": "无法找到用户"
+  },
+  {
+    "id": "api.command_remove.name",
+    "translation": "remove"
+  },
+  {
+    "id": "api.command_remove.permission.app_error",
+    "translation": "您没有权限重命名频道。"
+  },
+  {
+    "id": "api.command_remove.user_not_in_channel",
+    "translation": "{{.Username}} is not a member of this channel."
+  },
+  {
     "id": "api.command_search.desc",
     "translation": "在消息中搜索文字"
   },
@@ -1518,12 +1554,20 @@
     "translation": "multipart/form 请求缺少文件"
   },
   {
+    "id": "api.post.check_for_out_of_channel_mentions.link.private",
+    "translation": "add them to this private channel"
+  },
+  {
+    "id": "api.post.check_for_out_of_channel_mentions.link.public",
+    "translation": "add them to the channel"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
-    "translation": "{{.Usernames}}和{{.LastUsername}}被提到了，但是他们不会收到通知，因为他们不在这个频道。"
+    "translation": "@{{.Usernames}} and @{{.LastUsername}} were mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "{{.Username}}被提到了，但是他因不在此频道而不会收到通知。"
+    "translation": "@{{.Username}} was mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
   {
     "id": "api.post.create_post.attach_files.error",
@@ -3772,10 +3816,18 @@
     "translation": "解码搜索结果失败"
   },
   {
+    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
+    "translation": "Failed to create Elasticsearch bulk processor"
+  },
+  {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "无法设置 ElasticSearch 索引设定"
   },
   {
+    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
+    "translation": "Failed to start Elasticsearch bulk processor"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "连接 Elasticsearch 服务器失败。"
   },
@@ -4396,6 +4448,10 @@
     "translation": "当 Elastic Search SearchEnabled 设为是时必须设定 Elastic Search IndexingEnabled 为是。"
   },
   {
+    "id": "model.config.is_valid.elastic_search.live_indexing_batch_size.app_error",
+    "translation": "Elasticsearch Live Indexing Batch Size must be at least 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.password.app_error",
     "translation": "当 Elastic Search 索引开启时必须提供 Elastic Search 密码设定。"
   },
diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json
index 012ffae2a..f80de958d 100644
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -716,6 +716,10 @@
     "translation": "已加入頻道。"
   },
   {
+    "id": "api.command_kick.name",
+    "translation": "kick"
+  },
+  {
     "id": "api.command_leave.desc",
     "translation": "離開當前頻道"
   },
@@ -824,6 +828,38 @@
     "translation": "open"
   },
   {
+    "id": "api.command_remove.desc",
+    "translation": "Remove a member from the channel"
+  },
+  {
+    "id": "api.command_remove.direct_group.app_error",
+    "translation": "You can't remove someone from a direct message channel."
+  },
+  {
+    "id": "api.command_remove.hint",
+    "translation": "@[username]"
+  },
+  {
+    "id": "api.command_remove.message.app_error",
+    "translation": "使用 /rename 命令必須提供訊息。"
+  },
+  {
+    "id": "api.command_remove.missing.app_error",
+    "translation": "找不到使用者"
+  },
+  {
+    "id": "api.command_remove.name",
+    "translation": "remove"
+  },
+  {
+    "id": "api.command_remove.permission.app_error",
+    "translation": "權限不足以更改頻道名稱。"
+  },
+  {
+    "id": "api.command_remove.user_not_in_channel",
+    "translation": "{{.Username}} is not a member of this channel."
+  },
+  {
     "id": "api.command_search.desc",
     "translation": "從訊息中搜尋文字"
   },
@@ -1518,12 +1554,20 @@
     "translation": "multipart/form 要求缺少檔案"
   },
   {
+    "id": "api.post.check_for_out_of_channel_mentions.link.private",
+    "translation": "add them to this private channel"
+  },
+  {
+    "id": "api.post.check_for_out_of_channel_mentions.link.public",
+    "translation": "add them to the channel"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
-    "translation": "無法傳送通知給{{.Usernames}} 與 {{.LastUsername}}，因為他們並未加入此頻道。"
+    "translation": "@{{.Usernames}} and @{{.LastUsername}} were mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "無法傳送通知給未加入此頻道的{{.Username}}。"
+    "translation": "@{{.Username}} was mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
   },
   {
     "id": "api.post.create_post.attach_files.error",
@@ -3772,10 +3816,18 @@
     "translation": "無法解碼搜尋結果"
   },
   {
+    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
+    "translation": "Failed to create Elasticsearch bulk processor"
+  },
+  {
     "id": "ent.elasticsearch.start.index_settings_failed",
     "translation": "設定 Elasticsearch 索引設定時失敗"
   },
   {
+    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
+    "translation": "Failed to start Elasticsearch bulk processor"
+  },
+  {
     "id": "ent.elasticsearch.test_config.connect_failed",
     "translation": "連線至 Elasticsearch 伺服器失敗。"
   },
@@ -4396,6 +4448,10 @@
     "translation": "當啟用 ElasticSearch 搜尋時必須設定 ElasticSearch IndexingEnabled 為啟用。"
   },
   {
+    "id": "model.config.is_valid.elastic_search.live_indexing_batch_size.app_error",
+    "translation": "Elasticsearch Live Indexing Batch Size must be at least 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.password.app_error",
     "translation": "當啟用 ElasticSearch 搜尋時必須設定 ElasticSearch 密碼。"
   },