diff --git a/server/i18n/be.json b/server/i18n/be.json
index 70ed86c1896..6a411ac9603 100644
--- a/server/i18n/be.json
+++ b/server/i18n/be.json
@@ -4351,10 +4351,6 @@
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Elasticsearch ужо спынены."
   },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Не ўдалося запусціць масавы апрацоўшчык Elasticsearch."
-  },
   {
     "id": "ent.elasticsearch.start.parse_server_version.app_error",
     "translation": "Не ўдалося прааналізаваць версію сервера Elasticsearch."
@@ -4363,10 +4359,6 @@
     "id": "ent.elasticsearch.start.get_server_version.app_error",
     "translation": "Не ўдалося атрымаць версію сервера Elasticsearch."
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Не ўдалося стварыць масавы апрацоўшчык Elasticsearch."
-  },
   {
     "id": "ent.elasticsearch.search_users.unmarshall_user_failed",
     "translation": "Не ўдалося дэкадаваць вынікі пошуку"
diff --git a/server/i18n/bg.json b/server/i18n/bg.json
index 29f73acd661..82c5821c46b 100644
--- a/server/i18n/bg.json
+++ b/server/i18n/bg.json
@@ -1883,10 +1883,6 @@
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Elasticsearch вече е спрян."
   },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Неуспешно стартиране на групов процесор Elasticsearch."
-  },
   {
     "id": "ent.elasticsearch.start.parse_server_version.app_error",
     "translation": "Неуспешен анализ на версията на сървъра Elasticsearch."
@@ -1895,10 +1891,6 @@
     "id": "ent.elasticsearch.start.get_server_version.app_error",
     "translation": "Неуспешно получаване версията на сървъра Elasticsearch."
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Неуспешно създаване на групов процесор Elasticsearch."
-  },
   {
     "id": "ent.elasticsearch.search_users.unmarshall_user_failed",
     "translation": "Неуспешно декодиране на резултатите от търсенето"
diff --git a/server/i18n/ca.json b/server/i18n/ca.json
index 550fdef77fe..2f61fe2e52b 100644
--- a/server/i18n/ca.json
+++ b/server/i18n/ca.json
@@ -2515,14 +2515,6 @@
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "L'Elasticsearch ja s'ha aturat"
   },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "No s'ha pogut iniciar el processador massiu de l'Elasticsearch"
-  },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "No s'ha pogut crear el processador massiu de l'Elasticsearch"
-  },
   {
     "id": "ent.elasticsearch.search_users.unmarshall_user_failed",
     "translation": "No s'ha pogut descodificar els resultats de la cerca"
diff --git a/server/i18n/cs.json b/server/i18n/cs.json
index 9e6a0206370..4723ee0718d 100644
--- a/server/i18n/cs.json
+++ b/server/i18n/cs.json
@@ -727,10 +727,6 @@
     "id": "model.config.is_valid.message_export.export_type.app_error",
     "translation": "Úloha pro export zpráv ExportFormat musí být jedna z následujících 'actiance', 'csv' nebo'globalrelay'."
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Nepodařilo se vytvořit Elasticsearch dávkový procesor."
-  },
   {
     "id": "ent.elasticsearch.search_users.unmarshall_user_failed",
     "translation": "Nepodařilo se dekódovat výsledky hledání"
@@ -2671,10 +2667,6 @@
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Elasticsearch je už zastaven."
   },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Nepodařilo se spustit Elasticsearch dávkový procesor."
-  },
   {
     "id": "ent.elasticsearch.start.parse_server_version.app_error",
     "translation": "Nepodařilo se zpracovat verzi Elasticsearch serveru."
diff --git a/server/i18n/de.json b/server/i18n/de.json
index 79bdd2ee84f..ce55bf6478f 100644
--- a/server/i18n/de.json
+++ b/server/i18n/de.json
@@ -3134,14 +3134,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Konnte Suchergebnisse nicht dekodieren"
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Fehler beim Erstellen der Elasticsearch-Massenverarbeitung."
-  },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Fehler beim Starten der Elasticsearch-Massenverarbeitung."
-  },
   {
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Elasticsearch ist bereits angehalten."
@@ -8969,10 +8961,6 @@
     "id": "ent.elasticsearch.create_client.ca_cert_missing",
     "translation": "Die CA-Datei für Elasticsearch konnte nicht geöffnet werden"
   },
-  {
-    "id": "ent.elasticsearch.create_client.ca_cert_malformed",
-    "translation": "Dekodierung der CA für Elasticsearch fehlgeschlagen"
-  },
   {
     "id": "api.server.cws.health_check.app_error",
     "translation": "CWS Server ist nicht verfügbar."
@@ -10064,5 +10052,37 @@
   {
     "id": "model.user.pre_save.password_too_long.app_error",
     "translation": "Dein Passwort darf nicht mehr als 72 Zeichen enthalten."
+  },
+  {
+    "id": "api.get_site_url_error",
+    "translation": "Die URL der Instanzseite konnte nicht ermittelt werden"
+  },
+  {
+    "id": "api.remote_cluster.accept_invitation_error",
+    "translation": "Die Remote-Cluster-Einladung konnte nicht akzeptiert werden"
+  },
+  {
+    "id": "api.remote_cluster.base64_decode_error",
+    "translation": "Konnte den Base64-String nicht dekodieren"
+  },
+  {
+    "id": "api.remote_cluster.cluster_not_deleted",
+    "translation": "Remote-Cluster wurde nicht gelöscht"
+  },
+  {
+    "id": "api.remote_cluster.encrypt_invite_error",
+    "translation": "Die Remote Cluster Einladung konnte nicht mit dem angegebenen Passwort verschlüsselt werden"
+  },
+  {
+    "id": "api.remote_cluster.get.not_found",
+    "translation": "Remote Cluster nicht gefunden"
+  },
+  {
+    "id": "app.import.custom_status.error",
+    "translation": "Der benutzerdefinierte Status kann nicht gesetzt werden."
+  },
+  {
+    "id": "api.remote_cluster.invite_decrypt_error",
+    "translation": "Der Remote Cluster Einladung konnte mit dem angegebenen Passwort nicht entschlüsselt werden"
   }
 ]
diff --git a/server/i18n/en-AU.json b/server/i18n/en-AU.json
index e985ffd3bec..eafa66a398e 100644
--- a/server/i18n/en-AU.json
+++ b/server/i18n/en-AU.json
@@ -3215,10 +3215,6 @@
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Elasticsearch is already stopped."
   },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Failed to start Elasticsearch bulk processor."
-  },
   {
     "id": "ent.elasticsearch.start.parse_server_version.app_error",
     "translation": "Failed to parse Elasticsearch server version."
@@ -3227,10 +3223,6 @@
     "id": "ent.elasticsearch.start.get_server_version.app_error",
     "translation": "Failed to get Elasticsearch server version."
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Failed to create Elasticsearch bulk processor."
-  },
   {
     "id": "ent.elasticsearch.search_users.unmarshall_user_failed",
     "translation": "Failed to decode search results"
@@ -8938,10 +8930,6 @@
     "id": "ent.elasticsearch.create_client.ca_cert_missing",
     "translation": "Could not open the CA file for Elasticsearch"
   },
-  {
-    "id": "ent.elasticsearch.create_client.ca_cert_malformed",
-    "translation": "Decoding of the CA for Elasticsearch failed"
-  },
   {
     "id": "app.channel.count_urgent_posts_since.app_error",
     "translation": "Unable to enumerate urgent posts since the given date."
@@ -10045,5 +10033,53 @@
   {
     "id": "api.job.unable_to_manage_job.incorrect_job_type",
     "translation": "You do not have permission to manage this job type"
+  },
+  {
+    "id": "api.system.logs.download_bytes_buffer.app_error",
+    "translation": "Failed to write logs to buffer"
+  },
+  {
+    "id": "api.user.update_password.password_hash.app_error",
+    "translation": "An internal error occurred while saving the password."
+  },
+  {
+    "id": "model.user.pre_save.password_too_long.app_error",
+    "translation": "Your password must contain no more than 72 characters."
+  },
+  {
+    "id": "api.get_site_url_error",
+    "translation": "Could not retrieve the instance site URL"
+  },
+  {
+    "id": "api.remote_cluster.accept_invitation_error",
+    "translation": "Could not accept the remote cluster invitation"
+  },
+  {
+    "id": "api.remote_cluster.base64_decode_error",
+    "translation": "Could not decode the base64 string"
+  },
+  {
+    "id": "api.remote_cluster.cluster_not_deleted",
+    "translation": "Remote cluster has not been deleted"
+  },
+  {
+    "id": "api.remote_cluster.encrypt_invite_error",
+    "translation": "Could not encrypt the remote cluster invite using the provided password"
+  },
+  {
+    "id": "api.remote_cluster.get.not_found",
+    "translation": "Remote Cluster not found"
+  },
+  {
+    "id": "api.remote_cluster.invite_decrypt_error",
+    "translation": "Could not decrypt the remote cluster invite using the provided password"
+  },
+  {
+    "id": "app.import.custom_status.error",
+    "translation": "Unable to set custom status."
+  },
+  {
+    "id": "model.user.pre_save.password_hash.app_error",
+    "translation": "An internal error occurred while saving the password."
   }
 ]
diff --git a/server/i18n/es.json b/server/i18n/es.json
index 8ce90e5a6ac..cfa6ebbc9b5 100644
--- a/server/i18n/es.json
+++ b/server/i18n/es.json
@@ -3135,14 +3135,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "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.start_bulk_processor_failed.app_error",
-    "translation": "No se pudo iniciar procesador a granel de Elasticsearch."
-  },
   {
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Elasticsearch ya fue detenido."
diff --git a/server/i18n/fa.json b/server/i18n/fa.json
index 5b703c846e9..6bf87fb8a88 100644
--- a/server/i18n/fa.json
+++ b/server/i18n/fa.json
@@ -1915,10 +1915,6 @@
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "جستجوی الاستیک از قبل متوقف شده است."
   },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "پردازنده انبوه جستجوی الاستیک راه اندازی نشد."
-  },
   {
     "id": "ent.elasticsearch.start.parse_server_version.app_error",
     "translation": "تجزیه نسخه سرور جستجوی الاستیک انجام نشد."
@@ -1927,10 +1923,6 @@
     "id": "ent.elasticsearch.start.get_server_version.app_error",
     "translation": "نسخه سرور جستجوی الاستیک دریافت نشد."
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "پردازنده انبوه جستجوی الاستیک ایجاد نشد."
-  },
   {
     "id": "ent.elasticsearch.search_users.unmarshall_user_failed",
     "translation": "رمزگشایی نتایج جستجو انجام نشد"
diff --git a/server/i18n/fi.json b/server/i18n/fi.json
index cb224fd8893..2b207ff88a9 100644
--- a/server/i18n/fi.json
+++ b/server/i18n/fi.json
@@ -2783,14 +2783,6 @@
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Elasticsearch on jo lopetettu"
   },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Virhe käynnistettäessä Elasticsearch bulkkiprosessori"
-  },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Virhe luotaessa Elasticsearch bulkkiprosessoria"
-  },
   {
     "id": "ent.elasticsearch.search_users.unmarshall_user_failed",
     "translation": "Hakutulosten dekoodaus epäonnistui"
diff --git a/server/i18n/fr.json b/server/i18n/fr.json
index 4553bf72fda..2ab29e786f7 100644
--- a/server/i18n/fr.json
+++ b/server/i18n/fr.json
@@ -3139,14 +3139,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Impossible de décoder les résultats de recherche"
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Impossible de créer le processeur d'opérations en masse d'Elasticsearch (Elasticsearch bulk processor)"
-  },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Impossible de démarrer le processeur d'opérations en masse d'Elasticsearch (Elasticsearch bulk processor)"
-  },
   {
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Elasticsearch est déjà arrêté"
diff --git a/server/i18n/hi.json b/server/i18n/hi.json
index 8fe73a4fc62..0a383f72676 100644
--- a/server/i18n/hi.json
+++ b/server/i18n/hi.json
@@ -6700,10 +6700,6 @@
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "इलास्टिक्स खोज पहले ही रोक दी गई है।"
   },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Elasticsearch बल्क प्रोसेसर प्रारंभ करने में विफल।"
-  },
   {
     "id": "ent.elasticsearch.start.parse_server_version.app_error",
     "translation": "Elasticsearch सर्वर संस्करण को पार्स करने में विफल।"
@@ -6712,10 +6708,6 @@
     "id": "ent.elasticsearch.start.get_server_version.app_error",
     "translation": "Elasticsearch सर्वर संस्करण प्राप्त करने में विफल।"
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Elasticsearch बल्क प्रोसेसर बनाने में विफल।"
-  },
   {
     "id": "ent.elasticsearch.search_users.unmarshall_user_failed",
     "translation": "खोज परिणामों को डीकोड करने में विफल"
diff --git a/server/i18n/hu.json b/server/i18n/hu.json
index fd5a07c1bff..5d43bf40f24 100644
--- a/server/i18n/hu.json
+++ b/server/i18n/hu.json
@@ -3263,10 +3263,6 @@
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Az Elasticsearch már leállt."
   },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Nem sikerült elindítani az Elasticsearch tömeges feldolgozót."
-  },
   {
     "id": "ent.elasticsearch.start.parse_server_version.app_error",
     "translation": "Nem sikerült értelmezni az Elasticsearch szerver verzióját."
@@ -3275,10 +3271,6 @@
     "id": "ent.elasticsearch.start.get_server_version.app_error",
     "translation": "Nem sikerült lekérni az Elasticsearch szerver verzióját."
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Nem sikerült létrehozni az Elasticsearch tömeges feldolgozót."
-  },
   {
     "id": "ent.elasticsearch.search_users.unmarshall_user_failed",
     "translation": "Nem sikerült dekódolni a keresési eredményeket"
diff --git a/server/i18n/it.json b/server/i18n/it.json
index 876acd2bbae..c98c0ee7cbc 100644
--- a/server/i18n/it.json
+++ b/server/i18n/it.json
@@ -3135,14 +3135,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "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.start_bulk_processor_failed.app_error",
-    "translation": "Impossibile avviare il processore massivo Elasticsearch."
-  },
   {
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Elasticsearch è già fermo."
diff --git a/server/i18n/ja.json b/server/i18n/ja.json
index fc9d60e8ede..976678dca11 100644
--- a/server/i18n/ja.json
+++ b/server/i18n/ja.json
@@ -3129,14 +3129,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "検索結果をデコードできませんでした"
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Elasticsearch Bulk Processorを生成することが出来ませんでした。"
-  },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Elasticsearch Bulk Processorを開始することが出来ませんでした。"
-  },
   {
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Elasticsearchは既に停止されています。"
@@ -8961,10 +8953,6 @@
     "id": "ent.elasticsearch.create_client.ca_cert_missing",
     "translation": "ElasticsearchのCAファイルを開くことができませんでした"
   },
-  {
-    "id": "ent.elasticsearch.create_client.ca_cert_malformed",
-    "translation": "Elasticsearch用CAのデコードに失敗しました"
-  },
   {
     "id": "api.server.cws.health_check.app_error",
     "translation": "CWSサーバーは使用できません。"
@@ -10056,5 +10044,37 @@
   {
     "id": "app.job.update_status.app_error",
     "translation": "ジョブの状態を更新できませんでした。無効なステータスが設定されました"
+  },
+  {
+    "id": "api.get_site_url_error",
+    "translation": "インスタンスサイトのURLを取得できませんでした"
+  },
+  {
+    "id": "api.remote_cluster.accept_invitation_error",
+    "translation": "リモートクラスタの招待を承認できませんでした"
+  },
+  {
+    "id": "api.remote_cluster.base64_decode_error",
+    "translation": "base64文字列をデコードできませんでした"
+  },
+  {
+    "id": "api.remote_cluster.cluster_not_deleted",
+    "translation": "リモートクラスタが削除されていません"
+  },
+  {
+    "id": "api.remote_cluster.encrypt_invite_error",
+    "translation": "提供されたパスワードを使用してリモートクラスタの招待を暗号化できませんでした"
+  },
+  {
+    "id": "api.remote_cluster.get.not_found",
+    "translation": "リモートクラスターが見つかりません"
+  },
+  {
+    "id": "api.remote_cluster.invite_decrypt_error",
+    "translation": "提供されたパスワードを使用してリモートクラスタの招待を復号化できませんでした"
+  },
+  {
+    "id": "app.import.custom_status.error",
+    "translation": "カスタムステータスを設定できませんでした。"
   }
 ]
diff --git a/server/i18n/ko.json b/server/i18n/ko.json
index 5d7eb6ac90c..cf38dd75d92 100644
--- a/server/i18n/ko.json
+++ b/server/i18n/ko.json
@@ -3127,14 +3127,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "검색 결과를 디코딩하지 못했습니다"
   },
-  {
-    "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.stop.already_stopped.app_error",
     "translation": "Elasticsearch가 이미 중지되었습니다."
diff --git a/server/i18n/nl.json b/server/i18n/nl.json
index ce4153d6e00..f235f8c5bab 100644
--- a/server/i18n/nl.json
+++ b/server/i18n/nl.json
@@ -3134,14 +3134,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Fout bij decoderen van zoekresultaten"
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Aanmaken van Elasticsearch-bulkprocessor is mislukt."
-  },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Starten van Elasticsearch-bulkprocessor is mislukt."
-  },
   {
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Elasticsearch is reeds gestopt."
@@ -8969,10 +8961,6 @@
     "id": "ent.elasticsearch.create_client.ca_cert_missing",
     "translation": "Kon het CA-bestand voor Elasticsearch niet openen"
   },
-  {
-    "id": "ent.elasticsearch.create_client.ca_cert_malformed",
-    "translation": "Decodering van de CA voor Elasticsearch is mislukt"
-  },
   {
     "id": "api.server.cws.health_check.app_error",
     "translation": "CWS Server is niet beschikbaar."
@@ -10076,5 +10064,37 @@
   {
     "id": "model.user.pre_save.password_too_long.app_error",
     "translation": "Je wachtwoord mag niet meer dan 72 tekens bevatten."
+  },
+  {
+    "id": "api.get_site_url_error",
+    "translation": "Kon de url van de instantie-site niet ophalen"
+  },
+  {
+    "id": "api.remote_cluster.accept_invitation_error",
+    "translation": "Kan de uitnodiging voor de externe cluster niet accepteren"
+  },
+  {
+    "id": "api.remote_cluster.base64_decode_error",
+    "translation": "Kon de base64 string niet decoderen"
+  },
+  {
+    "id": "api.remote_cluster.cluster_not_deleted",
+    "translation": "Remote cluster is niet verwijderd"
+  },
+  {
+    "id": "api.remote_cluster.encrypt_invite_error",
+    "translation": "Kan de uitnodiging van de externe cluster niet versleutelen met het opgegeven wachtwoord"
+  },
+  {
+    "id": "api.remote_cluster.get.not_found",
+    "translation": "Externe Cluster niet gevonden"
+  },
+  {
+    "id": "api.remote_cluster.invite_decrypt_error",
+    "translation": "Kon de uitnodiging voor de externe cluster niet decoderen met het opgegeven wachtwoord"
+  },
+  {
+    "id": "app.import.custom_status.error",
+    "translation": "Kan aangepaste status niet instellen."
   }
 ]
diff --git a/server/i18n/pl.json b/server/i18n/pl.json
index d9dec8669bd..0cce7e6c631 100644
--- a/server/i18n/pl.json
+++ b/server/i18n/pl.json
@@ -3139,14 +3139,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Błąd w dekodowaniu wyników wyszukiwania"
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Nie udało się utworzyć procesora zbiorczego Elasticsearch."
-  },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Nie można uruchomić procesora masowego Elasticsearch."
-  },
   {
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Elasticsearch jest aktualnie zatrzymane."
@@ -8971,10 +8963,6 @@
     "id": "ent.elasticsearch.create_client.ca_cert_missing",
     "translation": "Nie można otworzyć pliku CA dla Elasticsearch"
   },
-  {
-    "id": "ent.elasticsearch.create_client.ca_cert_malformed",
-    "translation": "Dekodowanie CA dla Elasticsearch nie powiodło się"
-  },
   {
     "id": "api.server.cws.health_check.app_error",
     "translation": "Serwer CWS nie jest dostępny."
@@ -10054,5 +10042,49 @@
   {
     "id": "api.system.logs.download_bytes_buffer.app_error",
     "translation": "Nie udało się zapisać logów do bufora"
+  },
+  {
+    "id": "api.user.update_password.password_hash.app_error",
+    "translation": "Wystąpił wewnętrzny błąd podczas zapisywania hasła."
+  },
+  {
+    "id": "model.user.pre_save.password_hash.app_error",
+    "translation": "Wystąpił wewnętrzny błąd podczas zapisywania hasła."
+  },
+  {
+    "id": "model.user.pre_save.password_too_long.app_error",
+    "translation": "Twoje hasło nie może zawierać więcej niż 72 znaki."
+  },
+  {
+    "id": "api.get_site_url_error",
+    "translation": "Nie można uzyskać adresu URL strony instancji"
+  },
+  {
+    "id": "api.remote_cluster.base64_decode_error",
+    "translation": "Nie można zdekodować ciągu base64"
+  },
+  {
+    "id": "api.remote_cluster.cluster_not_deleted",
+    "translation": "Zdalny klaster nie został usunięty"
+  },
+  {
+    "id": "api.remote_cluster.get.not_found",
+    "translation": "Nie znaleziono zdalnego klastra"
+  },
+  {
+    "id": "api.remote_cluster.invite_decrypt_error",
+    "translation": "Nie udało się odszyfrować zaproszenia do zdalnego klastra przy użyciu podanego hasła"
+  },
+  {
+    "id": "app.import.custom_status.error",
+    "translation": "Nie można ustawić niestandardowego statusu."
+  },
+  {
+    "id": "api.remote_cluster.accept_invitation_error",
+    "translation": "Nie udało się zaakceptować zaproszenia do zdalnego klastra"
+  },
+  {
+    "id": "api.remote_cluster.encrypt_invite_error",
+    "translation": "Nie udało się zaszyfrować zaproszenia do zdalnego klastra przy użyciu podanego hasła"
   }
 ]
diff --git a/server/i18n/pt-BR.json b/server/i18n/pt-BR.json
index 797fd5cada5..f5d66d97ce8 100644
--- a/server/i18n/pt-BR.json
+++ b/server/i18n/pt-BR.json
@@ -3139,14 +3139,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "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.start_bulk_processor_failed.app_error",
-    "translation": "Erro ao iniciar o bulk processor do Elasticsearch."
-  },
   {
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Elasticsearch já está parado."
diff --git a/server/i18n/ro.json b/server/i18n/ro.json
index 021924435cd..36ac093a3e1 100644
--- a/server/i18n/ro.json
+++ b/server/i18n/ro.json
@@ -3135,14 +3135,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Nu a reuşit să decodeze rezultatele cautării"
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Nu s-a putut crea procesorul în bloc Elasticsearch."
-  },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Nu a putut porni procesorul în bloc Elasticsearch."
-  },
   {
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Elasticsearch este deja oprit."
diff --git a/server/i18n/ru.json b/server/i18n/ru.json
index 30eadb46a83..d6fd00dbac4 100644
--- a/server/i18n/ru.json
+++ b/server/i18n/ru.json
@@ -3139,14 +3139,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Не удалось декодировать результаты поиска"
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Не удалось создать массовый обработчик Elasticsearch."
-  },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Не удалось запустить массовый обработчик Elasticsearch."
-  },
   {
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Elasticsearch уже остановлен."
@@ -8971,10 +8963,6 @@
     "id": "ent.elasticsearch.create_client.ca_cert_missing",
     "translation": "Не удалось открыть файл CA для Elasticsearch"
   },
-  {
-    "id": "ent.elasticsearch.create_client.ca_cert_malformed",
-    "translation": "Расшифровка CA для Elasticsearch не удалась"
-  },
   {
     "id": "api.server.cws.health_check.app_error",
     "translation": "Сервер CWS не доступен."
@@ -10066,5 +10054,37 @@
   {
     "id": "api.user.update_password.password_hash.app_error",
     "translation": "Произошла внутренняя ошибка при сохранении пароля."
+  },
+  {
+    "id": "api.remote_cluster.accept_invitation_error",
+    "translation": "Не удалось принять приглашение удаленного кластера"
+  },
+  {
+    "id": "api.remote_cluster.base64_decode_error",
+    "translation": "Не удалось декодировать строку base64"
+  },
+  {
+    "id": "api.remote_cluster.cluster_not_deleted",
+    "translation": "Удаленный (remote) кластер не был удален"
+  },
+  {
+    "id": "api.remote_cluster.encrypt_invite_error",
+    "translation": "Не удалось зашифровать приглашение на удаленный кластер с помощью предоставленного пароля"
+  },
+  {
+    "id": "api.remote_cluster.get.not_found",
+    "translation": "Удаленный (remote) кластер не найден"
+  },
+  {
+    "id": "app.import.custom_status.error",
+    "translation": "Невозможно установить пользовательский статус."
+  },
+  {
+    "id": "api.get_site_url_error",
+    "translation": "Не удалось получить URL сайта экземпляра"
+  },
+  {
+    "id": "api.remote_cluster.invite_decrypt_error",
+    "translation": "Не удалось расшифровать приглашение удаленного кластера с помощью предоставленного пароля"
   }
 ]
diff --git a/server/i18n/sv.json b/server/i18n/sv.json
index 4f2c0206619..a875eb0413e 100644
--- a/server/i18n/sv.json
+++ b/server/i18n/sv.json
@@ -3011,10 +3011,6 @@
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Elasticsearch är redan stoppad."
   },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Misslyckades att starta Elasticsearch bulk processor."
-  },
   {
     "id": "ent.elasticsearch.start.parse_server_version.app_error",
     "translation": "Det gick inte att tolka Elasticsearch-serverns versionsnummer."
@@ -3023,10 +3019,6 @@
     "id": "ent.elasticsearch.start.get_server_version.app_error",
     "translation": "Det gick inte att hämta Elasticsearch-serverns versionsnummer."
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Misslyckades att skapa Elasticsearch bulk processor."
-  },
   {
     "id": "ent.elasticsearch.search_users.unmarshall_user_failed",
     "translation": "Kunde inte avkoda sökresultaten"
@@ -8969,10 +8961,6 @@
     "id": "ent.elasticsearch.create_client.ca_cert_missing",
     "translation": "Kunde inte öppna CA-filen för Elasticsearch"
   },
-  {
-    "id": "ent.elasticsearch.create_client.ca_cert_malformed",
-    "translation": "Avkodningen av CA för Elasticsearch misslyckades"
-  },
   {
     "id": "api.server.cws.health_check.app_error",
     "translation": "CWS Server är inte tillgänglig."
diff --git a/server/i18n/tr.json b/server/i18n/tr.json
index 89f529b6e32..585e254d9d2 100644
--- a/server/i18n/tr.json
+++ b/server/i18n/tr.json
@@ -3134,14 +3134,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Arama sonuçlarının kodu çözülemedi"
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Elasticsearch toplu işlemi oluşturulamadı."
-  },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Elasticsearch toplu işlemi başlatılamadı."
-  },
   {
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Elasticsearch zaten durdurulmuş."
@@ -8969,10 +8961,6 @@
     "id": "ent.elasticsearch.create_client.ca_cert_missing",
     "translation": "Elasticsearch için CA dosyası açılamadı"
   },
-  {
-    "id": "ent.elasticsearch.create_client.ca_cert_malformed",
-    "translation": "Elasticsearch için CA kodu çözülemedi"
-  },
   {
     "id": "api.server.cws.health_check.app_error",
     "translation": "Müşteri site sunucusu kullanılamıyor."
diff --git a/server/i18n/uk.json b/server/i18n/uk.json
index bc739fa6672..48b06f21c8d 100644
--- a/server/i18n/uk.json
+++ b/server/i18n/uk.json
@@ -3135,14 +3135,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Не вдається розшифрувати результати пошуку"
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Не вдалося створити масовий процесор Elasticsearch"
-  },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Не вдалося запустити масовий процесор Elasticsearch"
-  },
   {
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Еластичний пошук не запускається"
diff --git a/server/i18n/vi.json b/server/i18n/vi.json
index 48a4afd99b2..21bd1a1e5f4 100644
--- a/server/i18n/vi.json
+++ b/server/i18n/vi.json
@@ -4529,10 +4529,6 @@
     "id": "api.command_join.fail.app_error",
     "translation": "Đã xảy ra lỗi khi tham gia kênh."
   },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "Không thể khởi động bộ xử lý hàng loạt Elaticsearch"
-  },
   {
     "id": "api.command_collapse.success",
     "translation": "Liên kết hình ảnh hiện tại bị thu gọn theo mặc định"
@@ -4925,10 +4921,6 @@
     "id": "model.config.is_valid.message_export.global_relay.config_missing.app_error",
     "translation": "Tin nhắn xuất từ ExportFormat được đặt từ 'globalrelay', nhưng GlobalRelaySettings đang thiếu"
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "Không thể tạo bộ xử lý hàng loạt Elaticsearch"
-  },
   {
     "id": "api.command_me.hint",
     "translation": "[message]"
@@ -8633,10 +8625,6 @@
     "id": "ent.cluster.timeout.error",
     "translation": "Đã hết thời gian chờ phản hồi của cụm"
   },
-  {
-    "id": "ent.elasticsearch.create_client.ca_cert_malformed",
-    "translation": "Giải mã CA cho Elaticsearch không thành công"
-  },
   {
     "id": "app.channel.get_channels_member_count.existing.app_error",
     "translation": "Không thể tìm thấy số lượng thành viên cho các kênh nhất định."
diff --git a/server/i18n/zh-CN.json b/server/i18n/zh-CN.json
index 40860faaa17..53da932a36e 100644
--- a/server/i18n/zh-CN.json
+++ b/server/i18n/zh-CN.json
@@ -3129,14 +3129,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "解码搜索结果失败"
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "创建 Elasticsearch 批量处理器失败。"
-  },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "开始 Elasticsearch 批量处理器失败。"
-  },
   {
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "ElasticSearch 已停止。"
@@ -8861,10 +8853,6 @@
     "id": "ent.elasticsearch.create_client.ca_cert_missing",
     "translation": "无法打开 Elasticsearch CA 文件"
   },
-  {
-    "id": "ent.elasticsearch.create_client.ca_cert_malformed",
-    "translation": "解码 Elasticsearch CA 失败"
-  },
   {
     "id": "app.user.get_badge_count.app_error",
     "translation": "无法获取用户的奖章数目。"
@@ -10040,5 +10028,53 @@
   {
     "id": "app.user.save.groupname.app_error",
     "translation": "无法判断该用户名是否已存在"
+  },
+  {
+    "id": "api.system.logs.download_bytes_buffer.app_error",
+    "translation": "向缓冲区写入日志时发生错误"
+  },
+  {
+    "id": "api.user.update_password.password_hash.app_error",
+    "translation": "在保存密码时发生了内部错误。"
+  },
+  {
+    "id": "api.get_site_url_error",
+    "translation": "无法取得实例 URL"
+  },
+  {
+    "id": "api.remote_cluster.accept_invitation_error",
+    "translation": "无法接受远程集群的邀请"
+  },
+  {
+    "id": "api.remote_cluster.base64_decode_error",
+    "translation": "无法解码 base64 字符串"
+  },
+  {
+    "id": "api.remote_cluster.cluster_not_deleted",
+    "translation": "远程阵列并未删除"
+  },
+  {
+    "id": "api.remote_cluster.encrypt_invite_error",
+    "translation": "无法通过给定的密码加密远程阵列的邀请"
+  },
+  {
+    "id": "api.remote_cluster.get.not_found",
+    "translation": "远程阵列未找到"
+  },
+  {
+    "id": "api.remote_cluster.invite_decrypt_error",
+    "translation": "无法通过给定的密码解密远程阵列的邀请"
+  },
+  {
+    "id": "app.import.custom_status.error",
+    "translation": "无法设定自定义状态。"
+  },
+  {
+    "id": "model.user.pre_save.password_hash.app_error",
+    "translation": "在保存密码时发生了内部错误。"
+  },
+  {
+    "id": "model.user.pre_save.password_too_long.app_error",
+    "translation": "密码长度不能超过 72 个字符。"
   }
 ]
diff --git a/server/i18n/zh-TW.json b/server/i18n/zh-TW.json
index ad06cf05163..47ff2f514ac 100644
--- a/server/i18n/zh-TW.json
+++ b/server/i18n/zh-TW.json
@@ -3127,14 +3127,6 @@
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "無法解碼搜尋結果"
   },
-  {
-    "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error",
-    "translation": "建立 Elasticsearch 批次處理器時失敗"
-  },
-  {
-    "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error",
-    "translation": "啟動 Elasticsearch 批次處理器時失敗"
-  },
   {
     "id": "ent.elasticsearch.stop.already_stopped.app_error",
     "translation": "Elasticsearch 已停止"
diff --git a/webapp/channels/src/i18n/be.json b/webapp/channels/src/i18n/be.json
index a4201cac128..47d9ec3af07 100644
--- a/webapp/channels/src/i18n/be.json
+++ b/webapp/channels/src/i18n/be.json
@@ -2744,7 +2744,6 @@
   "create_category_modal.createCategory": "Стварыць катэгорыю",
   "create_comment.addComment": "Адказаць у гэтай тэме...",
   "create_comment.commentTitle": "Каментаваць",
-  "create_post.comment": "Каментаваць",
   "create_post.deactivated": "Вы праглядаеце архіваваны канал як **дэактываваны карыстач**. Новыя паведамленні не могуць быць апублікаваны.",
   "create_post.error_message": "Ваша паведамленне занадта доўгае. Колькасць сімвалаў: {length}/{limit}",
   "create_post.fileProcessing": "Апрацоўка...",
diff --git a/webapp/channels/src/i18n/bg.json b/webapp/channels/src/i18n/bg.json
index 3c8b0ff26b4..3cd9514031b 100644
--- a/webapp/channels/src/i18n/bg.json
+++ b/webapp/channels/src/i18n/bg.json
@@ -2582,7 +2582,6 @@
   "create_category_modal.createCategory": "Създайте нова категория",
   "create_comment.addComment": "Отговор в този разговор...",
   "create_comment.commentTitle": "Коментар",
-  "create_post.comment": "Коментар",
   "create_post.deactivated": "Преглеждате архивиран канал с **деактивиран потребител**. Не могат да се публикуват нови съобщения.",
   "create_post.error_message": "Вашето съобщение е твърде дълго. Брой на знаците: {length}/{limit}",
   "create_post.fileProcessing": "Обработка ...",
diff --git a/webapp/channels/src/i18n/cs.json b/webapp/channels/src/i18n/cs.json
index 282f75d74f0..b90ed3191ff 100644
--- a/webapp/channels/src/i18n/cs.json
+++ b/webapp/channels/src/i18n/cs.json
@@ -3032,7 +3032,6 @@
   "create_group_memberships_modal.create": "Ano",
   "create_group_memberships_modal.desc": "Tímto přidáte (nebo znovu přidáte) {username} do všech dostupných týmů a kanálů na základě jejich členství ve skupinách. Tuto změnu můžete kdykoli vrátit.",
   "create_group_memberships_modal.title": "Znovu přidejte uživatele {username} do týmů a kanálů",
-  "create_post.comment": "Komentář",
   "create_post.deactivated": "Prohlížíte si archivovaný kanál s **deaktivovaným uživatelem**. Nové zprávy nelze posílat.",
   "create_post.error_message": "Vaše zpráva je příliš dlouhá. Počet znaků: {length}/{limit}",
   "create_post.fileProcessing": "Zpracovává se...",
diff --git a/webapp/channels/src/i18n/de.json b/webapp/channels/src/i18n/de.json
index 3032e05cac1..4fd69533747 100644
--- a/webapp/channels/src/i18n/de.json
+++ b/webapp/channels/src/i18n/de.json
@@ -3339,7 +3339,6 @@
   "create_group_memberships_modal.create": "Ja",
   "create_group_memberships_modal.desc": "Du bist dabei, {username} zu Teams und Channels auf der Grundlage ihrer LDAP-Gruppenmitgliedschaft hinzuzufügen oder erneut hinzuzufügen. Du kannst diese Änderung jederzeit rückgängig machen.",
   "create_group_memberships_modal.title": "Erneutes Hinzufügen von {username} zu Teams und Kanälen",
-  "create_post.comment": "Kommentar",
   "create_post.deactivated": "Du betrachtest einen archivierten Kanal mit einem **deaktivierten Benutzer**. Neue Nachrichten können nicht gesendet werden.",
   "create_post.error_message": "Deine Nachricht ist zu lang. Zeichenanzahl: {length}/{limit}",
   "create_post.fileProcessing": "Verarbeitung...",
diff --git a/webapp/channels/src/i18n/en-AU.json b/webapp/channels/src/i18n/en-AU.json
index 27a27885ce3..411be2b6b06 100644
--- a/webapp/channels/src/i18n/en-AU.json
+++ b/webapp/channels/src/i18n/en-AU.json
@@ -1458,6 +1458,7 @@
   "admin.log.logLevel": "Level",
   "admin.logs.Alllevels": "All levels",
   "admin.logs.Debug": "Debug",
+  "admin.logs.DownloadLogs": "Download Logs",
   "admin.logs.Error": "Error",
   "admin.logs.Info": "Info",
   "admin.logs.ReloadLogs": "Reload Logs",
@@ -2290,6 +2291,8 @@
   "admin.service.ssoSessionHours": "SSO Session Length (hours):",
   "admin.service.ssoSessionHoursDesc": "The number of hours from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.",
   "admin.service.ssoSessionHoursDesc.extendLength": "Set the number of hours from the last activity in Mattermost to the expiry of the user’s session for SSO authentication, such as SAML, GitLab and OAuth 2.0. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.",
+  "admin.service.terminateSessionsOnPasswordChange.helpText": "When true, all sessions of a user will expire if their password is changed by themselves or an administrator. If password change is initiated by user, their current session is not terminated",
+  "admin.service.terminateSessionsOnPasswordChange.label": "Terminate Sessions on Password Change: ",
   "admin.service.testSiteURL": "Test Live URL",
   "admin.service.testSiteURLFail": "Test unsuccessful: {error}",
   "admin.service.testSiteURLSuccess": "Test successful. This is a valid URL.",
@@ -3044,6 +3047,31 @@
   "channelHeader.unmute": "Unmute",
   "channelHeader.viewInfo": "View Info",
   "channelView.login.successfull": "Login Successful",
+  "channel_bookmarks.addBookmark": "Add a bookmark",
+  "channel_bookmarks.addBookmarkLimitReached": "Cannot add more than {limit} bookmarks",
+  "channel_bookmarks.addLink": "Add a link",
+  "channel_bookmarks.attachFile": "Attach a file",
+  "channel_bookmarks.confirm.delete.button": "Yes, delete",
+  "channel_bookmarks.confirm.delete.text": "Are you sure you want to delete the bookmark <strong>{displayName}</strong>?",
+  "channel_bookmarks.confirm.delete.title": "Delete bookmark",
+  "channel_bookmarks.copy": "Copy link",
+  "channel_bookmarks.copyFilePublicLink": "Get a public link",
+  "channel_bookmarks.create.confirm_add.button": "Add bookmark",
+  "channel_bookmarks.create.confirm_save.button": "Save bookmark",
+  "channel_bookmarks.create.edit.title": "Edit bookmark",
+  "channel_bookmarks.create.error.generic_save": "An error occurred while attempting to save the bookmark.",
+  "channel_bookmarks.create.error.invalid_url": "Please enter a valid link",
+  "channel_bookmarks.create.file_input.edit": "Edit",
+  "channel_bookmarks.create.file_input.label": "Attachment",
+  "channel_bookmarks.create.link_info": "Add a link to any post, file or external link",
+  "channel_bookmarks.create.link_placeholder": "Link",
+  "channel_bookmarks.create.title": "Add a bookmark",
+  "channel_bookmarks.create.title_input.clear_emoji": "Remove emoji",
+  "channel_bookmarks.create.title_input.label": "Title",
+  "channel_bookmarks.delete": "Delete",
+  "channel_bookmarks.edit": "Edit",
+  "channel_bookmarks.editBookmarkLabel": "Bookmark menu",
+  "channel_bookmarks.open": "Open",
   "channel_groups": "{channel} Groups",
   "channel_header.addChannelHeader": "Add a channel header",
   "channel_header.channelFiles": "Channel files",
@@ -3311,7 +3339,6 @@
   "create_group_memberships_modal.create": "Yes",
   "create_group_memberships_modal.desc": "You're about to add or re-add {username} to teams and channels based on their LDAP group membership. You can revert this change at any time.",
   "create_group_memberships_modal.title": "Re-add {username} to teams and channels",
-  "create_post.comment": "Comment",
   "create_post.deactivated": "You are viewing an archived channel with a **deactivated user**. New messages cannot be posted.",
   "create_post.error_message": "Your message is too long. Character count: {length}/{limit}",
   "create_post.fileProcessing": "Processing...",
@@ -3481,6 +3508,7 @@
   "edit_post.action_buttons.save": "Save",
   "edit_post.editPost": "Edit the post...",
   "edit_post.helper_text": "<strong>{key}ENTER</strong> to Save, <strong>ESC</strong> to Cancel",
+  "edit_post.no_notification_trigger_on_mention": "Editing this message with an '@mention' will not notify the recipient.",
   "edit_post.time_limit_button.for_n_seconds": "For {n} seconds",
   "edit_post.time_limit_button.no_limit": "Anytime",
   "edit_post.time_limit_modal.description": "Setting a time limit **applies to all users** who have the 'Edit Post' permissions in any permission scheme.",
@@ -3618,6 +3646,7 @@
   "file_upload.fileAbove": "File above {max}MB cannot be uploaded: {filename}",
   "file_upload.filesAbove": "Files above {max}MB cannot be uploaded: {filenames}",
   "file_upload.generic_error": "There was a problem uploading your files.",
+  "file_upload.generic_error_file": "An error occurred while uploading your file.",
   "file_upload.limited": "Uploads limited to {count, number} files maximum. Please use additional posts for more files.",
   "file_upload.menuAriaLabel": "Upload type selector",
   "file_upload.pasted": "Image Pasted at ",
@@ -4207,6 +4236,7 @@
   "multiselect.list.notFound": "No results found matching <b>{searchQuery}</b>",
   "multiselect.loading": "Loading...",
   "multiselect.maxGroupMembers": "Groups can't have more than 256 members.",
+  "multiselect.maxPeople": "Use ↑↓ to browse, ↵ to select. You can't add more than 7 people. Please <a>create a channel</a> to include more people. ",
   "multiselect.numGroupsRemaining": "Use ↑↓ to browse, ↵ to select. You can add {num, number} more {num, plural, one {group} other {groups}}. ",
   "multiselect.numMembers": "{memberOptions, number} of {totalCount, number} members",
   "multiselect.numPeopleRemaining": "Use ↑↓ to browse, ↵ to select. You can add {num, number} more {num, plural, one {person} other {people}}. ",
diff --git a/webapp/channels/src/i18n/es.json b/webapp/channels/src/i18n/es.json
index 94291123a52..0a3cfe28ea2 100644
--- a/webapp/channels/src/i18n/es.json
+++ b/webapp/channels/src/i18n/es.json
@@ -2944,7 +2944,6 @@
   "create_comment.commentTitle": "Comentario",
   "create_group_memberships_modal.cancel": "No",
   "create_group_memberships_modal.create": "Sí",
-  "create_post.comment": "Comentario",
   "create_post.deactivated": "Estás viendo un canal archivado con un **usuario desactivado**. No se pueden publicar nuevos mensajes.",
   "create_post.error_message": "Tu mensaje es demasiado largo. Cantidad de caracteres: {length}/{limit}",
   "create_post.fileProcessing": "Procesando...",
diff --git a/webapp/channels/src/i18n/fa.json b/webapp/channels/src/i18n/fa.json
index d2ffff32d2d..07b75b7a455 100644
--- a/webapp/channels/src/i18n/fa.json
+++ b/webapp/channels/src/i18n/fa.json
@@ -2645,7 +2645,6 @@
   "create_comment.commentTitle": "اظهار نظر",
   "create_group_memberships_modal.cancel": "خیر",
   "create_group_memberships_modal.create": "بله",
-  "create_post.comment": "اظهار نظر",
   "create_post.deactivated": "شما در حال مشاهده یک کانال آرشیو شده با **کاربر غیرفعال** هستید. پیام های جدید قابل ارسال نیست.",
   "create_post.error_message": "پیام شما خیلی طولانی است تعداد کاراکتر: {length}/{limit}",
   "create_post.fileProcessing": "در حال پردازش...",
diff --git a/webapp/channels/src/i18n/fr.json b/webapp/channels/src/i18n/fr.json
index dab9a64aa7b..44190739d4c 100644
--- a/webapp/channels/src/i18n/fr.json
+++ b/webapp/channels/src/i18n/fr.json
@@ -2957,7 +2957,6 @@
   "create_group_memberships_modal.create": "Oui",
   "create_group_memberships_modal.desc": "Vous vous apprêter à ajouter ou réajouter {username} aux équipes et aux canaux sur la base de son appartenance au groupe LDAP. Vous pouvez revenir en arrière à tout moment.",
   "create_group_memberships_modal.title": "Réajouter {username} aux équipes et canaux",
-  "create_post.comment": "Commentaire",
   "create_post.deactivated": "Ceci est un canal de messages personnels archivé contenant une discussion avec un utilisateur désactivé.",
   "create_post.error_message": "Votre message est trop long. Nombre de caractères : {length}/{limit}",
   "create_post.fileProcessing": "Traitement en cours...",
diff --git a/webapp/channels/src/i18n/fy.json b/webapp/channels/src/i18n/fy.json
index c929ca5a1c0..75a6e4fa0bb 100644
--- a/webapp/channels/src/i18n/fy.json
+++ b/webapp/channels/src/i18n/fy.json
@@ -2824,7 +2824,6 @@
   "create_category_modal.createCategory": "Maak een nieuwe categorie",
   "create_comment.addComment": "Reageer op dit draadje...",
   "create_comment.commentTitle": "Commentaar",
-  "create_post.comment": "Commentaar",
   "create_post.deactivated": "Je bekijkt een gearchiveerd kanaal met een gedeactiveerde gebruiker. Je kan geen nieuwe berichten plaatsen.",
   "create_post.error_message": "Je bericht is te lang. Aantal tekens: {length}/{limit}",
   "create_post.fileProcessing": "Bezig met verwerken...",
diff --git a/webapp/channels/src/i18n/hr.json b/webapp/channels/src/i18n/hr.json
index 51743850f82..c9db1d65850 100644
--- a/webapp/channels/src/i18n/hr.json
+++ b/webapp/channels/src/i18n/hr.json
@@ -961,7 +961,6 @@
   "create_comment.commentTitle": "Komentar",
   "create_group_memberships_modal.cancel": "Ne",
   "create_group_memberships_modal.create": "Da",
-  "create_post.comment": "Komentar",
   "create_post.send_message": "Pošalji poruku",
   "create_team.display_name.next": "Dalje",
   "create_team.display_name.required": "Ovo je obavezno polje",
diff --git a/webapp/channels/src/i18n/hu.json b/webapp/channels/src/i18n/hu.json
index 74a1c235450..d8891c6dc01 100644
--- a/webapp/channels/src/i18n/hu.json
+++ b/webapp/channels/src/i18n/hu.json
@@ -2802,7 +2802,6 @@
   "create_category_modal.createCategory": "Új kategória létrehozása",
   "create_comment.addComment": "Válaszolás erre az üzenetszálra...",
   "create_comment.commentTitle": "Hozzászólás",
-  "create_post.comment": "Hozzászólás",
   "create_post.deactivated": "Egy **archivált csatornát néz** egy **deaktivált felhasználóval**. Új üzeneteket nem lehet közzétenni.",
   "create_post.error_message": "Az üzenete túl hosszú. Karakterek száma: {length}/{limit}",
   "create_post.fileProcessing": "Feldolgozás...",
diff --git a/webapp/channels/src/i18n/it.json b/webapp/channels/src/i18n/it.json
index 5ccdca44dc0..48cffdb7de7 100644
--- a/webapp/channels/src/i18n/it.json
+++ b/webapp/channels/src/i18n/it.json
@@ -2188,7 +2188,6 @@
   "create_category_modal.createCategory": "Crea una categoria",
   "create_comment.addComment": "Aggiungi un commento...",
   "create_comment.commentTitle": "Commento",
-  "create_post.comment": "Commento",
   "create_post.deactivated": "Stai visualizzando un canale archiviato con un utente disattivato.",
   "create_post.error_message": "Il tuo messaggio è troppo lungo. Conteggio caratteri: {length}/{limit}",
   "create_post.fileProcessing": "Elaborazione...",
diff --git a/webapp/channels/src/i18n/ja.json b/webapp/channels/src/i18n/ja.json
index dd0aa5383a8..7a186936249 100644
--- a/webapp/channels/src/i18n/ja.json
+++ b/webapp/channels/src/i18n/ja.json
@@ -3339,7 +3339,6 @@
   "create_group_memberships_modal.create": "はい",
   "create_group_memberships_modal.desc": "LDAPグループメンバーシップに基いて {username} がチームとチャンネルに追加または再追加されます。この変更はいつでも元に戻すことができます。",
   "create_group_memberships_modal.title": "{username} をチームとチャンネルに再追加する",
-  "create_post.comment": "コメント",
   "create_post.deactivated": "**無効化されたユーザー** のいるアーカイブされたチャンネルを見ています。新しいメッセージは投稿できません。",
   "create_post.error_message": "メッセージが長すぎます。文字数: {length}/{limit}",
   "create_post.fileProcessing": "処理しています...",
diff --git a/webapp/channels/src/i18n/ko.json b/webapp/channels/src/i18n/ko.json
index 40efb153b60..93410498fb4 100644
--- a/webapp/channels/src/i18n/ko.json
+++ b/webapp/channels/src/i18n/ko.json
@@ -2177,7 +2177,6 @@
   "create_category_modal.create": "Create",
   "create_comment.addComment": "이 글타래에 답글 달기...",
   "create_comment.commentTitle": "답글",
-  "create_post.comment": "답글",
   "create_post.deactivated": "**비활성화된 사용자**와 함께 보관된 채널을 보고 있습니다. 새로운 게시글을 올릴 수 없습니다.",
   "create_post.error_message": "메시지가 너무 깁니다. 문자 수 : {length}/{limit}",
   "create_post.fileProcessing": "진행 중...",
diff --git a/webapp/channels/src/i18n/lt.json b/webapp/channels/src/i18n/lt.json
index f3412dec259..cf3ae3a9e20 100644
--- a/webapp/channels/src/i18n/lt.json
+++ b/webapp/channels/src/i18n/lt.json
@@ -2903,7 +2903,6 @@
   "create_group_memberships_modal.create": "Taip",
   "create_group_memberships_modal.desc": "Taip bus pridėta (arba iš naujo pridėta) {username} prie visų galimų komandų ir kanalų, atsižvelgiant į jų narystes grupėse. Šį pakeitimą galite bet kada atšaukti.",
   "create_group_memberships_modal.title": "Iš naujo pridėkite {username} prie komandų ir kanalų",
-  "create_post.comment": "Komentaras",
   "create_post.deactivated": "Žiūrite suarchyvuotą kanalą su **išaktyvintu naudotoju**. Naujų pranešimų negalima skelbti.",
   "create_post.error_message": "Jūsų žinutė per ilga. Simbolių skaičius: {length}/{limit}",
   "create_post.fileProcessing": "Apdorojimas...",
diff --git a/webapp/channels/src/i18n/nl.json b/webapp/channels/src/i18n/nl.json
index fc682762d1f..683e19beed5 100644
--- a/webapp/channels/src/i18n/nl.json
+++ b/webapp/channels/src/i18n/nl.json
@@ -3049,10 +3049,29 @@
   "channelView.login.successfull": "Succesvol ingelogd",
   "channel_bookmarks.addBookmark": "Een bladwijzer toevoegen",
   "channel_bookmarks.addBookmarkLimitReached": "Kan niet meer dan {limit} bladwijzers toevoegen",
+  "channel_bookmarks.addLink": "Een link toevoegen",
+  "channel_bookmarks.attachFile": "Een bestand bijvoegen",
   "channel_bookmarks.confirm.delete.button": "Ja, verwijderen",
   "channel_bookmarks.confirm.delete.text": "Weet je zeker dat je de bladwijzer <strong>{displayName}</strong> wilt verwijderen?",
   "channel_bookmarks.confirm.delete.title": "Bladwijzer verwijderen",
   "channel_bookmarks.copy": "Link kopiëren",
+  "channel_bookmarks.copyFilePublicLink": "Openbare link ophalen",
+  "channel_bookmarks.create.confirm_add.button": "Bladwijzer toevoegen",
+  "channel_bookmarks.create.confirm_save.button": "Bladwijzer bewaren",
+  "channel_bookmarks.create.edit.title": "Bladwijzer bewerken",
+  "channel_bookmarks.create.error.generic_save": "Er is een fout opgetreden bij het bewaren van de bladwijzer.",
+  "channel_bookmarks.create.error.invalid_url": "Voer een geldige link in",
+  "channel_bookmarks.create.file_input.edit": "Bewerken",
+  "channel_bookmarks.create.file_input.label": "Bijlage",
+  "channel_bookmarks.create.link_info": "Voeg een link toe aan een bericht, bestand of externe link",
+  "channel_bookmarks.create.link_placeholder": "Link",
+  "channel_bookmarks.create.title": "Een bladwijzer toevoegen",
+  "channel_bookmarks.create.title_input.clear_emoji": "Emoji verwijderen",
+  "channel_bookmarks.create.title_input.label": "Titel",
+  "channel_bookmarks.delete": "Verwijderen",
+  "channel_bookmarks.edit": "Bewerken",
+  "channel_bookmarks.editBookmarkLabel": "Bladwijzermenu",
+  "channel_bookmarks.open": "Openen",
   "channel_groups": "{channel} groepen",
   "channel_header.addChannelHeader": "Een kanaalhoofding toevoegen",
   "channel_header.channelFiles": "Kanaalbestanden",
@@ -3320,7 +3339,6 @@
   "create_group_memberships_modal.create": "Ja",
   "create_group_memberships_modal.desc": "Je staat op het punt {username} toe te voegen of opnieuw toe te voegen aan teams en kanalen op basis van het lidmaatschap van LDAP-groepen. Je kan deze wijziging op elk moment ongedaan maken.",
   "create_group_memberships_modal.title": "{username} opnieuw toevoegen aan teams en kanalen",
-  "create_post.comment": "Commentaar",
   "create_post.deactivated": "Je bekijkt een gearchiveerd kanaal met een gedeactiveerde gebruiker. Je kan geen nieuwe berichten plaatsen.",
   "create_post.error_message": "Je bericht is te lang. Aantal tekens: {length}/{limit}",
   "create_post.fileProcessing": "Bezig met verwerken...",
@@ -3628,6 +3646,7 @@
   "file_upload.fileAbove": "Het bestand groter dan {max} MB kan niet worden geüploaded: {filename}",
   "file_upload.filesAbove": "Bestanden groter dan {max}MB kunnen niet worden geüpload: {filenames}",
   "file_upload.generic_error": "Er is een probleem opgetreden bij het uploaden van uw bestanden.",
+  "file_upload.generic_error_file": "Er is een probleem opgetreden bij het uploaden van je bestand.",
   "file_upload.limited": "Uploads gelimiteerd tot {count, number} bestanden. Gebruik additionele berichten voor meer bestanden.",
   "file_upload.menuAriaLabel": "Upload Type Selector",
   "file_upload.pasted": "Afbeelding geplakt in ",
@@ -4217,6 +4236,7 @@
   "multiselect.list.notFound": "Geen resultaten gevonden die overeenkomen met <b>{searchQuery}</b>",
   "multiselect.loading": "Laden...",
   "multiselect.maxGroupMembers": "Er kunnen niet meer dan 256 leden tegelijkertijd aan een groep toegevoegd worden.",
+  "multiselect.maxPeople": "Gebruik ↑↓ om te bladeren, ↵ om te selecteren. Je kunt niet meer dan 7 mensen toevoegen. <a><Maak een kanaal</a> om meer mensen toe te voegen. ",
   "multiselect.numGroupsRemaining": "Gebruik ↑↓ om te bladeren, ↵ om te kiezen. Je kan toevoegen {num, number} more {num, plural, one {group} other {groups}}. ",
   "multiselect.numMembers": "{memberOptions, number} van {totalCount, number} leden",
   "multiselect.numPeopleRemaining": "Gebruik ↑↓ om te bladeren, ↵ om te kiezen. Je kan nog {num, number} {num, plural, one {persoon} other {personen}} toevoegen. ",
diff --git a/webapp/channels/src/i18n/pl.json b/webapp/channels/src/i18n/pl.json
index 5d185535a6d..a6fd4e7f8f0 100644
--- a/webapp/channels/src/i18n/pl.json
+++ b/webapp/channels/src/i18n/pl.json
@@ -392,11 +392,11 @@
   "admin.billing.subscription.planDetails.productName.unknown": "Nieznany produkt",
   "admin.billing.subscription.planDetails.subheader": "Szczegóły planu",
   "admin.billing.subscription.planDetails.userCount": "{userCount} użytkowników",
-  "admin.billing.subscription.privateCloudCard.cloudEnterprise.description": "W Mattermost współpracujemy z Tobą i Twoim zespołem, aby spełnić Twoje potrzeby w zakresie całego produktu. Jeśli szukasz rocznej zniżki, skontaktuj się z naszym działem sprzedaży.",
-  "admin.billing.subscription.privateCloudCard.cloudEnterprise.title": "Szukasz rocznej zniżki? ",
+  "admin.billing.subscription.privateCloudCard.cloudEnterprise.description": "W Mattermost współpracujemy z Tobą i Twoją organizacją, aby spełnić Twoje potrzeby w całym produkcie. Jeśli rozważasz szersze wdrożenie, porozmawiaj z nami.",
+  "admin.billing.subscription.privateCloudCard.cloudEnterprise.title": "Chcesz wdrożyć Mattermost w całej organizacji? ",
   "admin.billing.subscription.privateCloudCard.cloudFree.description": "Zoptymalizuj swoje procesy dzięki Kontom Gości, integracji pakietów Office365, GitLab SSO i zaawansowanym uprawnieniom.",
   "admin.billing.subscription.privateCloudCard.cloudFree.title": "Uaktualnij do wersji Cloud Professional",
-  "admin.billing.subscription.privateCloudCard.cloudProfessional.description": "Zaawansowane funkcje bezpieczeństwa i zgodności z przepisami oraz wsparcie premium. Zobacz {pricingLink}, aby uzyskać więcej szczegółów.",
+  "admin.billing.subscription.privateCloudCard.cloudProfessional.description": "Zaawansowane funkcje bezpieczeństwa i zgodności ze wsparciem premium. Więcej informacji znajdziesz na stronie {pricingLink}.",
   "admin.billing.subscription.privateCloudCard.cloudProfessional.title": "Uaktualnienie do wersji Cloud Enterprise",
   "admin.billing.subscription.privateCloudCard.contactSales": "Kontakt ze sprzedażą",
   "admin.billing.subscription.privateCloudCard.contactSalesy": "Kontakt ze sprzedażą",
@@ -3047,6 +3047,31 @@
   "channelHeader.unmute": "Wyłącz wyciszenie",
   "channelHeader.viewInfo": "Wyświetl Informacje",
   "channelView.login.successfull": "Logowanie zakończone powodzeniem",
+  "channel_bookmarks.addBookmark": "Dodaj zakładkę",
+  "channel_bookmarks.addBookmarkLimitReached": "Nie możesz dodać więcej niż {limit} zakładek",
+  "channel_bookmarks.addLink": "Dodaj link",
+  "channel_bookmarks.attachFile": "Dołącz plik",
+  "channel_bookmarks.confirm.delete.button": "Tak, usuń",
+  "channel_bookmarks.confirm.delete.text": "Czy na pewno chcesz usunąć zakładkę <strong>{displayName}</strong> ?",
+  "channel_bookmarks.confirm.delete.title": "Usuń zakładkę",
+  "channel_bookmarks.copy": "Kopiuj odnośnik",
+  "channel_bookmarks.copyFilePublicLink": "Uzyskaj publiczny link",
+  "channel_bookmarks.create.confirm_add.button": "Dodaj zakładkę",
+  "channel_bookmarks.create.confirm_save.button": "Zapisz zakładkę",
+  "channel_bookmarks.create.edit.title": "Edytuj zakładkę",
+  "channel_bookmarks.create.error.generic_save": "Wystąpił błąd podczas próby zapisania zakładki.",
+  "channel_bookmarks.create.error.invalid_url": "Wprowadź prawidłowy link",
+  "channel_bookmarks.create.file_input.edit": "Edytuj",
+  "channel_bookmarks.create.file_input.label": "Załącznik",
+  "channel_bookmarks.create.link_info": "Dodaj link do dowolnego postu, pliku lub linku zewnętrznego",
+  "channel_bookmarks.create.link_placeholder": "Link",
+  "channel_bookmarks.create.title": "Dodaj zakładkę",
+  "channel_bookmarks.create.title_input.clear_emoji": "Usuń emoji",
+  "channel_bookmarks.create.title_input.label": "Tytuł",
+  "channel_bookmarks.delete": "Usuń",
+  "channel_bookmarks.edit": "Edytuj",
+  "channel_bookmarks.editBookmarkLabel": "Menu zakładek",
+  "channel_bookmarks.open": "Otwórz",
   "channel_groups": "{channel} Grupy",
   "channel_header.addChannelHeader": "Dodaj nagłówek kanału",
   "channel_header.channelFiles": "Pliki kanału",
@@ -3314,7 +3339,6 @@
   "create_group_memberships_modal.create": "Tak",
   "create_group_memberships_modal.desc": "Zamierzasz dodać lub ponownie dodać {username} do zespołów i kanałów na podstawie ich członkostwa w grupie LDAP. Możesz cofnąć tę zmianę w dowolnym momencie.",
   "create_group_memberships_modal.title": "Ponownie dodaj {username} do zespołów i kanałów",
-  "create_post.comment": "Komentarz",
   "create_post.deactivated": "Przeglądasz zarchiwizowany kanał z deaktywowanym użytkownikiem.",
   "create_post.error_message": "Wiadomość jest zbyt długa. Ilość znaków: {length}/{limit}",
   "create_post.fileProcessing": "Przetwarzanie...",
@@ -3622,6 +3646,7 @@
   "file_upload.fileAbove": "Plik powyżej {max} MB nie może zostać wysłany: {filename}",
   "file_upload.filesAbove": "Pliki powyżej {max} MB nie mogą zostać wysłane: {filenames}",
   "file_upload.generic_error": "Wystąpił problem podczas przesyłania twoich plików.",
+  "file_upload.generic_error_file": "Wystąpił problem z przesłaniem Twojego pliku.",
   "file_upload.limited": "Przesyłanie danych jest ograniczone do maksymalnie {count, number} plików. Proszę użyć dodatkowych postów, aby wysłać więcej plików.",
   "file_upload.menuAriaLabel": "Prześlij typ selektora",
   "file_upload.pasted": "Obrazek wklejony o ",
@@ -5052,7 +5077,7 @@
   "suggestion.mention.members": "Członkowie kanału",
   "suggestion.mention.morechannels": "Inne kanały",
   "suggestion.mention.moremembers": "Inni użytkownicy",
-  "suggestion.mention.nonmembers": "Nie na kanale",
+  "suggestion.mention.nonmembers": "Nie na Kanale",
   "suggestion.mention.private.channels": "Prywatne Kanały",
   "suggestion.mention.recent.channels": "Ostatni",
   "suggestion.mention.special": "Specjalne wzmianki",
diff --git a/webapp/channels/src/i18n/pt-BR.json b/webapp/channels/src/i18n/pt-BR.json
index 84e553a77b1..d088186e0cb 100644
--- a/webapp/channels/src/i18n/pt-BR.json
+++ b/webapp/channels/src/i18n/pt-BR.json
@@ -2707,7 +2707,6 @@
   "create_group_memberships_modal.create": "Sim",
   "create_group_memberships_modal.desc": "Isso adicionará (ou adicionará novamente) {username} a todas as equipes e canais disponíveis com base em suas associações de grupo. Você pode reverter essa alteração a qualquer momento.",
   "create_group_memberships_modal.title": "Adicione {username} novamente às equipes e canais",
-  "create_post.comment": "Comentário",
   "create_post.deactivated": "Você está vendo um canal arquivado com um **usuário inativo**. Novas mensagens não serão publicadas.",
   "create_post.error_message": "Sua mensagem é muito longa. Número de caracteres: {length}/{limit}",
   "create_post.fileProcessing": "Processando...",
diff --git a/webapp/channels/src/i18n/ro.json b/webapp/channels/src/i18n/ro.json
index b3764b03280..eb145b32fa9 100644
--- a/webapp/channels/src/i18n/ro.json
+++ b/webapp/channels/src/i18n/ro.json
@@ -2465,7 +2465,6 @@
   "create_category_modal.createCategory": "Creați o categorie nouă",
   "create_comment.addComment": "Adauga un comentariu...",
   "create_comment.commentTitle": "Comentariu",
-  "create_post.comment": "Comentariu",
   "create_post.deactivated": "Vizionați un canal arhivat cu un **utilizator dezactivat**. Mesajele noi nu pot fi postate.",
   "create_post.error_message": "Mesajul dvs. este prea lung. Număr de caractere: {length} / {limit}",
   "create_post.fileProcessing": "Prelucrare...",
diff --git a/webapp/channels/src/i18n/ru.json b/webapp/channels/src/i18n/ru.json
index 905061d2e9b..e16547ba92a 100644
--- a/webapp/channels/src/i18n/ru.json
+++ b/webapp/channels/src/i18n/ru.json
@@ -3339,7 +3339,6 @@
   "create_group_memberships_modal.create": "Да",
   "create_group_memberships_modal.desc": "Вы собираетесь добавить или изменить {username} в команды и каналы на основе их членства в группах LDAP. Вы можете отменить это изменение в любое время.",
   "create_group_memberships_modal.title": "Повторное добавление {username} к командам и каналам",
-  "create_post.comment": "Комментарий",
   "create_post.deactivated": "Вы просматриваете архивированный канал с **деактивированным пользователем**. Новые сообщения не могут быть отправлены.",
   "create_post.error_message": "Ваше сообщение слишком длинное. Количество символов: {length}/{limit}",
   "create_post.fileProcessing": "Обработка...",
@@ -3614,6 +3613,10 @@
   "export_error_modal.inProgress.title": "Экспорт находится в процессе выполнения",
   "export_error_modal.title": "Экспорт не может быть инициирован",
   "export_user_data_modal.dange_range.all_time": "Вы собираетесь экспортировать данные пользователей за все время. Когда экспорт будет готов, CSV-файл будет отправлен вам в личном сообщении Mattermost. Этот экспорт займет несколько минут.",
+  "export_user_data_modal.dange_range.last_30_days": "Вы собираетесь экспортировать данные о пользователях за последние 30 дней. Когда экспорт будет готов, CSV-файл будет отправлен вам в личном сообщении Mattermost. Этот экспорт займет несколько минут.",
+  "export_user_data_modal.dange_range.last_6_months": "Вы собираетесь экспортировать данные о пользователях за последние 6 месяцев. Когда экспорт будет готов, CSV-файл будет отправлен вам в личном сообщении Mattermost. Этот экспорт займет несколько минут.",
+  "export_user_data_modal.dange_range.previous_month": "Вы собираетесь экспортировать данные пользователей за предыдущий месяц. Когда экспорт будет готов, CSV-файл будет отправлен вам в личном сообщении Mattermost. Этот экспорт займет несколько минут.",
+  "export_user_data_modal.do_not_show": "Не показывай это снова",
   "feature_restricted_modal.agreement": "Нажимая <highlight>Попробовать бесплатно в течение {trialLength} дней</highlight>, я соглашаюсь с условиями <linkEvaluation>Соглашения об оценке программного обеспечения Mattermost</linkEvaluation>, <linkPrivacy>Политики конфиденциальности</linkPrivacy>, а также с получением электронных сообщений о продукте.",
   "feature_restricted_modal.button.notify": "Уведомить администратора",
   "feature_restricted_modal.button.plans": "Просмотр тарифных планов",
diff --git a/webapp/channels/src/i18n/sv.json b/webapp/channels/src/i18n/sv.json
index f5ca2246e6b..c7eae194ecc 100644
--- a/webapp/channels/src/i18n/sv.json
+++ b/webapp/channels/src/i18n/sv.json
@@ -3339,7 +3339,6 @@
   "create_group_memberships_modal.create": "Ja",
   "create_group_memberships_modal.desc": "Du är på väg att lägga till {username} till team och kanaler baserat på LDAP-gruppmedlemskap. Du kan återkalla den här ändringen när som helst.",
   "create_group_memberships_modal.title": "Lägg till {username} i team och kanaler på nytt",
-  "create_post.comment": "Kommentar",
   "create_post.deactivated": "Du visar en arkiverad kanal med ett **avstängt användarkonto**. Nya meddelanden kan inte postas.",
   "create_post.error_message": "Ditt meddelande är för långt. Antal tecken: {length}/{limit}",
   "create_post.fileProcessing": "Bearbetar...",
diff --git a/webapp/channels/src/i18n/tr.json b/webapp/channels/src/i18n/tr.json
index e5809ff7f0a..2940c13422c 100644
--- a/webapp/channels/src/i18n/tr.json
+++ b/webapp/channels/src/i18n/tr.json
@@ -3280,7 +3280,6 @@
   "create_group_memberships_modal.create": "Evet",
   "create_group_memberships_modal.desc": "{username} adresini LDAP grup üyeliklerine göre takım ve kanallara yeniden eklemek üzeresiniz. Bu değişikliği istediğiniz zaman geri alabilirsiniz.",
   "create_group_memberships_modal.title": "{username} takımlara ve kanallara yeniden eklensin",
-  "create_post.comment": "Yorum",
   "create_post.deactivated": "**Devre dışı bırakılmış bir kullanıcı** ile arşivlenmiş bir kanala bakıyorsunuz. Yeni ileti gönderilemez.",
   "create_post.error_message": "İletiniz çok uzun. Karakter sayısı: {length}/{limit}",
   "create_post.fileProcessing": "İşleniyor...",
diff --git a/webapp/channels/src/i18n/uk.json b/webapp/channels/src/i18n/uk.json
index bbca865194a..6b87fc0d494 100644
--- a/webapp/channels/src/i18n/uk.json
+++ b/webapp/channels/src/i18n/uk.json
@@ -1622,7 +1622,6 @@
   "create_category_modal.create": "Створити",
   "create_comment.addComment": "Додати коментар...",
   "create_comment.commentTitle": "Коментар",
-  "create_post.comment": "Коментар",
   "create_post.deactivated": "Ви переглядаєте архівований канал з деактивованим користувачем.",
   "create_post.error_message": "Ваше повідомлення занадто довге. Кількість символів: {length}/{limit}",
   "create_post.fileProcessing": "Обробка...",
diff --git a/webapp/channels/src/i18n/vi.json b/webapp/channels/src/i18n/vi.json
index f5266c60165..1e4afcfda69 100644
--- a/webapp/channels/src/i18n/vi.json
+++ b/webapp/channels/src/i18n/vi.json
@@ -2891,7 +2891,6 @@
   "create_group_memberships_modal.create": "Có",
   "create_group_memberships_modal.desc": "Thao tác này sẽ thêm (hoặc thêm lại) {username} vào tất cả các nhóm và kênh có sẵn dựa trên tư cách thành viên nhóm của họ. Bạn có thể hoàn nguyên thay đổi này bất cứ lúc nào.",
   "create_group_memberships_modal.title": "Thêm lại {username} vào nhóm và kênh",
-  "create_post.comment": "Nhận xét",
   "create_post.deactivated": "Bạn đang xem một kênh đã lưu trữ có **người dùng đã bị hủy kích hoạt**. Tin nhắn mới không thể được đăng.",
   "create_post.error_message": "Tin nhắn của bạn quá dài. Số lượng ký tự: {length} / {limit}",
   "create_post.fileProcessing": "Đang xử lý ...",
diff --git a/webapp/channels/src/i18n/zh-CN.json b/webapp/channels/src/i18n/zh-CN.json
index a380562f6ba..4a27dc9d9ea 100644
--- a/webapp/channels/src/i18n/zh-CN.json
+++ b/webapp/channels/src/i18n/zh-CN.json
@@ -1458,6 +1458,7 @@
   "admin.log.logLevel": "日志等级",
   "admin.logs.Alllevels": "所有等级",
   "admin.logs.Debug": "调试",
+  "admin.logs.DownloadLogs": "下载日志",
   "admin.logs.Error": "错误",
   "admin.logs.Info": "信息",
   "admin.logs.ReloadLogs": "重新加载日志",
@@ -2290,6 +2291,8 @@
   "admin.service.ssoSessionHours": "SSO会话时长（小时）：",
   "admin.service.ssoSessionHoursDesc": "从用户输入凭据的上次时间到用户会话过期的小时数。如果身份验证方法是 SAML 或 GitLab，如果用户已经登录到 SAML 或 GitLab，他们可能会自动登录到 Mattermost。更改此设置后，设置将在用户下次输入凭据后生效。",
   "admin.service.ssoSessionHoursDesc.extendLength": "设置从 Mattermost 的最后活动到用户在 SSO 身份验证（如 SAML、GitLab 和 OAuth 2.0）中会话过期的小时数。如果身份验证方法是 SAML 或 GitLab，如果用户已经登录到 SAML 或 GitLab，他们可能会自动登录到 Mattermost。更改此设置后，设置将在用户下次输入凭据后生效。",
+  "admin.service.terminateSessionsOnPasswordChange.helpText": "当设置为有效时，如果用户自己或管理员更改了密码，该用户的所有会话将过期。如果密码更改是由用户发起的，他们当前的会话不会被终止",
+  "admin.service.terminateSessionsOnPasswordChange.label": "在更改密码时吊销所有会话： ",
   "admin.service.testSiteURL": "测试网址",
   "admin.service.testSiteURLFail": "测试失败： {error}",
   "admin.service.testSiteURLSuccess": "测试成功。此为有效网址。",
@@ -3044,6 +3047,31 @@
   "channelHeader.unmute": "取消静音",
   "channelHeader.viewInfo": "频道详情",
   "channelView.login.successfull": "登录成功",
+  "channel_bookmarks.addBookmark": "加入收藏夹",
+  "channel_bookmarks.addBookmarkLimitReached": "无法加入超过 {limit} 个收藏夹",
+  "channel_bookmarks.addLink": "加入链接",
+  "channel_bookmarks.attachFile": "添加附件",
+  "channel_bookmarks.confirm.delete.button": "是的，删除",
+  "channel_bookmarks.confirm.delete.text": "你确定要删除书签 <strong>{displayName}</strong> 吗？",
+  "channel_bookmarks.confirm.delete.title": "删除书签",
+  "channel_bookmarks.copy": "复制链接",
+  "channel_bookmarks.copyFilePublicLink": "获得公开链接",
+  "channel_bookmarks.create.confirm_add.button": "添加书签",
+  "channel_bookmarks.create.confirm_save.button": "保存书签",
+  "channel_bookmarks.create.edit.title": "编辑书签",
+  "channel_bookmarks.create.error.generic_save": "在保存书签时发生了错误。",
+  "channel_bookmarks.create.error.invalid_url": "请输入有效的链接",
+  "channel_bookmarks.create.file_input.edit": "编辑",
+  "channel_bookmarks.create.file_input.label": "附件",
+  "channel_bookmarks.create.link_info": "添加链接到任何消息、文件或外部链接",
+  "channel_bookmarks.create.link_placeholder": "链接",
+  "channel_bookmarks.create.title": "添加书签",
+  "channel_bookmarks.create.title_input.clear_emoji": "删除颜文字",
+  "channel_bookmarks.create.title_input.label": "标题",
+  "channel_bookmarks.delete": "删除",
+  "channel_bookmarks.edit": "编辑",
+  "channel_bookmarks.editBookmarkLabel": "书签菜单",
+  "channel_bookmarks.open": "打开",
   "channel_groups": "{channel} 群组",
   "channel_header.addChannelHeader": "添加频道标题",
   "channel_header.channelFiles": "频道文件",
@@ -3311,7 +3339,6 @@
   "create_group_memberships_modal.create": "是",
   "create_group_memberships_modal.desc": "您将根据他们的 LDAP 组成员身份将 {username} 添加或重新添加到团队和频道中。您随时可以撤销此更改。",
   "create_group_memberships_modal.title": "将{username}重新添加到团队和频道",
-  "create_post.comment": "评论",
   "create_post.deactivated": "您正在查看已注销用户的归档频道。",
   "create_post.error_message": "您的消息太长。字数：{length}/{limit}",
   "create_post.fileProcessing": "处理中…",
@@ -3481,6 +3508,7 @@
   "edit_post.action_buttons.save": "保存",
   "edit_post.editPost": "编辑信息…",
   "edit_post.helper_text": "<strong>{key}回车</strong>保存，<strong>ESC</strong>取消",
+  "edit_post.no_notification_trigger_on_mention": "编辑信息并加上“@提及”并不会通知到目标用户。",
   "edit_post.time_limit_button.for_n_seconds": "⚙ {n} 秒",
   "edit_post.time_limit_button.no_limit": "随时",
   "edit_post.time_limit_modal.description": "设定时限将应用到任何权限方案中具有“编辑消息”权限的用户。",
@@ -3618,6 +3646,7 @@
   "file_upload.fileAbove": "文件超过 {max}MB 不能被上传：{filename}",
   "file_upload.filesAbove": "超过 {max}MB 的文件不能被上传：{filenames}",
   "file_upload.generic_error": "上传您的文件时出现错误。",
+  "file_upload.generic_error_file": "在上传文件时发生了一个错误。",
   "file_upload.limited": "最大上传文件数限制为 {count, number}。请使用新信息以上传更多文件。",
   "file_upload.menuAriaLabel": "上传类型选择器",
   "file_upload.pasted": "图片已粘贴至 ",
@@ -4207,6 +4236,7 @@
   "multiselect.list.notFound": "未找到<b>{searchQuery}</b>的搜索结果",
   "multiselect.loading": "加载中…",
   "multiselect.maxGroupMembers": "一次最多只能添加256个成员到一个群组中。",
+  "multiselect.maxPeople": "使用 ↑↓ 进行浏览，↵ 进行选择。你不能添加超过7名用户。请<a>创建一个频道</a>以加入更多用户。 ",
   "multiselect.numGroupsRemaining": "使用↑↓浏览，↵选择。您还可以添加 {num, number} 个群组。 ",
   "multiselect.numMembers": "{memberOptions, number}/{totalCount, number} 成员",
   "multiselect.numPeopleRemaining": "使用↑↓浏览，↵选择。您可以每次添加 {num, number} 位用户。 ",
diff --git a/webapp/channels/src/i18n/zh-TW.json b/webapp/channels/src/i18n/zh-TW.json
index 87a11caa943..112c0513465 100644
--- a/webapp/channels/src/i18n/zh-TW.json
+++ b/webapp/channels/src/i18n/zh-TW.json
@@ -2143,7 +2143,6 @@
   "create_category_modal.createCategory": "建立新分類",
   "create_comment.addComment": "新增註解...",
   "create_comment.commentTitle": "註解",
-  "create_post.comment": "註解",
   "create_post.deactivated": "正以被停用的使用者觀看被封存的頻道。",
   "create_post.error_message": "訊息過長。字數：{length}/{limit}",
   "create_post.fileProcessing": "處理中...",