diff --git a/i18n/bg.json b/i18n/bg.json
index 88e93cf1d1..28c0f60126 100644
--- a/i18n/bg.json
+++ b/i18n/bg.json
@@ -2503,14 +2503,6 @@
     "id": "app.team.analytics_team_count.app_error",
     "translation": "Не може да се броят екипите."
   },
-  {
-    "id": "app.team.analytics_public_team_count.app_error",
-    "translation": "Не могат да се броят публичните екипи."
-  },
-  {
-    "id": "app.team.analytics_private_team_count.app_error",
-    "translation": "Не могат да се броят частните екипи."
-  },
   {
     "id": "app.system_install_date.parse_int.app_error",
     "translation": "Неуспешна анализ на датата на инсталиране."
@@ -4003,10 +3995,6 @@
     "id": "app.team.get_all_team_listing.app_error",
     "translation": "Не успяхме да вземем всички екипи."
   },
-  {
-    "id": "app.team.get_all_private_team_page_listing.app_error",
-    "translation": "Не успяхме да вземем всички частни екипи в страницата."
-  },
   {
     "id": "api.upgrade_to_enterprise.already-done.app_error",
     "translation": "Вече надградихте до Mattermost корпоративна версия. Моля, рестартирайте сървъра, за да завършите надстройката."
diff --git a/i18n/de.json b/i18n/de.json
index 05944dc32c..045414403f 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -7050,10 +7050,6 @@
     "id": "app.team.get_all_team_listing.app_error",
     "translation": "Konnte nicht alle Teams abrufen."
   },
-  {
-    "id": "app.team.get_all_private_team_page_listing.app_error",
-    "translation": "Konnte nicht alle privaten Teams abrufen."
-  },
   {
     "id": "app.team.get_all_private_team_listing.app_error",
     "translation": "Konnte nicht alle privaten Teams abrufen."
@@ -7074,14 +7070,6 @@
     "id": "app.team.analytics_team_count.app_error",
     "translation": "Konnte die Anzahl der Teams nicht abrufen."
   },
-  {
-    "id": "app.team.analytics_public_team_count.app_error",
-    "translation": "Konnte die Anzahl der öffentlichen Teams nicht abrufen."
-  },
-  {
-    "id": "app.team.analytics_private_team_count.app_error",
-    "translation": "Konnte die Anzahl der privaten Teams nicht abrufen."
-  },
   {
     "id": "api.user.login_cws.license.error",
     "translation": "Bot-Anmeldung ist verboten."
diff --git a/i18n/es.json b/i18n/es.json
index e8da989006..99a45c29b1 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -7182,14 +7182,6 @@
     "id": "app.team.analytics_team_count.app_error",
     "translation": "No se puede obtener la cantidad de equipos."
   },
-  {
-    "id": "app.team.analytics_public_team_count.app_error",
-    "translation": "No se puede obtener la cantidad de equipos públicos."
-  },
-  {
-    "id": "app.team.analytics_private_team_count.app_error",
-    "translation": "No se puede obtener la cantidad de equipos privados."
-  },
   {
     "id": "app.post.get_posts_since.app_error",
     "translation": "No se puede obtener los mensajes del canal."
@@ -7746,10 +7738,6 @@
     "id": "api.post.search_posts.invalid_body.app_error",
     "translation": "No se puede analizar el cuerpo de la solicitud."
   },
-  {
-    "id": "app.team.get_all_private_team_page_listing.app_error",
-    "translation": "No pudimos poner todos los equipos privados en la página."
-  },
   {
     "id": "api.user.login_cws.license.error",
     "translation": "Está prohibido iniciar sesión con CWS."
diff --git a/i18n/fr.json b/i18n/fr.json
index 020b356f37..fdb2f6afcb 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -7030,10 +7030,6 @@
     "id": "app.team.get_all_team_listing.app_error",
     "translation": "Impossible de récupérer toutes les équipes."
   },
-  {
-    "id": "app.team.get_all_private_team_page_listing.app_error",
-    "translation": "Impossible de récupérer toutes les équipes privées."
-  },
   {
     "id": "app.team.get_all_private_team_listing.app_error",
     "translation": "Impossible de récupérer toutes les équipes privées."
@@ -7054,14 +7050,6 @@
     "id": "app.team.analytics_team_count.app_error",
     "translation": "Impossible de compter les équipes."
   },
-  {
-    "id": "app.team.analytics_public_team_count.app_error",
-    "translation": "Impossible de compter les équipes publiques."
-  },
-  {
-    "id": "app.team.analytics_private_team_count.app_error",
-    "translation": "Impossible de compter les équipes privées."
-  },
   {
     "id": "api.user.login_cws.license.error",
     "translation": "La connexion de bot est interdite."
diff --git a/i18n/it.json b/i18n/it.json
index 2db5756d47..ae8b8268c1 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -7274,10 +7274,6 @@
     "id": "app.team.get_all_team_listing.app_error",
     "translation": "Non è stato possibile recuperare tutte le squadre"
   },
-  {
-    "id": "app.team.get_all_private_team_page_listing.app_error",
-    "translation": "Non è stato possibile recuperare tutte le squadre private"
-  },
   {
     "id": "app.team.get_all_private_team_listing.app_error",
     "translation": "Non è stato possibile recuperare tutte le squadre private"
@@ -7298,14 +7294,6 @@
     "id": "app.team.analytics_team_count.app_error",
     "translation": "Impossibile contare le squadre"
   },
-  {
-    "id": "app.team.analytics_public_team_count.app_error",
-    "translation": "Impossibile contare le squadre pubbliche"
-  },
-  {
-    "id": "app.team.analytics_private_team_count.app_error",
-    "translation": "Impossibile contare le squadre private"
-  },
   {
     "id": "api.user.login_cws.license.error",
     "translation": "L'accesso bot è proibito."
diff --git a/i18n/ja.json b/i18n/ja.json
index 3b63726a35..ad765e4a9d 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -7025,14 +7025,6 @@
     "id": "app.team.analytics_team_count.app_error",
     "translation": "チームをカウントできませんでした。"
   },
-  {
-    "id": "app.team.analytics_public_team_count.app_error",
-    "translation": "公開チームをカウントできませんでした。"
-  },
-  {
-    "id": "app.team.analytics_private_team_count.app_error",
-    "translation": "非公開チームをカウントできませんでした。"
-  },
   {
     "id": "app.post.get_post_id_around.app_error",
     "translation": "指定時刻周辺の投稿を取得できませんでした。"
@@ -7185,10 +7177,6 @@
     "id": "app.team.get_member.app_error",
     "translation": "チームメンバーを取得できませんでした。"
   },
-  {
-    "id": "app.team.get_all_private_team_page_listing.app_error",
-    "translation": "ページ内の全ての非公開チームを取得できませんでした。"
-  },
   {
     "id": "app.team.get_all_private_team_listing.app_error",
     "translation": "全ての非公開チームを取得できませんでした。"
diff --git a/i18n/ko.json b/i18n/ko.json
index 102775e875..080bcc4ec7 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -7029,14 +7029,6 @@
     "id": "app.team.analytics_team_count.app_error",
     "translation": "팀의 갯수를 계산할 수 없습니다."
   },
-  {
-    "id": "app.team.analytics_public_team_count.app_error",
-    "translation": "공개 팀의 갯수를 계산할 수 없습니다."
-  },
-  {
-    "id": "app.team.analytics_private_team_count.app_error",
-    "translation": "비공개 팀의 갯수를 계산할 수 없습니다."
-  },
   {
     "id": "app.post.get_posts_since.app_error",
     "translation": "해당 채널에 대한 게시글을 가져올 수 없습니다."
@@ -7321,10 +7313,6 @@
     "id": "app.post.get_post_after_time.app_error",
     "translation": "시간 구간 이후의 게시글을 가져올 수 없습니다."
   },
-  {
-    "id": "app.team.get_all_private_team_page_listing.app_error",
-    "translation": "모든 비공개 팀을 페이지 형태로 가져오지 못했습니다."
-  },
   {
     "id": "api.user.login_cws.license.error",
     "translation": "CWS 로그인이 금지되어 있습니다."
diff --git a/i18n/nl.json b/i18n/nl.json
index 2356fd8b0e..eba8d1efd1 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -7582,10 +7582,6 @@
     "id": "app.team.get_all_team_listing.app_error",
     "translation": "We konden niet alle teams ophalen."
   },
-  {
-    "id": "app.team.get_all_private_team_page_listing.app_error",
-    "translation": "We kunnen niet alle private teams op de pagina krijgen."
-  },
   {
     "id": "app.team.get_all_private_team_listing.app_error",
     "translation": "We kunnen niet alle private teams ophalen."
@@ -7610,14 +7606,6 @@
     "id": "app.team.clear_all_custom_role_assignments.select.app_error",
     "translation": "Fout bij het ophalen van de teamleden."
   },
-  {
-    "id": "app.team.analytics_public_team_count.app_error",
-    "translation": "Fout bij het tellen van publieke teams."
-  },
-  {
-    "id": "app.team.analytics_private_team_count.app_error",
-    "translation": "Fout bij het tellen van private teams."
-  },
   {
     "id": "app.post.get_posts_since.app_error",
     "translation": "Fout bij het ophalen van berichten voor het kanaal."
diff --git a/i18n/pl.json b/i18n/pl.json
index 696ef75743..7f364d9c1b 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -7043,10 +7043,6 @@
     "id": "app.team.get_all_team_listing.app_error",
     "translation": "Nie mogliśmy pobrać wszystkich zespołów"
   },
-  {
-    "id": "app.team.get_all_private_team_page_listing.app_error",
-    "translation": "Nie mogliśmy pobrać wszystkich prywatnych zespołów"
-  },
   {
     "id": "app.team.get_all_private_team_listing.app_error",
     "translation": "Nie mogliśmy pobrać wszystkich prywatnych zespołów"
@@ -7067,14 +7063,6 @@
     "id": "app.team.analytics_team_count.app_error",
     "translation": "Nie można policzyć zespołów"
   },
-  {
-    "id": "app.team.analytics_public_team_count.app_error",
-    "translation": "Nie można policzyć publicznych zespołów"
-  },
-  {
-    "id": "app.team.analytics_private_team_count.app_error",
-    "translation": "Nie można policzyć prywatnych zespołów"
-  },
   {
     "id": "api.user.login_cws.license.error",
     "translation": "Logowanie bota jest zabronione"
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 46edbd8c46..edf19be4c5 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -7374,10 +7374,6 @@
     "id": "app.team.get_all_team_listing.app_error",
     "translation": "Não foi possível obter todas as equipes."
   },
-  {
-    "id": "app.team.get_all_private_team_page_listing.app_error",
-    "translation": "Não foi possível colocar todas as equipes privadas na página."
-  },
   {
     "id": "app.team.get_all_private_team_listing.app_error",
     "translation": "Não foi possível obter todas as equipes privadas."
@@ -7398,14 +7394,6 @@
     "id": "app.team.analytics_team_count.app_error",
     "translation": "Não foi possível contar as equipes."
   },
-  {
-    "id": "app.team.analytics_public_team_count.app_error",
-    "translation": "Não foi possível contar as equipes públicas."
-  },
-  {
-    "id": "app.team.analytics_private_team_count.app_error",
-    "translation": "Não foi possível contar as equipes privadas."
-  },
   {
     "id": "api.user.login_cws.license.error",
     "translation": "O login CWS é proibido."
diff --git a/i18n/ro.json b/i18n/ro.json
index acb307fb10..a4ff316a77 100644
--- a/i18n/ro.json
+++ b/i18n/ro.json
@@ -7131,14 +7131,6 @@
     "id": "app.team.analytics_team_count.app_error",
     "translation": "Imposibilitatea de a număra echipele."
   },
-  {
-    "id": "app.team.analytics_public_team_count.app_error",
-    "translation": "Imposibil de numărat echipele publice."
-  },
-  {
-    "id": "app.team.analytics_private_team_count.app_error",
-    "translation": "Imposibil de numărat echipele private."
-  },
   {
     "id": "app.post.get_posts_since.app_error",
     "translation": "Nu se pot obține postările pentru canal."
@@ -7439,10 +7431,6 @@
     "id": "app.upload.create.cannot_upload_to_deleted_channel.app_error",
     "translation": "Nu pot posta şterse canal."
   },
-  {
-    "id": "app.team.get_all_private_team_page_listing.app_error",
-    "translation": "Nu am putut obține toate echipele private."
-  },
   {
     "id": "api.user.login_cws.license.error",
     "translation": "Accesul la bot este interzis."
diff --git a/i18n/ru.json b/i18n/ru.json
index c2bd12fdd6..d3c934079a 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -7451,10 +7451,6 @@
     "id": "app.team.get_all_team_listing.app_error",
     "translation": "Не удалось получить все команды."
   },
-  {
-    "id": "app.team.get_all_private_team_page_listing.app_error",
-    "translation": "Мы не могли получить все приватные команды на странице."
-  },
   {
     "id": "app.team.get_all_private_team_listing.app_error",
     "translation": "Не удалось получить все приватные команды."
@@ -7475,14 +7471,6 @@
     "id": "app.team.analytics_team_count.app_error",
     "translation": "Не удалось подсчитать команды."
   },
-  {
-    "id": "app.team.analytics_public_team_count.app_error",
-    "translation": "Не удалось подсчитать публичные команды."
-  },
-  {
-    "id": "app.team.analytics_private_team_count.app_error",
-    "translation": "Не удалось подсчитать приватные команды."
-  },
   {
     "id": "api.user.update_password.user_and_hashed.app_error",
     "translation": "Только системные администраторы могут устанавливать уже хешированные пароли."
diff --git a/i18n/sv.json b/i18n/sv.json
index dc5d45c746..96a8b255a6 100644
--- a/i18n/sv.json
+++ b/i18n/sv.json
@@ -2351,10 +2351,6 @@
     "id": "app.team.get_all_team_listing.app_error",
     "translation": "Det gick inte att ta fram alla team."
   },
-  {
-    "id": "app.team.get_all_private_team_page_listing.app_error",
-    "translation": "Det gick inte att ta fram alla privata team på en sida."
-  },
   {
     "id": "app.team.get_all_private_team_listing.app_error",
     "translation": "Det gick inte att ta fram alla privata team."
@@ -2383,14 +2379,6 @@
     "id": "app.team.analytics_team_count.app_error",
     "translation": "Kan inte räkna antal team."
   },
-  {
-    "id": "app.team.analytics_public_team_count.app_error",
-    "translation": "Kunde inte räkna antal publika team."
-  },
-  {
-    "id": "app.team.analytics_private_team_count.app_error",
-    "translation": "Kunde inte räkna antal privata team."
-  },
   {
     "id": "app.system_install_date.parse_int.app_error",
     "translation": "Kunde inte tolka installationsdatum."
@@ -8688,7 +8676,7 @@
   },
   {
     "id": "api.templates.cloud_welcome_email.title",
-    "translation": "Grattis - din arbetsyta {{.WorkSpace}} är klar att användas!"
+    "translation": "Din testperiod på 14 dagar av {{.WorkSpace}} workspace är redo att starta!"
   },
   {
     "id": "api.templates.cloud_welcome_email.subtitle_info",
@@ -8824,7 +8812,7 @@
   },
   {
     "id": "api.command_remote.name.hint",
-    "translation": "Ett visningsnamn för det andra klustret"
+    "translation": "Ett unikt namn för det andra klustret"
   },
   {
     "id": "api.command_remote.name.help",
@@ -9221,5 +9209,37 @@
   {
     "id": "api.error_get_first_admin_visit_marketplace_status",
     "translation": "Det gick inte att hämta statusen för det första administratörsbesöket på marknadsplatsen från butiken."
+  },
+  {
+    "id": "api.user.cloud_trial_ending_email.error",
+    "translation": "Det gick inte att skicka mejl med information om att testperioden är på väg att ta slut"
+  },
+  {
+    "id": "api.templates.cloud_trial_ending_email.title",
+    "translation": "Din kostnadsfria testperiod på 14 dagar slutar snart"
+  },
+  {
+    "id": "api.templates.cloud_trial_ending_email.subtitle",
+    "translation": "{{.Username}}, din 14 dagars testperiod av Mattermost Cloud Professional avslutas om tre dagar, den {{.TrialEnd}}. Lägg till din betalinformation för att säkerställa att ditt team kan fortsätta nyttja funktionerna i Cloud Professional."
+  },
+  {
+    "id": "api.templates.cloud_trial_ending_email.subject",
+    "translation": "Mattermost cloud testperiod avslutas"
+  },
+  {
+    "id": "api.templates.cloud_trial_ending_email.add_payment_method",
+    "translation": "Lägg till betalmetod"
+  },
+  {
+    "id": "api.command_remote.displayname.help",
+    "translation": "Visningsnamn för det andra klustret"
+  },
+  {
+    "id": "api.command_remote.displayname.hint",
+    "translation": "Ett visningsnamn för det andra klustret"
+  },
+  {
+    "id": "api.admin.saml.failure_reset_authdata_to_email.app_error",
+    "translation": "Kunde inte återställa AuthData-fältet till mejl."
   }
 ]
diff --git a/i18n/tr.json b/i18n/tr.json
index 4f82bef133..5c43f729e8 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -7434,10 +7434,6 @@
     "id": "app.team.get_all_team_listing.app_error",
     "translation": "Tüm takımlar alınamadı."
   },
-  {
-    "id": "app.team.get_all_private_team_page_listing.app_error",
-    "translation": "Tüm özel takımlar alınamadı."
-  },
   {
     "id": "app.team.get_all_private_team_listing.app_error",
     "translation": "Tüm özel takımlar alınamadı."
@@ -7458,14 +7454,6 @@
     "id": "app.team.analytics_team_count.app_error",
     "translation": "Takımlar sayılamadı."
   },
-  {
-    "id": "app.team.analytics_public_team_count.app_error",
-    "translation": "Herkese açık takımlar sayılamadı."
-  },
-  {
-    "id": "app.team.analytics_private_team_count.app_error",
-    "translation": "Özel takımlar sayılamadı."
-  },
   {
     "id": "api.upgrade_to_enterprise_status.signature.app_error",
     "translation": "Mattermost Enterprise Sürümüne yükseltilemedi. İndirilen dosyanın sayısal imzası doğrulanamadı."
diff --git a/i18n/uk.json b/i18n/uk.json
index cb9dec102e..41a8e20335 100644
--- a/i18n/uk.json
+++ b/i18n/uk.json
@@ -7027,10 +7027,6 @@
     "id": "app.team.get_all_team_listing.app_error",
     "translation": "Не вдалося отримати всі команди"
   },
-  {
-    "id": "app.team.get_all_private_team_page_listing.app_error",
-    "translation": "Не вдалося отримати всі команди"
-  },
   {
     "id": "app.team.get_all_private_team_listing.app_error",
     "translation": "Не вдалося отримати всі команди"
@@ -7051,14 +7047,6 @@
     "id": "app.team.analytics_team_count.app_error",
     "translation": "Неможливо підрахувати команди"
   },
-  {
-    "id": "app.team.analytics_public_team_count.app_error",
-    "translation": "Неможливо підрахувати команди"
-  },
-  {
-    "id": "app.team.analytics_private_team_count.app_error",
-    "translation": "Неможливо підрахувати команди"
-  },
   {
     "id": "api.user.login_cws.license.error",
     "translation": "Bot login is forbidden."
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index de65131885..382539a4f9 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -6997,10 +6997,6 @@
     "id": "app.team.get_all_team_listing.app_error",
     "translation": "无法获取所有的团队。"
   },
-  {
-    "id": "app.team.get_all_private_team_page_listing.app_error",
-    "translation": "无法获取页面中的所有私有团队。"
-  },
   {
     "id": "app.team.get_all_private_team_listing.app_error",
     "translation": "无法获取所有私有团队。"
@@ -7029,14 +7025,6 @@
     "id": "app.team.analytics_team_count.app_error",
     "translation": "无法统计团队数。"
   },
-  {
-    "id": "app.team.analytics_public_team_count.app_error",
-    "translation": "无法统计公开团队数。"
-  },
-  {
-    "id": "app.team.analytics_private_team_count.app_error",
-    "translation": "无法统计私有团队数。"
-  },
   {
     "id": "app.system.warn_metric.store.app_error",
     "translation": "储存 {{.WarnMetricName}} 值失败"
diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json
index 00592d8428..dd295a36af 100644
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -7145,10 +7145,6 @@
     "id": "app.team.get_all_team_listing.app_error",
     "translation": "無法取得全部的團隊。"
   },
-  {
-    "id": "app.team.get_all_private_team_page_listing.app_error",
-    "translation": "無法取得分頁內全部的私人團隊。"
-  },
   {
     "id": "app.team.get_all_private_team_listing.app_error",
     "translation": "無法取得全部的私人團隊。"
@@ -7177,14 +7173,6 @@
     "id": "app.team.analytics_team_count.app_error",
     "translation": "無法計數團隊。"
   },
-  {
-    "id": "app.team.analytics_public_team_count.app_error",
-    "translation": "無法計數公開團隊。"
-  },
-  {
-    "id": "app.team.analytics_private_team_count.app_error",
-    "translation": "無法計數私人團隊。"
-  },
   {
     "id": "app.post.get_posts_since.app_error",
     "translation": "無法取得頻道的訊息。"