[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d25b9497c3 -s ours am: 4f6abdf7f3 -s ours am: 42a04b321e -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/24980680

Change-Id: Ia0507300122c3cfb1de755c368d368ca740e54ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index db0751c..58f6316 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,7 +49,7 @@
     aaptflags: ["--custom-package com.android.cellbroadcastreceiver"],
     manifest: "AndroidManifest.xml",
     apex_available: ["com.android.cellbroadcast"],
-    required: ["privapp_allowlist_com.android.cellbroadcastreceiver.module.xml"],
+    privapp_allowlist: ":privapp_allowlist_com.android.cellbroadcastreceiver.module.xml",
 }
 
 // filegroup used to include source into unit tests
@@ -72,7 +72,7 @@
      manifest: "AndroidManifest_Platform.xml",
      system_ext_specific: true,
      privileged: true,
-     required: ["platform_privapp_allowlist_com.android.cellbroadcastreceiver.xml"],
+     privapp_allowlist: ":platform_privapp_allowlist_com.android.cellbroadcastreceiver.xml",
 }
 
 // source file shared with legacy cellbroadcast app
diff --git a/apex/Android.bp b/apex/Android.bp
index 6dfe7eb..614c106 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -34,8 +34,4 @@
     name: "com.android.cellbroadcast",
     defaults:["com.android.cellbroadcast-defaults"],
     apps: ["CellBroadcastApp", "CellBroadcastServiceModule"],
-    prebuilts: [
-        "privapp_allowlist_com.android.cellbroadcastservice.xml",
-        "privapp_allowlist_com.android.cellbroadcastreceiver.module.xml",
-    ],
 }
diff --git a/apex/permissions/Android.bp b/apex/permissions/Android.bp
index 931d8c5..0e8f736 100644
--- a/apex/permissions/Android.bp
+++ b/apex/permissions/Android.bp
@@ -18,34 +18,25 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-prebuilt_etc {
+filegroup {
     name: "privapp_allowlist_com.android.cellbroadcastreceiver.module.xml",
-    sub_dir: "permissions",
-    src: "com.android.cellbroadcastreceiver.module.xml",
-    installable: false,
+    srcs: ["com.android.cellbroadcastreceiver.module.xml"],
 }
 
 // For platform only variant
-prebuilt_etc {
+filegroup {
     name: "platform_privapp_allowlist_com.android.cellbroadcastreceiver.xml",
-    sub_dir: "permissions",
-    src: "com.android.cellbroadcastreceiver.xml",
-    system_ext_specific: true,
+    srcs: ["com.android.cellbroadcastreceiver.xml"],
     visibility: ["//packages/apps/CellBroadcastReceiver"],
-    installable: true,
 }
 
 // For platform only variant
-prebuilt_etc {
+filegroup {
     name: "platform_privapp_allowlist_com.android.cellbroadcastservice.xml",
-    sub_dir: "permissions",
-    src: "com.android.cellbroadcastservice.xml",
-    installable: true,
+    srcs: ["com.android.cellbroadcastservice.xml"],
 }
 
-prebuilt_etc {
+filegroup {
     name: "privapp_allowlist_com.android.cellbroadcastservice.xml",
-    sub_dir: "permissions",
-    src: "com.android.cellbroadcastservice.xml",
-    installable: false,
+    srcs: ["com.android.cellbroadcastservice.xml"],
 }
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 0b0b71f..f11f1b6 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -80,7 +80,7 @@
     <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>
-    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"ባለሙሉ ማያ ገፅ መልዕክቶችን ያሳይ"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"ባለሙሉ ማያ ገጽ መልዕክቶችን ያሳይ"</string>
     <string name="enable_full_screen_public_safety_messages_summary" msgid="194171850169012897">"ሲጠፋ የሕዝብ ደህንነት መልዕክቶች አሁንም እንደ ማሳወቂያ ይላካሉ"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"የግዛት እና አካባቢያዊ ሙከራዎች"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"ከግዛት እና የአካባቢ ባለሥልጣናት የሙከራ መልዕክቶችን ተቀበል"</string>
@@ -113,7 +113,7 @@
     <string name="cmas_category_infra" msgid="3558151044446851398">"መሰረተ ልማት"</string>
     <string name="cmas_category_cbrne" msgid="240421557913603971">"ኬሚካል/ባዮሎጂካል/ኒውክሌር/ ፈንጅ"</string>
     <string name="cmas_category_other" msgid="6158932360790744360">"ሌላ"</string>
-    <string name="cmas_response_heading" msgid="4205379547245540163">"የምላሽ ዓይነት፦"</string>
+    <string name="cmas_response_heading" msgid="4205379547245540163">"የምላሽ አይነት፦"</string>
     <string name="cmas_response_shelter" msgid="7301175579079615909">"መጠለያ"</string>
     <string name="cmas_response_evacuate" msgid="5833170084430021095">"ልቀቅ"</string>
     <string name="cmas_response_prepare" msgid="8428073909753758319">"አዘጋጅ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 4f485c3..20e58a5 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -70,7 +70,7 @@
     <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_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>
@@ -82,7 +82,7 @@
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"الإجراءات المقترحة التي يمكن أن تنقذ الأرواح أو الممتلكات"</string>
     <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"إظهار الرسائل في وضع ملء الشاشة"</string>
     <string name="enable_full_screen_public_safety_messages_summary" msgid="194171850169012897">"سيتم إرسال رسائل السلامة العامة كإشعار حتى إذا كانت غير مفعّلة."</string>
-    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"تنبيهات تجريبية من سلطات الولاية والسلطات المحلية"</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_summary" msgid="7574617515441602546">"إرسال تحذير بشأن الأحداث التي تهدد الحياة"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 15e95c9..1bf2694 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -54,7 +54,7 @@
     <string name="public_safety_message" msgid="9119928798786998252">"Poruka o javnoj bezbednosti"</string>
     <string name="state_local_test_alert" msgid="8003145745857480200">"Proba državnih/lokalnih organa"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Obaveštenje o hitnom slučaju"</string>
-    <string name="emergency_alerts_title" msgid="6605036374197485429">"Upozorenja"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Obaveštenja"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Poruke o emitovanju"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Hitna obaveštenja"</string>
     <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Nepotvrđena obaveštenja o hitnim slučajevima"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 6a03739..aae3b11 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -24,7 +24,7 @@
     <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"তথ্য সংক্রান্ত বিজ্ঞপ্তি"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"এই ব্যবহারকারীর জন্য ওয়্যারলেস সতর্কতার সেটিংস উপলভ্য নয়"</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_preferences" msgid="3596514894131599202">"সেটিংস"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"সম্প্রচারগুলি মুছে দিন"</string>
     <string name="message_options" msgid="3178489901903589574">"মেসেজ বিকল্পগুলি"</string>
@@ -94,7 +94,7 @@
     <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
     <skip />
     <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"জরুরি সতর্কতা পান: অপারেটর সংক্রান্ত সতর্কতা"</string>
-    <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"কম্পন"</string>
+    <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"ভাইব্রেশন"</string>
     <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"যেকোনও সময়ে বিজ্ঞপ্তি পেতে সম্পূর্ণ ভলিউম দিন"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"বিরক্ত করবে না &amp; অন্য ভলিউম সেটিংস এড়িয়ে যান"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index d494fb5..63121a3 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/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="2008319089248760277">"Bezdrátové výstražné zprávy"</string>
-    <string name="sms_cb_settings" msgid="9021266457863671070">"Bezdrátové výstražné zprávy"</string>
-    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Bezdrátové výstražné zprávy"</string>
-    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Bezdrátové výstražné zprávy"</string>
-    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Bezdrátové výstražné zprávy"</string>
+    <string name="app_label" msgid="2008319089248760277">"Výstražné zprávy (bezdrátové)"</string>
+    <string name="sms_cb_settings" msgid="9021266457863671070">"Výstražné zprávy (bezdrátové)"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Výstražné zprávy (bezdrátové)"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Výstražné zprávy (bezdrátové)"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Výstražné zprávy (bezdrátové)"</string>
     <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Informační oznámení"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Nastavení bezdrátových výstražných zpráv nejsou pro tohoto uživatele dostupná"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
@@ -149,7 +149,7 @@
     <item msgid="3863339891188103437">"Každých 15 minut"</item>
     <item msgid="7388573183644474611">"Nikdy"</item>
   </string-array>
-    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Bezdrátové výstražné zprávy"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Výstražné zprávy (bezdrátové)"</string>
     <string name="enable_cmas_presidential_alerts_title" msgid="7293800023375154256">"Upozornění od prezidenta"</string>
     <string name="enable_cmas_presidential_alerts_summary" msgid="7900094335808247024">"Celostátní výstražné zprávy vydané prezidentem. Tuto funkci nelze vypnout."</string>
     <string name="receive_cmas_in_second_language_title" msgid="1223260365527361964"></string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ee4ee2b..4aa9962 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -62,7 +62,7 @@
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"De automatiske indstillinger for det trådløse advarselssystem skifter afhængigt af SIM-kortet"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Tillad nødalarmer"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Få notifikationer om mobilbaseret varsling"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Påmindelse om alarm"</string>
+    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alarm for påmindelse"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Læs advarselsmeddelelser op"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Få oplæst beskeder fra mobilbaseret varsling"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Der afspilles en påmindelseslyd i normal lydstyrke"</string>
@@ -163,7 +163,7 @@
     <string name="message_serial_number" msgid="3386553658712978964">"Serienummer:"</string>
     <string name="data_coding_scheme" msgid="4628901196730870577">"Datakodningsskema:"</string>
     <string name="message_content" msgid="6204502929879474632">"Meddelelsens indhold:"</string>
-    <string name="location_check_time" msgid="4105326161240531207">"Tidspunkt for lokationstjek:"</string>
+    <string name="location_check_time" msgid="4105326161240531207">"Tidspunkt for placeringstjek:"</string>
     <string name="message_displayed" msgid="5091678195925617971">"Beskeden blev vist:"</string>
     <string name="message_coordinates" msgid="356333576818059052">"Koordinater:"</string>
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maksimal ventetid:"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 0b1596f..244d37a 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -60,7 +60,7 @@
     <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Ez ikusi egin zaien larrialdi-alertak"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Larrialdien alertak ahots-deietan"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Hari gabeko larrialdi-alerten ezarpenak automatikoki aldatu dira SIMean oinarrituta"</string>
-    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Eman alertak erabiltzeko baimena"</string>
+    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Baimendu alertak"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Jaso hari gabeko larrialdi-alerten jakinarazpenak"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alerta-egoeraren abisua"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Irakurri alerta-mezua ozen"</string>
@@ -166,7 +166,7 @@
     <string name="location_check_time" msgid="4105326161240531207">"Kokapena egiaztatu zen ordua:"</string>
     <string name="message_displayed" msgid="5091678195925617971">"Bistaratu al da mezurik?"</string>
     <string name="message_coordinates" msgid="356333576818059052">"Koordenatuak:"</string>
-    <string name="maximum_waiting_time" msgid="3504809124079381356">"Gehieneko itxaron-denbora:"</string>
+    <string name="maximum_waiting_time" msgid="3504809124079381356">"Gehieneko itxarote-denbora:"</string>
     <string name="seconds" msgid="141450721520515025">"segundo"</string>
     <string name="message_copied" msgid="6922953753733166675">"Kopiatu da mezua"</string>
     <string name="top_intro_default_text" msgid="1922926733152511202"></string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index be107e6..95071a2 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -74,7 +74,7 @@
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Menaces extrêmes pour les biens et personnes"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Menaces graves"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Menaces graves pour les biens et personnes"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Alertes enlèvement"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Alertes Enlèvement"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Bulletins d\'urgence relatifs aux enlèvements d\'enfants"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"Messages d\'alerte"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Recevoir des avertissements relatifs aux menaces de sécurité imminentes"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 5f95471..e317445 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -60,7 +60,7 @@
     <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"अस्वीकार की गई आपातकालीन चेतावनियां"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"वॉयस कॉल के दौरान आपातकालीन चेतावनियां"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"अपने-आप काम करने वाली WEA की सूचनाओं की सेटिंग, सिम के हिसाब से बदल जाती है"</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="5583168548073938617">"वायरलेस इमरजेंसी अलर्ट की सूचनाएं पाएं"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"अलर्ट रिमाइंडर"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"अलर्ट मैसेज बोलें"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index a9c7d18..dbb5951 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -135,7 +135,7 @@
     <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> peringatan belum dibaca."</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"Peringatan baru"</string>
     <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Tunjukkan dialog menolak ikut serta setelah notifikasi pertama tampil (selain Notifikasi Presidensial)."</string>
-    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Tunjukkan dialog pilihan tidak ikut"</string>
+    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Tunjukkan dialog menolak ikut serta"</string>
     <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"Saat ini Anda menerima peringatan darurat nirkabel. Ingin terus menerima peringatan darurat nirkabel?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Ya"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Tidak"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 19b5bcc..73bbf69 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -54,20 +54,20 @@
     <string name="public_safety_message" msgid="9119928798786998252">"Messaggio di sicurezza pubblica"</string>
     <string name="state_local_test_alert" msgid="8003145745857480200">"Test a livello statale/locale"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Allerta di emergenza"</string>
-    <string name="emergency_alerts_title" msgid="6605036374197485429">"Avvisi"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Allerte"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Messaggi broadcast"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Avvisi di emergenza"</string>
     <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Avvisi di emergenza senza risposta"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Avvisi d\'emergenza in chiamata vocale"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Le impostazioni WEA automatiche cambiano in base alla SIM"</string>
-    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Consenti avvisi"</string>
+    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Consenti allerte"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Ricevi notifiche per allerte wireless di emergenza"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Promemoria allerte"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Leggimi messaggio di allerta"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Usa la sintesi vocale per leggermi i messaggi delle allerte di emergenza wireless"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Verrà riprodotto un suono di promemoria a volume normale"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Cronologia allerte di emergenza"</string>
-    <string name="alert_preferences_title" msgid="6001469026393248468">"Preferenze per gli avvisi"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Preferenze per le allerte"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Trasmissioni di prova ETWS"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Trasmissioni di prova per il sistema di avviso tsunami e terremoto"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Minacce estreme"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2500d28..7709d01 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -87,7 +87,7 @@
     <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="7194966927004755266">"テストアラート"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"携帯通信会社のテストや、安全警告システムの毎月のテストを受信する"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"安全警告システムの携帯通信会社テストと毎月のテストを受信する"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
     <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"緊急速報メール: 訓練用メッセージを受け取る"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index e08e130..bc9f409 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -19,7 +19,7 @@
     <string name="app_label" msgid="2008319089248760277">"Төтенше жағдай туралы сымсыз хабарландырулар"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Төтенше жағдай туралы сымсыз хабарландырулар"</string>
     <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Төтенше жағдай туралы сымсыз хабарландырулар"</string>
-    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Сымсыз шұғыл хабарландырулар"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Төтенше жағдай туралы сымсыз хабарландырулар"</string>
     <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Төтенше жағдай туралы сымсыз хабарландырулар"</string>
     <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Ақпараттық хабарландыру"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Төтенше жағдай туралы сымсыз хабарландыру параметрлері бұл пайдаланушы үшін қолжетімді емес."</string>
@@ -139,7 +139,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"Төтенше жағдай туралы сымсыз хабарландыруларды алып жүрсіз. Оларды әрі қарай ала бересіз бе?"</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 name="action_delete" msgid="7435661404543945861">"Жою"</string>
     <string name="action_detail_info" msgid="8486524382178381810">"Мәліметтерді көрсету"</string>
   <string-array name="alert_reminder_interval_entries">
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index df1b0ba..14ba5b0 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -21,7 +21,7 @@
     <string name="sms_cb_sender_name_default" msgid="972946539768958828">"ವೈರ್‌ಲೆಸ್ ತುರ್ತು ಅಲರ್ಟ್‌ಗಳು"</string>
     <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"ವೈರ್‌ಲೆಸ್ ತುರ್ತು ಅಲರ್ಟ್‌ಗಳು"</string>
     <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"ವೈರ್‌ಲೆಸ್ ತುರ್ತು ಅಲರ್ಟ್‌ಗಳು"</string>
-    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"ಮಾಹಿತಿಯ ನೋಟಿಫಿಕೇಶನ್"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"ಮಾಹಿತಿಯ ಅಧಿಸೂಚನೆ"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"ಈ ಬಳಕೆದಾರರಿಗೆ ವೈರ್‌ಲೆಸ್ ತುರ್ತು ಅಲರ್ಟ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ಸರಿ"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"ಹಿಂದಿನ ಯಾವುದೇ ಎಚ್ಚರಿಕೆಗಳಿಲ್ಲ"</string>
@@ -162,7 +162,7 @@
     <string name="message_identifier" msgid="5558338496219327850">"ಗುರುತಿಸುವಿಕೆ:"</string>
     <string name="message_serial_number" msgid="3386553658712978964">"ಕ್ರಮ ಸಂಖ್ಯೆ:"</string>
     <string name="data_coding_scheme" msgid="4628901196730870577">"ಡೇಟಾ ಕೋಡಿಂಗ್ ಸ್ಕೀಮ್:"</string>
-    <string name="message_content" msgid="6204502929879474632">"ಸಂದೇಶದ ಕಂಟೆಂಟ್‍:"</string>
+    <string name="message_content" msgid="6204502929879474632">"ಸಂದೇಶದ ವಿಷಯ:"</string>
     <string name="location_check_time" msgid="4105326161240531207">"ಸ್ಥಳ ಪರಿಶೀಲನೆಯ ಸಮಯ:"</string>
     <string name="message_displayed" msgid="5091678195925617971">"ಸಂದೇಶವನ್ನು ಪ್ರದರ್ಶಿಸಲಾಗಿದೆ:"</string>
     <string name="message_coordinates" msgid="356333576818059052">"ನಿರ್ದೇಶಾಂಕಗಳು:"</string>
diff --git a/res/values-mcc001-ur/strings.xml b/res/values-mcc001-ur/strings.xml
index fa54951..5c2061f 100644
--- a/res/values-mcc001-ur/strings.xml
+++ b/res/values-mcc001-ur/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="6380811692570868097">"ہسپانوی"</string>
-    <string name="receive_cmas_in_second_language_summary" msgid="2747100010816713897">"ممکن ہونے پر ہسپانوی میں ایمرجنسی الرٹس موصول کریں"</string>
+    <string name="receive_cmas_in_second_language_summary" msgid="2747100010816713897">"ممکن ہونے پر ہسپانوی میں ہنگامی الرٹس موصول کریں"</string>
 </resources>
diff --git a/res/values-mcc202-fa/strings.xml b/res/values-mcc202-fa/strings.xml
index ae6f1ec..f5ca11a 100644
--- a/res/values-mcc202-fa/strings.xml
+++ b/res/values-mcc202-fa/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="cmas_amber_alert" msgid="8487743009781574082">"هشدار یونان: هشدار اَمبِر"</string>
     <string name="cmas_presidential_level_alert" msgid="6341018911042907130">"هشدار یونان: هشدار ریاست جمهوری"</string>
-    <string name="cmas_extreme_alert" msgid="7989498696890004631">"هشدار یونان: هشدار شدید"</string>
-    <string name="cmas_extreme_immediate_observed_alert" msgid="3810446910355766140">"هشدار یونان: هشدار شدید"</string>
-    <string name="cmas_extreme_immediate_likely_alert" msgid="4723844134984591798">"هشدار یونان: هشدار شدید"</string>
+    <string name="cmas_extreme_alert" msgid="7989498696890004631">"هشدار یونان: هشدار بسیار جدی"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="3810446910355766140">"هشدار یونان: هشدار بسیار جدی"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="4723844134984591798">"هشدار یونان: هشدار بسیار جدی"</string>
     <string name="cmas_severe_alert" msgid="3002006180717551407">"هشدار یونان: هشدار جدی"</string>
 </resources>
diff --git a/res/values-mcc208-fa/strings.xml b/res/values-mcc208-fa/strings.xml
index 8fb7fac..f2bc277 100644
--- a/res/values-mcc208-fa/strings.xml
+++ b/res/values-mcc208-fa/strings.xml
@@ -17,8 +17,8 @@
 <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="7877341103742233094">"هشدار فرانسه: هشدار دولتی"</string>
-    <string name="cmas_extreme_alert" msgid="2584151399464241888">"هشدار فرانسه: هشدار شدید"</string>
-    <string name="cmas_severe_alert" msgid="9149520947951402872">"هشدار فرانسه: هشدار جدی"</string>
+    <string name="cmas_extreme_alert" msgid="2584151399464241888">"هشدار فرانسه: هشدار بسیار جدی"</string>
+    <string name="cmas_severe_alert" msgid="9149520947951402872">"هشدار فرانسه: هشدار شدید"</string>
     <string name="public_safety_message" msgid="5860178069821018697">"هشدار فرانسه: اخطار"</string>
     <string name="cmas_amber_alert" msgid="6428083238223852662">"هشدار فرانسه : هشدار آدم‌ربایی"</string>
     <string name="cmas_required_monthly_test" msgid="3216225136685938963">"آزمایش هشدار فرانسه"</string>
diff --git a/res/values-mcc222-ne/strings.xml b/res/values-mcc222-ne/strings.xml
index 564e70c..31573ea 100644
--- a/res/values-mcc222-ne/strings.xml
+++ b/res/values-mcc222-ne/strings.xml
@@ -28,5 +28,5 @@
     <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
     <string name="alerts_header_summary" msgid="5963536832729208581">"प्रयोगकर्ताले जस्तोसुकै सेटिङ लागू गरेको भए तापनि अत्यन्त जरुरी सन्देशहरूमा रोक लगाइँदैन"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"परीक्षण म्यासेजहरू"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"परीक्षण सन्देशहरू"</string>
 </resources>
diff --git a/res/values-mcc222-zh-rHK/strings.xml b/res/values-mcc222-zh-rHK/strings.xml
index f23a044..c133d7f 100644
--- a/res/values-mcc222-zh-rHK/strings.xml
+++ b/res/values-mcc222-zh-rHK/strings.xml
@@ -27,6 +27,6 @@
     <skip />
     <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <string name="alerts_header_summary" msgid="5963536832729208581">"你可能會收到重要訊息 (不論使用者設定)"</string>
+    <string name="alerts_header_summary" msgid="5963536832729208581">"您可能會收到重要訊息 (不論使用者設定)"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"測試訊息"</string>
 </resources>
diff --git a/res/values-mcc234-cs/strings.xml b/res/values-mcc234-cs/strings.xml
index 89625fa..bce99fc 100644
--- a/res/values-mcc234-cs/strings.xml
+++ b/res/values-mcc234-cs/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="8511466399220042295">"Extrémní výstrahy"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Závažné výstrahy"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Testovací upozornění"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Testovací výstrahy"</string>
     <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Cvičné výstrahy"</string>
     <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Vládní výstraha"</string>
     <string name="cmas_extreme_alert" msgid="3474352706075109113">"Extrémní výstraha"</string>
diff --git a/res/values-mcc234-pt-rPT/strings.xml b/res/values-mcc234-pt-rPT/strings.xml
index 4c250b7..ca7da65 100644
--- a/res/values-mcc234-pt-rPT/strings.xml
+++ b/res/values-mcc234-pt-rPT/strings.xml
@@ -33,7 +33,7 @@
     <string name="sms_cb_settings" msgid="4187131985831792308">"Alertas de emergência"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Receba notificações de alertas de emergência."</string>
     <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Utilize a conversão de texto em voz para dizer mensagens de alerta de emergência."</string>
-    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Atualmente, está a receber alertas de emergência. Quer continuar a receber alertas de emergência?"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Atualmente, está a receber alertas de emergência. Pretende continuar a receber alertas de emergência?"</string>
     <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Alertas de emergência"</string>
     <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Toque para ver as definições dos alertas de emergência"</string>
 </resources>
diff --git a/res/values-mcc234-ur/strings.xml b/res/values-mcc234-ur/strings.xml
index 7227348..97c51a1 100644
--- a/res/values-mcc234-ur/strings.xml
+++ b/res/values-mcc234-ur/strings.xml
@@ -31,9 +31,9 @@
     <string name="cmas_exercise_alert" msgid="4540370572086918020">"ورزش الرٹ"</string>
     <string name="app_label" msgid="3863159788297913185">"ایمرجنسی الرٹس"</string>
     <string name="sms_cb_settings" msgid="4187131985831792308">"ایمرجنسی الرٹس"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"ایمرجنسی الرٹ کی اطلاعات موصول کریں"</string>
-    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"ایمرجنسی الرٹ کے پیغامات بولنے کے لیے ٹیکسٹ ٹو اسپیچ کا استعمال کریں"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"آپ کو فی الحال ایمرجنسی الرٹس موصول ہو رہے ہیں۔ کیا آپ ایمرجنسی الرٹس حاصل کرتے رہنا چاہتے ہیں؟"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"ہنگامی الرٹ کی اطلاعات موصول کریں"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"ہنگامی الرٹ کے پیغامات بولنے کے لیے ٹیکسٹ ٹو اسپیچ کا استعمال کریں"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"آپ کو فی الحال ہنگامی الرٹس موصول ہو رہے ہیں۔ کیا آپ ہنگامی الرٹس حاصل کرتے رہنا چاہتے ہیں؟"</string>
     <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"ایمرجنسی الرٹس"</string>
-    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"ایمرجنسی الرٹ کی ترتیبات کو دیکھنے کے لیے تھپتھپائیں"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"ہنگامی الرٹ کی ترتیبات کو دیکھنے کے لیے تھپتھپائیں"</string>
 </resources>
diff --git a/res/values-mcc234-zh-rHK/strings.xml b/res/values-mcc234-zh-rHK/strings.xml
index c852052..6299997 100644
--- a/res/values-mcc234-zh-rHK/strings.xml
+++ b/res/values-mcc234-zh-rHK/strings.xml
@@ -33,7 +33,7 @@
     <string name="sms_cb_settings" msgid="4187131985831792308">"緊急警示"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"接收緊急警示通知"</string>
     <string name="enable_alert_speech_summary" msgid="5021926525240750702">"使用文字轉語音功能說出緊急警示訊息"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"你目前有接收緊急警示,要繼續接收嗎?"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"您目前有接收緊急警示,要繼續接收嗎?"</string>
     <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"緊急警示"</string>
     <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"輕按即可查看緊急警示設定"</string>
 </resources>
diff --git a/res/values-mcc286-kn/strings.xml b/res/values-mcc286-kn/strings.xml
index 5077557..1baab87 100644
--- a/res/values-mcc286-kn/strings.xml
+++ b/res/values-mcc286-kn/strings.xml
@@ -16,14 +16,14 @@
 
 <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="6414900103808998795">"ದೇಶ-ಸ್ಥಳೀಯ ಅಲರ್ಟ್‌ನ ನೋಟಿಫಿಕೇಶನ್"</string>
-    <string name="cmas_required_monthly_test" msgid="4500730781867583957">"ಪರೀಕ್ಷೆಯ ಅಲರ್ಟ್‌ನ ನೋಟಿಫಿಕೇಶನ್"</string>
-    <string name="cmas_extreme_alert" msgid="1869609432530517469">"ಜೀವಕ್ಕೆ ಅಪಾಯವಿದೆಯೆಂಬ ಅಲರ್ಟ್‌ನ ನೋಟಿಫಿಕೇಶನ್"</string>
+    <string name="cmas_presidential_level_alert" msgid="6414900103808998795">"ದೇಶ-ಸ್ಥಳೀಯ ಅಲರ್ಟ್‌ನ ಅಧಿಸೂಚನೆ"</string>
+    <string name="cmas_required_monthly_test" msgid="4500730781867583957">"ಪರೀಕ್ಷೆಯ ಅಲರ್ಟ್‌ನ ಅಧಿಸೂಚನೆ"</string>
+    <string name="cmas_extreme_alert" msgid="1869609432530517469">"ಜೀವಕ್ಕೆ ಅಪಾಯವಿದೆಯೆಂಬ ಅಲರ್ಟ್‌ನ ಅಧಿಸೂಚನೆ"</string>
     <!-- no translation found for cmas_extreme_immediate_observed_alert (6296555014688324240) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (8246414214802170006) -->
     <skip />
-    <string name="cmas_amber_alert" msgid="8879124499883205793">"ಕಳೆದುಹೋಗುವಿಕೆ ಅಥವಾ ಅಪಹರಣದ ಅಲರ್ಟ್‌ನ ನೋಟಿಫಿಕೇಶನ್"</string>
+    <string name="cmas_amber_alert" msgid="8879124499883205793">"ಕಳೆದುಹೋಗುವಿಕೆ ಅಥವಾ ಅಪಹರಣದ ಅಲರ್ಟ್‌ನ ಅಧಿಸೂಚನೆ"</string>
     <!-- no translation found for enable_cmas_test_alerts_title (7191924098636195819) -->
     <skip />
     <string name="enable_cmas_test_alerts_summary" msgid="8476051987965553727"></string>
diff --git a/res/values-mcc310-ne/strings.xml b/res/values-mcc310-ne/strings.xml
index 032621e..12e6f97 100644
--- a/res/values-mcc310-ne/strings.xml
+++ b/res/values-mcc310-ne/strings.xml
@@ -28,5 +28,5 @@
     <string name="cmas_presidential_level_alert" msgid="5810314558991898384">"राष्ट्रव्यापी अलर्ट"</string>
     <string name="show_cmas_opt_out_summary" msgid="5612381687166765604">"पहिलो अलर्ट देखाएपछि बाहिरिने डायलग देखाइयोस् (राष्ट्रव्यापी अलर्टबाहेक)।"</string>
     <string name="enable_cmas_presidential_alerts_title" msgid="3871388542233245120">"राष्ट्रव्यापी अलर्टहरू"</string>
-    <string name="enable_cmas_presidential_alerts_summary" msgid="1292969668875568075">"राष्ट्रव्यापी चेतावनीमूलक म्यासेजहरू। अफ गर्न मिल्दैन।"</string>
+    <string name="enable_cmas_presidential_alerts_summary" msgid="1292969668875568075">"राष्ट्रव्यापी चेतावनीमूलक सन्देशहरू। अफ गर्न मिल्दैन।"</string>
 </resources>
diff --git a/res/values-mcc310-ur/strings.xml b/res/values-mcc310-ur/strings.xml
index 1d82232..a64e636 100644
--- a/res/values-mcc310-ur/strings.xml
+++ b/res/values-mcc310-ur/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="receive_cmas_in_second_language_title" msgid="7539080017840218665">"ہسپانوی"</string>
-    <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"ممکن ہونے پر ہسپانوی میں ایمرجنسی الرٹس موصول کریں"</string>
+    <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"ممکن ہونے پر ہسپانوی میں ہنگامی الرٹس موصول کریں"</string>
     <string name="confirm_delete_broadcast" msgid="6808374217554967811">"اس الرٹ کو حذف کریں؟"</string>
     <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"سبھی موصولہ الرٹس حذف کریں؟"</string>
     <string name="menu_delete" msgid="2691868773984777519">"الرٹ حذف کریں"</string>
diff --git a/res/values-mcc364-ur/strings.xml b/res/values-mcc364-ur/strings.xml
index 77d4865..7e70dd7 100644
--- a/res/values-mcc364-ur/strings.xml
+++ b/res/values-mcc364-ur/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="cmas_presidential_level_alert" msgid="3594939559679728875">"قومی الرٹ"</string>
-    <string name="cmas_extreme_alert" msgid="8429379272087712590">"ایمرجنسی الرٹ"</string>
+    <string name="cmas_extreme_alert" msgid="8429379272087712590">"ہنگامی الرٹ"</string>
     <string name="cmas_amber_alert" msgid="4945503865591310102">"‏Marco الرٹ"</string>
     <string name="cmas_required_monthly_test" msgid="9000059463454474919">"ٹیسٹ الرٹ"</string>
     <!-- no translation found for enable_cmas_test_alerts_title (4196075349996937262) -->
diff --git a/res/values-mcc420-it/strings.xml b/res/values-mcc420-it/strings.xml
index 362ab13..a620771 100644
--- a/res/values-mcc420-it/strings.xml
+++ b/res/values-mcc420-it/strings.xml
@@ -20,8 +20,8 @@
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5872678423468023949) -->
     <skip />
     <string name="cmas_severe_alert" msgid="1611418922477376647">"Allarmi di emergenza"</string>
-    <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Avvisi"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Avvisi"</string>
+    <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Allerte"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Allerte"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Comportamenti consigliati che possono salvare vite umane o proprietà"</string>
     <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Avvisi di prova"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Esercitazioni"</string>
diff --git a/res/values-mcc422-ur/strings.xml b/res/values-mcc422-ur/strings.xml
index a2c32a0..055db66 100644
--- a/res/values-mcc422-ur/strings.xml
+++ b/res/values-mcc422-ur/strings.xml
@@ -13,7 +13,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="6613961558395121121">"ایمرجنسی الرٹ"</string>
+    <string name="cmas_presidential_level_alert" msgid="6613961558395121121">"ہنگامی الرٹ"</string>
     <string name="pws_other_message_identifiers" msgid="482796856521435227">"وارننگ الرٹ"</string>
     <string name="cmas_exercise_alert" msgid="4408794918342482664">"ورزشوں کا الرٹ"</string>
     <string name="enable_cmas_test_alerts_title" msgid="6262235749991861558">"ورزشوں کے الرٹس"</string>
diff --git a/res/values-mcc424-hi/strings.xml b/res/values-mcc424-hi/strings.xml
index 3d857f6..0188b81 100644
--- a/res/values-mcc424-hi/strings.xml
+++ b/res/values-mcc424-hi/strings.xml
@@ -23,7 +23,7 @@
     <string name="cmas_severe_alert" msgid="6255792641522355328">"आपातकालीन स्थिति के लिए चेतावनी"</string>
     <string name="pws_other_message_identifiers" msgid="2219849459734958071">"चेतावनी की सूचना"</string>
     <string name="public_safety_message" msgid="6430821308078207535">"सार्वजनिक सुरक्षा की चेतावनी"</string>
-    <string name="cmas_exercise_alert" msgid="5775307523978007483">"कसरत"</string>
+    <string name="cmas_exercise_alert" msgid="5775307523978007483">"व्यायाम"</string>
     <string name="cmas_required_monthly_test" msgid="638043663020315444">"टेस्ट अलर्ट"</string>
     <string name="state_local_test_alert" msgid="5347253401221487116">"टेस्ट अलर्ट"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"चेतावनी की सूचना"</string>
diff --git a/res/values-mcc424-ta/strings.xml b/res/values-mcc424-ta/strings.xml
index 40d569d..ec3db25 100644
--- a/res/values-mcc424-ta/strings.xml
+++ b/res/values-mcc424-ta/strings.xml
@@ -28,5 +28,5 @@
     <string name="state_local_test_alert" msgid="5347253401221487116">"சோதனை விழிப்பூட்டல்"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"எச்சரிக்கை விழிப்பூட்டல்கள்"</string>
     <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"பொதுப் பாதுகாப்பு விழிப்பூட்டல்கள்"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"பரிசோதனை எச்சரிக்கைகள்"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"சோதனை விழிப்பூட்டல்கள்"</string>
 </resources>
diff --git a/res/values-mcc424-ur/strings.xml b/res/values-mcc424-ur/strings.xml
index b68ffa4..760bdb6 100644
--- a/res/values-mcc424-ur/strings.xml
+++ b/res/values-mcc424-ur/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="cmas_presidential_level_alert" msgid="569470769079166304">"قومی ایمرجنسی الرٹ"</string>
-    <string name="cmas_extreme_alert" msgid="9135130008703049274">"ایمرجنسی الرٹ"</string>
-    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"ایمرجنسی الرٹ"</string>
-    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"ایمرجنسی الرٹ"</string>
-    <string name="cmas_severe_alert" msgid="6255792641522355328">"ایمرجنسی الرٹ"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"قومی ہنگامی الرٹ"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"ہنگامی الرٹ"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"ہنگامی الرٹ"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"ہنگامی الرٹ"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"ہنگامی الرٹ"</string>
     <string name="pws_other_message_identifiers" msgid="2219849459734958071">"وارننگ الرٹ"</string>
     <string name="public_safety_message" msgid="6430821308078207535">"عوامی حفاظتی الرٹ"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ورزش"</string>
diff --git a/res/values-mcc425-ne/strings.xml b/res/values-mcc425-ne/strings.xml
index 7005f66..df9e7af 100644
--- a/res/values-mcc425-ne/strings.xml
+++ b/res/values-mcc425-ne/strings.xml
@@ -20,6 +20,6 @@
     <string name="public_safety_message" msgid="7373019453807671797">"सूचनामूलक सन्देश"</string>
     <string name="cmas_amber_alert" msgid="740474290634511931">"सार्वजनिक रूपमा सहायता लिन अनुरोध गरिएको सन्देश"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="4570611095431464471">"चेतावनीसम्बन्धी सतर्कताहरू"</string>
-    <string name="enable_public_safety_messages_title" msgid="6173886162636474286">"सूचनामूलक म्यासेजहरू"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="3896845887375326185">"सार्वजनिक रूपमा सहायता लिन अनुरोध गरिएका म्यासेजहरू"</string>
+    <string name="enable_public_safety_messages_title" msgid="6173886162636474286">"सूचनामूलक सन्देशहरू"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="3896845887375326185">"सार्वजनिक रूपमा सहायता लिन अनुरोध गरिएका सन्देशहरू"</string>
 </resources>
diff --git a/res/values-mcc427-cs/strings.xml b/res/values-mcc427-cs/strings.xml
index 6dacfd6..c7f5af1 100644
--- a/res/values-mcc427-cs/strings.xml
+++ b/res/values-mcc427-cs/strings.xml
@@ -30,5 +30,5 @@
     <string name="state_local_test_alert" msgid="7009393486453350790">"Testovací výstraha"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="3253477871276901425">"Varování"</string>
     <string name="enable_public_safety_messages_title" msgid="6164589595328113173">"Upozornění ohledně veřejné bezpečnosti"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="5347896880762045640">"Testovací upozornění"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="5347896880762045640">"Testovací výstrahy"</string>
 </resources>
diff --git a/res/values-mcc450-ur/strings.xml b/res/values-mcc450-ur/strings.xml
index 067fcea..2fc708d 100644
--- a/res/values-mcc450-ur/strings.xml
+++ b/res/values-mcc450-ur/strings.xml
@@ -16,6 +16,6 @@
 
 <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="6968323372438785870">"اہم ایمرجنسی الرٹ"</string>
+    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"اہم ہنگامی الرٹ"</string>
     <string name="alerts_header_summary" msgid="8898082819299479687">"آپ کا فون قدرتی آفات کے دوران انخلائی ہدایات جیسے الرٹس آپ کو بھیج سکتا ہے۔ یہ سروس نیشنل ایمرجنسی مینجمنٹ ایجنسی، نیٹ ورک فراہم کنندگان اور آلہ مینوفیکچررز کے درمیان ایک معاونت ہے۔\n\nاگر آپ کے آلہ میں کوئی مسئلہ ہو یا نیٹ ورک کے حالات خراب ہو تو ہو سکتا ہے کہ آپ کو الرٹس موصول نہ ہوں۔"</string>
 </resources>
diff --git a/res/values-mcc450-zh-rHK/strings.xml b/res/values-mcc450-zh-rHK/strings.xml
index b9628d0..8adc5d5 100644
--- a/res/values-mcc450-zh-rHK/strings.xml
+++ b/res/values-mcc450-zh-rHK/strings.xml
@@ -17,5 +17,5 @@
 <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="6968323372438785870">"嚴重緊急警示"</string>
-    <string name="alerts_header_summary" msgid="8898082819299479687">"如果發生天災,手機就會向你傳送警示,例如疏散指示。此服務由南韓消防防災廳 (National Emergency Management Agency)、網絡供應商和裝置製造商共同提供。\n\n如你的裝置發生問題或網絡狀況不佳,可能不會收到警示。"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"如果發生天災,手機就會向您傳送警示,例如疏散指示。此服務由南韓消防防災廳 (National Emergency Management Agency)、網絡供應商和裝置製造商共同提供。\n\n如您的裝置發生問題或網絡狀況不佳,可能不會收到警示。"</string>
 </resources>
diff --git a/res/values-mcc454-ur/strings.xml b/res/values-mcc454-ur/strings.xml
index 7551a37..baa60b5 100644
--- a/res/values-mcc454-ur/strings.xml
+++ b/res/values-mcc454-ur/strings.xml
@@ -16,10 +16,10 @@
 
 <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="8798462930675572592">"انتہائی ایمرجنسی الرٹ"</string>
-    <string name="cmas_extreme_alert" msgid="666310502927269524">"ایمرجنسی الرٹ"</string>
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"انتہائی ہنگامی الرٹ"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"ہنگامی الرٹ"</string>
     <string name="cmas_required_monthly_test" msgid="3412608025684914213">"ٹیسٹ پیغام"</string>
-    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"ایمرجنسی الرٹس موصول کریں"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"ہنگامی الرٹس موصول کریں"</string>
     <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"ٹیسٹ پیغامات"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"ٹیسٹ پیغامات موصول کریں"</string>
 </resources>
diff --git a/res/values-mcc466-ne/strings.xml b/res/values-mcc466-ne/strings.xml
index 63aec8b..2006811 100644
--- a/res/values-mcc466-ne/strings.xml
+++ b/res/values-mcc466-ne/strings.xml
@@ -18,5 +18,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="4052407641316309322">"सतर्कतासम्बन्धी सन्देश"</string>
     <string name="enable_cmas_test_alerts_title" msgid="4165080207837566277">"मासिक परीक्षण आवश्यक छ"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="1339769389077152402">"सुरक्षा सतर्कता प्रणालीका परीक्षण म्यासेजहरू प्राप्त गर्नुहोस्"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="1339769389077152402">"सुरक्षा सतर्कता प्रणालीका परीक्षण सन्देशहरू प्राप्त गर्नुहोस्"</string>
 </resources>
diff --git a/res/values-mcc716-mk/strings.xml b/res/values-mcc716-mk/strings.xml
index 7203ef0..e4f52b5 100644
--- a/res/values-mcc716-mk/strings.xml
+++ b/res/values-mcc716-mk/strings.xml
@@ -22,5 +22,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Предупредување за итни случаи: тест порака"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Предупредување за итни случаи: порака за вежба/обука"</string>
     <string name="pws_other_message_identifiers" msgid="3831917966117253553">"Предупредување за итни случаи"</string>
-    <string name="button_dismiss" msgid="5823921161712171097">"Скриј"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Сокриј"</string>
 </resources>
diff --git a/res/values-mcc716-ur/strings.xml b/res/values-mcc716-ur/strings.xml
index 284b8f9..ff2a63d 100644
--- a/res/values-mcc716-ur/strings.xml
+++ b/res/values-mcc716-ur/strings.xml
@@ -19,8 +19,8 @@
     <string name="public_safety_message" msgid="7237115648380675159">"معلوماتی پیغام"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"معلوماتی پیغام"</string>
     <string name="cmas_presidential_level_alert" msgid="8876632274257614262">"ایمرجنسی الرٹ"</string>
-    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"ایمرجنسی الرٹ: ٹیسٹ پیغام"</string>
-    <string name="cmas_exercise_alert" msgid="3061507852301643814">"ایمرجنسی الرٹ: ورزش/ڈرِل پیغام"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"ہنگامی الرٹ: ٹیسٹ پیغام"</string>
+    <string name="cmas_exercise_alert" msgid="3061507852301643814">"ہنگامی الرٹ: ورزش/ڈرِل پیغام"</string>
     <string name="pws_other_message_identifiers" msgid="3831917966117253553">"ایمرجنسی الرٹ"</string>
     <string name="button_dismiss" msgid="5823921161712171097">"چھپائیں"</string>
 </resources>
diff --git a/res/values-mcc740-ur/strings.xml b/res/values-mcc740-ur/strings.xml
index d700de9..e0bf82d 100644
--- a/res/values-mcc740-ur/strings.xml
+++ b/res/values-mcc740-ur/strings.xml
@@ -16,10 +16,10 @@
 
 <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="8832531644152117875">"مقامی ایمرجنسی الرٹ"</string>
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"مقامی ہنگامی الرٹ"</string>
     <string name="button_dismiss" msgid="5975841666550833732">"بند کریں"</string>
     <string name="cmas_required_monthly_test" msgid="2287926047457291638">"ٹیسٹ پیغام"</string>
-    <string name="cmas_exercise_alert" msgid="998005154407142100">"ایمرجنسی الرٹ - ورزش / ڈرِل پیغام"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"ہنگامی الرٹ - ورزش / ڈرِل پیغام"</string>
     <string name="public_safety_message" msgid="6263179411117570932">"معلوماتی پیغام"</string>
     <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
     <skip />
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 5d1ce95..671b3c6 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -74,7 +74,7 @@
     <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">"अँबर सूचना"</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_summary" msgid="6525664541696985610">"सुस्पष्ट सुरक्षा धोक्यांची चेतावणी द्या"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 778faab..fb7837c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -64,7 +64,7 @@
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Motta trådløse nødvarsler"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Påminnelse om varsel"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Les opp varselmelding"</string>
-    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Bruk tekst-til-tale til å lese opp meldinger for nødvarsler"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Bruk tekst-til-tale for å lese opp meldinger for trådløse nødvarsler"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"En påminnelseslyd spilles av med vanlig volum"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Tidligere nødvarsler"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Innstillinger for varsler"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 3bdd58a..0cd9c9b 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -33,7 +33,7 @@
     <string name="view_details_title" msgid="1780427629491781473">"सावधानी विवरणहरू"</string>
     <string name="view_details_debugging_title" msgid="5699927030805114173">"डिबग प्रक्रियाका लागि अलर्टसम्बन्धी विवरण"</string>
     <string name="confirm_delete_broadcast" msgid="2540199303730232322">"यो प्रशारण मेटाउने हो?"</string>
-    <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"सबै प्राप्त प्रशारण म्यासेजहरू मेटाउने हो?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"सबै प्राप्त प्रशारण सन्देशहरू मेटाउने हो?"</string>
     <string name="button_delete" msgid="4672451757925194350">"मेटाउनुहोस्"</string>
     <string name="button_cancel" msgid="7479958360523246140">"रद्द गर्नुहोस्"</string>
     <string name="etws_earthquake_warning" msgid="6428741104423152511">"भूकम्प बारे सतर्कता"</string>
@@ -50,12 +50,12 @@
     <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>
+    <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="notification_channel_broadcast_messages" msgid="880704362482824524">"प्रसारण गर्ने म्यासेजहरू"</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_high_priority" msgid="3937475297436439073">"स्वीकार नगरिएका आपत्कालीन अलर्टहरू"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"भ्वाइस कलका आपत्‌कालीन अलर्टहरू"</string>
@@ -76,14 +76,14 @@
     <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_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_title" msgid="5576770949182656524">"सार्वजनिक सुरक्षाका सन्देशहरू"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"जीवन वा सम्पत्तिको सुरक्षा गर्न सक्ने सिफारिस गरिएको कार्य"</string>
     <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"फुल स्क्रिन म्यासेजहरू देखाइऊन्"</string>
     <string name="enable_full_screen_public_safety_messages_summary" msgid="194171850169012897">"यो सुविधा अफ गरे पनि सूचनाका माध्यमबाट सार्वजनिक सुरक्षासम्बन्धी म्यासेज पठाइन्छ"</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_state_local_test_alerts_summary" msgid="780298327377950187">"राज्यस्तरीय र स्थानीय अधिकारीहरूबाट परीक्षणसम्बन्धी सन्देशहरू प्राप्त गर्नुहोस्"</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="7194966927004755266">"परीक्षणसम्बन्धी सतर्कताहरू"</string>
@@ -151,14 +151,14 @@
   </string-array>
     <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"वायरलेस आपत्‌कालीन अलर्टहरू"</string>
     <string name="enable_cmas_presidential_alerts_title" msgid="7293800023375154256">"राष्ट्राध्यक्षीय सतर्कताहरू"</string>
-    <string name="enable_cmas_presidential_alerts_summary" msgid="7900094335808247024">"राष्ट्रपतिले जारी गर्नुभएका राष्ट्रिय चेतावनीसम्बन्धी म्यासेजहरू। निष्क्रिय पार्न सकिँदैन।"</string>
+    <string name="enable_cmas_presidential_alerts_summary" msgid="7900094335808247024">"राष्ट्रपतिले जारी गर्नुभएका राष्ट्रिय चेतावनीसम्बन्धी सन्देशहरू। निष्क्रिय पार्न सकिँदैन।"</string>
     <string name="receive_cmas_in_second_language_title" msgid="1223260365527361964"></string>
     <string name="receive_cmas_in_second_language_summary" msgid="7704105502782770718"></string>
     <string name="alerts_header_summary" msgid="4700985191868591788"></string>
     <string name="testing_mode_enabled" msgid="8296556666392297467">"मोबाइल प्रसारणको परीक्षण मोड सक्षम पारिएको छ।"</string>
     <string name="testing_mode_disabled" msgid="8381408377958182661">"मोबाइल प्रसारणको परीक्षण मोड असक्षम पारिएको छ।"</string>
-    <string name="show_all_messages" msgid="3780970968167139836">"सबै म्यासेजहरू देखाउनुहोस्"</string>
-    <string name="show_regular_messages" msgid="7376885150513522515">"नियमित म्यासेजहरू देखाउनुहोस्"</string>
+    <string name="show_all_messages" msgid="3780970968167139836">"सबै सन्देशहरू देखाउनुहोस्"</string>
+    <string name="show_regular_messages" msgid="7376885150513522515">"नियमित सन्देशहरू देखाउनुहोस्"</string>
     <string name="message_identifier" msgid="5558338496219327850">"पहिचानकर्ता:"</string>
     <string name="message_serial_number" msgid="3386553658712978964">"क्रम सङ्ख्या:"</string>
     <string name="data_coding_scheme" msgid="4628901196730870577">"डेटा कोड गर्नेसम्बन्धी योजना:"</string>
@@ -168,7 +168,7 @@
     <string name="message_coordinates" msgid="356333576818059052">"निर्देशाङ्कहरू:"</string>
     <string name="maximum_waiting_time" msgid="3504809124079381356">"पर्खनु पर्ने अधिकतम समय:"</string>
     <string name="seconds" msgid="141450721520515025">"सेकेन्ड"</string>
-    <string name="message_copied" msgid="6922953753733166675">"म्यासेज कपी गरियो"</string>
+    <string name="message_copied" msgid="6922953753733166675">"सन्देश प्रतिलिपि गरियो"</string>
     <string name="top_intro_default_text" msgid="1922926733152511202"></string>
     <string name="top_intro_roaming_text" msgid="186872150397081032">"रोमिङ मोडमा हुँदा तपाईं यी सेटिङमा समावेश नभएका केही अलर्टहरू प्राप्त गर्न सक्नुहुन्छ"</string>
     <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"सेवा प्रदायकले यी सेटिङ परिवर्तन गरेको छ"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 23fba09..95b254d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/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="2008319089248760277">"Mobiele noodmeldingen"</string>
-    <string name="sms_cb_settings" msgid="9021266457863671070">"Mobiele noodmeldingen"</string>
-    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Mobiele noodmeldingen"</string>
-    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Mobiele noodmeldingen"</string>
-    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Mobiele noodmeldingen"</string>
+    <string name="app_label" msgid="2008319089248760277">"Noodmeldingen"</string>
+    <string name="sms_cb_settings" msgid="9021266457863671070">"Noodmeldingen"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Noodmeldingen"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Noodmeldingen"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Noodmeldingen"</string>
     <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Informatieve melding"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Instellingen voor noodwaarschuwingen zijn niet beschikbaar voor deze gebruiker"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
@@ -149,7 +149,7 @@
     <item msgid="3863339891188103437">"Elke 15 minuten"</item>
     <item msgid="7388573183644474611">"Nooit"</item>
   </string-array>
-    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Mobiele noodmeldingen"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Noodmeldingen"</string>
     <string name="enable_cmas_presidential_alerts_title" msgid="7293800023375154256">"Presidentiële meldingen"</string>
     <string name="enable_cmas_presidential_alerts_summary" msgid="7900094335808247024">"Nationale waarschuwingen van de president. Kunnen niet worden uitgezet."</string>
     <string name="receive_cmas_in_second_language_title" msgid="1223260365527361964"></string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 445eda2..afc0bd8 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -17,10 +17,10 @@
 <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="2008319089248760277">"ୱେୟାରଲେସ୍ ଜରୁରୀକାଳୀନ ଆଲର୍ଟ"</string>
-    <string name="sms_cb_settings" msgid="9021266457863671070">"ୱାୟାରଲେସ ଜରୁରୀକାଳୀନ ଆଲର୍ଟ"</string>
+    <string name="sms_cb_settings" msgid="9021266457863671070">"ୱେୟାରଲେସ୍ ଜରୁରୀକାଳୀନ ଆଲର୍ଟ"</string>
     <string name="sms_cb_sender_name_default" msgid="972946539768958828">"ୱେୟାରଲେସ୍ ଜରୁରୀକାଳୀନ ଆଲର୍ଟ"</string>
-    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"ୱାୟାରଲେସ ଜରୁରୀକାଳୀନ ଆଲର୍ଟଗୁଡ଼ିକ"</string>
-    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"ୱେୟାରଲେସ ଜରୁରୀକାଳୀନ ଆଲର୍ଟଗୁଡ଼ିକ"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"ୱେୟାରଲେସ୍ ଜରୁରୀକାଳୀନ ଆଲର୍ଟଗୁଡ଼ିକ"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"ୱେୟାରଲେସ୍ ଜରୁରୀକାଳୀନ ଆଲର୍ଟଗୁଡ଼ିକ"</string>
     <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"ସୂଚନାଭିତ୍ତିକ ବିଜ୍ଞପ୍ତି"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପାଇଁ ୱେୟାରଲେସ ଜରୁରୀକାଳୀନ ଆଲର୍ଟ ସେଟିଂସ ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ଠିକ ଅଛି"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index eba269d..1e786e1 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -17,9 +17,9 @@
 <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="2008319089248760277">"ਵਾਇਰਲੈੱਸ ਐਮਰਜੈਂਸੀ ਸੁਚੇਤਨਾਵਾਂ"</string>
-    <string name="sms_cb_settings" msgid="9021266457863671070">"ਵਾਇਰਲੈੱਸ ਐਮਰਜੈਂਸੀ ਸੁਚੇਤਨਾਵਾਂ"</string>
+    <string name="sms_cb_settings" msgid="9021266457863671070">"ਵਾਇਰਲੈੱਸ ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾਵਾਂ"</string>
     <string name="sms_cb_sender_name_default" msgid="972946539768958828">"ਵਾਇਰਲੈੱਸ ਐਮਰਜੈਂਸੀ ਸੁਚੇਤਨਾਵਾਂ"</string>
-    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"ਵਾਇਰਲੈੱਸ ਐਮਰਜੈਂਸੀ ਸੁਚੇਤਨਾਵਾਂ"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"ਵਾਇਰਲੈੱਸ ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾਵਾਂ"</string>
     <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"ਵਾਇਰਲੈੱਸ ਐਮਰਜੈਂਸੀ ਸੁਚੇਤਨਾਵਾਂ"</string>
     <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"ਜਾਣਕਾਰੀ ਵਾਲੀ ਸੂਚਨਾ"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਵਾਇਰਲੈੱਸ ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ ਦੀਆਂ ਸੈਟਿੰਗਾਂ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
@@ -60,7 +60,7 @@
     <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"ਅਸਵੀਕਾਰ ਕੀਤੀਆਂ ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾਵਾਂ"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"ਅਵਾਜ਼ੀ ਕਾਲ ਵਿੱਚ ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾਵਾਂ"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"ਸਿਮ ਦੇ ਆਧਾਰ \'ਤੇ ਸਵੈਚਲਿਤ WEA ਸੈਟਿੰਗਾਂ ਦੀਆਂ ਤਬਦੀਲੀਆਂ"</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="5583168548073938617">"ਵਾਇਰਲੈੱਸ ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"ਸੁਚੇਤਨਾ ਰਿਮਾਈਂਡਰ"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"ਸੁਚੇਤਨਾ ਵਾਲਾ ਸੁਨੇਹਾ ਬੋਲੋ"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index a543f3c..8200f88 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -24,7 +24,7 @@
     <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Notificação informativa"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"As definições de alertas de emergência não estão disponíveis para este utilizador."</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"Não existem alertas anteriores"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"Não existem alertas anteriores."</string>
     <string name="menu_preferences" msgid="3596514894131599202">"Definições"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Eliminar transmissões"</string>
     <string name="message_options" msgid="3178489901903589574">"Opções da mensagem"</string>
@@ -74,7 +74,7 @@
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Ameaças extremas à vida e à propriedade"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ameaças graves"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Ameaças graves à vida e à propriedade"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Alertas AMBER"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Alertas ÂMBAR"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Boletins de emergência de raptos de crianças"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"Mensagens de alerta"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Avisar acerca de ameaças à segurança iminentes"</string>
@@ -87,7 +87,7 @@
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alertas de emergência"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Avisar acerca de eventos potencialmente fatais"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Alertas de teste"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Receba testes do operador e testes mensais do sistema de alerta de segurança"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Receber testes do operador e testes mensais do sistema de alerta de segurança"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
     <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Receber um alerta de emergência: mensagem de simulação/exercício"</string>
@@ -136,7 +136,7 @@
     <string name="notification_multiple_title" msgid="1523638925739947855">"Novos alertas"</string>
     <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Mostrar uma caixa de diálogo de exclusão após apresentar o 1.º alerta (para além do Alerta presid.)"</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Mostrar caixa de diálogo de exclusão"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"Atualmente, está a receber alertas de Emergência sem fios. Quer continuar a receber alertas de emergência sem fios?"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"Atualmente, está a receber alertas de Emergência sem fios. Pretende continuar a receber alertas de emergência sem fios?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Sim"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Não"</string>
     <string name="cb_list_activity_title" msgid="1433502151877791724">"Histórico de alertas de emergência"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0f32a78..8693a7d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -78,11 +78,11 @@
     <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>
+    <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Сообщения об угрозе общественной безопасности"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Рекомендуемые действия, которые помогут сохранить жизни или имущество"</string>
     <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Показывать сообщения в полноэкранном режиме"</string>
     <string name="enable_full_screen_public_safety_messages_summary" msgid="194171850169012897">"Если отключено, сообщения об угрозе обществ. безопасности продолжают отправляться в виде уведомлений"</string>
-    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Тестовые оповещения от органов власти"</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_summary" msgid="7574617515441602546">"Предупреждать о событиях, угрожающих жизни"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 4170751..80404c9 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -16,13 +16,13 @@
 
 <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="2008319089248760277">"Sinjalizimet wireless të urgjencës"</string>
-    <string name="sms_cb_settings" msgid="9021266457863671070">"Sinjalizimet wireless të urgjencës"</string>
-    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Sinjalizimet wireless të urgjencës"</string>
-    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Sinjalizimet wireless të urgjencës"</string>
-    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Sinjalizimet wireless të urgjencës"</string>
+    <string name="app_label" msgid="2008319089248760277">"Sinjalizimet me valë të urgjencës"</string>
+    <string name="sms_cb_settings" msgid="9021266457863671070">"Sinjalizimet me valë të urgjencës"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Sinjalizimet me valë të urgjencës"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Sinjalizimet me valë të urgjencës"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Sinjalizimet me valë të urgjencës"</string>
     <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Njoftim informues"</string>
-    <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Cilësimet e sinjalizimeve wireless të urgjencës nuk ofrohen për këtë përdorues"</string>
+    <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Cilësimet e sinjalizimeve me valë të urgjencës nuk ofrohen për këtë përdorues"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Në rregull"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Asnjë alarm i mëparshëm"</string>
     <string name="menu_preferences" msgid="3596514894131599202">"Cilësimet"</string>
@@ -61,10 +61,10 @@
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Sinjalizimet e urgjencës në telefonatë zanore"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Cilësimet automatike të WEA-s janë ndryshuar në bazë të kartës SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Lejo sinjalizimet"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Merr njoftimet e sinjalizimeve wireless të urgjencës"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Merr njoftimet e sinjalizimeve me valë të urgjencës"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alarmet rikujtuese"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Dëgjo mesazhin e alarmit"</string>
-    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Përdor tekstin-në-ligjërim që të lexohen me zë mesazhet e sinjalizimeve wireless të urgjencës"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Përdor tekstin-në-ligjërim që të lexohen me zë mesazhet e sinjalizimeve me valë të urgjencës"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Një tingull alarmi rikujtues do të luhet me volum të rregullt"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historiku i sinjalizimeve të urgjencës"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Preferencat për sinjalizimet"</string>
@@ -136,7 +136,7 @@
     <string name="notification_multiple_title" msgid="1523638925739947855">"Alarme të reja"</string>
     <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Shfaq dialogun e tërheqjes pas shfaqjes së sinjalizimit të parë (përveç \"Sinjalizimit presidencial\")."</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Shfaq dialogun e tërheqjes"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"Po merr aktualisht sinjalizime wireless të urgjencës. Dëshiron të vazhdosh të marrësh sinjalizimet wireless të urgjencës?"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"Po merr aktualisht sinjalizime me valë të urgjencës. Dëshiron të vazhdosh të marrësh sinjalizimet me valë të urgjencës?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Po"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Jo"</string>
     <string name="cb_list_activity_title" msgid="1433502151877791724">"Historiku i sinjalizimeve të urgjencës"</string>
@@ -149,7 +149,7 @@
     <item msgid="3863339891188103437">"Çdo 15 minuta"</item>
     <item msgid="7388573183644474611">"Asnjëherë"</item>
   </string-array>
-    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Sinjalizimet wireless të urgjencës"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Sinjalizimet me valë të urgjencës"</string>
     <string name="enable_cmas_presidential_alerts_title" msgid="7293800023375154256">"Sinjalizimet presidenciale"</string>
     <string name="enable_cmas_presidential_alerts_summary" msgid="7900094335808247024">"Mesazhe paralajmëruese kombëtare të lëshuara nga Presidenti. Nuk mund të çaktivizohen."</string>
     <string name="receive_cmas_in_second_language_title" msgid="1223260365527361964"></string>
@@ -172,5 +172,5 @@
     <string name="top_intro_default_text" msgid="1922926733152511202"></string>
     <string name="top_intro_roaming_text" msgid="186872150397081032">"Kur je në roaming, mund të marrësh disa sinjalizime që nuk janë të përfshira në këto cilësime"</string>
     <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Cilësimet janë ndryshuar nga operatori celular"</string>
-    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Trokit për të parë cilësimet e sinjalizimeve wireless të urgjencës"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Trokit për të parë cilësimet e sinjalizimeve me valë të urgjencës"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index b2b5c16..3207d9d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -54,7 +54,7 @@
     <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_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_high_priority" msgid="3937475297436439073">"Непотврђена обавештења о хитним случајевима"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 2f8aa5c..1209766 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -86,7 +86,7 @@
     <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_summary" msgid="7574617515441602546">"உயிருக்கு ஆபத்தை விளைவிக்கும் நிகழ்வுகள் பற்றி எச்சரிக்கவும்"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"பரிசோதனை எச்சரிக்கைகள்"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"பரிசோதனை விழிப்பூட்டல்கள்"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"பாதுகாப்பு விழிப்பூட்டல் அமைப்பிலிருந்து மொபைல் நிறுவன சோதனைகளையும் மாதாந்திர சோதனைகளையும் பெறுவீர்கள்"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 76c57b1..31d9187 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -62,7 +62,7 @@
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"SIM ఆధారంగా WEA సెట్టింగుల ఆటోమేటిక్ మార్పులు"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"అలర్ట్‌లను అనుమతించండి"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"వైర్‌లెస్ ఎమర్జెన్సీ అలర్ట్ నోటిఫికేషన్‌లను పొందండి"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"అలర్ట్ రిమైండర్"</string>
+    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"హెచ్చరిక రిమైండర్"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"అలర్ట్ మెసేజ్‌లను చదివి వినిపించు"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"ఎమర్జెన్సీ అలర్ట్ మెసేజ్‌లను చదివి వినిపించడానికి \'టెక్స్ట్-టు-స్పీచ్\' ఉపయోగించండి"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"రిమైండర్ శబ్దం క్రమ విరామాల వద్ద ప్లే అవుతుంది"</string>
@@ -70,11 +70,11 @@
     <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_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_summary" msgid="4495233280416889667">"పిల్లల అపహరణ అత్యవసర బులెటిన్‌లు"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"అలర్ట్ మెసేజ్‌లు"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"తక్షణ భద్రతా ప్రమాదాల గురించి హెచ్చరించు"</string>
@@ -87,7 +87,7 @@
     <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="7194966927004755266">"పరీక్ష అలర్ట్‌లు"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"భద్రతా అలర్ట్ సిస్టమ్ నుండి క్యారియర్ టెస్ట్‌లను, నెలవారీ టెస్ట్‌లను స్వీకరించండి"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"భద్రతా అలర్ట్ సిస్టమ్ నుండి క్యారియర్ పరిక్షలను, నెలవారీ పరిక్షలను స్వీకరించండి"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
     <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"ఎమర్జెన్సీ అలర్ట్‌ను అందుకోండి: అభ్యాసం/డ్రిల్ మెసేజ్"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 719fb99..43c5709 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -74,7 +74,7 @@
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Cana ve mala karşı olağanüstü tehditler"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ciddi tehditler"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Cana ve mala karşı ciddi tehditler"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER kayıp çocuk alarmı"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER uyarıları"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Çocuk kaçırma acil durum bültenleri"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"Uyarı mesajları"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Yaklaşan güvenlik tehditleri hakkında uyarılar alın"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index fc1cc33..c939ce8 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -16,13 +16,13 @@
 
 <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="2008319089248760277">"وائرلیس ایمرجنسی الرٹس"</string>
-    <string name="sms_cb_settings" msgid="9021266457863671070">"وائرلیس ایمرجنسی الرٹس"</string>
-    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"وائرلیس ایمرجنسی الرٹس"</string>
-    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"وائرلیس ایمرجنسی الرٹس"</string>
-    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"وائرلیس ایمرجنسی الرٹس"</string>
+    <string name="app_label" msgid="2008319089248760277">"وائرلیس ہنگامی الرٹس"</string>
+    <string name="sms_cb_settings" msgid="9021266457863671070">"وائرلیس ہنگامی الرٹس"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"وائرلیس ہنگامی الرٹس"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"وائرلیس ہنگامی الرٹس"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"وائرلیس ہنگامی الرٹس"</string>
     <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"معلوماتی اطلاع"</string>
-    <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"اس صارف کے ليے وائرلیس ایمرجنسی الرٹ کی ترتیبات دستیاب نہیں ہیں"</string>
+    <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"اس صارف کے ليے وائرلیس ہنگامی الرٹ کی ترتیبات دستیاب نہیں ہیں"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ٹھیک ہے"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"کوئی سابقہ الرٹس نہیں ہیں"</string>
     <string name="menu_preferences" msgid="3596514894131599202">"ترتیبات"</string>
@@ -40,31 +40,31 @@
     <string name="etws_tsunami_warning" msgid="6173964105145900312">"سونامی کی وارننگ"</string>
     <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="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_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_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_high_priority" msgid="3937475297436439073">"غیر تسلیم شدہ ایمرجنسی الرٹس"</string>
-    <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"صوتی کال میں ایمرجنسی الرٹس"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"غیر تسلیم شدہ ہنگامی الرٹس"</string>
+    <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"صوتی کال میں ہنگامی الرٹس"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"‏SIM کی بنیاد پر خودکار WEA ترتیبات کی تبدیلیاں"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"الرٹس کی اجازت دیں"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"وائرلیس ایمرجنسی الرٹ کی اطلاعات موصول کریں"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"وائرلیس ہنگامی الرٹ کی اطلاعات موصول کریں"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"الرٹ کی یاد دہانی"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"الرٹ کا پیغام بولیں"</string>
-    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"وائرلیس ایمرجنسی الرٹ کے پیغامات بولنے کے ليے ٹیکسٹ ٹو اسپیچ کا استعمال کریں"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"وائرلیس ہنگامی الرٹ کے پیغامات بولنے کے ليے ٹیکسٹ ٹو اسپیچ کا استعمال کریں"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"ایک یاد دہانی کی آواز ریگولر والیوم پر چلے گی"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"ایمرجنسی الرٹ کی سرگزشت"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"الرٹ کی ترجیحات"</string>
@@ -90,10 +90,10 @@
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"حفاظتی الرٹ سسٹم سے کیریئر ٹیسٹس اور ماہانہ ٹیسٹس موصول کریں"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
-    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"ایمرجنسی الرٹ موصول کریں: ورزش/ڈرِل پیغام"</string>
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"ہنگامی الرٹ موصول کریں: ورزش/ڈرِل پیغام"</string>
     <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
     <skip />
-    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"ایمرجنسی الرٹ موصول کریں: آپریٹر کی وضاحت کردہ"</string>
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"ہنگامی الرٹ موصول کریں: آپریٹر کی وضاحت کردہ"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"وائبریشن"</string>
     <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"ہمیشہ پورے والیوم پر الرٹ کریں"</string>
@@ -136,7 +136,7 @@
     <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="4820577535626084938">"آپ کو فی الحال وائرلیس ایمرجنسی الرٹس موصول ہو رہے ہیں۔ کیا آپ وائرلیس ایمرجنسی الرٹس حاصل کرتے رہنا چاہتے ہیں؟"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"آپ کو فی الحال وائرلیس ہنگامی الرٹس موصول ہو رہے ہیں۔ کیا آپ وائرلیس ہنگامی الرٹس حاصل کرتے رہنا چاہتے ہیں؟"</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>
@@ -172,5 +172,5 @@
     <string name="top_intro_default_text" msgid="1922926733152511202"></string>
     <string name="top_intro_roaming_text" msgid="186872150397081032">"آپ کے رومنگ کے دوران، آپ کو کچھ الرٹس موصول ہو سکتے ہیں جو ان ترتیبات میں شامل نہیں ہیں"</string>
     <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"ترتیبات کو کیریئر نے تبدیل کر دیا"</string>
-    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"وائرلیس ایمرجنسی الرٹ کی ترتیبات کو دیکھنے کیلئے تھپتھپائیں"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"وائرلیس ہنگامی الرٹ کی ترتیبات کو دیکھنے کیلئے تھپتھپائیں"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 8533efa..48f5801 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -136,7 +136,7 @@
     <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="4820577535626084938">"你目前有接收無線緊急警示,要繼續接收嗎?"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"您目前有接收無線緊急警示,要繼續接收嗎?"</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>
@@ -170,7 +170,7 @@
     <string name="seconds" msgid="141450721520515025">"秒"</string>
     <string name="message_copied" msgid="6922953753733166675">"已複製訊息"</string>
     <string name="top_intro_default_text" msgid="1922926733152511202"></string>
-    <string name="top_intro_roaming_text" msgid="186872150397081032">"漫遊時,你可能接收不包括在這些設定中的部分警示。"</string>
+    <string name="top_intro_roaming_text" msgid="186872150397081032">"漫遊時,您可能接收不包括在這些設定中的部分警示。"</string>
     <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"流動網絡供應商已變更設定"</string>
     <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"輕按以查看無線緊急警示設定"</string>
 </resources>
diff --git a/tests/compliancetests/Android.bp b/tests/compliancetests/Android.bp
index 93a2fb4..60a5a68 100644
--- a/tests/compliancetests/Android.bp
+++ b/tests/compliancetests/Android.bp
@@ -29,7 +29,7 @@
         "androidx.test.rules",
         "androidx.test.espresso.core",
         "mockito-target-minus-junit4",
-        "truth-prebuilt",
+        "truth",
         "ub-uiautomator",
         "android.telephony.mockmodem",
         "modules-utils-build_system",
@@ -43,7 +43,10 @@
 android_test {
     name: "CellBroadcastReceiverComplianceTests",
     defaults: ["CellBroadcastTestCommonComplianceTest"],
-    test_suites: ["device-tests", "mts-cellbroadcast"],
+    test_suites: [
+        "device-tests",
+        "mts-cellbroadcast",
+    ],
     min_sdk_version: "30",
 }
 
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index d4ee061..f7b82ac 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -28,9 +28,9 @@
     static_libs: [
         "androidx.test.rules",
         "androidx.test.espresso.core",
+        "androidx.test.uiautomator_uiautomator",
         "mockito-target-minus-junit4",
-        "truth-prebuilt",
-        "ub-uiautomator",
+        "truth",
     ],
     // Include all test java files.
     srcs: [":cellbroadcastreceiver-shared-srcs-test"],
@@ -44,14 +44,17 @@
     name: "CellBroadcastReceiverOemUnitTests",
     defaults: ["CellBroadcastTestCommon"],
     srcs: [":cellbroadcastreceiver-sources"],
-    test_suites: ["device-tests", "mts-cellbroadcast"],
+    test_suites: [
+        "device-tests",
+        "mts-cellbroadcast",
+    ],
     manifest: "AndroidManifest_OemTesting.xml",
     test_config: "AndroidTest_Oem.xml",
     resource_dirs: [
         "main-res",
     ],
     aaptflags: [
-        "--custom-package com.android.cellbroadcastreceiver"
+        "--custom-package com.android.cellbroadcastreceiver",
     ],
     static_libs: [
         "androidx.legacy_legacy-support-v4",
@@ -70,14 +73,16 @@
     min_sdk_version: "30",
 }
 
-
 // used to run mts coverage test
 android_test {
     name: "CellBroadcastReceiverUnitTests",
     certificate: "networkstack",
     defaults: ["CellBroadcastTestCommon"],
     instrumentation_for: "CellBroadcastApp",
-    test_suites: ["device-tests", "mts-cellbroadcast"],
+    test_suites: [
+        "device-tests",
+        "mts-cellbroadcast",
+    ],
     manifest: "AndroidManifest.xml",
     test_config: "AndroidTest.xml",
 }
@@ -87,7 +92,10 @@
     certificate: "networkstack",
     defaults: ["CellBroadcastTestCommon"],
     instrumentation_for: "CellBroadcastApp",
-    test_suites: ["device-tests", "mts-cellbroadcast"],
+    test_suites: [
+        "device-tests",
+        "mts-cellbroadcast",
+    ],
     manifest: "AndroidManifest.xml",
     test_config: "AndroidTest_PixelExperience.xml",
 }
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastSettingsTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastSettingsTest.java
index 28f7929..01b4c14 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastSettingsTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastSettingsTest.java
@@ -39,7 +39,6 @@
 import android.os.Looper;
 import android.os.RemoteException;
 import android.os.UserManager;
-import android.support.test.uiautomator.UiDevice;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 
@@ -48,6 +47,7 @@
 import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.FlakyTest;
 import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
 
 import com.android.cellbroadcastreceiver.CellBroadcastConfigService;
 import com.android.cellbroadcastreceiver.CellBroadcastSettings;