diff --git a/i18n/de.json b/i18n/de.json
index e8d3820236..2e063c36fb 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -7406,8 +7406,8 @@
   {
     "id": "api.email_batching.send_batched_email_notification.title",
     "translation": {
-      "one": "{{ .SenderName }} sendete Ihnen neue Nachrichten",
-      "other": "{{ .SenderName }} und {{.Count}} andere sendeten Ihnen neue Nachrichten"
+      "one": "Sie haben eine neue Nachricht",
+      "other": "Sie haben neue Nachrichten"
     }
   },
   {
diff --git a/i18n/en_AU.json b/i18n/en_AU.json
index ee9874294c..5e35ad735d 100644
--- a/i18n/en_AU.json
+++ b/i18n/en_AU.json
@@ -6766,8 +6766,8 @@
   {
     "id": "api.email_batching.send_batched_email_notification.title",
     "translation": {
-      "one": "{{ .SenderName }} sent you new message",
-      "other": "{{ .SenderName }} and {{.Count}} others sent you new messages"
+      "one": "You have new messages",
+      "other": "You have new messages"
     }
   },
   {
diff --git a/i18n/es.json b/i18n/es.json
index 9ba81e39cd..ef39dfdcc7 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -421,7 +421,7 @@
   },
   {
     "id": "api.command_channel_header.update_channel.app_error",
-    "translation": "Error al actualizar el canal actual."
+    "translation": "Error al actualizar la cabecera del canal."
   },
   {
     "id": "api.command_channel_purpose.channel.app_error",
@@ -1175,7 +1175,7 @@
   },
   {
     "id": "api.marshal_error",
-    "translation": "error de formato"
+    "translation": "Error al procesar."
   },
   {
     "id": "api.oauth.allow_oauth.redirect_callback.app_error",
@@ -8006,5 +8006,21 @@
   {
     "id": "api.admin.saml.failure_reset_authdata_to_email.app_error",
     "translation": "No se ha podido restablecer el campo AuthData a Email."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.max_length",
+    "translation": "El texto introducido supera el límite de caracteres. La cabecera del canal está limitada a {{.MaxLength}} caracteres."
+  },
+  {
+    "id": "api.cloud.cws_webhook_event_missing_error",
+    "translation": "El evento de Webhook no fue manejado. O bien falta o no es válido."
+  },
+  {
+    "id": "api.channel.patch_channel_moderations.cache_invalidation.error",
+    "translation": "Error al invalidar la caché"
+  },
+  {
+    "id": "api.channel.create_channel.direct_channel.team_restricted_error",
+    "translation": "No se puede crear un canal directo entre estos usuarios porque no comparten un equipo en común."
   }
 ]
diff --git a/i18n/hu.json b/i18n/hu.json
index ef660f76d9..2d31774920 100644
--- a/i18n/hu.json
+++ b/i18n/hu.json
@@ -8970,7 +8970,7 @@
   {
     "id": "api.email_batching.send_batched_email_notification.title",
     "translation": {
-      "one": "{{ .SenderName }} új üzenetet küldött Önnek",
+      "one": "Önnek új üzenetei vannak",
       "other": "{{ .SenderName }} és {{.Count}} másvalaki új üzenetet kültek Önnek"
     }
   },
diff --git a/i18n/ja.json b/i18n/ja.json
index 15b1854672..f2e4b361ce 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -9029,9 +9029,7 @@
   },
   {
     "id": "api.email_batching.send_batched_email_notification.title",
-    "translation": {
-      "other": "{{ .SenderName }} と 他 {{.Count}} 名があなたに新しいメッセージを送信しました"
-    }
+    "translation": "新しいメッセージがあります"
   },
   {
     "id": "api.email_batching.send_batched_email_notification.time",
@@ -9195,14 +9193,38 @@
   },
   {
     "id": "api.push_notification.title.collapsed_threads",
-    "translation": "スレッドへの返信"
+    "translation": "{{.channelName}} へ返信する"
   },
   {
     "id": "api.post.send_notification_and_forget.push_comment_on_crt_thread",
-    "translation": " フォローしているスレッドへコメントがありました。"
+    "translation": " フォローしているスレッドへ返信がありました。"
   },
   {
     "id": "api.config.reload_config.app_error",
     "translation": "設定をリロードできませんでした。"
+  },
+  {
+    "id": "app.notification.body.thread_channel.subTitle",
+    "translation": "あなたが離席中に、あなたがフォローしているスレッドへ {{.SenderName}} が返信しました。"
+  },
+  {
+    "id": "app.notification.body.thread_gm.subTitle",
+    "translation": "あなたが離席中に、{{.SenderName}}があなたのグループのスレッドに返信しました。"
+  },
+  {
+    "id": "app.notification.body.thread_dm.subTitle",
+    "translation": "あなたが離席中に、{{.SenderName}} がダイレクトメッセージのスレッドに返信しました。"
+  },
+  {
+    "id": "app.notification.body.thread_channel_full.subTitle",
+    "translation": "あなたが離席中に、{{.ChannelName}} であなたがフォローしているスレッドに {{.SenderName}} が返信しました。"
+  },
+  {
+    "id": "api.push_notification.title.collapsed_threads_dm",
+    "translation": "ダイレクトメッセージへ返信する"
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_crt_thread_dm",
+    "translation": " がスレッドへ返信しました。"
   }
 ]
diff --git a/i18n/nl.json b/i18n/nl.json
index 476784744c..8feba68e0d 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -9030,8 +9030,8 @@
   {
     "id": "api.email_batching.send_batched_email_notification.title",
     "translation": {
-      "one": "{{ .SenderName }} stuurde je een nieuw bericht",
-      "other": "{{ .SenderName }} and {{.Count}} anderen stuurde je een nieuw bericht"
+      "one": "Je hebt een nieuwe bericht",
+      "other": "Je hebt nieuwe berichten"
     }
   },
   {
@@ -9184,7 +9184,7 @@
   },
   {
     "id": "api.post.send_notification_and_forget.push_comment_on_crt_thread",
-    "translation": " commentaar gegeven op een draadje dat je volgt."
+    "translation": " antwoordde op een draadje dat je volgt."
   },
   {
     "id": "model.config.is_valid.collapsed_threads.autofollow.app_error",
@@ -9196,7 +9196,7 @@
   },
   {
     "id": "api.push_notification.title.collapsed_threads",
-    "translation": "Reageer op draadje"
+    "translation": "Antwoord in {{.channelName}}"
   },
   {
     "id": "api.config.reload_config.app_error",
@@ -9209,5 +9209,29 @@
   {
     "id": "api.unmarshal_error",
     "translation": "Fout bij unmarshaling."
+  },
+  {
+    "id": "app.notification.body.thread_gm.subTitle",
+    "translation": "Terwijl je weg was, heeft {{.SenderName}} een bericht beantwoord in jouw groep."
+  },
+  {
+    "id": "api.push_notification.title.collapsed_threads_dm",
+    "translation": "Antwoord in privé-bericht"
+  },
+  {
+    "id": "app.notification.body.thread_dm.subTitle",
+    "translation": "Terwijl je weg was, heeft {{.Afzendernaam}} op een draadje in je privé-berichten geantwoord."
+  },
+  {
+    "id": "app.notification.body.thread_channel_full.subTitle",
+    "translation": "Terwijl je weg was, heeft {{.SenderName}} geantwoord op een draadje dat je volgt in {{.ChannelName}}."
+  },
+  {
+    "id": "app.notification.body.thread_channel.subTitle",
+    "translation": "Terwijl je weg was, heeft {{.SenderName}} geantwoord op een draadje dat je volgt."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_crt_thread_dm",
+    "translation": " antwoordde op een draadje."
   }
 ]
diff --git a/i18n/tr.json b/i18n/tr.json
index 8073b66afa..144371fe0a 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -4837,7 +4837,7 @@
   },
   {
     "id": "app.plugin.marketplace_client.failed_to_fetch",
-    "translation": "Mağaza sunucusundan uygulama ekleri alınamadı."
+    "translation": "Uygulama ekleri mağaza sunucusundan alınamadı."
   },
   {
     "id": "app.plugin.marketplace_plugin_request.app_error",
@@ -4861,7 +4861,7 @@
   },
   {
     "id": "app.plugin.restart.app_error",
-    "translation": "Yükseltme işlemi sırasında uygulama eki yeniden başlatılamadı."
+    "translation": "Uygulama eki yükseltme işlemi sırasında yeniden başlatılamadı."
   },
   {
     "id": "app.plugin.signature_decode.app_error",
@@ -4873,7 +4873,7 @@
   },
   {
     "id": "app.plugin.sync.list_filestore.app_error",
-    "translation": "Dosya depolama alanındaki uygulama eki klasöründeki dosyalar okunurken sorun çıktı."
+    "translation": "Dosya depolama alanında uygulama eki klasöründeki dosyalar okunurken sorun çıktı."
   },
   {
     "id": "app.plugin.sync.read_local_folder.app_error",
@@ -9026,8 +9026,8 @@
   {
     "id": "api.email_batching.send_batched_email_notification.title",
     "translation": {
-      "one": "{{ .SenderName }} size yeni bir ileti göndermiş",
-      "other": "{{ .SenderName }} ve {{.Count}} diğer kişi size yeni iletiler göndermiş"
+      "one": "Yeni bir iletiniz var",
+      "other": "Yeni iletileriniz var"
     }
   },
   {