diff --git a/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesView.kt b/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesView.kt
index 5052f0927f..9678068a3c 100644
--- a/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesView.kt
+++ b/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesView.kt
@@ -22,6 +22,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import io.element.android.features.analytics.api.AnalyticsOptInEvents
+import io.element.android.features.analytics.api.R
 import io.element.android.libraries.designsystem.components.LINK_TAG
 import io.element.android.libraries.designsystem.components.list.ListItemContent
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@@ -30,7 +31,6 @@ import io.element.android.libraries.designsystem.text.buildAnnotatedStringWithSt
 import io.element.android.libraries.designsystem.theme.components.ListItem
 import io.element.android.libraries.designsystem.theme.components.ListSupportingText
 import io.element.android.libraries.designsystem.theme.components.Text
-import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun AnalyticsPreferencesView(
@@ -42,18 +42,18 @@ fun AnalyticsPreferencesView(
     }
 
     val supportingText = stringResource(
-        id = CommonStrings.screen_analytics_settings_help_us_improve,
+        id = R.string.screen_analytics_settings_help_us_improve,
         state.applicationName
     )
     val linkText = buildAnnotatedStringWithStyledPart(
-        CommonStrings.screen_analytics_settings_read_terms,
-        CommonStrings.screen_analytics_settings_read_terms_content_link,
+        R.string.screen_analytics_settings_read_terms,
+        R.string.screen_analytics_settings_read_terms_content_link,
         tagAndLink = LINK_TAG to state.policyUrl,
     )
     Column(modifier) {
         ListItem(
             headlineContent = {
-                Text(stringResource(id = CommonStrings.screen_analytics_settings_share_data))
+                Text(stringResource(id = R.string.screen_analytics_settings_share_data))
             },
             supportingContent = {
                 Text(supportingText)
diff --git a/features/analytics/api/src/main/res/values-cs/translations.xml b/features/analytics/api/src/main/res/values-cs/translations.xml
new file mode 100644
index 0000000000..a60d94b797
--- /dev/null
+++ b/features/analytics/api/src/main/res/values-cs/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_settings_share_data">"Sdílet analytická data"</string>
+  <string name="screen_analytics_settings_help_us_improve">"Sdílejte anonymní údaje o používání, které nám pomohou identifikovat problémy."</string>
+  <string name="screen_analytics_settings_read_terms">"Můžete si přečíst všechny naše podmínky %1$s."</string>
+  <string name="screen_analytics_settings_read_terms_content_link">"zde"</string>
+</resources>
diff --git a/features/analytics/api/src/main/res/values-de/translations.xml b/features/analytics/api/src/main/res/values-de/translations.xml
new file mode 100644
index 0000000000..135eac3d21
--- /dev/null
+++ b/features/analytics/api/src/main/res/values-de/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_settings_share_data">"Analysedaten teilen"</string>
+  <string name="screen_analytics_settings_help_us_improve">"Teile anonyme Nutzungsdaten, um uns bei der Identifizierung von Problemen zu helfen."</string>
+  <string name="screen_analytics_settings_read_terms">"Du kannst alle unsere Bedingungen lesen %1$s."</string>
+  <string name="screen_analytics_settings_read_terms_content_link">"hier"</string>
+</resources>
diff --git a/features/analytics/api/src/main/res/values-fr/translations.xml b/features/analytics/api/src/main/res/values-fr/translations.xml
new file mode 100644
index 0000000000..aa0fe9a14f
--- /dev/null
+++ b/features/analytics/api/src/main/res/values-fr/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_settings_share_data">"Partagez des données de statistiques d’utilisation"</string>
+  <string name="screen_analytics_settings_help_us_improve">"Partagez des données d’utilisation anonymes pour nous aider à identifier les problèmes."</string>
+  <string name="screen_analytics_settings_read_terms">"Vous pouvez lire toutes nos conditions %1$s."</string>
+  <string name="screen_analytics_settings_read_terms_content_link">"ici"</string>
+</resources>
diff --git a/features/analytics/api/src/main/res/values-ro/translations.xml b/features/analytics/api/src/main/res/values-ro/translations.xml
new file mode 100644
index 0000000000..e03a6cfb36
--- /dev/null
+++ b/features/analytics/api/src/main/res/values-ro/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_settings_share_data">"Partajați datele analitice"</string>
+  <string name="screen_analytics_settings_help_us_improve">"Distribuiți date anonime de utilizare pentru a ne ajuta să identificăm probleme."</string>
+  <string name="screen_analytics_settings_read_terms">"Puteți citi toate condițiile noastre %1$s."</string>
+  <string name="screen_analytics_settings_read_terms_content_link">"aici"</string>
+</resources>
diff --git a/features/analytics/api/src/main/res/values-ru/translations.xml b/features/analytics/api/src/main/res/values-ru/translations.xml
new file mode 100644
index 0000000000..0617f21bbf
--- /dev/null
+++ b/features/analytics/api/src/main/res/values-ru/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_settings_share_data">"Делитесь данными аналитики"</string>
+  <string name="screen_analytics_settings_help_us_improve">"Предоставлять анонимные данные об использовании, чтобы помочь нам выявить проблемы."</string>
+  <string name="screen_analytics_settings_read_terms">"Вы можете ознакомиться со всеми нашими условиями %1$s."</string>
+  <string name="screen_analytics_settings_read_terms_content_link">"здесь"</string>
+</resources>
diff --git a/features/analytics/api/src/main/res/values-sk/translations.xml b/features/analytics/api/src/main/res/values-sk/translations.xml
new file mode 100644
index 0000000000..a930b315ee
--- /dev/null
+++ b/features/analytics/api/src/main/res/values-sk/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_settings_share_data">"Zdieľať analytické údaje"</string>
+  <string name="screen_analytics_settings_help_us_improve">"Zdieľajte anonymné údaje o používaní, aby sme mohli identifikovať problémy."</string>
+  <string name="screen_analytics_settings_read_terms">"Môžete si prečítať všetky naše podmienky %1$s."</string>
+  <string name="screen_analytics_settings_read_terms_content_link">"tu"</string>
+</resources>
diff --git a/features/analytics/api/src/main/res/values-zh-rTW/translations.xml b/features/analytics/api/src/main/res/values-zh-rTW/translations.xml
new file mode 100644
index 0000000000..db8f91ceea
--- /dev/null
+++ b/features/analytics/api/src/main/res/values-zh-rTW/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_settings_share_data">"分享分析數據"</string>
+  <string name="screen_analytics_settings_help_us_improve">"分享匿名的使用數據以協助我們釐清問題。"</string>
+  <string name="screen_analytics_settings_read_terms">"您可以到%1$s閱讀我們的條款。"</string>
+  <string name="screen_analytics_settings_read_terms_content_link">"這裡"</string>
+</resources>
diff --git a/features/analytics/api/src/main/res/values/localazy.xml b/features/analytics/api/src/main/res/values/localazy.xml
new file mode 100644
index 0000000000..8ae2a2d3d8
--- /dev/null
+++ b/features/analytics/api/src/main/res/values/localazy.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_settings_share_data">"Share analytics data"</string>
+  <string name="screen_analytics_settings_help_us_improve">"Share anonymous usage data to help us identify issues."</string>
+  <string name="screen_analytics_settings_read_terms">"You can read all our terms %1$s."</string>
+  <string name="screen_analytics_settings_read_terms_content_link">"here"</string>
+</resources>
diff --git a/libraries/ui-strings/src/main/res/values-cs/translations.xml b/libraries/ui-strings/src/main/res/values-cs/translations.xml
index a1d01dc467..59a52044da 100644
--- a/libraries/ui-strings/src/main/res/values-cs/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-cs/translations.xml
@@ -135,6 +135,7 @@
   <string name="common_refreshing">"Obnovování…"</string>
   <string name="common_replying_to">"Odpověď na %1$s"</string>
   <string name="common_report_a_bug">"Nahlásit chybu"</string>
+  <string name="common_report_a_problem">"Nahlásit problém"</string>
   <string name="common_report_submitted">"Zpráva odeslána"</string>
   <string name="common_rich_text_editor">"Editor formátovaného textu"</string>
   <string name="common_room">"Místnost"</string>
@@ -173,7 +174,6 @@
   <string name="common_voice_message">"Hlasová zpráva"</string>
   <string name="common_waiting">"Čekání…"</string>
   <string name="common_waiting_for_decryption_key">"Čekání na dešifrovací klíč"</string>
-  <string name="common_report_a_problem">"Nahlásit problém"</string>
   <string name="common_poll_end_confirmation">"Opravdu chcete ukončit toto hlasování?"</string>
   <string name="common_poll_summary">"Hlasování: %1$s"</string>
   <string name="dialog_title_confirmation">"Potvrzení"</string>
@@ -223,7 +223,6 @@
   <string name="room_timeline_beginning_of_room">"Toto je začátek %1$s."</string>
   <string name="room_timeline_beginning_of_room_no_name">"Toto je začátek této konverzace."</string>
   <string name="room_timeline_read_marker_title">"Nové"</string>
-  <string name="screen_analytics_settings_share_data">"Sdílet analytická data"</string>
   <string name="screen_media_picker_error_failed_selection">"Výběr média se nezdařil, zkuste to prosím znovu."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Nahrání média se nezdařilo, zkuste to prosím znovu."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Nahrání média se nezdařilo, zkuste to prosím znovu."</string>
@@ -268,8 +267,5 @@ Pokud budete pokračovat, některá nastavení se mohou změnit."</string>
   <string name="test_language_identifier">"en"</string>
   <string name="dialog_title_error">"Chyba"</string>
   <string name="dialog_title_success">"Úspěch"</string>
-  <string name="screen_analytics_settings_help_us_improve">"Sdílejte anonymní údaje o používání, které nám pomohou identifikovat problémy."</string>
-  <string name="screen_analytics_settings_read_terms">"Můžete si přečíst všechny naše podmínky %1$s."</string>
-  <string name="screen_analytics_settings_read_terms_content_link">"zde"</string>
   <string name="screen_report_content_block_user">"Zablokovat uživatele"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-de/translations.xml b/libraries/ui-strings/src/main/res/values-de/translations.xml
index dd84815254..2983bc0be4 100644
--- a/libraries/ui-strings/src/main/res/values-de/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-de/translations.xml
@@ -191,7 +191,6 @@
   <string name="room_timeline_beginning_of_room">"Dies ist der Anfang von %1$s."</string>
   <string name="room_timeline_beginning_of_room_no_name">"Dies ist der Anfang dieses Gesprächs."</string>
   <string name="room_timeline_read_marker_title">"Neu"</string>
-  <string name="screen_analytics_settings_share_data">"Analysedaten teilen"</string>
   <string name="screen_media_picker_error_failed_selection">"Medienauswahl fehlgeschlagen, bitte versuche es erneut."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Fehler beim Verarbeiten des hochgeladenen Mediums. Bitte versuche es erneut."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Das Hochladen der Medien ist fehlgeschlagen. Bitte versuche es erneut."</string>
@@ -232,8 +231,5 @@
   <string name="test_language_identifier">"en"</string>
   <string name="dialog_title_error">"Fehler"</string>
   <string name="dialog_title_success">"Erfolg"</string>
-  <string name="screen_analytics_settings_help_us_improve">"Teile anonyme Nutzungsdaten, um uns bei der Identifizierung von Problemen zu helfen."</string>
-  <string name="screen_analytics_settings_read_terms">"Du kannst alle unsere Bedingungen lesen %1$s."</string>
-  <string name="screen_analytics_settings_read_terms_content_link">"hier"</string>
   <string name="screen_report_content_block_user">"Benutzer sperren"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-fr/translations.xml b/libraries/ui-strings/src/main/res/values-fr/translations.xml
index f655b1eafa..ed8ff54abf 100644
--- a/libraries/ui-strings/src/main/res/values-fr/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-fr/translations.xml
@@ -218,7 +218,6 @@
   <string name="room_timeline_beginning_of_room">"Ceci est le début de %1$s."</string>
   <string name="room_timeline_beginning_of_room_no_name">"Ceci est le début de cette conversation."</string>
   <string name="room_timeline_read_marker_title">"Nouveau"</string>
-  <string name="screen_analytics_settings_share_data">"Partagez des données de statistiques d’utilisation"</string>
   <string name="screen_media_picker_error_failed_selection">"Échec de la sélection du média, veuillez réessayer."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Échec du traitement des médias à télécharger, veuillez réessayer."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Échec du téléchargement du média, veuillez réessayer."</string>
@@ -263,8 +262,5 @@ Si vous continuez, il est possible que certains de vos paramètres soient modifi
   <string name="test_language_identifier">"Ang."</string>
   <string name="dialog_title_error">"Erreur"</string>
   <string name="dialog_title_success">"Succès"</string>
-  <string name="screen_analytics_settings_help_us_improve">"Partagez des données d’utilisation anonymes pour nous aider à identifier les problèmes."</string>
-  <string name="screen_analytics_settings_read_terms">"Vous pouvez lire toutes nos conditions %1$s."</string>
-  <string name="screen_analytics_settings_read_terms_content_link">"ici"</string>
   <string name="screen_report_content_block_user">"Bloquer l’utilisateur"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-ro/translations.xml b/libraries/ui-strings/src/main/res/values-ro/translations.xml
index 566133a6a5..00825d232a 100644
--- a/libraries/ui-strings/src/main/res/values-ro/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-ro/translations.xml
@@ -175,7 +175,6 @@
   <string name="room_timeline_beginning_of_room">"Acesta este începutul conversației %1$s."</string>
   <string name="room_timeline_beginning_of_room_no_name">"Acesta este începutul acestei conversații."</string>
   <string name="room_timeline_read_marker_title">"Nou"</string>
-  <string name="screen_analytics_settings_share_data">"Partajați datele analitice"</string>
   <string name="screen_media_picker_error_failed_selection">"Selectarea fișierelor media a eșuat, încercați din nou."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Procesarea datelor media a eșuat, vă rugăm să încercați din nou."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Încărcarea fișierelor media a eșuat, încercați din nou."</string>
@@ -220,8 +219,5 @@ Dacă continuați, unele dintre setările dumneavoastră pot fi modificate."</st
   <string name="test_language_identifier">"ro"</string>
   <string name="dialog_title_error">"Eroare"</string>
   <string name="dialog_title_success">"Succes"</string>
-  <string name="screen_analytics_settings_help_us_improve">"Distribuiți date anonime de utilizare pentru a ne ajuta să identificăm probleme."</string>
-  <string name="screen_analytics_settings_read_terms">"Puteți citi toate condițiile noastre %1$s."</string>
-  <string name="screen_analytics_settings_read_terms_content_link">"aici"</string>
   <string name="screen_report_content_block_user">"Blocați utilizatorul"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-ru/translations.xml b/libraries/ui-strings/src/main/res/values-ru/translations.xml
index 7f94e7e05b..aca6c68a85 100644
--- a/libraries/ui-strings/src/main/res/values-ru/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-ru/translations.xml
@@ -136,6 +136,7 @@
   <string name="common_refreshing">"Обновление…"</string>
   <string name="common_replying_to">"Отвечает на %1$s"</string>
   <string name="common_report_a_bug">"Сообщить об ошибке"</string>
+  <string name="common_report_a_problem">"Сообщить о проблеме"</string>
   <string name="common_report_submitted">"Отчет отправлен"</string>
   <string name="common_rich_text_editor">"Редактор форматированного текста"</string>
   <string name="common_room">"Комната"</string>
@@ -174,7 +175,6 @@
   <string name="common_voice_message">"Голосовое сообщение"</string>
   <string name="common_waiting">"Ожидание…"</string>
   <string name="common_waiting_for_decryption_key">"Ожидание ключа расшифровки"</string>
-  <string name="common_report_a_problem">"Сообщить о проблеме"</string>
   <string name="common_poll_end_confirmation">"Вы действительно хотите завершить данный опрос?"</string>
   <string name="common_poll_summary">"Опрос: %1$s"</string>
   <string name="common_verify_device">"Подтверждение устройства"</string>
@@ -225,7 +225,6 @@
   <string name="room_timeline_beginning_of_room">"Это начало %1$s."</string>
   <string name="room_timeline_beginning_of_room_no_name">"Это начало разговора."</string>
   <string name="room_timeline_read_marker_title">"Новый"</string>
-  <string name="screen_analytics_settings_share_data">"Делитесь данными аналитики"</string>
   <string name="screen_media_picker_error_failed_selection">"Не удалось выбрать носитель, попробуйте еще раз."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Не удалось обработать медиафайл для загрузки, попробуйте еще раз."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Не удалось загрузить медиафайлы, попробуйте еще раз."</string>
@@ -268,8 +267,5 @@
   <string name="test_language_identifier">"en"</string>
   <string name="dialog_title_error">"Ошибка"</string>
   <string name="dialog_title_success">"Успешно"</string>
-  <string name="screen_analytics_settings_help_us_improve">"Предоставлять анонимные данные об использовании, чтобы помочь нам выявить проблемы."</string>
-  <string name="screen_analytics_settings_read_terms">"Вы можете ознакомиться со всеми нашими условиями %1$s."</string>
-  <string name="screen_analytics_settings_read_terms_content_link">"здесь"</string>
   <string name="screen_report_content_block_user">"Заблокировать пользователя"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-sk/translations.xml b/libraries/ui-strings/src/main/res/values-sk/translations.xml
index 5aee90c0c3..3f4d241808 100644
--- a/libraries/ui-strings/src/main/res/values-sk/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-sk/translations.xml
@@ -136,6 +136,7 @@
   <string name="common_refreshing">"Obnovuje sa…"</string>
   <string name="common_replying_to">"Odpoveď na %1$s"</string>
   <string name="common_report_a_bug">"Nahlásiť chybu"</string>
+  <string name="common_report_a_problem">"Nahlásiť problém"</string>
   <string name="common_report_submitted">"Nahlásenie bolo odoslané"</string>
   <string name="common_rich_text_editor">"Rozšírený textový editor"</string>
   <string name="common_room">"Miestnosť"</string>
@@ -174,7 +175,6 @@
   <string name="common_voice_message">"Hlasová správa"</string>
   <string name="common_waiting">"Čaká sa…"</string>
   <string name="common_waiting_for_decryption_key">"Čaká sa na dešifrovací kľúč"</string>
-  <string name="common_report_a_problem">"Nahlásiť problém"</string>
   <string name="common_poll_end_confirmation">"Ste si istí, že chcete ukončiť túto anketu?"</string>
   <string name="common_poll_summary">"Anketa: %1$s"</string>
   <string name="common_verify_device">"Overiť zariadenie"</string>
@@ -225,7 +225,6 @@
   <string name="room_timeline_beginning_of_room">"Toto je začiatok %1$s."</string>
   <string name="room_timeline_beginning_of_room_no_name">"Toto je začiatok tejto konverzácie."</string>
   <string name="room_timeline_read_marker_title">"Nové"</string>
-  <string name="screen_analytics_settings_share_data">"Zdieľať analytické údaje"</string>
   <string name="screen_media_picker_error_failed_selection">"Nepodarilo sa vybrať médium, skúste to prosím znova."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Nepodarilo sa spracovať médiá na odoslanie, skúste to prosím znova."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Nepodarilo sa nahrať médiá, skúste to prosím znova."</string>
@@ -270,8 +269,5 @@ Ak budete pokračovať, niektoré z vašich nastavení sa môžu zmeniť."</stri
   <string name="test_language_identifier">"sk"</string>
   <string name="dialog_title_error">"Chyba"</string>
   <string name="dialog_title_success">"Úspech"</string>
-  <string name="screen_analytics_settings_help_us_improve">"Zdieľajte anonymné údaje o používaní, aby sme mohli identifikovať problémy."</string>
-  <string name="screen_analytics_settings_read_terms">"Môžete si prečítať všetky naše podmienky %1$s."</string>
-  <string name="screen_analytics_settings_read_terms_content_link">"tu"</string>
   <string name="screen_report_content_block_user">"Zablokovať používateľa"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml b/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml
index 37b372f46b..f4037bd603 100644
--- a/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml
@@ -180,7 +180,6 @@
   </plurals>
   <string name="report_content_hint">"檢舉這個內容的原因"</string>
   <string name="room_timeline_read_marker_title">"新訊息"</string>
-  <string name="screen_analytics_settings_share_data">"分享分析數據"</string>
   <string name="screen_media_upload_preview_error_failed_sending">"無法上傳媒體檔案，請稍後再試。"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"其他設定"</string>
   <string name="screen_notification_settings_direct_chats">"私訊"</string>
@@ -205,8 +204,5 @@
   <string name="test_language_identifier">"zh-tw"</string>
   <string name="dialog_title_error">"錯誤"</string>
   <string name="dialog_title_success">"成功"</string>
-  <string name="screen_analytics_settings_help_us_improve">"分享匿名的使用數據以協助我們釐清問題。"</string>
-  <string name="screen_analytics_settings_read_terms">"您可以到%1$s閱讀我們的條款。"</string>
-  <string name="screen_analytics_settings_read_terms_content_link">"這裡"</string>
   <string name="screen_report_content_block_user">"封鎖使用者"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml
index ec09f81b3d..4f18758bfb 100644
--- a/libraries/ui-strings/src/main/res/values/localazy.xml
+++ b/libraries/ui-strings/src/main/res/values/localazy.xml
@@ -136,6 +136,7 @@
   <string name="common_refreshing">"Refreshing…"</string>
   <string name="common_replying_to">"Replying to %1$s"</string>
   <string name="common_report_a_bug">"Report a bug"</string>
+  <string name="common_report_a_problem">"Report a problem"</string>
   <string name="common_report_submitted">"Report submitted"</string>
   <string name="common_rich_text_editor">"Rich text editor"</string>
   <string name="common_room">"Room"</string>
@@ -174,7 +175,6 @@
   <string name="common_voice_message">"Voice message"</string>
   <string name="common_waiting">"Waiting…"</string>
   <string name="common_waiting_for_decryption_key">"Waiting for this message"</string>
-  <string name="common_report_a_problem">"Report a problem"</string>
   <string name="common_poll_end_confirmation">"Are you sure you want to end this poll?"</string>
   <string name="common_poll_summary">"Poll: %1$s"</string>
   <string name="common_verify_device">"Verify device"</string>
@@ -222,7 +222,6 @@
   <string name="room_timeline_beginning_of_room">"This is the beginning of %1$s."</string>
   <string name="room_timeline_beginning_of_room_no_name">"This is the beginning of this conversation."</string>
   <string name="room_timeline_read_marker_title">"New"</string>
-  <string name="screen_analytics_settings_share_data">"Share analytics data"</string>
   <string name="screen_media_picker_error_failed_selection">"Failed selecting media, please try again."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Failed processing media to upload, please try again."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Failed uploading media, please try again."</string>
@@ -266,8 +265,5 @@ If you proceed, some of your settings may change."</string>
   <string name="test_untranslated_default_language_identifier">"en"</string>
   <string name="dialog_title_error">"Error"</string>
   <string name="dialog_title_success">"Success"</string>
-  <string name="screen_analytics_settings_help_us_improve">"Share anonymous usage data to help us identify issues."</string>
-  <string name="screen_analytics_settings_read_terms">"You can read all our terms %1$s."</string>
-  <string name="screen_analytics_settings_read_terms_content_link">"here"</string>
   <string name="screen_report_content_block_user">"Block user"</string>
 </resources>
diff --git a/tools/localazy/config.json b/tools/localazy/config.json
index 4fa301b914..08d5e35456 100644
--- a/tools/localazy/config.json
+++ b/tools/localazy/config.json
@@ -130,6 +130,12 @@
         "screen_analytics_prompt.*"
       ]
     },
+    {
+      "name": ":features:analytics:api",
+      "includeRegex": [
+        "screen_analytics_settings_.*"
+      ]
+    },
     {
       "name": ":features:ftue:impl",
       "includeRegex": [