Snap for 5605988 from 51c5a5bd1bab5174fa2efc0a97b08f6cee6ae655 to qt-release

Change-Id: I2afa353b3a9eb319733aade9e79c73d7b60e0dde

37 files changed, 98 insertions, 98 deletions

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 97d881c35..1950313b4 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -55,7 +55,7 @@
     <string name="enable_alerts_master_toggle_summary" msgid="699552922381916044">"تلقّي إشعارات عن حالات الطوارئ"</string>
     <string name="alert_reminder_interval_title" msgid="7466642011937564868">"مدّة التذكير بالتنبيه"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"الاستماع إلى رسالة التنبيه"</string>
-    <string name="enable_alert_speech_summary" msgid="356086178962268831">"استخدام ميزة \"تحويل النص إلى كلام\" لكي تستمع إلى رسائل إشعارات الطوارئ"</string>
+    <string name="enable_alert_speech_summary" msgid="356086178962268831">"استخدام ميزة \"تحويل النص إلى كلام\" للاستماع إلى رسائل إشعارات الطوارئ"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"سجلّ تنبيهات الطوارئ"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"الإعدادات المفضّلة للتنبيهات"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"‏مجموعات البث التجريبية في ETWS"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 91e28406d..5d6321685 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -121,7 +121,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Понастоящем получавате спешни сигнали. Искате ли да продължите да ги получавате?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Да"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Не"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"История на сигналите при спешни случаи"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Ист. на сигнали при спешност"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Веднъж"</item>
     <item msgid="9097229303902157183">"На всеки 2 минути"</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 275534235..14e233695 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="3795852619005211509">"Hitna upozorenja"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Postavke info servisa nisu dostupne ovom korisniku"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Uredu"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"Nema upozorenja od ranije"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"Nema prethodnih upozorenja"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Izbriši informacije"</string>
     <string name="message_options" msgid="3178489901903589574">"Opcije za poruke"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Prikaži detalje"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8ad8391e5..ef1711c3d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -116,7 +116,7 @@
     <string name="delivery_time_heading" msgid="5980836543433619329">"Modtaget:"</string>
     <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> ulæste advarsler."</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"Nye advarsler"</string>
-    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Vis en Vis en dialogboks om fravalg efter visningen af den første advarsel (nationalalarm undtaget)."</string>
+    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Vis en dialogboks om fravalg efter visningen af den første advarsel (nationalalarm undtaget)."</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Vis en dialogboks om fravalg"</string>
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Du modtager i øjeblikket nødadvarsler. Vil du gerne fortsætte med at modtage dem?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Ja"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d625b5040..6542301ff 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -35,13 +35,13 @@
     <string name="etws_earthquake_and_tsunami_warning" msgid="662449983177407681">"Erdbeben- und Tsunamiwarnung"</string>
     <string name="etws_test_message" msgid="8447820262584381894">"ETWS-Testnachricht"</string>
     <string name="etws_other_emergency_type" msgid="5233080551309721499">"Notfallwarnung"</string>
-    <string name="cmas_presidential_level_alert" msgid="1209234030582361001">"Benachrichtigung des Präsidenten"</string>
+    <string name="cmas_presidential_level_alert" msgid="1209234030582361001">"Warnung auf höchster Stufe"</string>
     <string name="cmas_extreme_alert" msgid="2588720613319969289">"Notfallbenachrichtigung: Extrem"</string>
     <string name="cmas_extreme_immediate_observed_alert" msgid="2328845915287460780">"Notfallbenachrichtigung: extrem"</string>
     <string name="cmas_extreme_immediate_likely_alert" msgid="1859702950323471778">"Notfallbenachrichtigung: extrem"</string>
     <string name="cmas_severe_alert" msgid="4135809475315826913">"Notfallbenachrichtigung: Schwerwiegend"</string>
     <string name="cmas_amber_alert" msgid="6154867710264778887">"Kindesentführung (Amber Alert)"</string>
-    <string name="cmas_required_monthly_test" msgid="1890205712251132193">"Erforderlicher monatlicher Test"</string>
+    <string name="cmas_required_monthly_test" msgid="1890205712251132193">"Monatlich testen"</string>
     <string name="cmas_exercise_alert" msgid="2892255514938370321">"Notfallbenachrichtigung (Übung)"</string>
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Notfallbenachrichtigung (Betreiber)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Broadcast-Nachrichten"</string>
@@ -56,7 +56,7 @@
     <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Benachrichtigungston"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Benachrichtigung vorlesen"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Notfallbenachrichtigungen per Sprachausgabe vorlesen"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Notfallbenachrichtigungsverlauf"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Bisherige Notfallbenachrichtigungen"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Benachrichtigungseinstellungen"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS-Testnachrichten"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Testnachrichten für Erdbeben-/Tsunami-Warnsystem"</string>
@@ -74,7 +74,7 @@
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Testnachrichten von staatlichen und lokalen Behörden erhalten"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Notfallbenachrichtigungen"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Vor lebensbedrohlichen Ereignissen warnen"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Erforderlicher monatlicher Test"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Monatlich testen"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="588517403520088484">"Testnachrichten für das Sicherheitswarnsystem erhalten"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibration"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Mit maximaler Lautstärke vorlesen"</string>
@@ -116,12 +116,12 @@
     <string name="delivery_time_heading" msgid="5980836543433619329">"Erhalten:"</string>
     <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> ungelesene Warnungen"</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"Neue Warnungen"</string>
-    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Nach erster Benachrichtigung (außer bei einem \"Presidential Alert\") Deaktivierungsoption anzeigen"</string>
+    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Nach erster Warnung Deaktivierungsoption anzeigen (außer bei Warnung auf höchster Stufe)"</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Option zum Deaktivieren anzeigen"</string>
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Du erhältst derzeit Notfallbenachrichtigungen. Möchtest du sie weiterhin erhalten?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"\"Ja\""</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Nein"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Verlauf für Notfallbenachrichtigungen"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Bisherige Notfallbenachrichtigungen"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Einmal"</item>
     <item msgid="9097229303902157183">"Alle 2 Minuten"</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index c055ff2e3..d103c3a63 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -78,7 +78,7 @@
     <string name="enable_cmas_test_alerts_summary" msgid="588517403520088484">"Receive test messages for the safety alert system"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibration"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Use full volume"</string>
-    <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignore other volume and do not disturb preferences"</string>
+    <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignore other volume and Do Not Disturb preferences"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Area update broadcasts"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Show update information in SIM status"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Developer options"</string>
@@ -116,7 +116,7 @@
     <string name="delivery_time_heading" msgid="5980836543433619329">"Received:"</string>
     <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> unread alerts."</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"New alerts"</string>
-    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Show an opt-out dialogue after displaying the first alert (other than Presidential Alert)."</string>
+    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Show an opt-out dialogue after displaying the first alert"</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Show opt-out dialogue"</string>
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"You are currently receiving Emergency Alerts. Would you like to continue receiving Emergency Alerts?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Yes"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index c055ff2e3..d103c3a63 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -78,7 +78,7 @@
     <string name="enable_cmas_test_alerts_summary" msgid="588517403520088484">"Receive test messages for the safety alert system"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibration"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Use full volume"</string>
-    <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignore other volume and do not disturb preferences"</string>
+    <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignore other volume and Do Not Disturb preferences"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Area update broadcasts"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Show update information in SIM status"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Developer options"</string>
@@ -116,7 +116,7 @@
     <string name="delivery_time_heading" msgid="5980836543433619329">"Received:"</string>
     <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> unread alerts."</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"New alerts"</string>
-    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Show an opt-out dialogue after displaying the first alert (other than Presidential Alert)."</string>
+    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Show an opt-out dialogue after displaying the first alert"</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Show opt-out dialogue"</string>
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"You are currently receiving Emergency Alerts. Would you like to continue receiving Emergency Alerts?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Yes"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c055ff2e3..d103c3a63 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -78,7 +78,7 @@
     <string name="enable_cmas_test_alerts_summary" msgid="588517403520088484">"Receive test messages for the safety alert system"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibration"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Use full volume"</string>
-    <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignore other volume and do not disturb preferences"</string>
+    <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignore other volume and Do Not Disturb preferences"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Area update broadcasts"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Show update information in SIM status"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Developer options"</string>
@@ -116,7 +116,7 @@
     <string name="delivery_time_heading" msgid="5980836543433619329">"Received:"</string>
     <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> unread alerts."</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"New alerts"</string>
-    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Show an opt-out dialogue after displaying the first alert (other than Presidential Alert)."</string>
+    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Show an opt-out dialogue after displaying the first alert"</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Show opt-out dialogue"</string>
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"You are currently receiving Emergency Alerts. Would you like to continue receiving Emergency Alerts?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Yes"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index c055ff2e3..d103c3a63 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -78,7 +78,7 @@
     <string name="enable_cmas_test_alerts_summary" msgid="588517403520088484">"Receive test messages for the safety alert system"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibration"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Use full volume"</string>
-    <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignore other volume and do not disturb preferences"</string>
+    <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignore other volume and Do Not Disturb preferences"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Area update broadcasts"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Show update information in SIM status"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Developer options"</string>
@@ -116,7 +116,7 @@
     <string name="delivery_time_heading" msgid="5980836543433619329">"Received:"</string>
     <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> unread alerts."</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"New alerts"</string>
-    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Show an opt-out dialogue after displaying the first alert (other than Presidential Alert)."</string>
+    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Show an opt-out dialogue after displaying the first alert"</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Show opt-out dialogue"</string>
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"You are currently receiving Emergency Alerts. Would you like to continue receiving Emergency Alerts?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Yes"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 75ca46915..977b1a3ae 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="3795852619005211509">"هشدارهای اضطراری"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"تنظیمات پخش سلولی برای این کاربر در دسترس نیست"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"تأیید"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"هیچ هشدار قبلی وجود ندارد"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"هیچ هشداری از قبل وجود ندارد"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"حذف پخش ها"</string>
     <string name="message_options" msgid="3178489901903589574">"گزینه‌های پیام"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"مشاهده جزئيات"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index aa2d152a2..bb95b2994 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -75,7 +75,7 @@
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Hätätiedotteet"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Varoita hengenvaarallisista tapahtumista"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Pakollinen kuukausittainen testi"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="588517403520088484">"Vastaanota turvahälytysjärjestelmän testiviestejä"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="588517403520088484">"Vastaanota turvahälytysjärjestelmän testiviestejä."</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Värinä"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Täysi äänenvoimakkuus"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ohita muut volyymi- ja Älä häiritse ‑valinnat."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index dd9da8e53..81fd012fe 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -78,7 +78,7 @@
     <string name="enable_cmas_test_alerts_summary" msgid="588517403520088484">"Recevoir des messages de test pour le système d\'alerte de sécurité"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibration"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Utiliser le volume maximal"</string>
-    <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorer autres préférences volume et \"Ne pas déranger\""</string>
+    <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorer les autres préférences de volume et \"Ne pas déranger\""</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Diffusion des dernières informations locales"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Afficher les dernières informations dans l\'état de la carte SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Options pour les développeurs"</string>
@@ -116,7 +116,7 @@
     <string name="delivery_time_heading" msgid="5980836543433619329">"Reçu :"</string>
     <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> alertes non lues"</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"Nouvelles alertes"</string>
-    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Afficher une boîte de dialogue de désactivation après la 1re alerte (sauf alerte présidentielle)."</string>
+    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Afficher une boîte de dialogue de désactivation après la 1re alerte (sauf alerte présidentielle)"</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Afficher boîte dialogue de désactivation"</string>
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Vous recevez actuellement les alertes d\'urgence. Voulez-vous continuer à les recevoir ?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Oui"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 205a3f3ac..941392b05 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -81,7 +81,7 @@
     <string name="use_full_volume_summary" msgid="3560764277281704697">"અન્ય વૉલ્યૂમ અને ખલેલ પાડશો નહીં પસંદગીઓને અવગણો"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"વિસ્તારના અપડેટ વિશેના બ્રૉડકાસ્ટ"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"અપડેટ વિશેની માહિતી SIMની સ્થિતિમાં બતાવો"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"વિકાસકર્તાનાં વિકલ્પો"</string>
+    <string name="category_dev_settings_title" msgid="6194393458398329994">"ડેવલપરના વિકલ્પો"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"ચેતવણીની કૅટેગરી:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ભૂભૌતિકીય"</string>
     <string name="cmas_category_met" msgid="7563732573851773537">"હવામાનશાસ્ત્ર સંબંધી"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 7d3f4f1b9..1ab7909d6 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -81,7 +81,7 @@
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Անտեսել ձայնի ուժգնության և «Չանհանգստացնել» ռեժիմի կարգավորումները"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Տեղական ծանուցող հեռարձակումներ"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Թարմացման մասին տեղեկությունը ցուցադրել SIM քարտի կարգավիճակում"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"Մշակողի ընտրանքներ"</string>
+    <string name="category_dev_settings_title" msgid="6194393458398329994">"Ծրագրավորողի ընտրանքներ"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Զգուշացման բաժինը՝"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Երկրաֆիզիկական"</string>
     <string name="cmas_category_met" msgid="7563732573851773537">"Մթնոլորտային"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 5e92ab2e9..e4ed6e19f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="3795852619005211509">"התרעות חירום"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"הגדרות של שידור סלולרי אינן זמינות עבור המשתמש הזה"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"אישור"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"אין התראות קודמות"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"אין התרעות קודמות"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"מחק את השידורים"</string>
     <string name="message_options" msgid="3178489901903589574">"אפשרויות הודעה"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"הצג פרטים"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index b49eac235..3e742f139 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -65,7 +65,7 @@
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ауыр қауіптер"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Өмірге және мүлікке төнген ауыр қауіптер"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER хабарламалары"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Бала ұрлау туралы төтенше бюллетеньдер"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Жоғалған балалар туралы хабарлар"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"Ескерту хабарлары"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Болатын қауіп туралы ескерту"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Жалпы қауіпсіздік хабарлары"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index e5827ce9f..453031baa 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -117,7 +117,7 @@
     <string name="notification_multiple" msgid="5121978148152124860">"ការ​ជូន​ដំណឹង​មិន​ទាន់​អាន <xliff:g id="COUNT">%s</xliff:g>"</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"ការ​ជូន​ដំណឹង​ថ្មី"</string>
     <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"បង្ហាញ​ប្រអប់​បញ្ចូល​សម្រាប់ការ​ផ្តាច់ចេញ បន្ទាប់​ពី​បង្ហាញ​ការ​ជូន​ដំណឹង​ដំបូង (ជា​ជាង​ការ​ជូន​ដំណឹងផ្លូវការ)។"</string>
-    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"បង្ហាញ​ប្រអប់​ចេញ"</string>
+    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"បង្ហាញ​ប្រអប់​បញ្ចូល​សម្រាប់ការ​ផ្តាច់ចេញ"</string>
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"បច្ចុប្បន្ន​អ្នក​កំពុង​ទទួល​ការ​ជូន​ដំណឹង​ពេល​អាសន្ន។ តើ​អ្នក​ចង់​បន្ត​ទទួល​ការ​ជូន​ដំណឹង​ពេល​អាសន្ន​ដែរ​ឬទេ?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"បាទ/ចាស"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"ទេ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 3b99b5ec3..5c1d0dbb7 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="3795852619005211509">"긴급 경보"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"이 사용자는 셀 브로드캐스트 설정을 사용할 수 없습니다."</string>
     <string name="button_dismiss" msgid="1234221657930516287">"확인"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"이전 알림 없음"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"이전 경보 없음"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"브로드캐스트 삭제"</string>
     <string name="message_options" msgid="3178489901903589574">"메시지 옵션"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"세부정보 보기"</string>
@@ -54,8 +54,8 @@
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"경보 허용"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="699552922381916044">"긴급 알림 수신"</string>
     <string name="alert_reminder_interval_title" msgid="7466642011937564868">"경보 알림음"</string>
-    <string name="enable_alert_speech_title" msgid="8052104771053526941">"경고 메시지를 음성 언어로 표시"</string>
-    <string name="enable_alert_speech_summary" msgid="356086178962268831">"비상사태 경고 메시지를 TTS 기능을 사용하여 음성 언어로 알림"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"경보 메시지를 음성 언어로 표시"</string>
+    <string name="enable_alert_speech_summary" msgid="356086178962268831">"긴급 경보 메시지를 TTS 기능을 사용하여 음성 언어로 알림"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"긴급 경보 내역"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"경보 환경설정"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS 테스트 브로드캐스트"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 912a775c8..b3d9b4ba1 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="6006277287245076524">"Шашылыш билдирүүлөр"</string>
-    <string name="sms_cb_settings" msgid="3795852619005211509">"Шашылыш эскертүүлөр"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Шашылыш билдирүүлөр"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Бул колдонуучу Уюктук таркатма жөндөөлөрүн колдоно албайт"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Эски билдирүүлөр жок"</string>
@@ -25,7 +25,7 @@
     <string name="message_options" msgid="3178489901903589574">"Билдирүүнүн параметрлери"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Дайындарды көрүү"</string>
     <string name="menu_delete" msgid="128380070910799366">"Уюк таркатмасын жок кылуу"</string>
-    <string name="view_details_title" msgid="1780427629491781473">"Айгай кабарынын чоо-жайы"</string>
+    <string name="view_details_title" msgid="1780427629491781473">"Шашылыш билдирүүнүн чоо-жайы"</string>
     <string name="confirm_delete_broadcast" msgid="2540199303730232322">"Бул уюк таркатмасы жок кылынсынбы?"</string>
     <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"Кабыл алынган уюк билдирүүлөрүнүн бардыгы жок кылынсынбы?"</string>
     <string name="button_delete" msgid="4672451757925194350">"Жок кылуу"</string>
@@ -35,38 +35,38 @@
     <string name="etws_earthquake_and_tsunami_warning" msgid="662449983177407681">"Жер титирөө жана цунами жөнүндө эскертүү"</string>
     <string name="etws_test_message" msgid="8447820262584381894">"ETWS сынак билдирүүсү"</string>
     <string name="etws_other_emergency_type" msgid="5233080551309721499">"Өзгөчө кырдаал жөнүндө эскертүү"</string>
-    <string name="cmas_presidential_level_alert" msgid="1209234030582361001">"Бүткүл республикалык айгай"</string>
-    <string name="cmas_extreme_alert" msgid="2588720613319969289">"Өзгөчө кырдаал жөнүндө айгай: Өтө коркунучтуу"</string>
-    <string name="cmas_extreme_immediate_observed_alert" msgid="2328845915287460780">"Өзгөчө кырдаал жөнүндө айгай: Өтө коркунучтуу"</string>
-    <string name="cmas_extreme_immediate_likely_alert" msgid="1859702950323471778">"Өзгөчө кырдаал жөнүндө айгай: Өтө коркунучтуу"</string>
-    <string name="cmas_severe_alert" msgid="4135809475315826913">"Өзгөчө кырдаал жөнүндө айгай кабар: Олуттуу"</string>
-    <string name="cmas_amber_alert" msgid="6154867710264778887">"Балдардын уурдалышы (Amber айгай кабары)"</string>
+    <string name="cmas_presidential_level_alert" msgid="1209234030582361001">"Президенттин шашылыш билдирүүсү"</string>
+    <string name="cmas_extreme_alert" msgid="2588720613319969289">"Шашылыш билдирүү (өзгөчө кырдаал)"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="2328845915287460780">"Шашылыш билдирүү (өзгөчө кырдаал)"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="1859702950323471778">"Шашылыш билдирүү (өзгөчө кырдаал)"</string>
+    <string name="cmas_severe_alert" msgid="4135809475315826913">"Шашылыш билдирүү: Олуттуу кырдаал"</string>
+    <string name="cmas_amber_alert" msgid="6154867710264778887">"Балдардын уурдалышы (Amber шашылыш билдирүүсү)"</string>
     <string name="cmas_required_monthly_test" msgid="1890205712251132193">"Милдеттүү ай сайын өткөрүлүүчү сыноо"</string>
-    <string name="cmas_exercise_alert" msgid="2892255514938370321">"Өзгөчө кырдаал жөнүндө айгай кабар берүү (көнүгүү)"</string>
-    <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Өзгөчө кырдаал жөнүндө айгай кабар (оператор)"</string>
+    <string name="cmas_exercise_alert" msgid="2892255514938370321">"Шашылыш билдирүү (окуу максатында)"</string>
+    <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Шашылыш билдирүү (оператор)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Билдирүүлөрдү таркатуу"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Коомдук коопсуздук тууралуу билдирүү"</string>
     <string name="state_local_test_alert" msgid="8003145745857480200">"Мамлекеттик/жергиликтүү органдардын билдирүүлөрү"</string>
-    <string name="emergency_alert" msgid="624783871477634263">"Өзгөчө кырдаал жөнүндө шашылыш билдирүү"</string>
-    <string name="emergency_alerts_title" msgid="6605036374197485429">"Эскертүүлөр"</string>
+    <string name="emergency_alert" msgid="624783871477634263">"Шашылыш билдирүү"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Шашылыш билдирүүлөр"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Билдирүүлөрдү таркатуу"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Шашылыш билдирүүлөр"</string>
-    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Эскертүүлөрдү алуу"</string>
+    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Шашылыш билдирүүлөргө уруксат берүү"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="699552922381916044">"Шашылыш билдирмелер алынат"</string>
-    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Эскертүүнүн үнү"</string>
-    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Кулактандырууну угуу"</string>
-    <string name="enable_alert_speech_summary" msgid="356086178962268831">"Өзгөчө кырдаал жөнүндө кулактандырууну угуу үчүн кеп синтезаторун колдонуңуз"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Өзгөчө кырдаал тууралуу кабарлардын таржымалы"</string>
-    <string name="alert_preferences_title" msgid="6001469026393248468">"Эскертүүнүн параметрлери"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Эстеткичтин үнү"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Шашылыш билдирүүнү угуу"</string>
+    <string name="enable_alert_speech_summary" msgid="356086178962268831">"Шашылыш билдирүүнү угуу үчүн кеп синтезаторун колдонуңуз"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Шашылыш билдирүүлөрдүн таржымалы"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Шашылыш билдирүүнүн параметрлери"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS сынамык таркатмалары"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Жер титирөө жана цунами жөнүндө эскертүү тутумунун сынамык таркатмалары"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Кескин коркунучтар"</string>
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Өмүргө жана мүлккө келтирилген кескин коркунучтар"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Олуттуу коркунучтар"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Өмүргө жана мүлккө келтирилген олуттуу коркунучтар"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER кулактандыруулары"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER шашылыш билдирүүлөрү"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Жоголгон балдар тууралуу кабарлар"</string>
-    <string name="enable_alert_message_title" msgid="2939830587633599352">"Айгай кабарлар"</string>
+    <string name="enable_alert_message_title" msgid="2939830587633599352">"Шашылыш билдирүүлөр"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Коопсуздукка коркунуч туудурган нерселер тууралуу кабарлоо"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Коомдук коопсуздук тууралуу билдирүүлөр"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Бирөөнүн өмүрүн же мүлкүн сактап калууга сунушталган аракеттер"</string>
@@ -75,14 +75,14 @@
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Шашылыш билдирүүлөр"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Жашоого коркунуч туудурган окуялар тууралуу эскертүү"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Милдеттүү ай сайын өткөрүлүүчү сыноо"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="588517403520088484">"CMAS системасынын кулактандыруулары келип турат"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="588517403520088484">"CMAS системасынын шашылыш билдирүүлөрү келип турат"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Дирилдөө"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Болушунча катуу угуу"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Үн жана \"Тынчымды алба\" функциясынын жөндөөлөрү көз жаздымда калат"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Аймакты жаңыртуу боюнча таркатмалар"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"SIM-картанын абалы тууралуу жаңыртылган маалымат көрсөтүлсүн"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Иштеп чыгуучунун параметрлери"</string>
-    <string name="cmas_category_heading" msgid="3923503130776640717">"Айгай кабарынын категориясы:"</string>
+    <string name="cmas_category_heading" msgid="3923503130776640717">"Шашылыш билдирүүнүн категориясы:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Геофизакалык"</string>
     <string name="cmas_category_met" msgid="7563732573851773537">"Метеорологиялык"</string>
     <string name="cmas_category_safety" msgid="2986472639641883453">"Коомдук коопсуздук"</string>
@@ -114,14 +114,14 @@
     <string name="cmas_certainty_observed" msgid="3668549749352106472">"Байкалган"</string>
     <string name="cmas_certainty_likely" msgid="4254497828943291749">"Мүмкүн"</string>
     <string name="delivery_time_heading" msgid="5980836543433619329">"Алынды:"</string>
-    <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> окула элек айгай кабар."</string>
-    <string name="notification_multiple_title" msgid="1523638925739947855">"Жаңы айгай кабарлар"</string>
-    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Өзгөчө кырдаалга байланыштуу биринчи кабар келгенден кийин, аларды өчүрүү сунушталат (Бүткүл республикалык кулактандыруудан башка)."</string>
+    <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> окула элек шашылыш билдирүү."</string>
+    <string name="notification_multiple_title" msgid="1523638925739947855">"Жаңы шашылыш билдирүүлөр"</string>
+    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Биринчи шашылыш билдирүү келгенден кийин, дароо өчүрүп салуу сунушталат (президенттикинен башка)."</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Эскертүүлөрдү өчүрүү"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Учурда өзгөчө кырдаал жөнүндө айгай кабарын алып жатасыз. Өзгөчө кырдаал жөнүндө айгай кабарлары алына берсинби?"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Учурда шашылыш билдирүүлөрдү алып жатасыз. Мындан ары да ала бересизби?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Ооба"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Жок"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Өзгөчө кырдаал тууралуу кабарлардын таржымалы"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Шашылыш билдирүүлөрдүн таржымалы"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Бир жолу"</item>
     <item msgid="9097229303902157183">"2 мүнөт сайын"</item>
@@ -129,5 +129,5 @@
     <item msgid="3863339891188103437">"15 мүнөт сайын"</item>
     <item msgid="6868848414437854609">"Өчүк"</item>
   </string-array>
-    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Өзгөчө кырдаалдар тууралуу кабарлоо"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Шашылыш билдирүүлөр"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 29f66acb4..c2fa836e1 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -121,7 +121,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Pašlaik jūs saņemat ārkārtas brīdinājumus. Vai vēlaties arī turpmāk saņemt ārkārtas brīdinājumus?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Jā"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Nē"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Ārkārtas situāciju brīdinājumu vēsture"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Ārkārtas situāciju vēsture"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Vienreiz"</item>
     <item msgid="9097229303902157183">"Ik pēc 2 minūtēm"</item>
diff --git a/res/values-mcc246-ky/strings.xml b/res/values-mcc246-ky/strings.xml
index 8f7fbda45..9101577c1 100644
--- a/res/values-mcc246-ky/strings.xml
+++ b/res/values-mcc246-ky/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"Эскертүүлөр (2-деңгээл)"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"Эскертүүлөр (3-деңгээл)"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"Шашылыш билдирүүлөр (2-деңгээл)"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"Шашылыш билдирүүлөр (3-деңгээл)"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
 </resources>
diff --git a/res/values-mcc424-ky/strings.xml b/res/values-mcc424-ky/strings.xml
index 4b18a3e90..2a07ea946 100644
--- a/res/values-mcc424-ky/strings.xml
+++ b/res/values-mcc424-ky/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Өзгөчө кырдаал жөнүндө шашылыш улуттук билдирүү"</string>
-    <string name="cmas_amber_alert" msgid="2410977367530696102">"Шашылыш кабар"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Сынамык шашылык билдирүү"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Улуттук шашылыш билдирүү"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Шашылыш билдирүү"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Сынамык шашылыш билдирүү"</string>
 </resources>
diff --git a/res/values-mcc716-ky/strings.xml b/res/values-mcc716-ky/strings.xml
index 6fcbca0ea..5415c24b1 100644
--- a/res/values-mcc716-ky/strings.xml
+++ b/res/values-mcc716-ky/strings.xml
@@ -18,6 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Маалыматтык билдирүү"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Маалыматтык билдирүү"</string>
-    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Өзгөчө кырдаал жөнүндө шашылыш билдирүү: Сынамык билдирүү"</string>
-    <string name="cmas_exercise_alert" msgid="996644454768618214">"Өзгөчө кырдаал жөнүндө шашылыш билдирүү: Окуу жана үйрөнүү үчүн билдирүү"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Өзгөчө кырдаал жөнүндө шашылыш билдирүү: Сынамык"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Өзгөчө кырдаал жөнүндө шашылыш билдирүү: Окуу максатында"</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index a2a2530fc..03e6001d2 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -77,7 +77,7 @@
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Задолжително месечно тестирање"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="588517403520088484">"Примај пробни-пораки од системот за безбедносни предупредувања"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Вибрации"</string>
-    <string name="use_full_volume_title" msgid="8581439612945182255">"Користете макс. јачина на звук"</string>
+    <string name="use_full_volume_title" msgid="8581439612945182255">"Користи макс. јачина на звук"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Занемари други пост. за јачина на звук и „Не вознемирувај“"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Емитување локални информации за состојбата"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Прикажувај информации за состојбата во статусот на SIM-картичката"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index c97b74f2c..048019cbb 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="3795852619005211509">"आणीबाणीच्या सूचना"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"या वापरकर्त्‍यासाठी सेल प्रसारण सेटिंग्‍ज उपलब्‍ध नाहीत"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ठीक आहे"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"मागील अलर्ट नाहीत"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"यापूर्वीचे अलर्ट नाहीत"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"प्रसारणे हटवा"</string>
     <string name="message_options" msgid="3178489901903589574">"मेसेज पर्याय"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"तपशील पहा"</string>
@@ -121,7 +121,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"तुम्ही सध्या आणीबाणी सूचना प्राप्त करत आहात. तुम्ही आणीबाणी सूचना प्राप्त करणे सुरु ठेऊ इच्छिता का?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"होय"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"नाही"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"आणीबाणी सतर्क इतिहास"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"आणीबाणी अलर्ट इतिहास"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"एकदा"</item>
     <item msgid="9097229303902157183">"दर 2 मिनिटांनी"</item>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index cf575cea0..19251888c 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -52,7 +52,7 @@
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"ବ୍ରୋଡକାଷ୍ଟ ମେସେଜ୍‌"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟ"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"ଆଲର୍ଟକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="699552922381916044">"ଆପାତକାଳୀନ ବିଜ୍ଞପ୍ତି ପାଆନ୍ତୁ"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="699552922381916044">"ଜରୁରୀକାଳୀନ ବିଜ୍ଞପ୍ତି ପାଆନ୍ତୁ"</string>
     <string name="alert_reminder_interval_title" msgid="7466642011937564868">"ଆଲର୍ଟ ରିମାଇଣ୍ଡର୍ ସାଉଣ୍ଡ"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"ଆଲର୍ଟ ମେସେଜ୍‌ କୁହନ୍ତୁ"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟ ମେସେଜ୍‌ କହିବା ପାଇଁ \"ଟେକ୍ସଟ୍‌-ଟୁ-ସ୍ପୀଚ୍\" ବ୍ୟବହାର କରନ୍ତୁ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 45e32633e..0379092e7 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -116,7 +116,7 @@
     <string name="delivery_time_heading" msgid="5980836543433619329">"Odebrano:"</string>
     <string name="notification_multiple" msgid="5121978148152124860">"Nieprzeczytane alerty: <xliff:g id="COUNT">%s</xliff:g>."</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"Nowe alerty"</string>
-    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Pokaż okno rezygnacji po wyświetleniu pierwszego alertu CMAS (innego niż alert prezydencki)."</string>
+    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Pokaż okno rezygnacji po wyświetleniu pierwszego alertu CMAS (innego niż alert prezydencki)"</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Pokaż okno rezygnacji"</string>
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Obecnie otrzymujesz alerty o zagrożeniu. Czy nadal chcesz je dostawać?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Tak"</string>
@@ -127,7 +127,7 @@
     <item msgid="9097229303902157183">"Co 2 minuty"</item>
     <item msgid="5718214950343391480">"Co 5 minut"</item>
     <item msgid="3863339891188103437">"Co 15 minut"</item>
-    <item msgid="6868848414437854609">"Wył."</item>
+    <item msgid="6868848414437854609">"Wyłączony"</item>
   </string-array>
     <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Alerty o zagrożeniu"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index dca38cbda..99c48541f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -116,7 +116,7 @@
     <string name="delivery_time_heading" msgid="5980836543433619329">"Recebida:"</string>
     <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> alertas não lidos."</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"Novos alertas"</string>
-    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Mostrar caixa de diálogo de desativação após exibir o primeiro alerta (exceto presidencial)."</string>
+    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Mostrar caixa de diálogo de desativação após exibir o primeiro alerta (exceção: alerta presidencial)."</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Mostrar diálogo de desativação"</string>
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Você está recebendo alertas de emergência. Quer continuar a receber alertas de emergência?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Sim"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 224ad60df..d3bf9a33d 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -116,8 +116,8 @@
     <string name="delivery_time_heading" msgid="5980836543433619329">"Prijaté:"</string>
     <string name="notification_multiple" msgid="5121978148152124860">"Počet neprečítaných upozornení: <xliff:g id="COUNT">%s</xliff:g>."</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"Nové upozornenia"</string>
-    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Zobraziť dialógové okno na zrušenie po spustení prvého upozornenia (okrem prezident. varovania)"</string>
-    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Zobraziť dialógové okno na zrušenie"</string>
+    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Zobraziť dialógové okno na odhlásenie po prvom upozornení (okrem prezident. varovania)"</string>
+    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Zobraziť dialógové okno na odhlásenie"</string>
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Aktuálne prijímate tiesňové upozornenia. Chcete ich prijímať aj naďalej?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Áno"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Nie"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ca88a31a3..95c732adf 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -78,7 +78,7 @@
     <string name="enable_cmas_test_alerts_summary" msgid="588517403520088484">"รับข้อความทดสอบสำหรับระบบแจ้งเตือนความปลอดภัย"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"การสั่น"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"ใช้เสียงเต็มระดับ"</string>
-    <string name="use_full_volume_summary" msgid="3560764277281704697">"ละเว้นระดับเสียงอื่นๆ และค่ากำหนด \"ห้ามรบกวน\""</string>
+    <string name="use_full_volume_summary" msgid="3560764277281704697">"ละเว้นค่ากำหนด \"ห้ามรบกวน\" และระดับเสียงอื่นๆ"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"การเผยแพร่การอัปเดตในพื้นที่"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"แสดงข้อมูลอัปเดตในสถานะซิม"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"ตัวเลือกสำหรับนักพัฒนาซอฟต์แวร์"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index c1b08594f..36a8bbc82 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="3795852619005211509">"Acil durum uyarıları"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Bu kullanıcı için Hücre Yayını ayarları yapılamıyor"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Tamam"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"Önceki uyarı yok"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"Henüz uyarı yok"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Yayınları sil"</string>
     <string name="message_options" msgid="3178489901903589574">"İleti seçenekleri"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Ayrıntıları görüntüle"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index adc7d84a3..2e34176bb 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -55,7 +55,7 @@
     <string name="enable_alerts_master_toggle_summary" msgid="699552922381916044">"Отримувати екстрені сповіщення"</string>
     <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Сигнал нагадування"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Промовляти сповіщення"</string>
-    <string name="enable_alert_speech_summary" msgid="356086178962268831">"Використовувати синтез мовлення, щоб диктувати тексти сповіщень про надзвичайні ситуації"</string>
+    <string name="enable_alert_speech_summary" msgid="356086178962268831">"Використовувати синтез мовлення, щоб озвучувати текст сповіщень про надзвичайні ситуації"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Історія екстрених сповіщень"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Параметри сповіщень"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Пробні сповіщення ETWS"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 68db19a1c..a4c29d1e5 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="3795852619005211509">"ایمرجنسی الرٹس"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"سیل براڈکاسٹ کی ترتیبات اس صارف کیلئے دستیاب نہیں ہیں"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ٹھیک ہے"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"کوئی سابقہ انتباہ نہیں ہے"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"کوئی سابقہ الرٹس نہیں ہیں"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"براڈکاسٹس حذف کریں"</string>
     <string name="message_options" msgid="3178489901903589574">"پیغام کے اختیارات"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"تفصیلات دیکھیں"</string>
@@ -124,9 +124,9 @@
     <string name="cb_list_activity_title" msgid="1433502151877791724">"ایمرجنسی الرٹ کی سر گزشت"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"ایک بار"</item>
-    <item msgid="9097229303902157183">"ہر 2 منٹ پر"</item>
+    <item msgid="9097229303902157183">"ہر 2 منٹ بعد"</item>
     <item msgid="5718214950343391480">"ہر 5 منٹ میں"</item>
-    <item msgid="3863339891188103437">"ہر 15 منٹ میں"</item>
+    <item msgid="3863339891188103437">"ہر 15 منٹ بعد"</item>
     <item msgid="6868848414437854609">"آف"</item>
   </string-array>
     <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"وائرلیس ایمرجنسی الرٹس"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index f8e44343b..bc7fcb2d3 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -53,11 +53,11 @@
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Cảnh báo khẩn cấp"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Cho phép cảnh báo"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="699552922381916044">"Nhận thông báo khẩn cấp"</string>
-    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Âm thanh lời nhắc thông báo"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Âm thanh lời nhắc cảnh báo"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Đọc to nội dung cảnh báo"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Sử dụng tính năng chuyển văn bản sang lời nói để đọc to nội dung các cảnh báo khẩn cấp"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Lịch sử cảnh báo khẩn cấp"</string>
-    <string name="alert_preferences_title" msgid="6001469026393248468">"Tùy chọn thông báo"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Tùy chọn cảnh báo"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Thông báo thử nghiệm cho ETWS"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Thông báo thử nghiệm cho Hệ thống cảnh báo động đất và sóng thần"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Mối đe dọa cực kỳ nghiêm trọng"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 227b3186a..8429d7824 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="3795852619005211509">"紧急警报"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"此用户无权修改小区广播设置"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"确定"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"没有之前的提醒"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"还没有任何警报"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"删除广播"</string>
     <string name="message_options" msgid="3178489901903589574">"短信选项"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"查看详情"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 068e4ec90..dad7b7566 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -16,11 +16,11 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6006277287245076524">"緊急通知"</string>
-    <string name="sms_cb_settings" msgid="3795852619005211509">"緊急警示"</string>
+    <string name="app_label" msgid="6006277287245076524">"緊急警報"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"緊急警報"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"此使用者無法修改區域廣播設定"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"確定"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"沒有任何之前的警示"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"沒有任何過往警報"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"刪除廣播"</string>
     <string name="message_options" msgid="3178489901903589574">"訊息選項"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"查看詳細資料"</string>
@@ -41,7 +41,7 @@
     <string name="cmas_extreme_immediate_likely_alert" msgid="1859702950323471778">"緊急警示：極嚴重"</string>
     <string name="cmas_severe_alert" msgid="4135809475315826913">"緊急警示：嚴重"</string>
     <string name="cmas_amber_alert" msgid="6154867710264778887">"誘拐兒童 (黃色警示)"</string>
-    <string name="cmas_required_monthly_test" msgid="1890205712251132193">"每月測試用訊息"</string>
+    <string name="cmas_required_monthly_test" msgid="1890205712251132193">"必要的每月測試訊息"</string>
     <string name="cmas_exercise_alert" msgid="2892255514938370321">"緊急警示 (演習)"</string>
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"緊急警示 (網絡供應商)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"廣播訊息"</string>
@@ -50,14 +50,14 @@
     <string name="emergency_alert" msgid="624783871477634263">"緊急警示"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"警報"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"廣播訊息"</string>
-    <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"緊急警示"</string>
+    <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"緊急警報"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"允許接收警報"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="699552922381916044">"接收緊急通知"</string>
-    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"警示提醒音效"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"警報提醒音效"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"說出警示訊息"</string>
-    <string name="enable_alert_speech_summary" msgid="356086178962268831">"使用文字轉語音功能說出緊急警示訊息"</string>
+    <string name="enable_alert_speech_summary" msgid="356086178962268831">"使用文字轉語音功能說出緊急警報訊息"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"緊急警報記錄"</string>
-    <string name="alert_preferences_title" msgid="6001469026393248468">"警示偏好設定"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"警報偏好設定"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS 測試廣播"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"地震海嘯警報系統測試廣播"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"極嚴重威脅"</string>
@@ -72,9 +72,9 @@
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"有助挽救生命或財產的建議行動"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"州份和地區測試"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"接收來自州政府和地區政府的測試訊息"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"緊急警示"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"緊急警報"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"對威脅生命安全的事件發出警告"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"每月測試用訊息"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"必要的每月測試訊息"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="588517403520088484">"接收安全警報系統的測試訊息"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"震動"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"使用最大音量"</string>
@@ -118,16 +118,16 @@
     <string name="notification_multiple_title" msgid="1523638925739947855">"新警示"</string>
     <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"首個警示出現後顯示停用對話框 (國家級警報除外)。"</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"顯示停用對話框"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"您目前有接收緊急警示，要繼續接收嗎？"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"您目前有接收緊急警報，要繼續接收嗎？"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"是"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"否"</string>
     <string name="cb_list_activity_title" msgid="1433502151877791724">"緊急警報記錄"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"一次"</item>
-    <item msgid="9097229303902157183">"每 2 分鐘提醒一次"</item>
+    <item msgid="9097229303902157183">"每 2 分鐘"</item>
     <item msgid="5718214950343391480">"每 5 分鐘"</item>
     <item msgid="3863339891188103437">"每 15 分鐘"</item>
     <item msgid="6868848414437854609">"關閉"</item>
   </string-array>
-    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"無線緊急警示"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"無線緊急警報"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 989026cc5..720b375fe 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="3795852619005211509">"緊急警報"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"這位使用者無法修改區域廣播設定"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"確定"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"先前沒有任何警示"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"先前沒有任何警報"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"刪除廣播"</string>
     <string name="message_options" msgid="3178489901903589574">"訊息選項"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"查看詳細資料"</string>