translations PR 20180619 (#8963)

14 files changed, 164 insertions, 268 deletions

diff --git a/i18n/de.json b/i18n/de.json
index ed973390c..c5249b95d 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -2275,22 +2275,6 @@
     "translation": "Slack-Import: Es trat ein Fehler beim Parsen einiger Slack-Beiträge auf. Import kann eventuell trotzdem funktionieren."
   },
   {
-    "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack-Import: Kanal {{.ChannelName}} hat einen zu langen Namen. Er wird beim Import gekürzt."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Slack-Import: Kanal {{.ChannelName}} hat einen zu langen Namen. Er wird beim Import gekürzt."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slack-Import: Kanal {{.ChannelName}} hat einen zu langen Handle. Er wird beim Import gekürzt."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Slack-Import: Kanal {{.ChannelName}} hat einen zu langen Zweck. Er wird beim Import gekürzt."
-  },
-  {
     "id": "api.status.init.debug",
     "translation": "Initialisiere Status-API-Routen"
   },
@@ -4287,6 +4271,10 @@
     "translation": "ElasticSearch-Suche ist auf diesem Server deaktiviert"
   },
   {
+    "id": "ent.elasticsearch.search_posts.parse_matches_failed",
+    "translation": "Failed to parse search result matches"
+  },
+  {
     "id": "ent.elasticsearch.search_posts.search_failed",
     "translation": "Suche konnte nicht abgeschlossen werden"
   },
@@ -4423,11 +4411,11 @@
     "translation": "Ungültiger MFA token"
   },
   {
-    "id": "ent.mfa.activate.save_active.app_erro",
+    "id": "ent.mfa.activate.save_active.app_error",
     "translation": "Konnte MFA Aktivstatus nicht für den Benutzer aktualisieren"
   },
   {
-    "id": "ent.mfa.deactivate.save_active.app_erro",
+    "id": "ent.mfa.deactivate.save_active.app_error",
     "translation": "Konnte MFA Aktivstatus nicht für den Benutzer aktualisieren"
   },
   {
@@ -5867,6 +5855,10 @@
     "translation": "Konnte nicht dekodieren"
   },
   {
+    "id": "oauth.gitlab.tos.error",
+    "translation": "GitLab's Terms of Service have updated. Please go to gitlab.com to accept them and then try logging into Mattermost again."
+  },
+  {
     "id": "plugin.rpcplugin.invocation.error",
     "translation": "Fehler bei Widerrufen des Plugin-RPC"
   },
@@ -6435,7 +6427,7 @@
     "translation": "Die Jobs konnten nicht abgerufen werden"
   },
   {
-    "id": "store.sql_job.get_count_by_status_and_type.app_erro",
+    "id": "store.sql_job.get_count_by_status_and_type.app_error",
     "translation": "Die Anzahl der Jobs konnte nicht über Status und Typ abgerufen werden"
   },
   {
diff --git a/i18n/en.json b/i18n/en.json
index 9964670bf..543c308bd 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2847,10 +2847,6 @@
     "translation": "Blank email"
   },
   {
-    "id": "oauth.gitlab.tos.error",
-    "translation": "GitLab's Terms of Service have updated. Please go to gitlab.com to accept them and then try logging into Mattermost again."
-  },
-  {
     "id": "api.user.complete_switch_with_oauth.parse.app_error",
     "translation": "Could not parse auth data out of {{.Service}} user object"
   },
@@ -4303,14 +4299,14 @@
     "translation": "Elasticsearch searching is disabled on this server"
   },
   {
-    "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "Search failed to complete"
-  },
-  {
     "id": "ent.elasticsearch.search_posts.parse_matches_failed",
     "translation": "Failed to parse search result matches"
   },
   {
+    "id": "ent.elasticsearch.search_posts.search_failed",
+    "translation": "Search failed to complete"
+  },
+  {
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Failed to decode search results"
   },
@@ -5915,6 +5911,10 @@
     "translation": "could not decode"
   },
   {
+    "id": "oauth.gitlab.tos.error",
+    "translation": "GitLab's Terms of Service have updated. Please go to gitlab.com to accept them and then try logging into Mattermost again."
+  },
+  {
     "id": "plugin.rpcplugin.invocation.error",
     "translation": "Error invoking plugin RPC"
   },
diff --git a/i18n/es.json b/i18n/es.json
index 7a34dea7d..67af1bf61 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -2275,22 +2275,6 @@
     "translation": "Slack Import: Ocurrió un error al analizar los mensajes de Slack. De igual forma puede que la importación funcione."
   },
   {
-    "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack Import: El canal: {{.ChannelName}} tiene un nombre que supera la longitud máxima. Se truncará cuando sea importado."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Slack Import: El canal: {{.ChannelName}} tiene un encabezado que supera la longitud máxima. Se truncará cuando sea importado."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slack Import: El canal: {{.ChannelName}} tiene un nombre que supera la longitud máxima. Se truncará cuando sea importado."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Slack Import: El canal: {{.ChannelName}} tiene una propósito que supera la longitud máxima. Se truncará cuando sea importado."
-  },
-  {
     "id": "api.status.init.debug",
     "translation": "Inicializando rutas del API para los estatus"
   },
@@ -4287,6 +4271,10 @@
     "translation": "La búsqueda con Elasticsearch está deshabilitada en este servidor"
   },
   {
+    "id": "ent.elasticsearch.search_posts.parse_matches_failed",
+    "translation": "Failed to parse search result matches"
+  },
+  {
     "id": "ent.elasticsearch.search_posts.search_failed",
     "translation": "La búsqueda no se pudo completar"
   },
@@ -4423,12 +4411,12 @@
     "translation": "Token MFA inválido"
   },
   {
-    "id": "ent.mfa.activate.save_active.app_erro",
-    "translation": "No se pudo actualizar el estado activo MFA para el usuario"
+    "id": "ent.mfa.activate.save_active.app_error",
+    "translation": "No se pudo actualizar el estado activo de MFA para el usuario"
   },
   {
-    "id": "ent.mfa.deactivate.save_active.app_erro",
-    "translation": "No se pudo actualizar el estado activo MFA para el usuario"
+    "id": "ent.mfa.deactivate.save_active.app_error",
+    "translation": "No se pudo actualizar el estado activo de MFA para el usuario"
   },
   {
     "id": "ent.mfa.deactivate.save_secret.app_error",
@@ -5867,6 +5855,10 @@
     "translation": "no se puede decodificar"
   },
   {
+    "id": "oauth.gitlab.tos.error",
+    "translation": "Los Términos de Servicio de GitLab se han actualizado. Por favor, vaya a gitlab.com a aceptar y, a continuación, intente iniciar sesión en Mattermost de nuevo."
+  },
+  {
     "id": "plugin.rpcplugin.invocation.error",
     "translation": "Error al invocar el plugin de RPC"
   },
@@ -6435,7 +6427,7 @@
     "translation": "No pudimos obtener los trabajos"
   },
   {
-    "id": "store.sql_job.get_count_by_status_and_type.app_erro",
+    "id": "store.sql_job.get_count_by_status_and_type.app_error",
     "translation": "No pudimos obtener la cantidad de trabajos según estado y tipo"
   },
   {
diff --git a/i18n/fr.json b/i18n/fr.json
index 662be728d..0f1d69c41 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -2275,22 +2275,6 @@
     "translation": "Importateur Slack : Une erreur s'est produite lors de l'analyse de certains messages Slack. L'importation pourrait quand même fonctionner."
   },
   {
-    "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Importateur Slack : Le nom d'affichage du canal {{.ChannelName}} excède la longueur maximale. Il sera tronqué lors de l'importation."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Importateur Slack : L'entête du canal {{.ChannelName}} excède la longueur maximale. Il sera tronqué lors de l'importation."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Importateur Slack : L'identifiant du canal {{.ChannelName}} excède la longueur maximale. Il sera tronqué lors de l'importation."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Importateur Slack : La description du canal {{.ChannelName}} excède la longueur maximale. Elle sera tronquée lors de l'importation."
-  },
-  {
     "id": "api.status.init.debug",
     "translation": "Initialisation des routes de l'API des statuts"
   },
@@ -4287,6 +4271,10 @@
     "translation": "La recherche Elasticsearch est désactivée sur ce serveur"
   },
   {
+    "id": "ent.elasticsearch.search_posts.parse_matches_failed",
+    "translation": "Failed to parse search result matches"
+  },
+  {
     "id": "ent.elasticsearch.search_posts.search_failed",
     "translation": "La recherche a échoué"
   },
@@ -4423,11 +4411,11 @@
     "translation": "MFA token invalide"
   },
   {
-    "id": "ent.mfa.activate.save_active.app_erro",
+    "id": "ent.mfa.activate.save_active.app_error",
     "translation": "Impossible de mettre à jour le statut actif MFA pour l'utilisateur"
   },
   {
-    "id": "ent.mfa.deactivate.save_active.app_erro",
+    "id": "ent.mfa.deactivate.save_active.app_error",
     "translation": "Impossible de mettre à jour le statut actif MFA pour l'utilisateur"
   },
   {
@@ -5867,6 +5855,10 @@
     "translation": "impossible de décoder"
   },
   {
+    "id": "oauth.gitlab.tos.error",
+    "translation": "GitLab's Terms of Service have updated. Please go to gitlab.com to accept them and then try logging into Mattermost again."
+  },
+  {
     "id": "plugin.rpcplugin.invocation.error",
     "translation": "Une erreur s'est produite lors de l'invocation du plugin RPC"
   },
@@ -6435,7 +6427,7 @@
     "translation": "Impossible de récupérer les tâches"
   },
   {
-    "id": "store.sql_job.get_count_by_status_and_type.app_erro",
+    "id": "store.sql_job.get_count_by_status_and_type.app_error",
     "translation": "Impossible de récupérer le nombre de tâches par statut et par type"
   },
   {
diff --git a/i18n/it.json b/i18n/it.json
index 492c8794b..e89b39c78 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -2275,22 +2275,6 @@
     "translation": "Slack Import: Errore durante l'analisi di alcune pubblicazioni Slack. L'importazione potrebbe continuare senza problemi."
   },
   {
-    "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Importazione Slack: il canale {{.ChannelName}} ha un nome troppo lungo. Verrà troncato durante l'importazione."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Importazione Slack: il canale {{.ChannelName}} ha un header troppo lungo. Verrà troncato durante l'importazione."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Importazione Slack: il canale {{.ChannelName}} ha un nome troppo lungo. Verrà troncato durante l'importazione."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Importazione Slack: il canale {{.ChannelName}} ha il testo \"scopo\" troppo lungo. Verrà troncato durante l'importazione."
-  },
-  {
     "id": "api.status.init.debug",
     "translation": "Inizializzazione API Routes per lo stato"
   },
@@ -4287,6 +4271,10 @@
     "translation": "La ricerca Elasticsearch è disabilitata su questo server"
   },
   {
+    "id": "ent.elasticsearch.search_posts.parse_matches_failed",
+    "translation": "Failed to parse search result matches"
+  },
+  {
     "id": "ent.elasticsearch.search_posts.search_failed",
     "translation": "La ricerca non è stata completata"
   },
@@ -4423,11 +4411,11 @@
     "translation": "Token MFA invalido"
   },
   {
-    "id": "ent.mfa.activate.save_active.app_erro",
+    "id": "ent.mfa.activate.save_active.app_error",
     "translation": "Impossibile aggiornare lo stato MFA attivo per l'utente"
   },
   {
-    "id": "ent.mfa.deactivate.save_active.app_erro",
+    "id": "ent.mfa.deactivate.save_active.app_error",
     "translation": "Impossibile aggiornare lo stato MFA attivo per l'utente"
   },
   {
@@ -5867,6 +5855,10 @@
     "translation": "impossibile decodificare"
   },
   {
+    "id": "oauth.gitlab.tos.error",
+    "translation": "I Termini del Servizio di GitLab sono stati aggiornati. Per favore visita gitlab.com per accettarli e poi eseguire il login su Mattermost."
+  },
+  {
     "id": "plugin.rpcplugin.invocation.error",
     "translation": "Errore nella chiamata al plugin RPC"
   },
@@ -6435,7 +6427,7 @@
     "translation": "Impossibile recuperare i lavori"
   },
   {
-    "id": "store.sql_job.get_count_by_status_and_type.app_erro",
+    "id": "store.sql_job.get_count_by_status_and_type.app_error",
     "translation": "Impossibile recuperare il numero di lavori per stato e tipo"
   },
   {
diff --git a/i18n/ja.json b/i18n/ja.json
index 78457defb..9b921c780 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -2275,22 +2275,6 @@
     "translation": "Slackインポート: Slack投稿を解析する際にエラーが発生しました。インポート自体は動作している可能性があります。"
   },
   {
-    "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slackインポート: チャンネル {{.ChannelName}}の名前が長すぎます。インポートの際に切り詰められます。"
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Slackインポート: チャンネル {{.ChannelName}}のヘッダーが長すぎます。インポートの際に切り詰められます。"
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slackインポート: チャンネル {{.ChannelName}}のハンドルが長すぎます。インポートの際に切り詰められます。"
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Slackインポート: チャンネル {{.ChannelName}}の目的が長すぎます。インポートの際に切り詰められます。"
-  },
-  {
     "id": "api.status.init.debug",
     "translation": "状態APIルートを初期化しています"
   },
@@ -4287,6 +4271,10 @@
     "translation": "このサーバーではElasticsearchによる検索は無効です。"
   },
   {
+    "id": "ent.elasticsearch.search_posts.parse_matches_failed",
+    "translation": "Failed to parse search result matches"
+  },
+  {
     "id": "ent.elasticsearch.search_posts.search_failed",
     "translation": "検索を完了できませんでした"
   },
@@ -4423,11 +4411,11 @@
     "translation": "不正な多要素認証トークンです"
   },
   {
-    "id": "ent.mfa.activate.save_active.app_erro",
+    "id": "ent.mfa.activate.save_active.app_error",
     "translation": "ユーザーの多要素認証の活動状態を更新できませんでした"
   },
   {
-    "id": "ent.mfa.deactivate.save_active.app_erro",
+    "id": "ent.mfa.deactivate.save_active.app_error",
     "translation": "ユーザーの多要素認証の活動状態を更新できませんでした"
   },
   {
@@ -5867,6 +5855,10 @@
     "translation": "デコードできませんでした"
   },
   {
+    "id": "oauth.gitlab.tos.error",
+    "translation": "GitLabの使用条件が更新されました。gitlab.comで新しい使用条件に同意してから、もう一度Mattermostへログインしてみてください。"
+  },
+  {
     "id": "plugin.rpcplugin.invocation.error",
     "translation": "プラグインRPC呼出エラー"
   },
@@ -6435,7 +6427,7 @@
     "translation": "ジョブを取得できませんでした"
   },
   {
-    "id": "store.sql_job.get_count_by_status_and_type.app_erro",
+    "id": "store.sql_job.get_count_by_status_and_type.app_error",
     "translation": "状態と種類からジョブ数を取得することができませんでした"
   },
   {
diff --git a/i18n/ko.json b/i18n/ko.json
index 4fbf54d37..bda1363b5 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -2275,22 +2275,6 @@
     "translation": "Slack Import: Error occurred when parsing some Slack posts. Import may work anyway."
   },
   {
-    "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack Import: Channel {{.ChannelName}} display name exceeds the maximum length. It will be truncated when imported."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Slack Import: Channel {{.ChannelName}} header exceeds the maximum length. It will be truncated when imported."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slack Import: Channel {{.ChannelName}} handle exceeds the maximum length. It will be truncated when imported."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Slack Import: Channel {{.ChannelName}} purpose exceeds the maximum length. It will be truncated when imported."
-  },
-  {
     "id": "api.status.init.debug",
     "translation": "상태 API 루트를 초기화 중"
   },
@@ -4287,6 +4271,10 @@
     "translation": "Elasticsearch searching is disabled on this server"
   },
   {
+    "id": "ent.elasticsearch.search_posts.parse_matches_failed",
+    "translation": "Failed to parse search result matches"
+  },
+  {
     "id": "ent.elasticsearch.search_posts.search_failed",
     "translation": "Search failed to complete"
   },
@@ -4423,11 +4411,11 @@
     "translation": "올바르지 않은 MFA 토큰"
   },
   {
-    "id": "ent.mfa.activate.save_active.app_erro",
+    "id": "ent.mfa.activate.save_active.app_error",
     "translation": "Unable to update MFA active status for the user"
   },
   {
-    "id": "ent.mfa.deactivate.save_active.app_erro",
+    "id": "ent.mfa.deactivate.save_active.app_error",
     "translation": "Unable to update MFA active status for the user"
   },
   {
@@ -5867,6 +5855,10 @@
     "translation": "could not decode"
   },
   {
+    "id": "oauth.gitlab.tos.error",
+    "translation": "GitLab's Terms of Service have updated. Please go to gitlab.com to accept them and then try logging into Mattermost again."
+  },
+  {
     "id": "plugin.rpcplugin.invocation.error",
     "translation": "Error invoking plugin RPC"
   },
@@ -6435,7 +6427,7 @@
     "translation": "채널을 찾을 수 없습니다"
   },
   {
-    "id": "store.sql_job.get_count_by_status_and_type.app_erro",
+    "id": "store.sql_job.get_count_by_status_and_type.app_error",
     "translation": "We couldn't get the job count by status and type"
   },
   {
diff --git a/i18n/nl.json b/i18n/nl.json
index bbac107af..f2a11101e 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -2275,22 +2275,6 @@
     "translation": "Slack Import: Error occurred when parsing some Slack posts. Import may work anyway."
   },
   {
-    "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack Import: Channel {{.ChannelName}} display name exceeds the maximum length. It will be truncated when imported."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Slack Import: Channel {{.ChannelName}} header exceeds the maximum length. It will be truncated when imported."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slack Import: Channel {{.ChannelName}} handle exceeds the maximum length. It will be truncated when imported."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Slack Import: Channel {{.ChannelName}} purpose exceeds the maximum length. It will be truncated when imported."
-  },
-  {
     "id": "api.status.init.debug",
     "translation": "Het initialiseren van status api routes"
   },
@@ -4287,6 +4271,10 @@
     "translation": "Elasticsearch searching is disabled on this server"
   },
   {
+    "id": "ent.elasticsearch.search_posts.parse_matches_failed",
+    "translation": "Failed to parse search result matches"
+  },
+  {
     "id": "ent.elasticsearch.search_posts.search_failed",
     "translation": "Search failed to complete"
   },
@@ -4423,11 +4411,11 @@
     "translation": "Ongeldige 'MFA' token"
   },
   {
-    "id": "ent.mfa.activate.save_active.app_erro",
+    "id": "ent.mfa.activate.save_active.app_error",
     "translation": "Kan de MFA status van de gebruiker niet bijwerken"
   },
   {
-    "id": "ent.mfa.deactivate.save_active.app_erro",
+    "id": "ent.mfa.deactivate.save_active.app_error",
     "translation": "Kan de MFA status van de gebruiker niet bijwerken"
   },
   {
@@ -5867,6 +5855,10 @@
     "translation": "kan niet decoderen"
   },
   {
+    "id": "oauth.gitlab.tos.error",
+    "translation": "GitLab's Terms of Service have updated. Please go to gitlab.com to accept them and then try logging into Mattermost again."
+  },
+  {
     "id": "plugin.rpcplugin.invocation.error",
     "translation": "Error invoking plugin RPC"
   },
@@ -6435,7 +6427,7 @@
     "translation": "Het bericht kan niet opgehaald worden"
   },
   {
-    "id": "store.sql_job.get_count_by_status_and_type.app_erro",
+    "id": "store.sql_job.get_count_by_status_and_type.app_error",
     "translation": "We couldn't get the job count by status and type"
   },
   {
diff --git a/i18n/pl.json b/i18n/pl.json
index 6ae0391ce..e9335e449 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -2275,22 +2275,6 @@
     "translation": "Slack Import: Wystąpił błąd parsowania postów Slacka. Import może działać pomimo tego."
   },
   {
-    "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack Importer: Kanał {{.ChannelName}} ma wyświetlaną nazwę, która jest za długa. Będzie ona przycięta po zaimportowaniu."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Slack Importer: Kanał {{.ChannelName}} ma nagłówek, który jest za długi. Będzie on przycięty po zaimportowaniu."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slack Importer: Kanał {{.ChannelName}} ma nazwę, która jest za długa. Będzie ona przycięta po zaimportowaniu."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Slack Importer: Kanał {{.ChannelName}} ma cel, który jest za długi. Będzie on przycięty po zaimportowaniu."
-  },
-  {
     "id": "api.status.init.debug",
     "translation": "Inicjalizacja tras dla API statusu"
   },
@@ -4287,6 +4271,10 @@
     "translation": "Na tym serwerze wyszukiwanie ElasticSearch jest wyłączone."
   },
   {
+    "id": "ent.elasticsearch.search_posts.parse_matches_failed",
+    "translation": "Failed to parse search result matches"
+  },
+  {
     "id": "ent.elasticsearch.search_posts.search_failed",
     "translation": "Nie udało się zakończyć wyszukiwania."
   },
@@ -4423,11 +4411,11 @@
     "translation": "Niepoprawny token MFA."
   },
   {
-    "id": "ent.mfa.activate.save_active.app_erro",
+    "id": "ent.mfa.activate.save_active.app_error",
     "translation": "Nie udało się zaktualizować stanu aktywności MFA dla użytkownika"
   },
   {
-    "id": "ent.mfa.deactivate.save_active.app_erro",
+    "id": "ent.mfa.deactivate.save_active.app_error",
     "translation": "Nie udało się zaktualizować stanu aktywności MFA dla użytkownika"
   },
   {
@@ -5867,6 +5855,10 @@
     "translation": "nie można zdekodować"
   },
   {
+    "id": "oauth.gitlab.tos.error",
+    "translation": "GitLab's Terms of Service have updated. Please go to gitlab.com to accept them and then try logging into Mattermost again."
+  },
+  {
     "id": "plugin.rpcplugin.invocation.error",
     "translation": "Error invoking plugin RPC"
   },
@@ -6435,7 +6427,7 @@
     "translation": "Nie udało się pobrać wiadomości"
   },
   {
-    "id": "store.sql_job.get_count_by_status_and_type.app_erro",
+    "id": "store.sql_job.get_count_by_status_and_type.app_error",
     "translation": "We couldn't get the job count by status and type"
   },
   {
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 1cc98a6fc..feef794b8 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -2275,22 +2275,6 @@
     "translation": "Slack Import: Ocorreu um erro ao analisar algumas postagens do Slack. A importação pode funcionar de qualquer maneira."
   },
   {
-    "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack Import: Canal {{.ChannelName}} nome de exibição excede o tamanho máximo. Será truncado quando importado."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Slack Import: Canal {{.ChannelName}} cabeçalho que excede o tamanho máximo. Será truncado quando importado."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slack Import: Canal {{.ChannelName}} handle excede o tamanho máximo. Será truncado quando importado."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Slack Import: Canal {{.ChannelName}} propósito excede o tamanho máximo. Será truncado quando importado."
-  },
-  {
     "id": "api.status.init.debug",
     "translation": "Inicializando as rotas de API status"
   },
@@ -4287,6 +4271,10 @@
     "translation": "A busca usando o ElasticSearch foi desativada neste servidor"
   },
   {
+    "id": "ent.elasticsearch.search_posts.parse_matches_failed",
+    "translation": "Failed to parse search result matches"
+  },
+  {
     "id": "ent.elasticsearch.search_posts.search_failed",
     "translation": "Não foi possível completar a busca"
   },
@@ -4423,11 +4411,11 @@
     "translation": "Token MFA inválido"
   },
   {
-    "id": "ent.mfa.activate.save_active.app_erro",
+    "id": "ent.mfa.activate.save_active.app_error",
     "translation": "Não foi possível atualizar o status ativo MFA para o usuário"
   },
   {
-    "id": "ent.mfa.deactivate.save_active.app_erro",
+    "id": "ent.mfa.deactivate.save_active.app_error",
     "translation": "Não foi possível atualizar o status ativo MFA para o usuário"
   },
   {
@@ -5867,6 +5855,10 @@
     "translation": "não foi possível decodificar"
   },
   {
+    "id": "oauth.gitlab.tos.error",
+    "translation": "GitLab's Terms of Service have updated. Please go to gitlab.com to accept them and then try logging into Mattermost again."
+  },
+  {
     "id": "plugin.rpcplugin.invocation.error",
     "translation": "Erro ao chamar o plugin RPC"
   },
@@ -6435,7 +6427,7 @@
     "translation": "Não foi possível obter os jobs"
   },
   {
-    "id": "store.sql_job.get_count_by_status_and_type.app_erro",
+    "id": "store.sql_job.get_count_by_status_and_type.app_error",
     "translation": "Não foi possível buscar o número de job por status e tipo"
   },
   {
diff --git a/i18n/ru.json b/i18n/ru.json
index f20ec2c3f..c20e59a56 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -2275,22 +2275,6 @@
     "translation": "Менеджер импорта Slack: Возникла ошибка во время обработки некоторых сообщений Slack. Импорт мог завершиться успешно."
   },
   {
-    "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Менеджер импорта Slack: канал {{.ChannelName}} имеет слишком длинное имя. Оно будет укорочено при импорте."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Менеджер импорта Slack: канал {{.ChannelName}} имеет слишком длинный заголовок. Он будет укорочен при импорте."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Менеджер импорта Slack: канал {{.ChannelName}} имеет слишком длинное имя. Оно будет укорочено при импорте."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Менеджер импорта Slack: канал {{.ChannelName}} имеет слишком длинную цель. Она будет укорочена при импорте."
-  },
-  {
     "id": "api.status.init.debug",
     "translation": "Инициализация API статусов"
   },
@@ -4287,6 +4271,10 @@
     "translation": "Elasticsearch searching is disabled on this server"
   },
   {
+    "id": "ent.elasticsearch.search_posts.parse_matches_failed",
+    "translation": "Failed to parse search result matches"
+  },
+  {
     "id": "ent.elasticsearch.search_posts.search_failed",
     "translation": "Search failed to complete"
   },
@@ -4423,11 +4411,11 @@
     "translation": "Неверный токен МФА"
   },
   {
-    "id": "ent.mfa.activate.save_active.app_erro",
+    "id": "ent.mfa.activate.save_active.app_error",
     "translation": "Невозможно обновить активный статус MFA для пользователя"
   },
   {
-    "id": "ent.mfa.deactivate.save_active.app_erro",
+    "id": "ent.mfa.deactivate.save_active.app_error",
     "translation": "Невозможно обновить активный статус MFA для пользователя"
   },
   {
@@ -5867,6 +5855,10 @@
     "translation": "невозможно декодировать"
   },
   {
+    "id": "oauth.gitlab.tos.error",
+    "translation": "GitLab's Terms of Service have updated. Please go to gitlab.com to accept them and then try logging into Mattermost again."
+  },
+  {
     "id": "plugin.rpcplugin.invocation.error",
     "translation": "Error invoking plugin RPC"
   },
@@ -6435,7 +6427,7 @@
     "translation": "Не удалось получить задачи"
   },
   {
-    "id": "store.sql_job.get_count_by_status_and_type.app_erro",
+    "id": "store.sql_job.get_count_by_status_and_type.app_error",
     "translation": "We couldn't get the job count by status and type"
   },
   {
diff --git a/i18n/tr.json b/i18n/tr.json
index 4a57ba193..04fe2daca 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -549,7 +549,7 @@
   },
   {
     "id": "api.command_channel_header.hint",
-    "translation": "[text]"
+    "translation": "[metin]"
   },
   {
     "id": "api.command_channel_header.message.app_error",
@@ -585,7 +585,7 @@
   },
   {
     "id": "api.command_channel_purpose.hint",
-    "translation": "[text]"
+    "translation": "[metin]"
   },
   {
     "id": "api.command_channel_purpose.message.app_error",
@@ -617,7 +617,7 @@
   },
   {
     "id": "api.command_channel_rename.hint",
-    "translation": "[text]"
+    "translation": "[metin]"
   },
   {
     "id": "api.command_channel_rename.message.app_error",
@@ -653,7 +653,7 @@
   },
   {
     "id": "api.command_code.hint",
-    "translation": "[text]"
+    "translation": "[metin]"
   },
   {
     "id": "api.command_code.message.app_error",
@@ -820,7 +820,7 @@
   },
   {
     "id": "api.command_invite.hint",
-    "translation": "@[username] ~[channel]"
+    "translation": "@[kullanıcıadı] ~[kanal]"
   },
   {
     "id": "api.command_invite.missing_message.app_error",
@@ -860,7 +860,7 @@
   },
   {
     "id": "api.command_join.hint",
-    "translation": "~[channel]"
+    "translation": "~[kanal]"
   },
   {
     "id": "api.command_join.list.app_error",
@@ -944,7 +944,7 @@
   },
   {
     "id": "api.command_msg.hint",
-    "translation": "@[kullaniciadi] 'ileti'"
+    "translation": "@[kullanıcıadı] 'ileti'"
   },
   {
     "id": "api.command_msg.list.app_error",
@@ -964,7 +964,7 @@
   },
   {
     "id": "api.command_mute.desc",
-    "translation": "Geçerli kanal ya da belirtilen [channel] için masaüstü, e-posta ve anlık bildirimlerini kapatır."
+    "translation": "Geçerli kanal ya da belirtilen [kanal] için masaüstü, e-posta ve anlık bildirimlerini kapatır."
   },
   {
     "id": "api.command_mute.error",
@@ -972,7 +972,7 @@
   },
   {
     "id": "api.command_mute.hint",
-    "translation": "~[channel]"
+    "translation": "~[kanal]"
   },
   {
     "id": "api.command_mute.name",
@@ -1040,7 +1040,7 @@
   },
   {
     "id": "api.command_remove.hint",
-    "translation": "@[username]"
+    "translation": "@[kullanıcıadı]"
   },
   {
     "id": "api.command_remove.message.app_error",
@@ -1068,7 +1068,7 @@
   },
   {
     "id": "api.command_search.hint",
-    "translation": "[text]"
+    "translation": "[metin]"
   },
   {
     "id": "api.command_search.name",
@@ -2275,22 +2275,6 @@
     "translation": "Slack İçe Aktarma: Bazı Slack iletileri işlenirken sorun çıktı. Buna rağmen belki içe aktarım yapılabilir."
   },
   {
-    "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack İçe Aktarma: {{.ChannelName}} kanalının adı çok uzun. İçe aktarılırken budanarak kısaltılacak."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Slack İçe Aktarma: {{.ChannelName}} kanalının adı çok uzun. İçe aktarılırken budanarak kısaltılacak."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slack İçe Aktarma: {{.ChannelName}} kanalının adı çok uzun. İçe aktarılırken budanarak kısaltılacak."
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Slack İçe Aktarma: {{.ChannelName}} kanalının amacı çok uzun. İçe aktarılırken budanarak kısaltılacak."
-  },
-  {
     "id": "api.status.init.debug",
     "translation": "Durum API rotaları hazırlanıyor"
   },
@@ -4287,6 +4271,10 @@
     "translation": "Elasticsearch araması bu sunucu üzerinde devre dışı bırakılmış"
   },
   {
+    "id": "ent.elasticsearch.search_posts.parse_matches_failed",
+    "translation": "Failed to parse search result matches"
+  },
+  {
     "id": "ent.elasticsearch.search_posts.search_failed",
     "translation": "Search failed to complete"
   },
@@ -4423,11 +4411,11 @@
     "translation": "MFA kodu geçersiz"
   },
   {
-    "id": "ent.mfa.activate.save_active.app_erro",
+    "id": "ent.mfa.activate.save_active.app_error",
     "translation": "Kullanıcının MFA etkin durumu güncellenemedi"
   },
   {
-    "id": "ent.mfa.deactivate.save_active.app_erro",
+    "id": "ent.mfa.deactivate.save_active.app_error",
     "translation": "Kullanıcının MFA etkin durumu güncellenemedi"
   },
   {
@@ -5867,6 +5855,10 @@
     "translation": "kod çözülemedi"
   },
   {
+    "id": "oauth.gitlab.tos.error",
+    "translation": "GitLab Hizmet Koşulları güncellendi. Lütfen gitlab.com adresine giderek yeni hizmet koşullarını onayladıktan sonra yeniden Mattermost oturumu açmayı deneyin."
+  },
+  {
     "id": "plugin.rpcplugin.invocation.error",
     "translation": "Uygulama eki RPC eklenirken sorun çıktı"
   },
@@ -6435,7 +6427,7 @@
     "translation": "İşler alınamadı"
   },
   {
-    "id": "store.sql_job.get_count_by_status_and_type.app_erro",
+    "id": "store.sql_job.get_count_by_status_and_type.app_error",
     "translation": "Durum ve türe göre görev sayısı alınamadı"
   },
   {
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index 71149dfd8..cd111108a 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -2275,22 +2275,6 @@
     "translation": "Slack 导入：部分 Slack 消息导入时发送错误。导入可能仍然可用。"
   },
   {
-    "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack 导入：频道 {{.ChannelName}} 的名称过长。导入时会被截断。"
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Slack 导入：频道 {{.ChannelName}} 的标题过长。导入时会被截断。"
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slack 导入：频道 {{.ChannelName}} 的识别过长。导入时会被截断。"
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Slack 导入：频道 {{.ChannelName}} 的用途过长。导入时会被截断。"
-  },
-  {
     "id": "api.status.init.debug",
     "translation": "正在初始化状态 API 路由"
   },
@@ -4287,6 +4271,10 @@
     "translation": "ElasticSearch 搜索已在本服务器禁用"
   },
   {
+    "id": "ent.elasticsearch.search_posts.parse_matches_failed",
+    "translation": "Failed to parse search result matches"
+  },
+  {
     "id": "ent.elasticsearch.search_posts.search_failed",
     "translation": "搜索无法完成"
   },
@@ -4423,11 +4411,11 @@
     "translation": "无效的多重验证令牌"
   },
   {
-    "id": "ent.mfa.activate.save_active.app_erro",
+    "id": "ent.mfa.activate.save_active.app_error",
     "translation": "无法为用户更新多重验证启用状态"
   },
   {
-    "id": "ent.mfa.deactivate.save_active.app_erro",
+    "id": "ent.mfa.deactivate.save_active.app_error",
     "translation": "无法为用户更新多重验证启用状态"
   },
   {
@@ -5867,6 +5855,10 @@
     "translation": "无法解码"
   },
   {
+    "id": "oauth.gitlab.tos.error",
+    "translation": "GitLab 的使用条款已更新。请到 gitlab.com 接受新的使用条款后再尝试登入 Mattermost。"
+  },
+  {
     "id": "plugin.rpcplugin.invocation.error",
     "translation": "调用插件 RPC 错误"
   },
@@ -6435,7 +6427,7 @@
     "translation": "我们无法获取任务"
   },
   {
-    "id": "store.sql_job.get_count_by_status_and_type.app_erro",
+    "id": "store.sql_job.get_count_by_status_and_type.app_error",
     "translation": "我们无法以状态和类型获取任务数"
   },
   {
diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json
index e1578540a..c42354c99 100644
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -2275,22 +2275,6 @@
     "translation": "匯入 Slack：剖析部份 Slack 訊息時發生錯誤。匯入可能可以繼續運行。"
   },
   {
-    "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack 匯入：頻道 {{.ChannelName}} 的顯示名稱過長，將會在匯入時被截短。"
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Slack 匯入：頻道 {{.ChannelName}} 的標題過長，將會在匯入時被截短。"
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slack 匯入：頻道 {{.ChannelName}} 的 Handle 過長，將會在匯入時被截短。"
-  },
-  {
-    "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Slack 匯入：頻道 {{.ChannelName}} 的用途過長，將會在匯入時被截短。"
-  },
-  {
     "id": "api.status.init.debug",
     "translation": "正在初始化狀態 API 路徑"
   },
@@ -4287,6 +4271,10 @@
     "translation": "Elasticsearch 搜尋在此伺服器上為停用"
   },
   {
+    "id": "ent.elasticsearch.search_posts.parse_matches_failed",
+    "translation": "Failed to parse search result matches"
+  },
+  {
     "id": "ent.elasticsearch.search_posts.search_failed",
     "translation": "無法完成搜尋"
   },
@@ -4423,11 +4411,11 @@
     "translation": "無效的多重要素驗證 Token"
   },
   {
-    "id": "ent.mfa.activate.save_active.app_erro",
+    "id": "ent.mfa.activate.save_active.app_error",
     "translation": "無法為使用者更新多重要素驗證使用狀態"
   },
   {
-    "id": "ent.mfa.deactivate.save_active.app_erro",
+    "id": "ent.mfa.deactivate.save_active.app_error",
     "translation": "無法為使用者更新多重要素驗證使用狀態"
   },
   {
@@ -5867,6 +5855,10 @@
     "translation": "無法解碼"
   },
   {
+    "id": "oauth.gitlab.tos.error",
+    "translation": "GitLab's Terms of Service have updated. Please go to gitlab.com to accept them and then try logging into Mattermost again."
+  },
+  {
     "id": "plugin.rpcplugin.invocation.error",
     "translation": "呼叫模組 RPC 時錯誤"
   },
@@ -6435,7 +6427,7 @@
     "translation": "無法取得工作"
   },
   {
-    "id": "store.sql_job.get_count_by_status_and_type.app_erro",
+    "id": "store.sql_job.get_count_by_status_and_type.app_error",
     "translation": "無法根據狀態與類型取得工作數量"
   },
   {