translations PR 20170529 (#6514)

13 files changed, 190 insertions, 142 deletions

diff --git a/i18n/de.json b/i18n/de.json
index 4069cca45..32b063b30 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -2469,7 +2469,7 @@
   },
   {
     "id": "api.user.create_user.missing_hash_or_data.app_error",
-    "translation": "Missing Hash or URL query data."
+    "translation": "Fehlender Hash oder URL Anfrage-Daten."
   },
   {
     "id": "api.user.create_user.missing_invite_id.app_error",
@@ -2985,7 +2985,7 @@
   },
   {
     "id": "app.import.validate_channel_import_data.display_name_missing.error",
-    "translation": "Fehlende erforderliche Kanaleigenschaft: display_name."
+    "translation": "Fehlende erforderliche Kanaleigenschaft: display_name"
   },
   {
     "id": "app.import.validate_channel_import_data.header_length.error",
@@ -3065,7 +3065,7 @@
   },
   {
     "id": "app.import.validate_team_import_data.display_name_missing.error",
-    "translation": "Fehlende erforderliche Teameigenschaft: display_name"
+    "translation": "Fehlende erforderliche Teameigenschaft: display_name."
   },
   {
     "id": "app.import.validate_team_import_data.name_characters.error",
@@ -3089,7 +3089,7 @@
   },
   {
     "id": "app.import.validate_team_import_data.type_missing.error",
-    "translation": "Fehlende erforderliche Teameigenschaft: type"
+    "translation": "Fehlende erforderliche Teameigenschaft: type."
   },
   {
     "id": "app.import.validate_user_channels_import_data.channel_name_missing.error",
@@ -3309,35 +3309,35 @@
   },
   {
     "id": "ent.elasticsearch.search_posts.disabled",
-    "translation": "ElasticSearch searching is disabled on this server"
+    "translation": "ElasticSearch-Suche ist auf diesem Server deaktiviert"
   },
   {
     "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "Search failed to complete"
+    "translation": "Suche konnte nicht abgeschlossen werden"
   },
   {
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
-    "translation": "Failed to decode search results"
+    "translation": "Konnte Suchergebnisse nicht dekodieren"
   },
   {
     "id": "ent.elasticsearch.start.connect_failed",
-    "translation": "Setting up ElasticSearch Client Failed"
+    "translation": "Fehler beim Einrichten des ElasticSearch-Client"
   },
   {
     "id": "ent.elasticsearch.start.index_create_failed",
-    "translation": "Failed to create ElasticSearch index"
+    "translation": "Konnte ElasticSearch-Index nicht erstellen"
   },
   {
     "id": "ent.elasticsearch.start.index_exists_failed",
-    "translation": "Failed to establish whether ElasticSearch index exists"
+    "translation": "Konnte nicht bestimmen, ob der ElasticSearch-Index existiert"
   },
   {
     "id": "ent.elasticsearch.start.index_mapping_failed",
-    "translation": "Failed to setup ElasticSearch index mapping"
+    "translation": "Konnte ElasticSearch-Index-Mapping nicht einrichten"
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
-    "translation": "Failed to set ElasticSearch index settings"
+    "translation": "Konnte ElasticSearch-Index-Einstellungen nicht setzen"
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
@@ -3897,19 +3897,19 @@
   },
   {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
-    "translation": "Elastic Search ConnectionUrl setting must be provided when Elastic Search indexing is enabled."
+    "translation": "ElasticSearch-Einstellung ConnectionUrl muss angegeben sein, wenn Elastic-Search-Indizierung aktiviert ist."
   },
   {
     "id": "model.config.is_valid.elastic_search.enable_searching.app_error",
-    "translation": "Elastic Search IndexingEnabled setting must be set to true when Elastic Search SearchEnabled is set to true."
+    "translation": "ElasticSearch-Einstellung IndexingEnabled muss angegeben sein, wenn Elastic-Search-Indizierung aktiviert ist."
   },
   {
     "id": "model.config.is_valid.elastic_search.password.app_error",
-    "translation": "Elastic Search Password setting must be provided when Elastic Search indexing is enabled."
+    "translation": "ElasticSearch-Einstellung Passwort muss angegeben sein, wenn Elastic-Search-Indizierung aktiviert ist."
   },
   {
     "id": "model.config.is_valid.elastic_search.username.app_error",
-    "translation": "Elastic Search Username setting must be provided when Elastic Search indexing is enabled."
+    "translation": "ElasticSearch-Einstellung Benutzername muss angegeben sein, wenn Elastic-Search-Indizierung aktiviert ist."
   },
   {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
@@ -4136,6 +4136,10 @@
     "translation": "Ungültige maximale Anzahl an offenen Verbindungen in SQL Einstellungen.  Muss eine positive Zahl sein."
   },
   {
+    "id": "model.config.is_valid.sql_query_timeout.app_error",
+    "translation": "Invalid query timeout for SQL settings.  Must be a positive number."
+  },
+  {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "Zeit zwischen Benutzereingabenaktualisierung sollte nicht weniger als 1000 Millisekunden betragen."
   },
@@ -4713,7 +4717,7 @@
   },
   {
     "id": "store.sql.schema_out_of_date.warn",
-    "translation": "Das Datenbankschema der Version %v scheint veralten zu sein"
+    "translation": "Das Datenbankschema der Version %v scheint veraltet zu sein"
   },
   {
     "id": "store.sql.schema_set.info",
@@ -5097,27 +5101,27 @@
   },
   {
     "id": "store.sql_file_info.save_or_update.app_error",
-    "translation": "Die Dateiinformationen konnten nicht gespeichert werden"
+    "translation": "Die Dateiinformationen konnten nicht gespeichert oder aktualisiert werden"
   },
   {
     "id": "store.sql_job_status.delete_by_type.app_error",
-    "translation": "Die Nachricht konnte nicht gelöscht werden"
+    "translation": "Der Job-Status konnte nicht gelöscht werden"
   },
   {
     "id": "store.sql_job_status.get.app_error",
-    "translation": "Die Nachricht konnte nicht abgerufen werden"
+    "translation": "Der Job-Status konnte nicht abgerufen werden"
   },
   {
     "id": "store.sql_job_status.get_all.app_error",
-    "translation": "Die Nachricht konnte nicht abgerufen werden"
+    "translation": "Wir konnten nicht den Status aller Jobs abrufen"
   },
   {
     "id": "store.sql_job_status.save.app_error",
-    "translation": "Die Nachricht konnte nicht gespeichert werden"
+    "translation": "Der Job-Status konnte nicht gespeichert werden"
   },
   {
     "id": "store.sql_job_status.update.app_error",
-    "translation": "Die Nachricht konnte nicht aktualisiert werden"
+    "translation": "Der Job-Status konnte nicht aktualisiert werden"
   },
   {
     "id": "store.sql_license.get.app_error",
@@ -5269,7 +5273,7 @@
   },
   {
     "id": "store.sql_post.get_posts_by_ids.app_error",
-    "translation": "Die Nachricht konnte nicht abgerufen werden"
+    "translation": "Die Nachrichten konnten nicht abgerufen werden."
   },
   {
     "id": "store.sql_post.get_posts_created_att.app_error",
@@ -6013,7 +6017,7 @@
   },
   {
     "id": "utils.mail.send_mail.from_address.app_error",
-    "translation": "Fehler beim Hinzufügen der Absender E-Mail-Adresse"
+    "translation": "Benachrichtigungseinstellung Absenderadresse fehlt oder ist ungültig."
   },
   {
     "id": "utils.mail.send_mail.msg.app_error",
@@ -6029,7 +6033,7 @@
   },
   {
     "id": "utils.mail.send_mail.to_address.app_error",
-    "translation": "Fehler beim Hinzufügen der E-Mail Adresse"
+    "translation": "Benachrichtigungseinstellung Empfängeradresse fehlt oder ist ungültig."
   },
   {
     "id": "utils.mail.test.configured.error",
diff --git a/i18n/en.json b/i18n/en.json
index 4674f3fb2..d2640e672 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4140,14 +4140,14 @@
     "translation": "Invalid maximum idle connection for SQL settings.  Must be a positive number."
   },
   {
-    "id": "model.config.is_valid.sql_query_timeout.app_error",
-    "translation": "Invalid query timeout for SQL settings.  Must be a positive number."
-  },
-  {
     "id": "model.config.is_valid.sql_max_conn.app_error",
     "translation": "Invalid maximum open connection for SQL settings.  Must be a positive number."
   },
   {
+    "id": "model.config.is_valid.sql_query_timeout.app_error",
+    "translation": "Invalid query timeout for SQL settings.  Must be a positive number."
+  },
+  {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "Time between user typing updates should not be set to less than 1000 milliseconds."
   },
diff --git a/i18n/es.json b/i18n/es.json
index 6ee8d78e5..8cd62bf46 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -3897,19 +3897,19 @@
   },
   {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
-    "translation": "Elastic Search ConnectionUrl setting must be provided when Elastic Search indexing is enabled."
+    "translation": "El valor de Elastic Search ConnectionUrl debe ser proporcionado cuando está habilitado la indización de Elastic Search."
   },
   {
     "id": "model.config.is_valid.elastic_search.enable_searching.app_error",
-    "translation": "Elastic Search IndexingEnabled setting must be set to true when Elastic Search SearchEnabled is set to true."
+    "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.password.app_error",
-    "translation": "Elastic Search Password setting must be provided when Elastic Search indexing is enabled."
+    "translation": "El valor de Elastic Search Password debe ser proporcionado cuando está habilitado la indización de Elastic Search."
   },
   {
     "id": "model.config.is_valid.elastic_search.username.app_error",
-    "translation": "Elastic Search Username setting must be provided when Elastic Search indexing is enabled."
+    "translation": "El valor de Elastic Search Username debe ser proporcionado cuando está habilitado la indización de Elastic Search."
   },
   {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
@@ -4136,6 +4136,10 @@
     "translation": "Inválida cantidad de conexiones abiertas para la configuración de SQL.  Debe ser un número positivo."
   },
   {
+    "id": "model.config.is_valid.sql_query_timeout.app_error",
+    "translation": "Invalid query timeout for SQL settings.  Must be a positive number."
+  },
+  {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "El tiempo transcurrido para actualizar que el usuario está escribiendo no debe ser menor a 1000 milisegundos."
   },
@@ -5097,27 +5101,27 @@
   },
   {
     "id": "store.sql_file_info.save_or_update.app_error",
-    "translation": "No pudimos guardar la información del archivo"
+    "translation": "No pudimos guardar o actualizar la información del archivo"
   },
   {
     "id": "store.sql_job_status.delete_by_type.app_error",
-    "translation": "No pudimos eliminar el mensaje"
+    "translation": "No pudimos eliminar el trabajo de estatus"
   },
   {
     "id": "store.sql_job_status.get.app_error",
-    "translation": "No pudimos obtener el mensaje"
+    "translation": "No pudimos obtener el trabajo de estatus"
   },
   {
     "id": "store.sql_job_status.get_all.app_error",
-    "translation": "No pudimos obtener el mensaje"
+    "translation": "No pudimos obtener todos los trabajos de estatus"
   },
   {
     "id": "store.sql_job_status.save.app_error",
-    "translation": "No pudimos guardar el Mensaje"
+    "translation": "No pudimos guardar el trabajo de estatus"
   },
   {
     "id": "store.sql_job_status.update.app_error",
-    "translation": "No pudimos actualizar el Mensaje"
+    "translation": "No pudimos actualizar el trabajo de estatus"
   },
   {
     "id": "store.sql_license.get.app_error",
@@ -5269,7 +5273,7 @@
   },
   {
     "id": "store.sql_post.get_posts_by_ids.app_error",
-    "translation": "No pudimos obtener el mensaje"
+    "translation": "No pudimos obtener los mensajes"
   },
   {
     "id": "store.sql_post.get_posts_created_att.app_error",
@@ -6013,7 +6017,7 @@
   },
   {
     "id": "utils.mail.send_mail.from_address.app_error",
-    "translation": "Falla al agregar el correo electrónico desde"
+    "translation": "Notificación la Dirección del remitente falta o no es válida."
   },
   {
     "id": "utils.mail.send_mail.msg.app_error",
@@ -6029,7 +6033,7 @@
   },
   {
     "id": "utils.mail.send_mail.to_address.app_error",
-    "translation": "Falla al agregar el correo electrónico para"
+    "translation": "Notificación la Dirección de recepción falta o no es válida."
   },
   {
     "id": "utils.mail.test.configured.error",
diff --git a/i18n/fr.json b/i18n/fr.json
index e6fa2e6e7..d32baddcf 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -4136,6 +4136,10 @@
     "translation": "Nombre maximum de connexions ouvertes invalide dans les paramètres SQL. Doit être un entier positif."
   },
   {
+    "id": "model.config.is_valid.sql_query_timeout.app_error",
+    "translation": "Invalid query timeout for SQL settings.  Must be a positive number."
+  },
+  {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "Le temps entre chaque utilisateur tapant une mise à jour ne doit pas être inférieur à 1000 millisecondes."
   },
@@ -6013,7 +6017,7 @@
   },
   {
     "id": "utils.mail.send_mail.from_address.app_error",
-    "translation": "Échec d'ajout de l'adresse e-mail de l'expéditeur"
+    "translation": "Notification From Address setting is missing or invalid."
   },
   {
     "id": "utils.mail.send_mail.msg.app_error",
@@ -6029,7 +6033,7 @@
   },
   {
     "id": "utils.mail.send_mail.to_address.app_error",
-    "translation": "Échec de l'ajout de l'adresse e-mail"
+    "translation": "Notification To Address setting is missing or invalid."
   },
   {
     "id": "utils.mail.test.configured.error",
diff --git a/i18n/ja.json b/i18n/ja.json
index bbb4e59b5..137b4dc4a 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -53,19 +53,19 @@
   },
   {
     "id": "api.admin.add_certificate.open.app_error",
-    "translation": "証明書ファイルを開くことができませんでした"
+    "translation": "証明書ファイルを開くことができませんでした。"
   },
   {
     "id": "api.admin.add_certificate.saving.app_error",
-    "translation": "証明書ファイルを保存できませんでした"
+    "translation": "証明書ファイルを保存できませんでした。"
   },
   {
     "id": "api.admin.file_read_error",
-    "translation": "ログファイルの読み込み中にエラーが発生しました"
+    "translation": "ログファイルの読み込み中にエラーが発生しました。"
   },
   {
     "id": "api.admin.get_brand_image.not_available.app_error",
-    "translation": "独自ブランディングは設定されていないか、このサーバーではサポートされていません"
+    "translation": "独自ブランディングは設定されていないか、このサーバーではサポートされていません。"
   },
   {
     "id": "api.admin.get_brand_image.storage.app_error",
@@ -73,15 +73,15 @@
   },
   {
     "id": "api.admin.init.debug",
-    "translation": "管理者APIルートを初期化しています"
+    "translation": "管理者APIルートを初期化しています。"
   },
   {
     "id": "api.admin.recycle_db_end.warn",
-    "translation": "データベース接続の再利用が完了しました"
+    "translation": "データベース接続の再利用が完了しました。"
   },
   {
     "id": "api.admin.recycle_db_start.warn",
-    "translation": "データベース接続を再利用しようとしています"
+    "translation": "データベース接続を再利用しようとしています。"
   },
   {
     "id": "api.admin.remove_certificate.delete.app_error",
@@ -89,7 +89,7 @@
   },
   {
     "id": "api.admin.saml.metadata.app_error",
-    "translation": "サービスプロバイダーのメタデータを構築中にエラーが発生しました"
+    "translation": "サービスプロバイダーのメタデータを構築中にエラーが発生しました。"
   },
   {
     "id": "api.admin.test_email.body",
@@ -1347,7 +1347,7 @@
   },
   {
     "id": "api.oauth.complete_oauth.missing_code.app_error",
-    "translation": "サービスプロバイダー {{.service}} はリダイレクトURLで認証コードを提供していません。\n\n[Google Apps](https://docs.mattermost.com/deployment/sso-google.html)で、あなたの管理者がGoogle+ APIを有効にしているか確認してください。\n\n[Office 365](https://docs.mattermost.com/deployment/sso-office.html)で、あなたのMicrosoft組織の管理者がMattermostアプリを有効にしている確認してください。\n\n[GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html)で、セットアップ手順に従っているか確認してください。\n\n以上を確認しても設定が上手くいかない場合は、[Troubleshooting forum](https://forum.mattermost.org/c/general/trouble-shoot)へ投稿してください。私たちはセットアップ中の問題について喜んでお手伝いします。"
+    "translation": "サービスプロバイダー {{.service}} はリダイレクトURLで認証コードを提供していません。\n\n[Google Apps](https://docs.mattermost.com/deployment/sso-google.html)で、あなたの管理者がGoogle+ APIを有効にしているか確認してください。\n\n[Office 365](https://docs.mattermost.com/deployment/sso-office.html)で、あなたのMicrosoft組織の管理者がMattermostアプリを有効にしている確認してください。\n\n[GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html)で、セットアップ手順に従っているか確認してください。\n\n以上を確認しても設定が上手くいかない場合は、[トラブルシューティングフォーラム](https://forum.mattermost.org/c/general/trouble-shoot)へ投稿してください。私たちはセットアップ中の問題について喜んでお手伝いします。"
   },
   {
     "id": "api.oauth.delete.permissions.app_error",
@@ -1451,7 +1451,7 @@
   },
   {
     "id": "api.opengraph.init.debug",
-    "translation": "Initializing open graph protocol api routes"
+    "translation": "オープングラフプロトコルのAPIルートを初期化しています"
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
@@ -2469,11 +2469,11 @@
   },
   {
     "id": "api.user.create_user.missing_hash_or_data.app_error",
-    "translation": "Missing Hash or URL query data."
+    "translation": "クエリデータのハッシュ、もしくはURLが見つかりません。"
   },
   {
     "id": "api.user.create_user.missing_invite_id.app_error",
-    "translation": "Missing Invite Id."
+    "translation": "招待IDが存在しません。"
   },
   {
     "id": "api.user.create_user.no_open_server",
@@ -3029,7 +3029,7 @@
   },
   {
     "id": "app.import.validate_post_import_data.create_at_zero.error",
-    "translation": "Post CreateAt property must not be zero if provided."
+    "translation": "投稿の作成日時には0を設定できません。"
   },
   {
     "id": "app.import.validate_post_import_data.message_length.error",
@@ -3309,35 +3309,35 @@
   },
   {
     "id": "ent.elasticsearch.search_posts.disabled",
-    "translation": "ElasticSearch searching is disabled on this server"
+    "translation": "このサーバーではElasticSearchによる検索は無効です。"
   },
   {
     "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "Search failed to complete"
+    "translation": "検索を完了できませんでした"
   },
   {
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
-    "translation": "Failed to decode search results"
+    "translation": "検索結果をデコードできませんでした"
   },
   {
     "id": "ent.elasticsearch.start.connect_failed",
-    "translation": "Setting up ElasticSearch Client Failed"
+    "translation": "ElasticSearchクライアントを設定できませんでした"
   },
   {
     "id": "ent.elasticsearch.start.index_create_failed",
-    "translation": "Failed to create ElasticSearch index"
+    "translation": "ElasticSearchのインデックスを作成できませんでした"
   },
   {
     "id": "ent.elasticsearch.start.index_exists_failed",
-    "translation": "Failed to establish whether ElasticSearch index exists"
+    "translation": "ElasticSearchインデックスの存在を確認できませんでした"
   },
   {
     "id": "ent.elasticsearch.start.index_mapping_failed",
-    "translation": "Failed to setup ElasticSearch index mapping"
+    "translation": "ElasticSearchインデックスのマッピングを設定できませんでした"
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
-    "translation": "Failed to set ElasticSearch index settings"
+    "translation": "ElasticSearchインデックス設定を設定できませんでした"
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
@@ -3897,19 +3897,19 @@
   },
   {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
-    "translation": "Elastic Search ConnectionUrl setting must be provided when Elastic Search indexing is enabled."
+    "translation": "Elastic Searchインデックスが有効な場合、Elastic SearchのConnectionUrl設定は必須です。"
   },
   {
     "id": "model.config.is_valid.elastic_search.enable_searching.app_error",
-    "translation": "Elastic Search IndexingEnabled setting must be set to true when Elastic Search SearchEnabled is set to true."
+    "translation": "Elastic Search検索有効化に有効が設定されている場合、Elastic Searchインデックス有効化設定は有効でなければなりません。"
   },
   {
     "id": "model.config.is_valid.elastic_search.password.app_error",
-    "translation": "Elastic Search Password setting must be provided when Elastic Search indexing is enabled."
+    "translation": "Elastic Searchインデックスが有効な場合、Elastic Searchパスワード設定は必須です。"
   },
   {
     "id": "model.config.is_valid.elastic_search.username.app_error",
-    "translation": "Elastic Search Username setting must be provided when Elastic Search indexing is enabled."
+    "translation": "Elastic Searchインデックスが有効な場合、Elastic Searchユーザー名設定は必須です。"
   },
   {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
@@ -4136,6 +4136,10 @@
     "translation": "SQL設定の最大稼働接続数が不正です。正の数を指定してください。"
   },
   {
+    "id": "model.config.is_valid.sql_query_timeout.app_error",
+    "translation": "Invalid query timeout for SQL settings.  Must be a positive number."
+  },
+  {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "ユーザー入力の更新間隔は1000ミリ秒未満に設定しないでください。"
   },
@@ -5097,27 +5101,27 @@
   },
   {
     "id": "store.sql_file_info.save_or_update.app_error",
-    "translation": "ファイル情報を保存できませんでした"
+    "translation": "ファイル情報を保存、または更新できませんでした"
   },
   {
     "id": "store.sql_job_status.delete_by_type.app_error",
-    "translation": "投稿を削除できませんでした"
+    "translation": "ジョブの状態を削除できませんでした"
   },
   {
     "id": "store.sql_job_status.get.app_error",
-    "translation": "投稿を取得できませんでした"
+    "translation": "ジョブの状態を取得できませんでした"
   },
   {
     "id": "store.sql_job_status.get_all.app_error",
-    "translation": "投稿を取得できませんでした"
+    "translation": "すべてのジョブの状態を取得できませんでした"
   },
   {
     "id": "store.sql_job_status.save.app_error",
-    "translation": "投稿を保存できませんでした"
+    "translation": "ジョブの状態を保存できませんでした"
   },
   {
     "id": "store.sql_job_status.update.app_error",
-    "translation": "投稿を更新できませんでした"
+    "translation": "ジョブの状態を更新できませんでした"
   },
   {
     "id": "store.sql_license.get.app_error",
@@ -5985,7 +5989,7 @@
   },
   {
     "id": "utils.mail.connect_smtp.helo.app_error",
-    "translation": "Failed to set HELO"
+    "translation": "HELOを設定できませんでした"
   },
   {
     "id": "utils.mail.connect_smtp.open.app_error",
@@ -6001,7 +6005,7 @@
   },
   {
     "id": "utils.mail.new_client.helo.error",
-    "translation": "Failed to to set the HELO to SMTP server %v"
+    "translation": "SMTPサーバー %v にHELOを設定できませんでした"
   },
   {
     "id": "utils.mail.new_client.open.error",
@@ -6013,7 +6017,7 @@
   },
   {
     "id": "utils.mail.send_mail.from_address.app_error",
-    "translation": "差出元の電子メールアドレスを追加できませんでした"
+    "translation": "通知の送信元電子メールアドレス設定が存在しないか不正です。"
   },
   {
     "id": "utils.mail.send_mail.msg.app_error",
@@ -6029,7 +6033,7 @@
   },
   {
     "id": "utils.mail.send_mail.to_address.app_error",
-    "translation": "宛先の電子メールアドレスを追加できませんでした"
+    "translation": "通知の送信先電子メールアドレス設定が存在しないか不正です。"
   },
   {
     "id": "utils.mail.test.configured.error",
diff --git a/i18n/ko.json b/i18n/ko.json
index a4ab4b3e1..0b63faeae 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -4136,6 +4136,10 @@
     "translation": "Invalid maximum open connection for SQL settings.  Must be a positive number."
   },
   {
+    "id": "model.config.is_valid.sql_query_timeout.app_error",
+    "translation": "Invalid query timeout for SQL settings.  Must be a positive number."
+  },
+  {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "Time between user typing updates should not be set to less than 1000 milliseconds."
   },
@@ -6013,7 +6017,7 @@
   },
   {
     "id": "utils.mail.send_mail.from_address.app_error",
-    "translation": "Failed to add from email address"
+    "translation": "Notification From Address setting is missing or invalid."
   },
   {
     "id": "utils.mail.send_mail.msg.app_error",
@@ -6029,7 +6033,7 @@
   },
   {
     "id": "utils.mail.send_mail.to_address.app_error",
-    "translation": "Failed to add to email address"
+    "translation": "Notification To Address setting is missing or invalid."
   },
   {
     "id": "utils.mail.test.configured.error",
diff --git a/i18n/nl.json b/i18n/nl.json
index db5dab6bb..7b4671d79 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -4136,6 +4136,10 @@
     "translation": "Ongeldig maximaal aantal open verbindingen bij SQL instellingen. Moet een getal groter dan 0 zijn."
   },
   {
+    "id": "model.config.is_valid.sql_query_timeout.app_error",
+    "translation": "Invalid query timeout for SQL settings.  Must be a positive number."
+  },
+  {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "Time between user typing updates should not be set to less than 1000 milliseconds."
   },
@@ -6013,7 +6017,7 @@
   },
   {
     "id": "utils.mail.send_mail.from_address.app_error",
-    "translation": "Toevoegen vanuit een e-mailadres is mislukt"
+    "translation": "Notification From Address setting is missing or invalid."
   },
   {
     "id": "utils.mail.send_mail.msg.app_error",
@@ -6029,7 +6033,7 @@
   },
   {
     "id": "utils.mail.send_mail.to_address.app_error",
-    "translation": "Kan e-mailadres niet toevoegen"
+    "translation": "Notification To Address setting is missing or invalid."
   },
   {
     "id": "utils.mail.test.configured.error",
diff --git a/i18n/pl.json b/i18n/pl.json
index 3a015ce52..aa702555c 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -4136,6 +4136,10 @@
     "translation": "Nieprawidłowy maksymalny czas otwarcia połączenia dla ustawień SQL. Musi być liczbą większą od 0."
   },
   {
+    "id": "model.config.is_valid.sql_query_timeout.app_error",
+    "translation": "Invalid query timeout for SQL settings.  Must be a positive number."
+  },
+  {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "Czas pomiędzy aktualizacjami podczas wprowadzania tekstu przez użytkownika nie może być mniejszy niż 1000 milisekund."
   },
@@ -6013,7 +6017,7 @@
   },
   {
     "id": "utils.mail.send_mail.from_address.app_error",
-    "translation": "Failed to add from email address"
+    "translation": "Notification From Address setting is missing or invalid."
   },
   {
     "id": "utils.mail.send_mail.msg.app_error",
@@ -6029,7 +6033,7 @@
   },
   {
     "id": "utils.mail.send_mail.to_address.app_error",
-    "translation": "Failed to add to email address"
+    "translation": "Notification To Address setting is missing or invalid."
   },
   {
     "id": "utils.mail.test.configured.error",
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 3d838b8c8..528141d2a 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -4136,6 +4136,10 @@
     "translation": "Inválido máximo de conexões abertas em configurações SQL.  Deve ser um número positivo."
   },
   {
+    "id": "model.config.is_valid.sql_query_timeout.app_error",
+    "translation": "Invalid query timeout for SQL settings.  Must be a positive number."
+  },
+  {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "O tempo de atualização de digitação do usuário não deve ser definido para menos de 1000 milissegundos."
   },
@@ -6013,7 +6017,7 @@
   },
   {
     "id": "utils.mail.send_mail.from_address.app_error",
-    "translation": "Falha ao adicionar endereço de remetente de email"
+    "translation": "Endereço de remetente de email para notificação está faltando ou é inválido."
   },
   {
     "id": "utils.mail.send_mail.msg.app_error",
@@ -6029,7 +6033,7 @@
   },
   {
     "id": "utils.mail.send_mail.to_address.app_error",
-    "translation": "Falha ao adicionar o endereço de email"
+    "translation": "Endereço de email para notificação está faltando ou é inválido."
   },
   {
     "id": "utils.mail.test.configured.error",
diff --git a/i18n/ru.json b/i18n/ru.json
index 6898c2fc2..6779aa5b6 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -4136,6 +4136,10 @@
     "translation": "Неверное значение максимального количества открытых соединений в настройках SQL. Число должно быть положительным."
   },
   {
+    "id": "model.config.is_valid.sql_query_timeout.app_error",
+    "translation": "Invalid query timeout for SQL settings.  Must be a positive number."
+  },
+  {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "Обновления статуса набора текста пользователем не могут быть чаще, чем раз в 1000 миллисекунд."
   },
@@ -6013,7 +6017,7 @@
   },
   {
     "id": "utils.mail.send_mail.from_address.app_error",
-    "translation": "Не удалось добавить из адреса электронной почты"
+    "translation": "Notification From Address setting is missing or invalid."
   },
   {
     "id": "utils.mail.send_mail.msg.app_error",
@@ -6029,7 +6033,7 @@
   },
   {
     "id": "utils.mail.send_mail.to_address.app_error",
-    "translation": "Не удалось добавить адрес электронной почты"
+    "translation": "Notification To Address setting is missing or invalid."
   },
   {
     "id": "utils.mail.test.configured.error",
diff --git a/i18n/tr.json b/i18n/tr.json
index 44825aca4..f5afa2c93 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -1450,6 +1450,10 @@
     "translation": "Hesap açma bağlantısı geçersiz görünüyor"
   },
   {
+    "id": "api.opengraph.init.debug",
+    "translation": "Initializing open graph protocol api routes"
+  },
+  {
     "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."
   },
@@ -1700,10 +1704,6 @@
     "translation": "Tepki API rotaları hazırlanıyor"
   },
   {
-    "id": "api.opengraph.init.debug",
-    "translation": "Initializing open graph protocol api routes"
-  },
-  {
     "id": "api.reaction.list_reactions.mismatched_channel_id.app_error",
     "translation": "Kanal kodu adresteki ileti koduyla eşleşmediğinden tepkiler alınamadı"
   },
@@ -2468,6 +2468,14 @@
     "translation": "Varsayılan kanallara katılırken bir sorun çıktı. Kullanıcı Kodu: %v, Takım Kodu: %v, Hata: %v"
   },
   {
+    "id": "api.user.create_user.missing_hash_or_data.app_error",
+    "translation": "Missing Hash or URL query data."
+  },
+  {
+    "id": "api.user.create_user.missing_invite_id.app_error",
+    "translation": "Missing Invite Id."
+  },
+  {
     "id": "api.user.create_user.no_open_server",
     "translation": "Sunucu hesap açılmasına izin vermiyor. Lütfen bir çağrı almak için yönetici ile görüşün."
   },
@@ -2480,14 +2488,6 @@
     "translation": "E-posta ile kullanıcı hesabı açma özelliği devre dışı bırakılmış."
   },
   {
-    "id": "api.user.create_user.missing_invite_id.app_error",
-    "translation": "Missing Invite Id."
-  },
-  {
-    "id": "api.user.create_user.missing_hash_or_data.app_error",
-    "translation": "Missing Hash or URL query data."
-  },
-  {
     "id": "api.user.create_user.signup_link_expired.app_error",
     "translation": "Hesap açma bağlantısının süresi geçmiş"
   },
@@ -3308,36 +3308,36 @@
     "translation": "'{{.JobName}}' görevi için '{{.FilePath}}' konumuna uygunluk verme işlemi başlatıldı"
   },
   {
-    "id": "ent.elasticsearch.start.connect_failed",
-    "translation": "Setting up ElasticSearch Client Failed"
+    "id": "ent.elasticsearch.search_posts.disabled",
+    "translation": "ElasticSearch searching is disabled on this server"
   },
   {
-    "id": "ent.elasticsearch.start.index_exists_failed",
-    "translation": "Failed to establish whether ElasticSearch index exists"
+    "id": "ent.elasticsearch.search_posts.search_failed",
+    "translation": "Search failed to complete"
   },
   {
-    "id": "ent.elasticsearch.start.index_create_failed",
-    "translation": "Failed to create ElasticSearch index"
+    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
+    "translation": "Failed to decode search results"
   },
   {
-    "id": "ent.elasticsearch.start.index_settings_failed",
-    "translation": "Failed to set ElasticSearch index settings"
+    "id": "ent.elasticsearch.start.connect_failed",
+    "translation": "Setting up ElasticSearch Client Failed"
   },
   {
-    "id": "ent.elasticsearch.start.index_mapping_failed",
-    "translation": "Failed to setup ElasticSearch index mapping"
+    "id": "ent.elasticsearch.start.index_create_failed",
+    "translation": "Failed to create ElasticSearch index"
   },
   {
-    "id": "ent.elasticsearch.search_posts.disabled",
-    "translation": "ElasticSearch searching is disabled on this server"
+    "id": "ent.elasticsearch.start.index_exists_failed",
+    "translation": "Failed to establish whether ElasticSearch index exists"
   },
   {
-    "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "Search failed to complete"
+    "id": "ent.elasticsearch.start.index_mapping_failed",
+    "translation": "Failed to setup ElasticSearch index mapping"
   },
   {
-    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
-    "translation": "Failed to decode search results"
+    "id": "ent.elasticsearch.start.index_settings_failed",
+    "translation": "Failed to set ElasticSearch index settings"
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
@@ -3892,24 +3892,24 @@
     "translation": "Bitiş, başlangıç zamanından büyük olmalıdır"
   },
   {
+    "id": "model.config.is_valid.cluster_email_batching.app_error",
+    "translation": "Küme özelliği etkinleştirilmişken toplu e-posta etkinleştirilemez."
+  },
+  {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
     "translation": "Elastic Search ConnectionUrl setting must be provided when Elastic Search indexing is enabled."
   },
   {
-    "id": "model.config.is_valid.elastic_search.username.app_error",
-    "translation": "Elastic Search Username setting must be provided when Elastic Search indexing is enabled."
+    "id": "model.config.is_valid.elastic_search.enable_searching.app_error",
+    "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.password.app_error",
     "translation": "Elastic Search Password setting must be provided when Elastic Search indexing is enabled."
   },
   {
-    "id": "model.config.is_valid.elastic_search.enable_searching.app_error",
-    "translation": "Elastic Search IndexingEnabled setting must be set to true when Elastic Search SearchEnabled is set to true."
-  },
-  {
-    "id": "model.config.is_valid.cluster_email_batching.app_error",
-    "translation": "Küme özelliği etkinleştirilmişken toplu e-posta etkinleştirilemez."
+    "id": "model.config.is_valid.elastic_search.username.app_error",
+    "translation": "Elastic Search Username setting must be provided when Elastic Search indexing is enabled."
   },
   {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
@@ -4136,6 +4136,10 @@
     "translation": "En fazla açık bağlantı SQL ayarı geçersiz. Pozitif bir sayı olmalı."
   },
   {
+    "id": "model.config.is_valid.sql_query_timeout.app_error",
+    "translation": "Invalid query timeout for SQL settings.  Must be a positive number."
+  },
+  {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "Kullanıcının yazma aralıkları süresi 1000 milisaniyeden küçük olmamalıdır."
   },
@@ -5252,10 +5256,6 @@
     "translation": "İleti alınamadı"
   },
   {
-    "id": "store.sql_post.get_posts_by_ids.app_error",
-    "translation": "We couldn't get the posts"
-  },
-  {
     "id": "store.sql_post.get_parents_posts.app_error",
     "translation": "Kanalın üst iletisi alınamadı"
   },
@@ -5272,6 +5272,10 @@
     "translation": "Kanalın üst iletileri alınamadı"
   },
   {
+    "id": "store.sql_post.get_posts_by_ids.app_error",
+    "translation": "We couldn't get the posts"
+  },
+  {
     "id": "store.sql_post.get_posts_created_att.app_error",
     "translation": "Kanalın iletileri alınamadı"
   },
@@ -5984,6 +5988,10 @@
     "translation": "Lisans imzalanırken sorun çıktı. Hata: %v"
   },
   {
+    "id": "utils.mail.connect_smtp.helo.app_error",
+    "translation": "Failed to set HELO"
+  },
+  {
     "id": "utils.mail.connect_smtp.open.app_error",
     "translation": "Bağlantı açılamadı"
   },
@@ -5992,22 +6000,18 @@
     "translation": "TLS bağlantısı açılamadı"
   },
   {
-    "id": "utils.mail.connect_smtp.helo.app_error",
-    "translation": "Failed to set HELO"
-  },
-  {
     "id": "utils.mail.new_client.auth.app_error",
     "translation": "SMTP sunucusu üzerinde kimlik doğrulanamadı"
   },
   {
-    "id": "utils.mail.new_client.open.error",
-    "translation": "%v SMTP sunucusu üzerinde bağlantı açılamadı"
-  },
-  {
     "id": "utils.mail.new_client.helo.error",
     "translation": "Failed to to set the HELO to SMTP server %v"
   },
   {
+    "id": "utils.mail.new_client.open.error",
+    "translation": "%v SMTP sunucusu üzerinde bağlantı açılamadı"
+  },
+  {
     "id": "utils.mail.send_mail.close.app_error",
     "translation": "SMTP sunucu bağlantısı kapatılamadı"
   },
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index 7022fb790..134ce0a32 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -4136,6 +4136,10 @@
     "translation": "SQL 设置中最大开启连接数无效。必须是正整数。"
   },
   {
+    "id": "model.config.is_valid.sql_query_timeout.app_error",
+    "translation": "Invalid query timeout for SQL settings.  Must be a positive number."
+  },
+  {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "用户键入更新间隔不应设置为小于1000毫秒。"
   },
@@ -6013,7 +6017,7 @@
   },
   {
     "id": "utils.mail.send_mail.from_address.app_error",
-    "translation": "未能从电子邮件地址添加"
+    "translation": "Notification From Address setting is missing or invalid."
   },
   {
     "id": "utils.mail.send_mail.msg.app_error",
@@ -6029,7 +6033,7 @@
   },
   {
     "id": "utils.mail.send_mail.to_address.app_error",
-    "translation": "添加邮箱地址失败"
+    "translation": "Notification To Address setting is missing or invalid."
   },
   {
     "id": "utils.mail.test.configured.error",
diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json
index 28584c899..6cdbf4b68 100644
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -4136,6 +4136,10 @@
     "translation": "SQL 設定中的最高開啟連線數無效。必須為正數。"
   },
   {
+    "id": "model.config.is_valid.sql_query_timeout.app_error",
+    "translation": "Invalid query timeout for SQL settings.  Must be a positive number."
+  },
+  {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
     "translation": "使用者輸入更新間隔不應該設定為低於 1000 毫秒。"
   },
@@ -6013,7 +6017,7 @@
   },
   {
     "id": "utils.mail.send_mail.from_address.app_error",
-    "translation": "新增送信人失敗"
+    "translation": "Notification From Address setting is missing or invalid."
   },
   {
     "id": "utils.mail.send_mail.msg.app_error",
@@ -6029,7 +6033,7 @@
   },
   {
     "id": "utils.mail.send_mail.to_address.app_error",
-    "translation": "新增收件人失敗"
+    "translation": "Notification To Address setting is missing or invalid."
   },
   {
     "id": "utils.mail.test.configured.error",