diff --git a/Android.mk b/Android.mk
index 48e892c..f95f810 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,13 +14,15 @@
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_USE_AAPT2 := true
 
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
 LOCAL_STATIC_ANDROID_LIBRARIES := \
-    android-support-v4 \
-    android-support-v13 \
-    android-support-v7-recyclerview \
-    android-support-v7-preference \
-    android-support-v7-appcompat \
-    android-support-v14-preference
+    androidx.legacy_legacy-support-v4 \
+    androidx.legacy_legacy-support-v13 \
+    androidx.recyclerview_recyclerview \
+    androidx.preference_preference \
+    androidx.appcompat_appcompat \
+    androidx.legacy_legacy-preference-v14
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index adbe01b..d66643d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -32,6 +32,8 @@
     <uses-permission android:name="android.permission.MANAGE_USERS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
 
+    <uses-sdk android:minSdkVersion="21"/>
+
     <application android:name="CellBroadcastReceiverApp"
             android:label="@string/app_label"
             android:icon="@mipmap/ic_launcher_cell_broadcast"
diff --git a/proguard.flags b/proguard.flags
index bd1646a..873e7c0 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -26,7 +26,7 @@
 }
 
 # Keep annotated classes or class members.
--keep @android.support.annotation.Keep class *
+-keep @androidx.annotation.Keep class *
 -keepclassmembers class * {
-    @android.support.annotation.Keep *;
+    @androidx.annotation.Keep *;
 }
\ No newline at end of file
diff --git a/res/layout/cell_broadcast_disallowed_preference_screen.xml b/res/layout/cell_broadcast_disallowed_preference_screen.xml
index 613393a..4ddc6ee 100644
--- a/res/layout/cell_broadcast_disallowed_preference_screen.xml
+++ b/res/layout/cell_broadcast_disallowed_preference_screen.xml
@@ -30,10 +30,10 @@
                 android:cacheColorHint="@android:color/white"
                 android:fadingEdgeLength="16dip" />
 
-        <TextView android:id="@+android:id/empty"
+        <TextView android:id="@+id/empty"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:gravity="center"
                 android:text="@string/cell_broadcast_settings_not_available"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/res/layout/cell_broadcast_list_screen.xml b/res/layout/cell_broadcast_list_screen.xml
index fd7f784..42c1d16 100644
--- a/res/layout/cell_broadcast_list_screen.xml
+++ b/res/layout/cell_broadcast_list_screen.xml
@@ -28,7 +28,7 @@
                 android:scrollbarStyle="insideOverlay"
                 />
 
-        <TextView android:id="@+android:id/empty"
+        <TextView android:id="@+id/empty"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:gravity="center"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index edb9dac..0258a7f 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Noodberig (diensverskaffer)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Uitsaaiboodskappe"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Publiekeveiligheidsboodskap"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Deelstaat-/Plaaslike toets"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Noodberig"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Waarskuwings"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Uitsaaiboodskappe"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Waarsku oor dreigende veiligheidskwessies"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Publiekeveiligheidsboodskappe"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Aanbevole handelinge wat lewens of eiendom kan red"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Deelstaat- en plaaslike toetse"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Ontvang toetsboodskappe van deelstaat- en plaaslike owerhede af"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Noodwaarskuwings"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Waarsku oor lewensgevaarlike gebeurtenisse"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Vereiste maandelikse toets"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 33ea970..bfc1a57 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"የአደጋ ጊዜ ማንቂያ(ከዋኝ)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"መልዕክቶችን አሰራጭ"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"የሕዝብ ደህንነት መልዕክት"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"የግዛት/አካባቢያዊ ሙከራ"</string>
     <string name="emergency_alert" msgid="624783871477634263">"የአደጋ ጊዜ ማንቂያ"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"ማንቂያዎች"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"መልእክቶችን አሰራጭ"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"የወርሃዊ ሙከራን ጠይቅ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 9bac884..75bc60b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"إنذار الطوارئ (مشغل شبكة الجوال)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"رسائل البث"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"رسالة السلامة العامة"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"اختبار الولاية/الاختبار المحلي"</string>
     <string name="emergency_alert" msgid="624783871477634263">"إنذار الطوارئ"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"التنبيهات"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"رسائل البث"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"الاختبار الشهري المطلوب"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
deleted file mode 100644
index e854635..0000000
--- a/res/values-as/strings.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<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="7559008249836700599">"চেল সম্প্ৰচাৰসমূহ"</string>
-    <string name="sms_cb_settings" msgid="3795852619005211509">"জৰুৰীকালীন সতৰ্কবাণীসমূহ"</string>
-    <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"এই ব্য়ৱহাৰকাৰীৰ বাবে চেল সম্প্ৰচাৰ ছেটিংসমূহ নাই"</string>
-    <string name="button_dismiss" msgid="1234221657930516287">"ঠিক আছে"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"আপোনাৰ এলেকাত কোনো সক্ৰিয় বিপদৰ সতৰ্কবাণী নাই। আপুনি ছেটিংসমূহৰ মেনুৰ বিকল্প ব্যৱহাৰ কৰি সতৰ্কবাণীৰ ছেটিংসমূহ সলনি কৰিব পাৰে।"</string>
-    <string name="menu_delete_all" msgid="3940997343921149800">"সম্প্ৰচাৰসমূহ মচক"</string>
-    <string name="message_options" msgid="3178489901903589574">"বাৰ্তাৰ বিকল্পসমূহ"</string>
-    <string name="menu_view_details" msgid="1040989019045280975">"সবিশেষ চাওক"</string>
-    <string name="menu_delete" msgid="128380070910799366">"সম্প্ৰচাৰ মচক"</string>
-    <string name="view_details_title" msgid="1780427629491781473">"সতৰ্কবাণীৰ সবিশেষ"</string>
-    <string name="confirm_delete_broadcast" msgid="2540199303730232322">"এই সম্প্ৰচাৰটো মচিবনে?"</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>
-    <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="cmas_presidential_level_alert" msgid="1209234030582361001">"ৰাষ্ট্ৰপতিয়ে জাৰি কৰা সতৰ্কবাণী"</string>
-    <string name="cmas_extreme_alert" msgid="2588720613319969289">"জৰুৰীকালীন সতর্কতাৰ অৱস্থা: চৰম"</string>
-    <string name="cmas_extreme_immediate_observed_alert" msgid="2328845915287460780">"জৰুৰীকালীন সতর্কতাৰ অৱস্থা: চৰম"</string>
-    <string name="cmas_extreme_immediate_likely_alert" msgid="1859702950323471778">"জৰুৰীকালীন সতর্কতাৰ অৱস্থা: চৰম"</string>
-    <string name="cmas_severe_alert" msgid="4135809475315826913">"জৰুৰীকালীন সতর্কতা অৱস্থা: গম্ভীৰ"</string>
-    <string name="cmas_amber_alert" msgid="6154867710264778887">"শিশুৰ অপহৰণ (এম্বাৰ সতৰ্কবাণী)"</string>
-    <string name="cmas_required_monthly_test" msgid="1890205712251132193">"দৰকাৰী মাহেকীয়া পৰীক্ষা"</string>
-    <string name="cmas_exercise_alert" msgid="2892255514938370321">"জৰুৰীকালীন সতৰ্কবাণী (অনুশীলন)"</string>
-    <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"জৰুৰীকালীন সতৰ্কবাণী (অপাৰেটৰ)"</string>
-    <string name="cb_other_message_identifiers" msgid="5790068194529377210">"সম্প্ৰচাৰ কৰা বাৰ্তাবোৰ"</string>
-    <string name="public_safety_message" msgid="9119928798786998252">"ৰাজহুৱা নিৰাপত্তা বিষয়ক বাৰ্তা"</string>
-    <string name="emergency_alert" msgid="624783871477634263">"জৰুৰীকালীন সতৰ্কবাণী"</string>
-    <string name="emergency_alerts_title" msgid="6605036374197485429">"সতৰ্কবাণীসমূহ"</string>
-    <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"সম্প্ৰচাৰ কৰা বাৰ্তাবোৰ"</string>
-    <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"জৰুৰীকালীন সতৰ্কবাণীসমূহ"</string>
-    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"সতৰ্কবাণীযুক্ত বাৰ্তাসমূহ লাভ কৰিবলৈ অনুমতি দিয়ক"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="699552922381916044">"জৰুৰীকালীন সতৰ্কবাণীসমূহ লাভ কৰক"</string>
-    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"সতর্কতা স্মৰণ কৰোৱা ধ্বনি"</string>
-    <string name="enable_alert_speech_title" msgid="8052104771053526941">"সতৰ্কবাণী পঢ়ি শুনাওক"</string>
-    <string name="enable_alert_speech_summary" msgid="356086178962268831">"জৰুৰীকালীন সতৰ্কবাণী পঢ়ি শুনাবৰ বাবে পাঠৰ পৰা কথনৰ সুবিধা ব্য়ৱহাৰ কৰক"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"জৰুৰীকালীন সতৰ্কবাণীৰ ইতিহাস"</string>
-    <string name="alert_preferences_title" msgid="6001469026393248468">"সতর্কতা সম্পৰ্কীয় অগ্ৰাধিকাৰসমূহ"</string>
-    <string name="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">"এম্বাৰ সতৰ্কবাণীসমূহ"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"শিশু অপহৰণ সম্পৰ্কীয় জৰুৰীকালীন বুলেটিন"</string>
-    <string name="enable_alert_message_title" msgid="2939830587633599352">"সতৰ্কবাণীযুক্ত বাৰ্তাসমূহ"</string>
-    <string name="enable_alert_message_summary" msgid="6525664541696985610">"আসন্ন বিপদাশংকাৰ বিষয়ে সতৰ্ক কৰক"</string>
-    <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"ৰাজহুৱা নিৰাপত্তা বিষয়ক বাৰ্তাসমূহ"</string>
-    <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"জীৱন বা সম্পত্তি ৰক্ষা কৰিব পৰা অনুমোদিত কাৰ্যসমূহ"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"জৰুৰীকালীন সতৰ্কবাণীসমূহ"</string>
-    <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"জীৱন-সংশয়ী ঘটনাসমূহৰ বিষয়ে সতৰ্ক কৰক"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"দৰকাৰী মাহেকীয়া পৰীক্ষা"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="588517403520088484">"সুৰক্ষা সতৰ্কীকৰণ ব্যৱস্থাৰ পৰীক্ষামূলক বাৰ্তা লাভ কৰক"</string>
-    <string name="enable_alert_vibrate_title" msgid="982817538757982090">"কম্পন"</string>
-    <string name="use_full_volume_title" msgid="8581439612945182255">"সম্পূৰ্ণ ভলিউম ব্য়ৱহাৰ কৰক"</string>
-    <string name="use_full_volume_summary" msgid="3560764277281704697">"অন্য়ান্য় ভলিউম আৰু \'অসুবিধা নিদিব\'ৰ অগ্ৰাধিকাৰবোৰ উপেক্ষা কৰক"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"এলেকা আপডেট সম্প্ৰচাৰসমূহ"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"ছিমৰ স্থিতিত আপডেটৰ তথ্য় দেখুৱাওক"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"বিকাশকৰ্তাৰ বিকল্পসমূহ"</string>
-    <string name="cmas_category_heading" msgid="3923503130776640717">"সতৰ্কবাণীৰ প্ৰকাৰ:"</string>
-    <string name="cmas_category_geo" msgid="4979494217069688527">"ভূ-ভৌতিক সম্পর্কীয় সতর্কতা"</string>
-    <string name="cmas_category_met" msgid="7563732573851773537">"বতৰ সম্পৰ্কীয়"</string>
-    <string name="cmas_category_safety" msgid="2986472639641883453">"সুৰক্ষা"</string>
-    <string name="cmas_category_security" msgid="2549520159044403704">"নিৰাপত্তা"</string>
-    <string name="cmas_category_rescue" msgid="4907571719983321086">"উদ্ধাৰ"</string>
-    <string name="cmas_category_fire" msgid="3331981591918341119">"জুই"</string>
-    <string name="cmas_category_health" msgid="312569774587117324">"স্বাস্থ্য় সম্পৰ্কীয়"</string>
-    <string name="cmas_category_env" msgid="9213088574227522961">"পৰিৱেশ সম্পর্কীয়"</string>
-    <string name="cmas_category_transport" msgid="5014901635987361642">"যাতায়ত"</string>
-    <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_shelter" msgid="7301175579079615909">"আশ্ৰয়"</string>
-    <string name="cmas_response_evacuate" msgid="5833170084430021095">"স্থান ত্যাগ কৰক"</string>
-    <string name="cmas_response_prepare" msgid="8428073909753758319">"সাজু হওক"</string>
-    <string name="cmas_response_execute" msgid="284719420769568493">"কার্যকৰী কৰক"</string>
-    <string name="cmas_response_monitor" msgid="681400164440495749">"পৰ্যবেক্ষণ"</string>
-    <string name="cmas_response_avoid" msgid="156419597612629270">"এৰাই চলক"</string>
-    <string name="cmas_response_assess" msgid="9043534222710563415">"মূল্য়ায়ন"</string>
-    <string name="cmas_response_none" msgid="5149009359674452959">"নাই"</string>
-    <string name="cmas_severity_heading" msgid="8437057117822305243">"গম্ভীৰতা:"</string>
-    <string name="cmas_severity_extreme" msgid="1312013282860183082">"চৰম"</string>
-    <string name="cmas_severity_severe" msgid="7504359209737074524">"গম্ভীৰ"</string>
-    <string name="cmas_urgency_heading" msgid="8218282767913431492">"অত্য়াৱশ্য়কতা:"</string>
-    <string name="cmas_urgency_immediate" msgid="1577485208196449288">"তাৎক্ষণিক"</string>
-    <string name="cmas_urgency_expected" msgid="6830831119872375936">"আশানুৰূপ"</string>
-    <string name="cmas_certainty_heading" msgid="8374669249736439193">"নিশ্চয়তা:"</string>
-    <string name="cmas_certainty_observed" msgid="3668549749352106472">"নিৰীক্ষণ কৰা হৈছে"</string>
-    <string name="cmas_certainty_likely" msgid="4254497828943291749">"সম্ভৱত"</string>
-    <string name="delivery_time_heading" msgid="5980836543433619329">"প্ৰাপ্ত:"</string>
-    <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> নপঢ়া সতৰ্কবাণীসমূহ।"</string>
-    <string name="notification_multiple_title" msgid="1523638925739947855">"নতুন সতৰ্কবাণী"</string>
-    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"প্ৰথমটো সতৰ্কবাণী দেখুওৱাৰ পিছত এই সেৱা পৰিত্যাগ কৰা বার্তা দেখুৱাওক (ৰাষ্ট্ৰপতিয়ে জাৰি কৰা সতৰ্কবাণীৰ বাহিৰে)।"</string>
-    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"এই সেৱা পৰিত্যাগ কৰা বার্তা দেখুৱাওক"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"আপুনি বৰ্তমান জৰুৰীকালীন সতৰ্কবাণী লাভ কৰি আছে। আপুনি আগলৈও জৰুৰীকালীন সতৰ্কবাণী পাব বিচাৰেনে?"</string>
-    <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"হয়"</string>
-    <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"নহয়"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"জৰুৰীকালীন সতৰ্কবাণীৰ ইতিহাস"</string>
-  <string-array name="alert_reminder_interval_entries">
-    <item msgid="6595211083588795160">"এবাৰ"</item>
-    <item msgid="9097229303902157183">"প্ৰতি ২ মিনিটত"</item>
-    <item msgid="5718214950343391480">"প্ৰতি ৫ মিনিটত"</item>
-    <item msgid="3863339891188103437">"প্ৰতি ১৫ মিনিটত"</item>
-    <item msgid="6868848414437854609">"অফ"</item>
-  </string-array>
-    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"অনাতাঁৰ জৰুৰীকালীন সতৰ্কবাণীসমূহ"</string>
-</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index f75891e..4b0965d 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Həyəcan siqnalı (operator)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Yayım mesajları"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"İctimai təhlükəsizlik mesajı"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Dövlət/Yerli test"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Həyəcan siqnalı"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Siqnallar"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Yayım mesajları"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Qaçılmaz təhlükələr ilə bağlı xəbərdarlıq edin"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"İctimai təhlükəsizlik mesajları"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Həyat və mülkiyyətinin qorunması ilə bağlı məsləhətli əməliyyatlar"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Dövlət və yerli testlər"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Dövlət və yerli orqanlardan mətn mesajları alın"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Həyəcan siqnalı"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Həyati təhlükəsi olan hadisələrlə bağlı xəbərdarlıq edin"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Tələb olunan aylıq test"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 4f9f108..b9965f5 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Obaveštenje o hitnom slučaju (operater)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Poruke o emitovanju"</string>
     <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">"Obaveštenja"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Poruke o emitovanju"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Upozoravaj me na neposredne bezbednosne pretnje"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Poruke o javnoj bezbednosti"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Preporučene radnje koje mogu da sačuvaju živote ili imovinu"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Probne poruke državnih i lokalnih organa"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Primaj probne poruke od državnih i lokalnih organa"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Obaveštenja o hitnim slučajevima"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Upozoravaj me na događaje opasne po život"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Obavezan mesečni test"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index da12787..766132d 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Аварыйная абвестка (аператар)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Паведамленні рассылкі"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Паведамленне аб пагрозе грамадскай бяспецы"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Дзяржаўнае ці мясцовае тэставае паведамленне"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Аварыйная абвестка"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Абвесткі"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Паведамленні рассылкі"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Абавязковы штомесячны тэст"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index b8aeea7..ecf27d9 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Сигнал при спешни случаи (оператор)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Съобщения за излъчване"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Съобщение за обществена безопасност"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Тест на щатско/местно ниво"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Сигнал при спешни случаи"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Сигнали"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Съобщения за излъчване"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Задължителен месечен тест"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index b9921e2..c2680e7 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"জরুরী সতর্কতা (অপারেটর)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"সম্প্রচারিত মেসেজ"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"সর্বজনীন নিরাপত্তা মেসেজ"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"রাজ্য/স্থানীয় পরীক্ষা"</string>
     <string name="emergency_alert" msgid="624783871477634263">"জরুরি সতর্কতা"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"সতর্কতা"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"সম্প্রচারিত মেসেজ"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"প্রয়োজনীয় মাসিক পরীক্ষা"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 186c4ab..3400815 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Upozorenje za vanredne situacije (operater)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Emitiranje poruka"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Poruka za javnu sigurnost"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Državni/lokalni test"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Upozorenje za hitan slučaj"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Upozorenja"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Poruke emitera"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Upozori na neposredne sigurnosne prijetnje"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Poruka za javnu sigurnost"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Preporučene radnje kojim se mogu spasiti životi ili imovina"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Državni i lokalni testovi"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Primanje testnih poruka od državnih i lokalnih vlasti"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Hitna upozorenja"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Upozori na događaje opasne po život"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Obavezan mjesečni test"</string>
@@ -85,7 +88,7 @@
     <string name="cmas_category_safety" msgid="2986472639641883453">"Sigurnost"</string>
     <string name="cmas_category_security" msgid="2549520159044403704">"Zaštita"</string>
     <string name="cmas_category_rescue" msgid="4907571719983321086">"Spašavanje"</string>
-    <string name="cmas_category_fire" msgid="3331981591918341119">"Požarno"</string>
+    <string name="cmas_category_fire" msgid="3331981591918341119">"Požar"</string>
     <string name="cmas_category_health" msgid="312569774587117324">"Zdravstveno"</string>
     <string name="cmas_category_env" msgid="9213088574227522961">"Ekološko"</string>
     <string name="cmas_category_transport" msgid="5014901635987361642">"Transport"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 2b073f0..67b5ee7 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alerta d\'emergències (operador)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Missatges de difusió"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Missatge de seguretat pública"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Prova local o estatal"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Alerta d\'emergències"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertes"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Missatges de difusió"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Avisa\'m quan hi hagi amenaces de seguretat imminents"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Missatges de seguretat pública"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Accions recomanades que poden salvar vides o propietats"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Proves locals i estatals"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Vull rebre missatges de prova de les autoritats locals i estatals"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alertes d\'emergència"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Avisa\'m quan hi hagi esdeveniments potencialment mortals"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Prova mensual obligatòria"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index d3c297f..8109ea1 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Nouzová výstraha (operátor)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Zprávy informačních služeb"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Zpráva o veřejné bezpečnosti"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Státní/místní test"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Nouzová výstraha"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Upozornění"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Zprávy informačních služeb"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Dostávat upozornění na bezprostřední bezpečnostní hrozby"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Zprávy o veřejné bezpečnosti"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Doporučené akce, které mohou zachránit životy či majetek"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Státní a místní testy"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Dostávat testovací zprávy od státních a místních úřadů"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Výstražné zprávy"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Upozornění na události ohrožující život"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Povinná měsíční zkouška"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a684497..1b89e0f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Nødalarm (mobilselskab)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Udsendte beskeder"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Meddelelse om offentlig sikkerhed"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Central/lokal testadvarsel"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Nødalarm"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alarmer"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Udsendte beskeder"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Advar om overhængende sikkerhedstrusler"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Meddelelser om offentlig sikkerhed"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Anbefalede handlinger, der kan redde liv eller ejendom"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Centrale og lokale testadvarsler"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Modtag testmeddelelser fra centrale og lokale myndigheder"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Nødalarmer"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Advar om livstruende hændelser"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Påkrævet månedlig test"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 34a867f..03026a3 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Notfallbenachrichtigung (Betreiber)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Broadcast-Nachrichten"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Nachricht zur öffentlichen Sicherheit"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Staatlicher/lokaler Test"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Notfallbenachrichtigung"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Benachrichtigungen"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast-Nachrichten"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Vor akuten Sicherheitsbedrohungen warnen"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Nachrichten zur öffentlichen Sicherheit"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Empfohlene Maßnahmen, die Leben oder Eigentum retten können"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Staatliche und lokale Tests"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Testnachrichten von staatlichen und lokalen Behörden erhalten"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Notfallbenachrichtigungen"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Vor lebensbedrohlichen Ereignissen warnen"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Erforderlicher monatlicher Test"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index c5a54b9..fb72743 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Ειδοποίηση έκτακτης ανάγκης (εταιρεία κιν. τηλεφ.)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Μετάδοση μηνυμάτων"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Μήνυμα δημόσιας ασφάλειας"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Κρατική/τοπική δοκιμή"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Ειδοποίηση έκτακτης ανάγκης"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Ειδοποιήσεις"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Μετάδοση μηνυμάτων"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Απαιτούμενη μηνιαία δοκιμή"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index fcc2a15..b8af790 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Emergency alert (operator)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Broadcast messages"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Public safety message"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Regional/local test"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Emergency alert"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alerts"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast messages"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Warn about imminent safety threats"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Public safety messages"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Recommended actions that can save lives or property"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Regional and local tests"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Receive test messages from regional and local authorities"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Emergency alerts"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Warn about life-threatening events"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Required monthly test"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index fcc2a15..d91a64f 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -44,9 +44,9 @@
     <string name="cmas_required_monthly_test" msgid="1890205712251132193">"Required Monthly Test"</string>
     <string name="cmas_exercise_alert" msgid="2892255514938370321">"Emergency alert (exercise)"</string>
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Emergency alert (operator)"</string>
+    <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Emergency alert"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Broadcast messages"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Public safety message"</string>
-    <string name="emergency_alert" msgid="624783871477634263">"Emergency alert"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alerts"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast messages"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Emergency alerts"</string>
@@ -54,7 +54,7 @@
     <string name="enable_alerts_master_toggle_summary" msgid="699552922381916044">"Receive emergency notifications"</string>
     <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Alert reminder sound"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Speak alert message"</string>
-    <string name="enable_alert_speech_summary" msgid="356086178962268831">"Use Text-to-Speech to speak emergency alert messages"</string>
+    <string name="enable_alert_speech_summary" msgid="356086178962268831">"Use text-to-speech to speak emergency alert messages"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Emergency alert history"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Alert preferences"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS test broadcasts"</string>
@@ -67,8 +67,6 @@
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Child abduction emergency bulletins"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"Alert messages"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Warn about imminent safety threats"</string>
-    <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Public safety messages"</string>
-    <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Recommended actions that can save lives or property"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Emergency alerts"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Warn about life-threatening events"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Required monthly test"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index fcc2a15..b8af790 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Emergency alert (operator)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Broadcast messages"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Public safety message"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Regional/local test"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Emergency alert"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alerts"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast messages"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Warn about imminent safety threats"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Public safety messages"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Recommended actions that can save lives or property"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Regional and local tests"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Receive test messages from regional and local authorities"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Emergency alerts"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Warn about life-threatening events"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Required monthly test"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index fcc2a15..b8af790 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Emergency alert (operator)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Broadcast messages"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Public safety message"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Regional/local test"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Emergency alert"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alerts"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast messages"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Warn about imminent safety threats"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Public safety messages"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Recommended actions that can save lives or property"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Regional and local tests"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Receive test messages from regional and local authorities"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Emergency alerts"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Warn about life-threatening events"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Required monthly test"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 2ca0c5c..222535e 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -44,9 +44,9 @@
     <string name="cmas_required_monthly_test" msgid="1890205712251132193">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎‏‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‏‎Required Monthly Test‎‏‎‎‏‎"</string>
     <string name="cmas_exercise_alert" msgid="2892255514938370321">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎‎‏‎Emergency alert (exercise)‎‏‎‎‏‎"</string>
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎Emergency alert (operator)‎‏‎‎‏‎"</string>
+    <string name="pws_other_message_identifiers" msgid="1813329661891149820">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎Emergency alert‎‏‎‎‏‎"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‏‎‏‏‎‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎Broadcast messages‎‏‎‎‏‎"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎Public safety message‎‏‎‎‏‎"</string>
-    <string name="emergency_alert" msgid="624783871477634263">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‏‎‏‎‏‎‎‏‏‎‏‎‏‏‏‎Emergency alert‎‏‎‎‏‎"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎Alerts‎‏‎‎‏‎"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‎Broadcast messages‎‏‎‎‏‎"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‎Emergency alerts‎‏‎‎‏‎"</string>
@@ -67,8 +67,6 @@
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎Child abduction emergency bulletins‎‏‎‎‏‎"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‎Alert messages‎‏‎‎‏‎"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‎‎‎‎‏‎‏‎‎‎‎‎‏‎‏‎‎Warn about imminent safety threats‎‏‎‎‏‎"</string>
-    <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎Public safety messages‎‏‎‎‏‎"</string>
-    <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‎‏‎Recommended actions that can save lives or property‎‏‎‎‏‎"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎Emergency alerts‎‏‎‎‏‎"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎Warn about life-threatening events‎‏‎‎‏‎"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‏‏‏‎Required monthly test‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index bdb3835..f0ede18 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alerta de emergencia (operador)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Mensajes de transmisión"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Mensaje de seguridad pública"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Prueba local o estatal"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Alerta de emergencia"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertas"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mensajes de transmisión"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Alertar sobre amenazas de seguridad inminentes"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Mensajes de seguridad pública"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Acciones recomendadas que pueden salvar vidas o propiedades"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Pruebas locales y estatales"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Recibir mensajes de prueba de autoridades locales y estatales"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alertas de emergencia"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Alertar sobre eventos peligrosos"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Prueba mensual obligatoria"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2d78f6f..a40945f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alerta de emergencia (operador)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Mensajes de difusión"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Mensaje de seguridad pública"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Prueba local/estatal"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Alerta de emergencia"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertas"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mensajes de difusión"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Advertencia sobre amenazas de seguridad inminentes"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Mensajes de seguridad pública"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Acciones recomendadas que pueden salvar vidas o propiedades"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Pruebas locales y estatales"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Recibir mensajes de prueba de autoridades locales y estatales"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alertas de emergencias"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Advertencia sobre eventos que pueden ser mortales"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Prueba mensual obligatoria"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index e2175ea..eb1baac 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Hädaolukorra märguanne (operaator)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Sõnumite edastamine"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Avalik turvateadaanne"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Riiklik/kohalik test"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Hädaolukorra märguanne"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Teatised"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Sõnumite edastamine"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Hoiatused eelseisvate turvaohtude puhul"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Avalikud turvateadaanded"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Soovitatud toimingud, mis võivad päästa elusid või vara"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Riiklikud ja kohalikud testid"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Saate riiklikelt ja kohalikelt ametkondadelt testsõnumeid"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Hädaolukorra hoiatused"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Hoiatused eluohtlike sündmuste puhul"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Igakuine kohustuslik test"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 4ccb45a..35823cc 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Larrialdi-alerta (operadorea)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Igorpen-mezuak"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Segurtasun publikoari buruzko mezua"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Estatuko/Tokiko erakundeen probak"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Larrialdi-alerta"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertak"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Igorpen-mezuak"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Ohartarazi berehalako segurtasun-arriskuei buruz"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Segurtasun publikoari buruzko mezuak"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Bizia edo ondasunak salbatzeko ekintza gomendatuak"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Estatuko eta tokiko erakundeen probak"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Jaso probako mezuak estatuko eta tokiko erakundeengandik"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Larrialdi-alertak"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Ohartarazi bizitza arriskuan jar dezaketen gertaerei buruz"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Hileroko nahitaezko proba"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index d6217e5..2914bf6 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"هشدار اضطراری (اپراتور)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"پیام‌های پخش"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"پیام امنیت عمومی"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"آزمایش ایالتی/محلی"</string>
     <string name="emergency_alert" msgid="624783871477634263">"هشدار اضطراری"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"هشدارها"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"پیام‌های پخش"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"آزمون ماهیانه الزامی است"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 9cf13a0..4a2cacb 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Hätätilannevaroitus (operaattori)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Lähetysviestit"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Yleistä turvallisuutta koskeva ilmoitus"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Paikallinen testi"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Hätätilannehälytys"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Ilmoitukset"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Lähetysviestit"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Varoita välittömistä turvallisuusuhista"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Yleistä turvallisuutta koskevat tiedotteet"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Toimintasuositukset, joilla voidaan suojata ihmishenkiä tai omaisuutta"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Paikalliset testit"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Vastaanota koeviestejä paikallisilta viranomaisilta"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Hätätiedotteet"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Varoita hengenvaarallisista tapahtumista"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Pakollinen kuukausittainen testi"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 1d60bc3..4a374ad 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alerte d\'urgence (opérateur)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Messages de diffusion"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Message de sécurité publique"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Test des autorités nationales et locales"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Alerte d\'urgence"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertes"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Messages de diffusion"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Avertir des menaces de sécurité imminentes"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Messages de sécurité publique"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Actions recommandées pouvant sauver des vies ou des biens"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Tests des autorités nationales et locales"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Recevoir des messages de test des autorités nationales et locales"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alertes d\'urgence"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Avertir des événements potentiellement mortels"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Test mensuel requis"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 767ac81..fe6a577 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alerte d\'urgence (opérateur)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Messages de diffusion"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Message de sécurité publique"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Test national/local"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Alerte d\'urgence"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertes"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Messages de diffusion"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Recevoir des avertissements relatifs aux menaces de sécurité imminentes"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Messages de sécurité publique"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Actions recommandées susceptibles de sauver des vies ou des biens"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Tests à l\'échelle nationale et locale"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Recevoir des messages tests des autorités nationales et locales"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alertes d\'urgence"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Recevoir des avertissements relatifs aux événements potentiellement mortels"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Test mensuel obligatoire"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 6138132..5cef557 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alerta de urxencia (operador)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Mensaxes de emisión"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Mensaxe de seguranza pública"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Probas procedentes de autoridades locais/estatais"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Alerta de urxencia"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertas"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mensaxes de emisión"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Recibir advertencias de ameazas de seguranza inminentes"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Mensaxes de seguranza pública"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Accións recomendadas que poden salvar vidas ou propiedades"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Probas procedentes de autoridades locais e estatais"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Recibir mensaxes de proba procedentes de autoridades locais e estatais"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alertas de urxencia"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Recibir advertencias de eventos que poñen a vida en perigo"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Proba mensual obrigatoria"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 9eacc0e..f6c3e87 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"કટોકટીની ચેતવણી (ઓપરેટર)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"બ્રોડકાસ્ટના સંદેશા"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"સાર્વજનિક સુરક્ષા સંદેશ"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"રાજ્ય/સ્થાનિક પરીક્ષણ"</string>
     <string name="emergency_alert" msgid="624783871477634263">"કટોકટીની ચેતવણી"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"ચેતવણીઓ"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"બ્રોડકાસ્ટના સંદેશા"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"આવશ્યક માસિક પરીક્ષણ"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 9f4b8ff..1bb4e8a 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"आपातकालीन अलर्ट (ऑपरेटर)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"प्रसारण संदेश"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"सार्वजनिक सुरक्षा से जुड़ा मैसेज"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"राज्य/स्थानीय टेस्ट"</string>
     <string name="emergency_alert" msgid="624783871477634263">"इमरजेंसी के समय सूचनाएं"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"सूचनाएं"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"प्रसारण संदेश"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"हर महीने की जाने वाली ज़रूरी जाँच"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 31796f7..be99562 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Hitna upozorenja (operator)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Emitirane poruke"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Poruka o javnoj sigurnosti"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Državni/lokalni test"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Hitno upozorenje"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Upozorenja"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Emitirane poruke"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Upozorenja o neposrednim sigurnosnim prijetnjama"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Poruke o javnoj sigurnosti"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Preporučene radnje koje mogu spasiti živote ili imovinu"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Državni i lokalni testovi"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Primajte testne poruke od nadležnih državnih i lokalnih tijela"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Hitna upozorenja"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Upozorenja o događajima opasnima po život"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Obavezan mjesečni test"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 0b14902..e7eeb42 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Vészjelzés (operátor)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Sugárzott üzenetek"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Közbiztonsággal kapcsolatos üzenet"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Állami/helyi teszt"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Vészjelzés"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Figyelmeztetések"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Sugárzott üzenetek"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Közvetlen biztonsági fenyegetésekkel kapcsolatos figyelmeztetés"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Közbiztonsággal kapcsolatos üzenetek"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Élet és anyagi eszközök mentésére szolgáló javasolt intézkedések"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Állami és helyi tesztek"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Tesztüzenetek fogadása az állami és a helyi hatóságoktól"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Vészriasztások"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Életet veszélyeztető eseményekkel kapcsolatos figyelmeztetés"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Kötelező havi ellenőrzés"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 80f5aab..d3efe63 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Արտակարգ իրավիճակի զգուշացում (օպերատոր)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Հեռարձակման հաղորդագրություններ"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Հաղորդագրություն հանրային անվտանգության մասին"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Համապետական/տեղական փորձնական ահազանգ"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Արտակարգ իրավիճակի ահազանգ"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Ծանուցումներ"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Հեռարձակման հաղորդագրություններ"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Ամենամսյա պարտադիր փորձարկում"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 729ddd6..b4458b1 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Peringatan darurat (operator)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Pesan broadcast"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Pesan keselamatan publik"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Peringatan percobaan dari Negara Bagian/Lokal"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Notifikasi darurat"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Notifikasi"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Pesan broadcast"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Peringatkan tentang ancaman keamanan yang akan segera terjadi"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Pesan keselamatan publik"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Tindakan yang disarankan untuk menyelamatkan nyawa atau harta benda"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Peringatan percobaan dari negara bagian dan lokal"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Menerima pesan percobaan dari otoritas negara bagian atau lokal"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Peringatan darurat"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Peringatkan tentang peristiwa yang mengancam jiwa"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Pengujian bulanan yang harus dilakukan"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index f6cffed..43c8cad 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Neyðarviðvörun (símafyrirtæki)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Útsendingarskilaboð"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Skilaboð frá almannavörnum"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Staðbundin prufuviðvörun"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Neyðarviðvörun"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Tilkynningar"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Útsendingarskilaboð"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Vara við yfirvofandi öryggisógnum"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Skilaboð frá almannavörnum"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Ráðlagðar aðgerðir sem geta bjargað mannslífum og verndað eignir"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Staðbundin prufuviðvörun"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Fá prufuskilboð frá ríkis- og staðaryfirvöldum"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Neyðartilkynningar"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Vara við lífshættulegum atburðum"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Áskilin mánaðarleg prófun"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 35c15be..64e9331 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Avviso di emergenza (operatore)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Messaggi broadcast"</string>
     <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">"Avviso di emergenza"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Avvisi"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Messaggi broadcast"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Avvisi relativi a imminenti minacce alla sicurezza"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Messaggi di sicurezza pubblica"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Azioni consigliate per salvare vite umane o proteggere cose"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Test a livello statale e locale"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Ricevi messaggi di prova da autorità statali e locali"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Avvisi d\'emergenza"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Avvisi relativi a eventi potenzialmente letali"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Test mensile obbligatorio"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f91823f..b4abce8 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"התרעת חירום (מפעיל)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"הודעות שידור"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"הודעה ביטחונית"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"בדיקה מקומית/ארצית"</string>
     <string name="emergency_alert" msgid="624783871477634263">"התרעה על מקרה חירום"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"התרעות"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"הודעות שידור"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"בדיקה חודשית נדרשת"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index bfd17d1..4df7a2d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"緊急速報メール（オペレーター）"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"緊急速報メール SMS"</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>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"必須の毎月のテスト"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 1f0dedb..5c45f15 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"საგანგებო ვითარების შესახებ გაფრთხილება (ოპერატორი)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"შეტყობინებათა გავრცელება"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"შეტყობინება საზოგადოებრივ უსაფრთხოებაზე"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"სახელმწიფო/ადგილობრივი სატესტო შეტყობინებები"</string>
     <string name="emergency_alert" msgid="624783871477634263">"საგანგებო გაფრთხილება"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"გაფრთხილებები"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast შეტყობინებები"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"სავალდებულო ყოველთვიური ტესტი"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 4065a02..6dba453 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Төтенше дабыл (оператор)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Таратылым хабарлары"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Жалпы қауіпсіздік хабары"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Мемлекеттік/Жергілікті тексеру"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Төтенше жағдай дабылы"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Хабарламалар"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Таратылым хабарлары"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Ай сайынғы міндетті сынақ"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 91ac21c..1df87df 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"ការ​ជូន​ដំណឹង​ពេល​អាសន្ន (ប្រតិបត្តិ​ករ)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"សារ​ផ្សព្វផ្សាយ"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"សារ​សុវត្ថិភាព​សាធារណៈ"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"ការសាកល្បង​ក្នុងមូលដ្ឋាន/រដ្ឋ"</string>
     <string name="emergency_alert" msgid="624783871477634263">"ការ​ជូន​ដំណឹង​ពេល​អាសន្ន"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"ការជូនដំណឹង"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"សារ​ផ្សព្វផ្សាយ"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"តេស្ត​ប្រចាំ​ខែ​ដែល​ចាំបាច់"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 625f94b..4bca145 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"ತುರ್ತು ಎಚ್ಚರಿಕೆ (ಆಪರೇಟರ್‌)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"ಪ್ರಸಾರ ಸಂದೇಶಗಳು"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"ಸಾರ್ವಜನಿಕ ಸುರಕ್ಷತೆಯ ಸಂದೇಶ"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"ರಾಜ್ಯ/ಸ್ಥಳೀಯ ಪರೀಕ್ಷೆ"</string>
     <string name="emergency_alert" msgid="624783871477634263">"ತುರ್ತು ಎಚ್ಚರಿಕೆ"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"ಎಚ್ಚರಿಕೆಗಳು"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"ಪ್ರಸಾರ ಸಂದೇಶಗಳು"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"ಅಗತ್ಯವಿರುವ ಮಾಸಿಕ ಪರೀಕ್ಷೆ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 664a31b..0f6efde 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"비상사태 경보(통신사)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"브로드캐스트 메시지"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"공공 안전 메시지"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"주/지방 테스트"</string>
     <string name="emergency_alert" msgid="624783871477634263">"비상사태 경고"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"경보"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"브로드캐스트 메시지"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"필수 월간 테스트"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 6507b27..1c4fd8c 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Өзгөчө кырдаал жөнүндө айгай кабар (оператор)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Билдирүүлөрдү таркатуу"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Коомдук коопсуздук тууралуу билдирүү"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Мамлекеттик/жергиликтүү органдардын билдирүүлөрү"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Өзгөчө кырдаал жөнүндө шашылыш билдирүү"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Эскертүүлөр"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Билдирүүлөрдү таркатуу"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Милдеттүү ай сайын өткөрүлүүчү сыноо"</string>
@@ -126,5 +129,5 @@
     <item msgid="3863339891188103437">"15 мүнөт сайын"</item>
     <item msgid="6868848414437854609">"Өчүк"</item>
   </string-array>
-    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Шашылыш билдирүүлөрдү зымсыз жөнөтүү"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Өзгөчө кырдаалдар тууралуу кабарлоо"</string>
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 32804ed..8f17533 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -46,6 +46,7 @@
     <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">"Public safety message"</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>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"ການທົດສອບລາຍເດືອນທີ່ຈຳເປັນ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 420f6d6..510bbd7 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Nepaprastasis įspėjimas (operacijos ženklas)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Transliacijos pranešimai"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Visuomenės saugumo pranešimas"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Valstybinės / vietinės institucijos bandymas"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Nepaprastasis įspėjimas"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Įspėjimai"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Transliacijos pranešimai"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Įspėti apie neišvengiamas saugos grėsmes"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Visuomenės saugumo pranešimai"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Rekomenduojami veiksmai, kuriais galima apsaugoti gyvybę arba nuosavybę"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Valstybinių ir vietinių institucijų bandymai"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Gauti bandomuosius pranešimus iš valstybinių ir vietinių institucijų"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Nepaprastosios padėties įspėjimai"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Įspėti apie gyvybei grėsmingus įvykius"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Būtinas mėnesinis testas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 225d5da..b91ca19 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Ārkārtas situācijas brīdinājums (operators)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Apraides ziņojumi"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Ziņojums par sabiedrisko drošību"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Valsts/vietējā pārbaude"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Ārkārtas situācijas brīdinājums"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Brīdinājumi"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Apraides ziņojumi"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Brīdināt par nenovēršamu drošības apdraudējumu"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Ziņojumi par sabiedrisko drošību"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Ieteicamās darbības, kas var izglābt dzīvību vai īpašumu"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Valsts un vietējās pārbaudes"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Saņemt pārbaudes ziņojumus no valsts un vietējām varas iestādēm"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Ārkārtas brīdinājumi"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Brīdināt par dzīvību apdraudošiem notikumiem"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Jāveic ikmēneša tests"</string>
diff --git a/res/values-mcc246-as/strings.xml b/res/values-mcc246-as/strings.xml
deleted file mode 100644
index 568240e..0000000
--- a/res/values-mcc246-as/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2016 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-সতৰ্কতাৰ স্তৰ ২"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-সতর্কতাৰ স্তৰ ৩"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-এম্বাৰ"</string>
-</resources>
diff --git a/res/values-mcc246-or/strings.xml b/res/values-mcc246-or/strings.xml
deleted file mode 100644
index 46d9c04..0000000
--- a/res/values-mcc246-or/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2016 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-ଅଲର୍ଟ ସ୍ତର 2"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-ଅଲର୍ଟ ସ୍ତର 3"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-ଅମ୍ବର୍‌"</string>
-</resources>
diff --git a/res/values-mcc302/strings.xml b/res/values-mcc302/strings.xml
index 8ae44b8..4d24a7a 100644
--- a/res/values-mcc302/strings.xml
+++ b/res/values-mcc302/strings.xml
@@ -28,6 +28,8 @@
     <string name="etws_other_emergency_type" translatable="false">EMERGENCY ALERT / ALERTE D’URGENCE</string>
     <string name="cmas_presidential_level_alert" translatable="false">EMERGENCY ALERT / ALERTE D’URGENCE</string>
     <string name="cmas_extreme_alert" translatable="false">EMERGENCY ALERT / ALERTE D’URGENCE</string>
+    <string name="cmas_extreme_immediate_observed_alert" translatable="false">EMERGENCY ALERT / ALERTE D’URGENCE</string>
+    <string name="cmas_extreme_immediate_likely_alert" translatable="false">EMERGENCY ALERT / ALERTE D’URGENCE</string>
     <string name="cmas_severe_alert" translatable="false">EMERGENCY ALERT / ALERTE D’URGENCE</string>
     <string name="cmas_amber_alert" translatable="false">EMERGENCY ALERT / ALERTE D’URGENCE</string>
     <string name="cmas_required_monthly_test" translatable="false">EMERGENCY ALERT / ALERTE D’URGENCE</string>
diff --git a/res/values-mcc310/config.xml b/res/values-mcc310/config.xml
new file mode 100644
index 0000000..d164ad7
--- /dev/null
+++ b/res/values-mcc310/config.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- 4370, 4383 -->
+    <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
+        <item>0x1112-0x1112:rat=gsm, emergency=true</item>
+        <item>0x1000-0x1000:rat=cdma, emergency=true</item>
+        <!-- additional language -->
+        <item>0x111F-0x111F:rat=gsm, emergency=true, filter_language=true</item>
+    </string-array>
+    <!-- 4371~4372, 4384~4385 -->
+    <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false">
+        <item>0x1113-0x1114:rat=gsm, emergency=true</item>
+        <item>0x1001-0x1001:rat=cdma, emergency=true</item>
+        <!-- additional language -->
+        <item>0x1120-0x1121:rat=gsm, emergency=true, filter_language=true</item>
+    </string-array>
+    <!-- 4373~4378, 4386~4391 -->
+    <string-array name="cmas_alerts_severe_range_strings" translatable="false">
+        <item>0x1115-0x111A:rat=gsm, emergency=true</item>
+        <item>0x1002-0x1002:rat=cdma, emergency=true</item>
+        <!-- additional language -->
+        <item>0x1122-0x1127:rat=gsm, emergency=true, filter_language=true</item>
+    </string-array>
+    <!-- 4379, 4392 -->
+    <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false">
+        <item>0x111B-0x111B:rat=gsm, emergency=true</item>
+        <item>0x1003-0x1003:rat=cdma, emergency=true</item>
+        <!-- additional language -->
+        <item>0x1128-0x1128:rat=gsm, emergency=true, filter_language=true</item>
+    </string-array>
+    <!-- 4380~4382, 4393~4395 -->
+    <string-array name="required_monthly_test_range_strings" translatable="false">
+        <item>0x111C-0x111C:rat=gsm, emergency=true</item>
+        <item>0x1004-0x1004:rat=cdma, emergency=true</item>
+        <!-- additional language -->
+        <item>0x1129-0x1129:rat=gsm, emergency=true, filter_language=true</item>
+    </string-array>
+    <string-array name="exercise_alert_range_strings" translatable="false">
+        <item>0x111D-0x111D:rat=gsm, emergency=true</item>
+        <!-- additional language -->
+        <item>0x112A-0x112A:rat=gsm, emergency=true, filter_language=true</item>
+    </string-array>
+    <string-array name="operator_defined_alert_range_strings" translatable="false">
+        <item>0x111E-0x111E:rat=gsm, emergency=true</item>
+        <!-- additional language -->
+        <item>0x112B-0x112B:rat=gsm, emergency=true, filter_language=true</item>
+    </string-array>
+    <string-array name="public_safety_messages_channels_range_strings" translatable="false">
+        <!-- Public safety messages -->
+        <item>0x112C-0x112C:rat=gsm, emergency=true</item>
+        <!-- Public safety messages for additional language -->
+        <item>0x112D-0x112D:rat=gsm, emergency=true, filter_language=true</item>
+    </string-array>
+    <!-- Channels to receive state/local test messages -->
+    <string-array name="state_local_test_alert_range_strings" translatable="false">
+        <!-- state/local test -->
+        <item>0x112E-0x112E:rat=gsm, emergency=true</item>
+        <!-- state/local test additional language -->
+        <item>0x112F-0x112F:rat=gsm, emergency=true, filter_language=true</item>
+    </string-array>
+</resources>
diff --git a/res/values-mcc311/config.xml b/res/values-mcc311/config.xml
new file mode 120000
index 0000000..0dc8a9d
--- /dev/null
+++ b/res/values-mcc311/config.xml
@@ -0,0 +1 @@
+../values-mcc310/config.xml
\ No newline at end of file
diff --git a/res/values-mcc312/config.xml b/res/values-mcc312/config.xml
new file mode 120000
index 0000000..0dc8a9d
--- /dev/null
+++ b/res/values-mcc312/config.xml
@@ -0,0 +1 @@
+../values-mcc310/config.xml
\ No newline at end of file
diff --git a/res/values-mcc313/config.xml b/res/values-mcc313/config.xml
new file mode 120000
index 0000000..0dc8a9d
--- /dev/null
+++ b/res/values-mcc313/config.xml
@@ -0,0 +1 @@
+../values-mcc310/config.xml
\ No newline at end of file
diff --git a/res/values-mcc314/config.xml b/res/values-mcc314/config.xml
new file mode 120000
index 0000000..0dc8a9d
--- /dev/null
+++ b/res/values-mcc314/config.xml
@@ -0,0 +1 @@
+../values-mcc310/config.xml
\ No newline at end of file
diff --git a/res/values-mcc315/config.xml b/res/values-mcc315/config.xml
new file mode 120000
index 0000000..0dc8a9d
--- /dev/null
+++ b/res/values-mcc315/config.xml
@@ -0,0 +1 @@
+../values-mcc310/config.xml
\ No newline at end of file
diff --git a/res/values-mcc316/config.xml b/res/values-mcc316/config.xml
new file mode 120000
index 0000000..0dc8a9d
--- /dev/null
+++ b/res/values-mcc316/config.xml
@@ -0,0 +1 @@
+../values-mcc310/config.xml
\ No newline at end of file
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc334-mnc03/config.xml
similarity index 62%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc334-mnc03/config.xml
index 369554d..b6f782a 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc334-mnc03/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,11 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
+-->
 
-<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">"Critical emergency alert"</string>
+<resources>
+    <string-array name="additional_cbs_channels_strings" translatable="false">
+        <!-- Channel 50 for area update info -->
+        <item>0x032:type=area, emergency=false</item>
+    </string-array>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc334-mnc030/config.xml
similarity index 62%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc334-mnc030/config.xml
index 369554d..b6f782a 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc334-mnc030/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,11 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
+-->
 
-<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">"Critical emergency alert"</string>
+<resources>
+    <string-array name="additional_cbs_channels_strings" translatable="false">
+        <!-- Channel 50 for area update info -->
+        <item>0x032:type=area, emergency=false</item>
+    </string-array>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-af/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-af/strings.xml
index 369554d..7e9f200 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-af/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Nasionale noodberig"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Waarskuwingsberig"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Toetswaarskuwing"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-am/strings.xml
similarity index 69%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-am/strings.xml
index 369554d..6ffa24b 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-am/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ብሔራዊ የአደጋ ጊዜ ማንቂያ"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"የማስጠንቀቂያ ማንቂያ"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ማንቂያን ፈትሽ"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-ar/strings.xml
similarity index 70%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-ar/strings.xml
index 369554d..dc72ae3 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-ar/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"إنذار طوارئ على المستوى القومي"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"تحذير"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"تنبيه للاختبار"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-az/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-az/strings.xml
index 369554d..cdb6892 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-az/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Yerli həyəcan siqnalı"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Xəbərdarlıq siqnalı"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test siqnalı"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-b+sr+Latn/strings.xml
similarity index 70%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-b+sr+Latn/strings.xml
index 369554d..19f86c4 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-b+sr+Latn/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Obaveštenje o hitnom slučaju na nivou zemlje"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Obaveštenje o upozorenju"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test obaveštenje"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-be/strings.xml
similarity index 66%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-be/strings.xml
index 369554d..fc1319d 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-be/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Дзяржаўная абвестка пра надзвычайную сітуацыю"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Папераджальная абвестка"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Тэставая абвестка"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-bg/strings.xml
similarity index 66%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-bg/strings.xml
index 369554d..d1ee3a0 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-bg/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Сигнал при спешни случаи на национално ниво"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Сигнал за предупреждение"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Тестови сигнал"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-bn/strings.xml
similarity index 65%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-bn/strings.xml
index 369554d..b656afc 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-bn/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"জাতীয় স্তরে জরুরি সতর্কতা"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"সতর্কতা"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"পরীক্ষামূলকভাবে সতর্কতা জারি"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-bs/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-bs/strings.xml
index 369554d..a46bd32 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-bs/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Državno upozorenje za hitan slučaj"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Upozorenje"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testno upozorenje"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-ca/strings.xml
similarity index 71%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-ca/strings.xml
index 369554d..332ac62 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-ca/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerta d\'emergència nacional"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Alerta d\'advertiment"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerta de prova"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-cs/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-cs/strings.xml
index 369554d..2901fd3 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-cs/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Celostátní nouzová výstraha"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Upozornění"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testovací výstraha"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-da/strings.xml
similarity index 73%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-da/strings.xml
index 369554d..4ef0e95 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-da/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"National nødalarm"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Advarselsalarm"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testalarm"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-de/strings.xml
similarity index 73%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-de/strings.xml
index 369554d..168e859 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-de/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Nationale Notfallwarnung"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Warnmeldung"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testwarnung"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-el/strings.xml
similarity index 65%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-el/strings.xml
index 369554d..3319ff7 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-el/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Ειδοποίηση κατάστασης εθνικής έκτακτης ανάγκης"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Ειδοποίηση προειδοποίησης"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Δοκιμαστική ειδοποίηση"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-en-rAU/strings.xml
similarity index 73%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-en-rAU/strings.xml
index 369554d..b66490c 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-en-rAU/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"National emergency alert"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Warning alert"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test alert"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-en-rGB/strings.xml
similarity index 73%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-en-rGB/strings.xml
index 369554d..b66490c 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-en-rGB/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"National emergency alert"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Warning alert"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test alert"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-en-rIN/strings.xml
similarity index 73%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-en-rIN/strings.xml
index 369554d..b66490c 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-en-rIN/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"National emergency alert"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Warning alert"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test alert"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-es-rUS/strings.xml
similarity index 71%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-es-rUS/strings.xml
index 369554d..e8195d5 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-es-rUS/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerta de emergencia nacional"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Alerta de advertencia"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerta de prueba"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-es/strings.xml
similarity index 71%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-es/strings.xml
index 369554d..e8195d5 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-es/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerta de emergencia nacional"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Alerta de advertencia"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerta de prueba"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-et/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-et/strings.xml
index 369554d..ad1dad3 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-et/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Riiklik hädaolukorra märguanne"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Hoiatusmärguanne"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testmärguanne"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-eu/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-eu/strings.xml
index 369554d..5b4a79d 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-eu/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Larrialdi-alerta nazionala"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Abisu-alerta"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Probako alerta"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-fa/strings.xml
similarity index 70%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-fa/strings.xml
index 369554d..c5e2838 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-fa/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"اعلام خطر اضطرای در کشور"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"اعلام خطر"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"اعلام خطر آزمایشی"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-fi/strings.xml
similarity index 73%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-fi/strings.xml
index 369554d..a00bfa1 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-fi/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Kansallinen hätäilmoitus"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Varoitus"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testihälytys"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-fr-rCA/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-fr-rCA/strings.xml
index 369554d..4b50bb7 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-fr-rCA/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerte d\'urgence nationale"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Alerte d\'avertissement"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerte test"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-fr/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-fr/strings.xml
index 369554d..4b50bb7 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-fr/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerte d\'urgence nationale"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Alerte d\'avertissement"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerte test"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-gl/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-gl/strings.xml
index 369554d..6d0379c 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-gl/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerta nacional de emerxencia"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Alerta de advertencia"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerta de proba"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-gu/strings.xml
similarity index 67%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-gu/strings.xml
index 369554d..8af90c5 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-gu/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"રાષ્ટ્રીય કટોકટીની અલર્ટ"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"ચેતવણી અલર્ટ"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"પરીક્ષણ અલર્ટ"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-hi/strings.xml
similarity index 67%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-hi/strings.xml
index 369554d..1d6f1e3 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-hi/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"राष्ट्रीय आपातकालीन अलर्ट"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"चेतावनी अलर्ट"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"टेस्ट अलर्ट"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-hr/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-hr/strings.xml
index 369554d..55d5750 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-hr/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Nacionalno hitno upozorenje"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Upozorenje"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testno upozorenje"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-hu/strings.xml
similarity index 70%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-hu/strings.xml
index 369554d..235f55e 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-hu/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Országos szükségállapotról szóló riasztás"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Figyelmeztető riasztás"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Próbariasztás"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-hy/strings.xml
similarity index 68%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-hy/strings.xml
index 369554d..a6c966b 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-hy/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Արտակարգ իրավիճակի համապետական ահազանգ"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Զգուշացում"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Փորձնական ահազանգ"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-in/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-in/strings.xml
index 369554d..0c4f73b 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-in/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Peringatan darurat nasional"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Peringatan"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Uji peringatan"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-is/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-is/strings.xml
index 369554d..f6cc546 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-is/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Innlend neyðarviðvörun"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Viðvörunartilkynning"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Prufuviðvörun"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-it/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-it/strings.xml
index 369554d..76b3781 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-it/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Avviso d\'emergenza nazionale"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Avviso"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Avviso di prova"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-iw/strings.xml
similarity index 70%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-iw/strings.xml
index 369554d..368c1f6 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-iw/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"התרעה על מקרה חירום לאומי"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"התראת אזהרה"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"התראת בדיקה"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-ja/strings.xml
similarity index 71%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-ja/strings.xml
index 369554d..b97e3c6 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-ja/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"緊急速報メール（国内）"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"警告アラート"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"テストアラート"</string>
 </resources>
diff --git a/res/values-mcc466-or/strings.xml b/res/values-mcc424-ka/strings.xml
similarity index 64%
rename from res/values-mcc466-or/strings.xml
rename to res/values-mcc424-ka/strings.xml
index 91ec1d0..1f63837 100644
--- a/res/values-mcc466-or/strings.xml
+++ b/res/values-mcc424-ka/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="public_safety_message" msgid="4052407641316309322">"ଆଲର୍ଟ ମେସେଜ୍"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ეროვნული საგანგებო გაფრთხილება"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"გამაფრთხილებელი განგაში"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"სატესტო გაფრთხილება"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-kk/strings.xml
similarity index 69%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-kk/strings.xml
index 369554d..93c1526 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-kk/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Елдегі төтенше жағдай туралы ескерту"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Ескерту"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Сынақ ескерту"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-km/strings.xml
similarity index 63%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-km/strings.xml
index 369554d..2c52b30 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-km/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ការ​ជូន​ដំណឹង​ពេល​អាសន្នថ្នាក់ជាតិ"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"ការជូន​ដំណឹងព្រមាន"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ការ​ជូន​ដំណឹងសាកល្បង"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-kn/strings.xml
similarity index 65%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-kn/strings.xml
index 369554d..3006417 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-kn/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ರಾಷ್ಟ್ರೀಯ ತುರ್ತು ಎಚ್ಚರಿಕೆ"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"ಮುನ್ಸೂಚನೆಯ ಎಚ್ಚರಿಕೆ"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ಪರೀಕ್ಷಾ ಎಚ್ಚರಿಕೆ"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-ko/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-ko/strings.xml
index 369554d..880bbb4 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-ko/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"국가 응급 상황 알림"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"경고 알림"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"시험 알림"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-ky/strings.xml
similarity index 66%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-ky/strings.xml
index 369554d..4b18a3e 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-ky/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Өзгөчө кырдаал жөнүндө шашылыш улуттук билдирүү"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Шашылыш кабар"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Сынамык шашылык билдирүү"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-lo/strings.xml
similarity index 65%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-lo/strings.xml
index 369554d..1c25b0a 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-lo/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ການເຕືອນສຸກເສີນລະດັບປະເທດ"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"ຄຳເຕືອນການແຈ້ງເຕືອນ"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ທົດສອບການເຕືອນ"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-lt/strings.xml
similarity index 70%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-lt/strings.xml
index 369554d..3a3e83a 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-lt/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Nacionalinis nepaprastosios padėties įspėjimas"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Įspėjimas"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Bandomasis įspėjimas"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-lv/strings.xml
similarity index 71%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-lv/strings.xml
index 369554d..51a9397 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-lv/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Valsts līmeņa ārkārtas brīdinājums"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Brīdinājuma signāls"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testa brīdinājums"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-mk/strings.xml
similarity index 66%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-mk/strings.xml
index 369554d..84b70d5 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-mk/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Национално предупредување за итни случаи"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Предупредување"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Предупредување за тестирање"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-ml/strings.xml
similarity index 65%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-ml/strings.xml
index 369554d..dfb21e4 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-ml/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ദേശീയ അടിയന്തര അലേർട്ട്"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"മുന്നറിയിപ്പ് അലേർട്ട്"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"പരീക്ഷണ അലേർട്ട്"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-mn/strings.xml
similarity index 66%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-mn/strings.xml
index 369554d..022760d 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-mn/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Онцгой байдлын үндэсний сэрэмжлүүлэг"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Анхааруулах сэрэмжлүүлэг"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Сэрэмжлүүлгийг шалгах"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-mr/strings.xml
similarity index 66%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-mr/strings.xml
index 369554d..5984e97 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-mr/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"राष्ट्रीय आणीबाणीच्या सूचना"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"चेतावणीच्या सूचना"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"चाचणी सूचना"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-ms/strings.xml
similarity index 73%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-ms/strings.xml
index 369554d..957be61 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-ms/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Amaran kecemasan nasional"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Amaran"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Makluman ujian"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-my/strings.xml
similarity index 62%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-my/strings.xml
index 369554d..d2cdaf5 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-my/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"နိုင်ငံတော်နှင့်ဆိုင်သော အရေးပေါ် သတိပေးချက်"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"သတိပေး အချက်ပြမှု"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"စမ်းသပ် သတိပေးချက်"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-nb/strings.xml
similarity index 73%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-nb/strings.xml
index 369554d..0dd0bd3 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-nb/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Nasjonalt nødvarsel"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Advarsel"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testvarsel"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-ne/strings.xml
similarity index 66%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-ne/strings.xml
index 369554d..0faae61 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-ne/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"राष्ट्रिय आपातकालीन अलर्ट"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"चेतावनीको अलर्ट"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"परीक्षण अलर्ट"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-nl/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-nl/strings.xml
index 369554d..62f6f88 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-nl/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Nationale noodmelding"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Waarschuwingsmelding"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testmelding"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-pa/strings.xml
similarity index 67%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-pa/strings.xml
index 369554d..f6674a9 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-pa/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ਕੌਮੀ ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"ਚਿਤਾਵਨੀ ਸੁਚੇਤਨਾ"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ਟੈਸਟ ਸੁਚੇਤਨਾ"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-pl/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-pl/strings.xml
index 369554d..76725f4 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-pl/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alert o zagrożeniu krajowym"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Ostrzeżenie"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alert testowy"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-pt-rPT/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-pt-rPT/strings.xml
index 369554d..d07da47 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-pt-rPT/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerta de emergência nacional"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Alerta de aviso"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerta de teste"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-pt/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-pt/strings.xml
index 369554d..d07da47 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-pt/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerta de emergência nacional"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Alerta de aviso"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerta de teste"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-ro/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-ro/strings.xml
index 369554d..f6e7320 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-ro/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alertă națională de urgență"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Alertă"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alertă de testare"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-ru/strings.xml
similarity index 66%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-ru/strings.xml
index 369554d..faca4e9 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-ru/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Федеральное экстренное оповещение"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Предупреждающее оповещение"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Тестовое оповещение"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-si/strings.xml
similarity index 67%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-si/strings.xml
index 369554d..f8931f7 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-si/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ජාතික හදිසි අවස්ථා ඇඟවීම"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"අනතුරු ඇඟවීම"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"පරීක්ෂණ ඇඟවීම"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-sk/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-sk/strings.xml
index 369554d..b141686 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-sk/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Celoštátne núdzové varovanie"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Varovanie"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testovacie varovanie"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-sl/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-sl/strings.xml
index 369554d..493df69 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-sl/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Državno opozorilo v sili"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Opozorilno obvestilo"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Preskusno opozorilo"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-sq/strings.xml
similarity index 71%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-sq/strings.xml
index 369554d..407a3b2 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-sq/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Sinjalizim urgjence kombëtare"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Sinjalizim paralajmërues"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Sinjalizim testimi"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-sr/strings.xml
similarity index 67%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-sr/strings.xml
index 369554d..517d6a9 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-sr/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Обавештење о хитном случају на нивоу земље"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Обавештење о упозорењу"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Тест обавештење"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-sv/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-sv/strings.xml
index 369554d..a14ba5d 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-sv/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Varning om nationell nödsituation"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Varningsmeddelande"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testvarning"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-sw/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-sw/strings.xml
index 369554d..d163872 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-sw/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Tahadhari kuhusu dharura ya kitaifa"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Tahadhari"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Jaribio la tahadhari"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-ta/strings.xml
similarity index 63%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-ta/strings.xml
index 369554d..a36597a 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-ta/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"தேசிய அளவிலான அவசரக்கால எச்சரிக்கை"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"எச்சரிக்கை விழிப்பூட்டல்"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"சோதனை எச்சரிக்கை"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-te/strings.xml
similarity index 66%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-te/strings.xml
index 369554d..a0176a5 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-te/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"జాతీయ అత్యవసర హెచ్చరిక"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"అప్రమత్త హెచ్చరిక"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"పరీక్ష హెచ్చరిక"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-th/strings.xml
similarity index 66%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-th/strings.xml
index 369554d..a913ba5 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-th/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"การแจ้งเหตุฉุกเฉินระดับชาติ"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"การเตือนภัย"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ทดสอบการแจ้งเหตุ"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-tl/strings.xml
similarity index 71%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-tl/strings.xml
index 369554d..0c0582b 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-tl/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerto para sa pambansang emergency"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Alertong babala"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Pansubok na alerto"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-tr/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-tr/strings.xml
index 369554d..2f882c0 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-tr/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Ulusal acil durum uyarısı"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Uyarı"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test amaçlı uyarı"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-uk/strings.xml
similarity index 68%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-uk/strings.xml
index 369554d..b28a0b3 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-uk/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Екстрене сповіщення для всієї країни"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Застереження"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Тестове сповіщення"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-ur/strings.xml
similarity index 71%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-ur/strings.xml
index 369554d..8ad2000 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-ur/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"قومی ہنگامی الرٹ"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"وارننگ الرٹ"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ٹیسٹ الرٹ"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-uz/strings.xml
similarity index 72%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-uz/strings.xml
index 369554d..73e4c2c 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-uz/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Milliy favqulodda ogohlantirish"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Ogohlantirish"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Sinov ogohlantirishi"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-vi/strings.xml
similarity index 71%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-vi/strings.xml
index 369554d..394e703 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-vi/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Cảnh báo khẩn cấp của quốc gia"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Cảnh báo"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Cảnh báo thử nghiệm"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-zh-rCN/strings.xml
similarity index 73%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-zh-rCN/strings.xml
index 369554d..4f16ead 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-zh-rCN/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"国家紧急警报"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"警报"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"测试警报"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-zh-rHK/strings.xml
similarity index 73%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-zh-rHK/strings.xml
index 369554d..85e116c 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-zh-rHK/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"國家/地區緊急警示"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"警示"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"測試警示"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-zh-rTW/strings.xml
similarity index 73%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-zh-rTW/strings.xml
index 369554d..c3021f1 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-zh-rTW/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"國家/地區緊急警報"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"警報"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"測試警報"</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc424-zu/strings.xml
similarity index 71%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc424-zu/strings.xml
index 369554d..b63f7d4 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc424-zu/strings.xml
@@ -16,5 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Critical emergency alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Isaziso esiphuthumayo sikazwelonke"</string>
+    <string name="cmas_amber_alert" msgid="2410977367530696102">"Isexwayiso sokuxwayisa"</string>
+    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Isixwayiso sokuhlola"</string>
 </resources>
diff --git a/res/values-mcc424/config.xml b/res/values-mcc424/config.xml
new file mode 100644
index 0000000..cd2b1fa
--- /dev/null
+++ b/res/values-mcc424/config.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Whether to enable CMAS settings (United States) -->
+    <!-- No need to show this for United Arab Emirates users -->
+    <bool name="show_cmas_settings">false</bool>
+    <!-- Whether to always sound CBS alerts at full volume -->
+    <!-- By default it's true for United Arab Emirates users -->
+    <bool name="use_full_volume">true</bool>
+</resources>
diff --git a/res/values-mcc424/strings.xml b/res/values-mcc424/strings.xml
new file mode 100644
index 0000000..3d50659
--- /dev/null
+++ b/res/values-mcc424/strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<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">National emergency alert</string>
+
+    <string name="cmas_extreme_alert" translatable="false">@string/emergency_alert</string>
+    <string name="cmas_extreme_immediate_observed_alert" translatable="false">@string/emergency_alert</string>
+    <string name="cmas_extreme_immediate_likely_alert" translatable="false">@string/emergency_alert</string>
+    <string name="cmas_severe_alert" translatable="false">@string/emergency_alert</string>
+    <string name="cmas_amber_alert">Warning alert</string>
+    <string name="cmas_required_monthly_test">Test alert</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-mcc440-mnc50/config.xml b/res/values-mcc440-mnc50/config.xml
index 0db8f82..24f8896 100644
--- a/res/values-mcc440-mnc50/config.xml
+++ b/res/values-mcc440-mnc50/config.xml
@@ -15,8 +15,10 @@
 -->
 
 <resources>
-    <string-array name="additional_cbs_channels_strings" translatable="false">
-        <item>0xAC00:type=test, emergency=true, scope=carrier</item>
-        <item>0x1105-0xAFFF:type=other, emergency=true, scope=carrier</item>
+    <string-array name="etws_alerts_range_strings" translatable="false">
+        <!-- 0x1100 for earthquake -->
+        <item>0x1100:rat=gsm, emergency=true</item>
+        <!-- 0xA003 for other purposes -->
+        <item>0xA003:rat=gsm, type=other, emergency=true, scope=carrier</item>
     </string-array>
 </resources>
diff --git a/res/values-mcc440-mnc51/config.xml b/res/values-mcc440-mnc51/config.xml
index 0db8f82..24f8896 100644
--- a/res/values-mcc440-mnc51/config.xml
+++ b/res/values-mcc440-mnc51/config.xml
@@ -15,8 +15,10 @@
 -->
 
 <resources>
-    <string-array name="additional_cbs_channels_strings" translatable="false">
-        <item>0xAC00:type=test, emergency=true, scope=carrier</item>
-        <item>0x1105-0xAFFF:type=other, emergency=true, scope=carrier</item>
+    <string-array name="etws_alerts_range_strings" translatable="false">
+        <!-- 0x1100 for earthquake -->
+        <item>0x1100:rat=gsm, emergency=true</item>
+        <!-- 0xA003 for other purposes -->
+        <item>0xA003:rat=gsm, type=other, emergency=true, scope=carrier</item>
     </string-array>
 </resources>
diff --git a/res/values-mcc440-mnc52/config.xml b/res/values-mcc440-mnc52/config.xml
index 0db8f82..24f8896 100644
--- a/res/values-mcc440-mnc52/config.xml
+++ b/res/values-mcc440-mnc52/config.xml
@@ -15,8 +15,10 @@
 -->
 
 <resources>
-    <string-array name="additional_cbs_channels_strings" translatable="false">
-        <item>0xAC00:type=test, emergency=true, scope=carrier</item>
-        <item>0x1105-0xAFFF:type=other, emergency=true, scope=carrier</item>
+    <string-array name="etws_alerts_range_strings" translatable="false">
+        <!-- 0x1100 for earthquake -->
+        <item>0x1100:rat=gsm, emergency=true</item>
+        <!-- 0xA003 for other purposes -->
+        <item>0xA003:rat=gsm, type=other, emergency=true, scope=carrier</item>
     </string-array>
 </resources>
diff --git a/res/values-mcc450-as/strings.xml b/res/values-mcc450-as/strings.xml
deleted file mode 100644
index 087a7f1..0000000
--- a/res/values-mcc450-as/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<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>
-</resources>
diff --git a/res/values-mcc450-en-rXC/strings.xml b/res/values-mcc450-en-rXC/strings.xml
deleted file mode 100644
index a4afd98..0000000
--- a/res/values-mcc450-en-rXC/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‏‎‎‏‏‏‎‎Critical emergency alert‎‏‎‎‏‎"</string>
-</resources>
diff --git a/res/values-mcc450-or/strings.xml b/res/values-mcc450-or/strings.xml
deleted file mode 100644
index f62935b..0000000
--- a/res/values-mcc450-or/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<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>
-</resources>
diff --git a/res/values-mcc466-as/strings.xml b/res/values-mcc466-as/strings.xml
deleted file mode 100644
index d196bdd..0000000
--- a/res/values-mcc466-as/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="public_safety_message" msgid="4052407641316309322">"সতৰ্কতা বাৰ্তা"</string>
-</resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc530/config.xml
similarity index 69%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc530/config.xml
index 369554d..38c5bd8 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc530/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2018 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +14,7 @@
      limitations under the License.
  -->
 
-<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">"Critical emergency alert"</string>
+<resources>
+    <bool name="show_date_time_title">true</bool>
+    <bool name="use_full_volume">true</bool>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc530/strings.xml
similarity index 75%
rename from res/values-mcc450-en-rCA/strings.xml
rename to res/values-mcc530/strings.xml
index 369554d..1fcf240 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc530/strings.xml
@@ -15,6 +15,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="6968323372438785870">"Critical emergency alert"</string>
+           xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Special New Zealand requirement for the presidential alert title -->
+    <string name="cmas_presidential_level_alert" translatable="false">@string/emergency_alert</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc704-mnc03/config.xml
similarity index 62%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc704-mnc03/config.xml
index 369554d..b6f782a 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc704-mnc03/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,11 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
+-->
 
-<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">"Critical emergency alert"</string>
+<resources>
+    <string-array name="additional_cbs_channels_strings" translatable="false">
+        <!-- Channel 50 for area update info -->
+        <item>0x032:type=area, emergency=false</item>
+    </string-array>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc706-mnc04/config.xml
similarity index 62%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc706-mnc04/config.xml
index 369554d..b6f782a 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc706-mnc04/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,11 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
+-->
 
-<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">"Critical emergency alert"</string>
+<resources>
+    <string-array name="additional_cbs_channels_strings" translatable="false">
+        <!-- Channel 50 for area update info -->
+        <item>0x032:type=area, emergency=false</item>
+    </string-array>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc712-mnc04/config.xml
similarity index 62%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc712-mnc04/config.xml
index 369554d..b6f782a 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc712-mnc04/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,11 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
+-->
 
-<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">"Critical emergency alert"</string>
+<resources>
+    <string-array name="additional_cbs_channels_strings" translatable="false">
+        <!-- Channel 50 for area update info -->
+        <item>0x032:type=area, emergency=false</item>
+    </string-array>
 </resources>
diff --git a/res/values-mcc716-af/strings.xml b/res/values-mcc716-af/strings.xml
index daa6800..d70b1b2 100644
--- a/res/values-mcc716-af/strings.xml
+++ b/res/values-mcc716-af/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Informatiewe boodskap"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Informatiewe boodskap"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Noodberig: Toetsboodskap"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Noodberig: Oefening-/Simulasieboodskap"</string>
 </resources>
diff --git a/res/values-mcc716-am/strings.xml b/res/values-mcc716-am/strings.xml
index 43bfdc8..383448a 100644
--- a/res/values-mcc716-am/strings.xml
+++ b/res/values-mcc716-am/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"መረጃ ሰጪ መልዕክት"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"መረጃ ሰጪ መልዕክት"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"የአደጋ ጊዜ ማንቂያ፦ የሙከራ መልዕክት"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"የአደጋ ጊዜ ማንቂያ፦ የልምምድ/ማስመሰል መልዕክት"</string>
 </resources>
diff --git a/res/values-mcc716-ar/strings.xml b/res/values-mcc716-ar/strings.xml
index cad27a9..c97a133 100644
--- a/res/values-mcc716-ar/strings.xml
+++ b/res/values-mcc716-ar/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"رسالة إعلامية"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"رسالة إعلامية"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"إنذار الطوارئ: رسالة اختبارية"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"إنذار الطوارئ: رسالة التدريب/المحاكاة"</string>
 </resources>
diff --git a/res/values-mcc716-as/strings.xml b/res/values-mcc716-as/strings.xml
deleted file mode 100644
index c04daf7..0000000
--- a/res/values-mcc716-as/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="public_safety_message" msgid="7237115648380675159">"তথ্যসমৃদ্ধ বাৰ্তা"</string>
-    <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"তথ্যসমৃদ্ধ বাৰ্তা"</string>
-</resources>
diff --git a/res/values-mcc716-az/strings.xml b/res/values-mcc716-az/strings.xml
index 41a533a..0a45f5b 100644
--- a/res/values-mcc716-az/strings.xml
+++ b/res/values-mcc716-az/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"İnformativ mesaj"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"İnformativ mesaj"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Mühüm bildiriş: Test mesajı"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Mühüm bildiriş: Tapşırıq/Simulasiya mesajı"</string>
 </resources>
diff --git a/res/values-mcc716-b+sr+Latn/strings.xml b/res/values-mcc716-b+sr+Latn/strings.xml
index 4d18c5e..378d6db 100644
--- a/res/values-mcc716-b+sr+Latn/strings.xml
+++ b/res/values-mcc716-b+sr+Latn/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Informativna poruka"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Informativna poruka"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Obaveštenje o hitnom slučaju: probna poruka"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Obaveštenje o hitnom slučaju: poruka vežbe/simulacije"</string>
 </resources>
diff --git a/res/values-mcc716-be/strings.xml b/res/values-mcc716-be/strings.xml
index 50bb841..2cccf66 100644
--- a/res/values-mcc716-be/strings.xml
+++ b/res/values-mcc716-be/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Інфармацыйнае паведамленне"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Інфармацыйнае паведамленне"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Абвестка аб надзвычайнай сітуацыі: тэставае паведамленне"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Абвестка аб надзвычайнай сітуацыі: вучэбнае ці імітаванае паведамленне"</string>
 </resources>
diff --git a/res/values-mcc716-bg/strings.xml b/res/values-mcc716-bg/strings.xml
index 9f432ba..61091e4 100644
--- a/res/values-mcc716-bg/strings.xml
+++ b/res/values-mcc716-bg/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Информативно съобщение"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Информативно съобщение"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Сигнал при спешни случаи: Тестово съобщение"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Сигнал при спешни случаи: Съобщение за провеждане на учение/симулация"</string>
 </resources>
diff --git a/res/values-mcc716-bn/strings.xml b/res/values-mcc716-bn/strings.xml
index f4d6437..293374e 100644
--- a/res/values-mcc716-bn/strings.xml
+++ b/res/values-mcc716-bn/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"তথ্যমূলক মেসেজ"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"তথ্যমূলক মেসেজ"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"জরুরি সতর্কতা: পরীক্ষামূলক মেসেজ"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"জরুরি সতর্কতা: Exercise/Simulation মেসেজ"</string>
 </resources>
diff --git a/res/values-mcc716-bs/strings.xml b/res/values-mcc716-bs/strings.xml
index 4d18c5e..61fe226 100644
--- a/res/values-mcc716-bs/strings.xml
+++ b/res/values-mcc716-bs/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Informativna poruka"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Informativna poruka"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Upozorenje za vanredne situacije: testna poruka"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Upozorenje za vanredne situacije: poruka za vježbu/simulaciju"</string>
 </resources>
diff --git a/res/values-mcc716-ca/strings.xml b/res/values-mcc716-ca/strings.xml
index e9d9fa3..9d5785f 100644
--- a/res/values-mcc716-ca/strings.xml
+++ b/res/values-mcc716-ca/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Missatge informatiu"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Missatge informatiu"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alerta d\'emergències: missatge de prova"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Alerta d\'emergències: missatge de simulació o prova"</string>
 </resources>
diff --git a/res/values-mcc716-cs/strings.xml b/res/values-mcc716-cs/strings.xml
index dd23b1d..4faa795 100644
--- a/res/values-mcc716-cs/strings.xml
+++ b/res/values-mcc716-cs/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Informativní zpráva"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Informativní zpráva"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Nouzová výstraha: testovací zpráva"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Nouzová výstraha: cvičná/simulovaná zpráva"</string>
 </resources>
diff --git a/res/values-mcc716-da/strings.xml b/res/values-mcc716-da/strings.xml
index bbb6874..4fc1876 100644
--- a/res/values-mcc716-da/strings.xml
+++ b/res/values-mcc716-da/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Informationsmeddelelse"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Informationsmeddelelse"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Nødalarm: Testmeddelelse"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Nødalarm: Meddelelse om handling/efterligning"</string>
 </resources>
diff --git a/res/values-mcc716-de/strings.xml b/res/values-mcc716-de/strings.xml
index 674896c..61d62a0 100644
--- a/res/values-mcc716-de/strings.xml
+++ b/res/values-mcc716-de/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Öffentliche Sicherheitsinformation"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Öffentliche Sicherheitsinformation"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Notfallbenachrichtigung: Testnachricht"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Notfallbenachrichtigung: Testnachricht"</string>
 </resources>
diff --git a/res/values-mcc716-el/strings.xml b/res/values-mcc716-el/strings.xml
index da64665..08de881 100644
--- a/res/values-mcc716-el/strings.xml
+++ b/res/values-mcc716-el/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Ενημερωτικό μήνυμα"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Ενημερωτικό μήνυμα"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Ειδοποίηση έκτακτης ανάγκης: Δοκιμαστικό μήνυμα"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Ειδοποίηση έκτακτης ανάγκης: Μήνυμα άσκησης/προσομοίωσης"</string>
 </resources>
diff --git a/res/values-mcc716-en-rAU/strings.xml b/res/values-mcc716-en-rAU/strings.xml
index ec02b15..bb83408 100644
--- a/res/values-mcc716-en-rAU/strings.xml
+++ b/res/values-mcc716-en-rAU/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Informative message"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Informative message"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Emergency alert: test message"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Emergency alert: exercise/simulation message"</string>
 </resources>
diff --git a/res/values-mcc716-en-rCA/strings.xml b/res/values-mcc716-en-rCA/strings.xml
deleted file mode 100644
index ec02b15..0000000
--- a/res/values-mcc716-en-rCA/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="public_safety_message" msgid="7237115648380675159">"Informative message"</string>
-    <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Informative message"</string>
-</resources>
diff --git a/res/values-mcc716-en-rGB/strings.xml b/res/values-mcc716-en-rGB/strings.xml
index ec02b15..bb83408 100644
--- a/res/values-mcc716-en-rGB/strings.xml
+++ b/res/values-mcc716-en-rGB/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Informative message"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Informative message"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Emergency alert: test message"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Emergency alert: exercise/simulation message"</string>
 </resources>
diff --git a/res/values-mcc716-en-rIN/strings.xml b/res/values-mcc716-en-rIN/strings.xml
index ec02b15..bb83408 100644
--- a/res/values-mcc716-en-rIN/strings.xml
+++ b/res/values-mcc716-en-rIN/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Informative message"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Informative message"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Emergency alert: test message"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Emergency alert: exercise/simulation message"</string>
 </resources>
diff --git a/res/values-mcc716-en-rXC/strings.xml b/res/values-mcc716-en-rXC/strings.xml
deleted file mode 100644
index a41c364..0000000
--- a/res/values-mcc716-en-rXC/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="public_safety_message" msgid="7237115648380675159">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‏‏‎‏‎‎‏‏‏‎‎‎‎‏‎‎‏‏‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎Informative message‎‏‎‎‏‎"</string>
-    <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎Informative message‎‏‎‎‏‎"</string>
-</resources>
diff --git a/res/values-mcc716-es-rUS/strings.xml b/res/values-mcc716-es-rUS/strings.xml
index ccbe69b..87b0d62 100644
--- a/res/values-mcc716-es-rUS/strings.xml
+++ b/res/values-mcc716-es-rUS/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Mensaje informativo"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Mensaje informativo"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alerta de emergencia: mensaje de prueba"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Alerta de emergencia: mensaje de simulacro/prueba"</string>
 </resources>
diff --git a/res/values-mcc716-es/strings.xml b/res/values-mcc716-es/strings.xml
index ccbe69b..87b0d62 100644
--- a/res/values-mcc716-es/strings.xml
+++ b/res/values-mcc716-es/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Mensaje informativo"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Mensaje informativo"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alerta de emergencia: mensaje de prueba"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Alerta de emergencia: mensaje de simulacro/prueba"</string>
 </resources>
diff --git a/res/values-mcc716-et/strings.xml b/res/values-mcc716-et/strings.xml
index 61113c8..e5d47ca 100644
--- a/res/values-mcc716-et/strings.xml
+++ b/res/values-mcc716-et/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Teavitussõnum"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Teavitussõnum"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Hädaolukorra märguanne: testsõnum"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Hädaolukorra märguanne: proovisõnum/simulatsioon"</string>
 </resources>
diff --git a/res/values-mcc716-eu/strings.xml b/res/values-mcc716-eu/strings.xml
index e4c0671..3005147 100644
--- a/res/values-mcc716-eu/strings.xml
+++ b/res/values-mcc716-eu/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Mezu informatiboa"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Mezu informatiboa"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Larrialdi-alerta: probako mezua"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Larrialdi-alerta: ariketa/simulazio motako mezua"</string>
 </resources>
diff --git a/res/values-mcc716-fa/strings.xml b/res/values-mcc716-fa/strings.xml
index af8cc29..dc81da1 100644
--- a/res/values-mcc716-fa/strings.xml
+++ b/res/values-mcc716-fa/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"پیام آگاهی‌دهنده"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"پیام آگاهی‌دهنده"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"هشدار اضطراری: پیام آزمایشی"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"هشدار آزمایشی: پیام تمرینی/شبیه‌سازی"</string>
 </resources>
diff --git a/res/values-mcc716-fi/strings.xml b/res/values-mcc716-fi/strings.xml
index e62fe6e..d4be694 100644
--- a/res/values-mcc716-fi/strings.xml
+++ b/res/values-mcc716-fi/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Hyödyllinen viesti"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Hyödylliset viestit"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Hätähälytys: koeviesti"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Hätähälytys: harjoitusviesti"</string>
 </resources>
diff --git a/res/values-mcc716-fr-rCA/strings.xml b/res/values-mcc716-fr-rCA/strings.xml
index 79abc96..073c292 100644
--- a/res/values-mcc716-fr-rCA/strings.xml
+++ b/res/values-mcc716-fr-rCA/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Message d\'information"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Message d\'information"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alerte d\'urgence : message test"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Alerte d\'urgence : message de pratique ou simulation"</string>
 </resources>
diff --git a/res/values-mcc716-fr/strings.xml b/res/values-mcc716-fr/strings.xml
index 37b6df8..34f32c7 100644
--- a/res/values-mcc716-fr/strings.xml
+++ b/res/values-mcc716-fr/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Message informatif"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Message informatif"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alerte d\'urgence : message test"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Alerte d\'urgence : message d\'exercice/de simulation"</string>
 </resources>
diff --git a/res/values-mcc716-gl/strings.xml b/res/values-mcc716-gl/strings.xml
index 34c05c6..8a1b220 100644
--- a/res/values-mcc716-gl/strings.xml
+++ b/res/values-mcc716-gl/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Mensaxe informativa"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Mensaxe informativa"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alerta de emerxencia: mensaxe de proba"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Alerta de emerxencia: mensaxe de proba/simulación"</string>
 </resources>
diff --git a/res/values-mcc716-gu/strings.xml b/res/values-mcc716-gu/strings.xml
index 9a9744d..b887384 100644
--- a/res/values-mcc716-gu/strings.xml
+++ b/res/values-mcc716-gu/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"માહિતીપ્રદ સંદેશ"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"માહિતીપ્રદ સંદેશ"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"કટોકટીની ચેતવણી: પરીક્ષણ સંદેશ"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"કટોકટીની ચેતવણી: વ્યાયામ/સિમ્યુલેશન સંદેશ"</string>
 </resources>
diff --git a/res/values-mcc716-hi/strings.xml b/res/values-mcc716-hi/strings.xml
index c98ca3d..d450409 100644
--- a/res/values-mcc716-hi/strings.xml
+++ b/res/values-mcc716-hi/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"जानकारी देने वाला मैसेज"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"जानकारी देने वाला मैसेज"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"आपातकालीन अलर्ट: टेस्ट मैसेज"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"आपातकालीन अलर्ट: कसरत/सिम्युलेशन मैसेज"</string>
 </resources>
diff --git a/res/values-mcc716-hr/strings.xml b/res/values-mcc716-hr/strings.xml
index 4d18c5e..9b20067 100644
--- a/res/values-mcc716-hr/strings.xml
+++ b/res/values-mcc716-hr/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Informativna poruka"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Informativna poruka"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Hitno upozorenje: testna poruka"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Hitno upozorenje: poruka vježbe/simulacije"</string>
 </resources>
diff --git a/res/values-mcc716-hu/strings.xml b/res/values-mcc716-hu/strings.xml
index 16d75a0..d65b467 100644
--- a/res/values-mcc716-hu/strings.xml
+++ b/res/values-mcc716-hu/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Tájékoztató üzenet"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Tájékoztató üzenet"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Vészjelzés: Tesztüzenet"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Vészjelzés: Gyakorló/szimulációs üzenet"</string>
 </resources>
diff --git a/res/values-mcc716-hy/strings.xml b/res/values-mcc716-hy/strings.xml
index 0760478..0629f42 100644
--- a/res/values-mcc716-hy/strings.xml
+++ b/res/values-mcc716-hy/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Տեղեկատվական ծանուցում"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Տեղեկատվական ծանուցում"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Արտակարգ իրավիճակի զգուշացում՝ փորձնական ահազանգ"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Արտակարգ իրավիճակի զգուշացում՝ փորձնական ահազանգ"</string>
 </resources>
diff --git a/res/values-mcc716-in/strings.xml b/res/values-mcc716-in/strings.xml
index 9d2684f..9cd39bf 100644
--- a/res/values-mcc716-in/strings.xml
+++ b/res/values-mcc716-in/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Pesan informatif"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Pesan informatif"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Peringatan darurat: Pesan percobaan"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Peringatan darurat: pesan Latihan/Simulasi"</string>
 </resources>
diff --git a/res/values-mcc716-is/strings.xml b/res/values-mcc716-is/strings.xml
index 7d13587..35e9669 100644
--- a/res/values-mcc716-is/strings.xml
+++ b/res/values-mcc716-is/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Almannatilkynningar"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Almannatilkynningar"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Neyðarviðvörun: Prufuskilaboð"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Neyðarviðvörun: Æfingar- eða stælingarskilaboð"</string>
 </resources>
diff --git a/res/values-mcc716-it/strings.xml b/res/values-mcc716-it/strings.xml
index 6daf07c..e191f6c 100644
--- a/res/values-mcc716-it/strings.xml
+++ b/res/values-mcc716-it/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Messaggio informativo"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Messaggio informativo"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Avvisi d\'emergenza: messaggio di prova"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Avvisi d\'emergenza: messaggio di esercitazione/simulazione"</string>
 </resources>
diff --git a/res/values-mcc716-iw/strings.xml b/res/values-mcc716-iw/strings.xml
index 4c22549..841b1da 100644
--- a/res/values-mcc716-iw/strings.xml
+++ b/res/values-mcc716-iw/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"מידע לציבור"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"מידע לציבור"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"התרעה על מקרי חירום: הודעת בדיקה"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"התרעה על מקרי חירום: הודעת הדמיה/תרגיל"</string>
 </resources>
diff --git a/res/values-mcc716-ja/strings.xml b/res/values-mcc716-ja/strings.xml
index 4c70d69..d61410d 100644
--- a/res/values-mcc716-ja/strings.xml
+++ b/res/values-mcc716-ja/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"災害情報メッセージ"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"災害情報メッセージ"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"緊急速報メール: テスト メッセージ"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"緊急速報メール: 訓練用メッセージ"</string>
 </resources>
diff --git a/res/values-mcc716-ka/strings.xml b/res/values-mcc716-ka/strings.xml
index 5a217a6..a58a99b 100644
--- a/res/values-mcc716-ka/strings.xml
+++ b/res/values-mcc716-ka/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"მაინფორმირებელი შეტყობინება"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"მაინფორმირებელი შეტყობინება"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"გაფრთხილება საგანგებო ვითარების შესახებ: სატესტო შეტყობინება"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"გაფრთხილება საგანგებო ვითარების შესახებ: სავარჯიშო/სიმულაციური შეტყობინება"</string>
 </resources>
diff --git a/res/values-mcc716-kk/strings.xml b/res/values-mcc716-kk/strings.xml
index 62a5c9f..230c54c 100644
--- a/res/values-mcc716-kk/strings.xml
+++ b/res/values-mcc716-kk/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Ақпараттық хабар"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Ақпараттық хабар"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Төтенше жағдай туралы ескерту: тексеру хабары"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Төтенше жағдай туралы ескерту: жаттығу/симуляциялық хабар"</string>
 </resources>
diff --git a/res/values-mcc716-km/strings.xml b/res/values-mcc716-km/strings.xml
index 484b398..b5fc00b 100644
--- a/res/values-mcc716-km/strings.xml
+++ b/res/values-mcc716-km/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"សារ​ដែលផ្តល់ព័ត៌មាន​ជាប្រយោជន៍"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"សារ​ដែលផ្តល់ព័ត៌មាន​ជាប្រយោជន៍"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"ការ​ជូន​ដំណឹង​ពេល​អាសន្ន៖ សារសាកល្បង"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"ការ​ជូន​ដំណឹង​ពេល​អាសន្ន៖ សារនៃការអនុវត្ត​ត្រាប់តាម/ការហ្វឹកហាត់"</string>
 </resources>
diff --git a/res/values-mcc716-kn/strings.xml b/res/values-mcc716-kn/strings.xml
index dbe2d86..fc10f50 100644
--- a/res/values-mcc716-kn/strings.xml
+++ b/res/values-mcc716-kn/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"ಮಾಹಿತಿಯುಕ್ತ ಸಂದೇಶ"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"ಮಾಹಿತಿಯುಕ್ತ ಸಂದೇಶ"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"ತುರ್ತು ಎಚ್ಚರಿಕೆ: ಪರಿಕ್ಷಾ ಸಂದೇಶ"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"ತುರ್ತು ಎಚ್ಚರಿಕೆ: ವ್ಯಾಯಾಮ/ಅನುಕರಣೆಯ ಸಂದೇಶ"</string>
 </resources>
diff --git a/res/values-mcc716-ko/strings.xml b/res/values-mcc716-ko/strings.xml
index aa1e5f0..7505af9 100644
--- a/res/values-mcc716-ko/strings.xml
+++ b/res/values-mcc716-ko/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"정보 메시지"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"정보 메시지"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"비상사태 경고: 테스트 메시지"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"비상사태 경고: 운동/시뮬레이션 메시지"</string>
 </resources>
diff --git a/res/values-mcc716-ky/strings.xml b/res/values-mcc716-ky/strings.xml
index d55ffc8..6fcbca0 100644
--- a/res/values-mcc716-ky/strings.xml
+++ b/res/values-mcc716-ky/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Маалыматтык билдирүү"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Маалыматтык билдирүү"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Өзгөчө кырдаал жөнүндө шашылыш билдирүү: Сынамык билдирүү"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Өзгөчө кырдаал жөнүндө шашылыш билдирүү: Окуу жана үйрөнүү үчүн билдирүү"</string>
 </resources>
diff --git a/res/values-mcc716-lo/strings.xml b/res/values-mcc716-lo/strings.xml
index b00e60a..8efd8bf 100644
--- a/res/values-mcc716-lo/strings.xml
+++ b/res/values-mcc716-lo/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"ຂໍ້ຄວາມທີ່ເປັນຂໍ້ມູນ"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"ຂໍ້ຄວາມທີ່ເປັນຂໍ້ມູນ"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"ການເຕືອນສຸກເສີນ: ຂໍ້ຄວາມທົດສອບ"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"ການເຕືອນສຸກເສີນ: ຂໍ້ຄວາມເຝິກແອບ/ຈຳລອງ"</string>
 </resources>
diff --git a/res/values-mcc716-lt/strings.xml b/res/values-mcc716-lt/strings.xml
index 2816da6..a85ac0a 100644
--- a/res/values-mcc716-lt/strings.xml
+++ b/res/values-mcc716-lt/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Informacinis pranešimas"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Informacinis pranešimas"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Nepaprastosios padėties įspėjimas: bandomasis pranešimas"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Nepaprastosios padėties įspėjimas: mokymų / simuliacinis pranešimas"</string>
 </resources>
diff --git a/res/values-mcc716-lv/strings.xml b/res/values-mcc716-lv/strings.xml
index 1259451..2a7d1c4 100644
--- a/res/values-mcc716-lv/strings.xml
+++ b/res/values-mcc716-lv/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Informatīvs ziņojums"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Informatīvs ziņojums"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Ārkārtas situācijas brīdinājums: pārbaudes ziņojums"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Ārkārtas situācijas brīdinājums: vingrinājuma/simulācijas ziņojums"</string>
 </resources>
diff --git a/res/values-mcc716-mk/strings.xml b/res/values-mcc716-mk/strings.xml
index aa34dcb..708437f 100644
--- a/res/values-mcc716-mk/strings.xml
+++ b/res/values-mcc716-mk/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Информативна порака"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Информативна порака"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Предупредување за итни случаи: тест порака"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Предупредување за итни случаи: порака за вежба/симулација"</string>
 </resources>
diff --git a/res/values-mcc716-ml/strings.xml b/res/values-mcc716-ml/strings.xml
index db5e937..fbc8200 100644
--- a/res/values-mcc716-ml/strings.xml
+++ b/res/values-mcc716-ml/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"അറിവ് നൽകുന്ന സന്ദേശം"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"അറിവ് നൽകുന്ന സന്ദേശം"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"അടിയന്തര മുന്നറിയിപ്പ്: പരീക്ഷണ സന്ദേശം"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"അടിയന്തര മുന്നറിയിപ്പ്: പരിശീലന/അനുകരണ സന്ദേശം"</string>
 </resources>
diff --git a/res/values-mcc716-mn/strings.xml b/res/values-mcc716-mn/strings.xml
index db1fdd2..5ab43e1 100644
--- a/res/values-mcc716-mn/strings.xml
+++ b/res/values-mcc716-mn/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Мэдээллийн зурвас"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Мэдээллийн зурвас"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Яаралтай сэрэмжлүүлэг: Туршилтын мессеж"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Яаралтай сэрэмжлүүлэг: Дасгал/Загварчилсан мессеж"</string>
 </resources>
diff --git a/res/values-mcc716-mr/strings.xml b/res/values-mcc716-mr/strings.xml
index 8bec160..de92611 100644
--- a/res/values-mcc716-mr/strings.xml
+++ b/res/values-mcc716-mr/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"माहितीपूर्ण मेसेज"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"माहितीपूर्ण मेसेज"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"आणीबाणी सूचना: चाचणी मेसेज"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"आणीबाणी सूचना: व्यायाम/सिम्युलेशन मेसेज"</string>
 </resources>
diff --git a/res/values-mcc716-ms/strings.xml b/res/values-mcc716-ms/strings.xml
index e5f0741..80932d1 100644
--- a/res/values-mcc716-ms/strings.xml
+++ b/res/values-mcc716-ms/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Mesej bermaklumat"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Mesej bermaklumat"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Makluman kecemasan: Mesej ujian"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Makluman kecemasan: Mesej latihan/simulasi"</string>
 </resources>
diff --git a/res/values-mcc716-my/strings.xml b/res/values-mcc716-my/strings.xml
index 9800404..8971cc4 100644
--- a/res/values-mcc716-my/strings.xml
+++ b/res/values-mcc716-my/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"အချက်အလက်စုံသည့် မက်ဆေ့ဂျ်"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"အချက်အလက်စုံသည့် မက်ဆေ့ဂျ်"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"အရေးပေါ် သတိပေးချက်− စမ်းသပ်မက်ဆေ့ဂျ်"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"အရေးပေါ် သတိပေးချက်− လေ့ကျင့်ခန်း/သရုပ်သကန်ဖန်တီးခြင်း မက်ဆေ့ဂျ်"</string>
 </resources>
diff --git a/res/values-mcc716-nb/strings.xml b/res/values-mcc716-nb/strings.xml
index ab00a6f..fefb2ee 100644
--- a/res/values-mcc716-nb/strings.xml
+++ b/res/values-mcc716-nb/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Informativ melding"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Informativ melding"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Nødvarsel: testmelding"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Nødvarsel: øvelses-/simuleringsmelding"</string>
 </resources>
diff --git a/res/values-mcc716-ne/strings.xml b/res/values-mcc716-ne/strings.xml
index 8689dd0..c3beba7 100644
--- a/res/values-mcc716-ne/strings.xml
+++ b/res/values-mcc716-ne/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"सूचनामूलक सन्देश"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"सूचनामूलक सन्देश"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"आपत्कालीन सतर्कता: परीक्षण सन्देश"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"आपत्कालीन सतर्कता: अभ्यास/सिमुलेसन सन्देश"</string>
 </resources>
diff --git a/res/values-mcc716-nl/strings.xml b/res/values-mcc716-nl/strings.xml
index 079285d..b070e5e 100644
--- a/res/values-mcc716-nl/strings.xml
+++ b/res/values-mcc716-nl/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Openbaar informatiebericht"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Openbaar informatiebericht"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Noodmelding: testbericht"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Noodmelding: bericht over oefening/simulatie"</string>
 </resources>
diff --git a/res/values-mcc716-or/strings.xml b/res/values-mcc716-or/strings.xml
deleted file mode 100644
index 7e45eb9..0000000
--- a/res/values-mcc716-or/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="public_safety_message" msgid="7237115648380675159">"ଶିକ୍ଷାପ୍ରଦ ମେସେଜ୍"</string>
-    <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"ଶିକ୍ଷାପ୍ରଦ ମେସେଜ୍"</string>
-</resources>
diff --git a/res/values-mcc716-pa/strings.xml b/res/values-mcc716-pa/strings.xml
index e92a468..ec5f5c5 100644
--- a/res/values-mcc716-pa/strings.xml
+++ b/res/values-mcc716-pa/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"ਜਾਣਕਾਰੀ ਭਰਪੂਰ ਸੁਨੇਹਾ"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"ਜਾਣਕਾਰੀ ਭਰਪੂਰ ਸੁਨੇਹਾ"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"ਸੰਕਟਕਾਲੀਨ ਚਿਤਾਵਨੀ: ਟੈਸਟ ਸੁਨੇਹਾ"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"ਸੰਕਟਕਾਲੀਨ ਚਿਤਾਵਨੀ: ਕਸਰਤ ਜਾਂ ਸਿਮੂਲੇਸ਼ਨ ਸੁਨੇਹਾ"</string>
 </resources>
diff --git a/res/values-mcc716-pl/strings.xml b/res/values-mcc716-pl/strings.xml
index 248f70e..effe1f55b 100644
--- a/res/values-mcc716-pl/strings.xml
+++ b/res/values-mcc716-pl/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Wiadomość informacyjna"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Wiadomość informacyjna"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alert o zagrożeniu: wiadomość testowa"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Alert o zagrożeniu: komunikat o ćwiczeniach/symulacji"</string>
 </resources>
diff --git a/res/values-mcc716-pt-rPT/strings.xml b/res/values-mcc716-pt-rPT/strings.xml
index 276dc89..3998282 100644
--- a/res/values-mcc716-pt-rPT/strings.xml
+++ b/res/values-mcc716-pt-rPT/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Mensagem informativa"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Mensagem informativa"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alerta de emergência: mensagem de teste"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Alerta de emergência: mensagem de simulação/exercício"</string>
 </resources>
diff --git a/res/values-mcc716-pt/strings.xml b/res/values-mcc716-pt/strings.xml
index 276dc89..448e616 100644
--- a/res/values-mcc716-pt/strings.xml
+++ b/res/values-mcc716-pt/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Mensagem informativa"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Mensagem informativa"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alerta de emergência: mensagem de teste"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Alerta de emergência: mensagem de exercício/simulação"</string>
 </resources>
diff --git a/res/values-mcc716-ro/strings.xml b/res/values-mcc716-ro/strings.xml
index c09deac..22c63f8 100644
--- a/res/values-mcc716-ro/strings.xml
+++ b/res/values-mcc716-ro/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Mesaj informativ"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Mesaj informativ"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alertă de urgență: mesaj de testare"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Alertă de urgență: mesaj de exercițiu/simulare"</string>
 </resources>
diff --git a/res/values-mcc716-ru/strings.xml b/res/values-mcc716-ru/strings.xml
index 8296caa..a9413e2 100644
--- a/res/values-mcc716-ru/strings.xml
+++ b/res/values-mcc716-ru/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Информационное сообщение"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Информационное сообщение"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Тестовое оповещение о чрезвычайных ситуациях"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Оповещение об учебной тревоге"</string>
 </resources>
diff --git a/res/values-mcc716-si/strings.xml b/res/values-mcc716-si/strings.xml
index f51b750..b767a36 100644
--- a/res/values-mcc716-si/strings.xml
+++ b/res/values-mcc716-si/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"තොරතුරුමය පණිවිඩය"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"තොරතුරුමය පණිවිඩය"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"හදිසි අනතුරු ඇඟවීම: පරීක්ෂණ පණිවිඩය"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"හදිසි අනතුරු ඇඟවීම: අභ්‍යාස/අනුකාරක පණිවුඩය"</string>
 </resources>
diff --git a/res/values-mcc716-sk/strings.xml b/res/values-mcc716-sk/strings.xml
index fd8d311..9a1791e 100644
--- a/res/values-mcc716-sk/strings.xml
+++ b/res/values-mcc716-sk/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Informatívna správa"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Informatívna správa"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Tiesňové upozornenie: testovacia správa"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Tiesňové upozornenie: cvičná/simulovaná správa"</string>
 </resources>
diff --git a/res/values-mcc716-sl/strings.xml b/res/values-mcc716-sl/strings.xml
index e42f0ef..986ebda 100644
--- a/res/values-mcc716-sl/strings.xml
+++ b/res/values-mcc716-sl/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Informativno sporočilo"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Informativno sporočilo"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Opozorilo v sili: preskusno sporočilo"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Opozorilo v sili: sporočilo za vajo/simulacijo"</string>
 </resources>
diff --git a/res/values-mcc716-sq/strings.xml b/res/values-mcc716-sq/strings.xml
index d19ab96..c4af199 100644
--- a/res/values-mcc716-sq/strings.xml
+++ b/res/values-mcc716-sq/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Mesazh informues"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Mesazh informues"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alarmi i urgjencës: Mesazhi i testimit"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Alarmi i urgjencës: Mesazhi i ushtrimit/simulimit"</string>
 </resources>
diff --git a/res/values-mcc716-sr/strings.xml b/res/values-mcc716-sr/strings.xml
index d365139..fe0ae89 100644
--- a/res/values-mcc716-sr/strings.xml
+++ b/res/values-mcc716-sr/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Информативна порука"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Информативна порука"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Обавештење о хитном случају: пробна порука"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Обавештење о хитном случају: порука вежбе/симулације"</string>
 </resources>
diff --git a/res/values-mcc716-sv/strings.xml b/res/values-mcc716-sv/strings.xml
index 523e860..125ab4b 100644
--- a/res/values-mcc716-sv/strings.xml
+++ b/res/values-mcc716-sv/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Informationsmeddelande"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Informationsmeddelande"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Varning om nödsituation: testmeddelande"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Varning om nödsituation: övnings-/simuleringsmeddelande"</string>
 </resources>
diff --git a/res/values-mcc716-sw/strings.xml b/res/values-mcc716-sw/strings.xml
index 75798e3..7a86f86 100644
--- a/res/values-mcc716-sw/strings.xml
+++ b/res/values-mcc716-sw/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Ujumbe muhimu"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Ujumbe muhimu"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Arifa ya dharura: Ujumbe wa jaribio"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Arifa ya dharura: Ujumbe wa Mazoezi au Uigaji"</string>
 </resources>
diff --git a/res/values-mcc716-ta/strings.xml b/res/values-mcc716-ta/strings.xml
index 8daf431..e36d495 100644
--- a/res/values-mcc716-ta/strings.xml
+++ b/res/values-mcc716-ta/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"முக்கியத் தகவல்"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"முக்கியத் தகவல்"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"அவசரக்கால எச்சரிக்கை: சோதனை மெசேஜ்"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"அவசரக்கால எச்சரிக்கை: நடவடிக்கை/சிமுலேஷன் மெசேஜ்"</string>
 </resources>
diff --git a/res/values-mcc716-te/strings.xml b/res/values-mcc716-te/strings.xml
index 67d252c..42f86c2 100644
--- a/res/values-mcc716-te/strings.xml
+++ b/res/values-mcc716-te/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"సమాచారాత్మక సందేశం"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"సమాచారాత్మక సందేశం"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"అత్యవసర హెచ్చరిక: పరీక్ష సందేశం"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"అత్యవసర హెచ్చరిక: అభ్యాస/నమూనా సందేశం"</string>
 </resources>
diff --git a/res/values-mcc716-th/strings.xml b/res/values-mcc716-th/strings.xml
index 0067574..5da93a2 100644
--- a/res/values-mcc716-th/strings.xml
+++ b/res/values-mcc716-th/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"ข้อความที่เป็นประโยชน์"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"ข้อความที่เป็นประโยชน์"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"การแจ้งเตือนฉุกเฉิน: ข้อความทดสอบ"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"การแจ้งเตือนฉุกเฉิน: ข้อความฝึกฝน/จำลอง"</string>
 </resources>
diff --git a/res/values-mcc716-tl/strings.xml b/res/values-mcc716-tl/strings.xml
index f5021f6..143710a 100644
--- a/res/values-mcc716-tl/strings.xml
+++ b/res/values-mcc716-tl/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Nakapagbibigay-impormasyong mensahe"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Nakapagbibigay-impormasyong mensahe"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Pang-emergency na alerto: Pansubok na mensahe"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Pang-emergency na alerto: Mensahe para pagsasanay/simulation"</string>
 </resources>
diff --git a/res/values-mcc716-tr/strings.xml b/res/values-mcc716-tr/strings.xml
index b095e5e..a17dcbb 100644
--- a/res/values-mcc716-tr/strings.xml
+++ b/res/values-mcc716-tr/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Bilgilendirici mesaj"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Bilgilendirici mesaj"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Acil durum uyarısı: Test mesajı"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Acil durum uyarısı: Egzersiz/Simülasyon mesajı"</string>
 </resources>
diff --git a/res/values-mcc716-uk/strings.xml b/res/values-mcc716-uk/strings.xml
index a07f638..8d259a9 100644
--- a/res/values-mcc716-uk/strings.xml
+++ b/res/values-mcc716-uk/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Інформативне повідомлення"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Інформативне повідомлення"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Сповіщення про надзвичайну ситуацію: тестове повідомлення"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Сповіщення про надзвичайну ситуацію: тренувальне/симуляційне повідомлення"</string>
 </resources>
diff --git a/res/values-mcc716-ur/strings.xml b/res/values-mcc716-ur/strings.xml
index b5fba28..061d146 100644
--- a/res/values-mcc716-ur/strings.xml
+++ b/res/values-mcc716-ur/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"معلوماتی پیغام"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"معلوماتی پیغام"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"ہنگامی الرٹ: ٹیسٹ پیغام"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"ہنگامی الرٹ: مشق/سیمولیشن پیغام"</string>
 </resources>
diff --git a/res/values-mcc716-uz/strings.xml b/res/values-mcc716-uz/strings.xml
index 9218db3..19895ec 100644
--- a/res/values-mcc716-uz/strings.xml
+++ b/res/values-mcc716-uz/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Axborotli xabar"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Axborotli xabar"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Favqulodda ogohlantiruv: sinov xabari"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"O‘quv-ogohlantiruv haqida xabar"</string>
 </resources>
diff --git a/res/values-mcc716-vi/strings.xml b/res/values-mcc716-vi/strings.xml
index 0b355d8..55996b1 100644
--- a/res/values-mcc716-vi/strings.xml
+++ b/res/values-mcc716-vi/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Thư thông báo"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Thư thông báo"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Cảnh báo khẩn cấp: Tin nhắn thử nghiệm"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Cảnh báo khẩn cấp: Tin nhắn diễn tập/mô phỏng"</string>
 </resources>
diff --git a/res/values-mcc716-zh-rCN/strings.xml b/res/values-mcc716-zh-rCN/strings.xml
index 75f9ce8..12ee266 100644
--- a/res/values-mcc716-zh-rCN/strings.xml
+++ b/res/values-mcc716-zh-rCN/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"有用的消息"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"有用的消息"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"紧急警报：测试消息"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"紧急警报：演习/模拟消息"</string>
 </resources>
diff --git a/res/values-mcc716-zh-rHK/strings.xml b/res/values-mcc716-zh-rHK/strings.xml
index a1ce810..7f4e481 100644
--- a/res/values-mcc716-zh-rHK/strings.xml
+++ b/res/values-mcc716-zh-rHK/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"資訊型訊息"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"資訊型訊息"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"緊急警示：測試訊息"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"緊急警示：練習/模擬訊息"</string>
 </resources>
diff --git a/res/values-mcc716-zh-rTW/strings.xml b/res/values-mcc716-zh-rTW/strings.xml
index a1ce810..187e71b 100644
--- a/res/values-mcc716-zh-rTW/strings.xml
+++ b/res/values-mcc716-zh-rTW/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"資訊型訊息"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"資訊型訊息"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"緊急警報：測試訊息"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"緊急警報：演習/模擬訊息"</string>
 </resources>
diff --git a/res/values-mcc716-zu/strings.xml b/res/values-mcc716-zu/strings.xml
index ca78f78..42ac915 100644
--- a/res/values-mcc716-zu/strings.xml
+++ b/res/values-mcc716-zu/strings.xml
@@ -18,4 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Umlayezo owazisayo"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Umlayezo owazisayo"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Isexwayiso esiphuthumayo: Umlayezo wokuhlolwa"</string>
+    <string name="cmas_exercise_alert" msgid="996644454768618214">"Isexwayiso esiphuthumayo: Umlayezo wokujima/Owokulingisa"</string>
 </resources>
diff --git a/res/values-mcc716/config.xml b/res/values-mcc716/config.xml
index 714437f..8b23083 100644
--- a/res/values-mcc716/config.xml
+++ b/res/values-mcc716/config.xml
@@ -19,11 +19,10 @@
     <!-- No need to show this for Peru users -->
     <bool name="show_cmas_settings">false</bool>
 
-    <!-- 4370, 4383, 50, 919 -->
+    <!-- 4370, 4383, 919 -->
     <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
         <item>0x1112:rat=gsm, emergency=true</item>
         <item>0x111F:rat=gsm, emergency=true</item>
-        <item>0x32:rat=gsm, emergency=true</item>
         <item>0x397:rat=gsm, emergency=true</item>
     </string-array>
 
@@ -43,9 +42,10 @@
         <item>0x111D:rat=gsm, emergency=true</item>
     </string-array>
 
-    <!-- 4396~4399 -->
+    <!-- 4396~4399, 50 -->
     <string-array name="additional_cbs_channels_strings" translatable="false">
-        <item>0x112C-0x112F:rat:gsm, emergency=true</item>
+        <item>0x112C-0x112F:rat=gsm, emergency=true</item>
+        <item>0x032:type=area, emergency=false</item>
     </string-array>
 
     <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false"></string-array>
diff --git a/res/values-mcc716/strings.xml b/res/values-mcc716/strings.xml
index 0958649..0fe5f10 100644
--- a/res/values-mcc716/strings.xml
+++ b/res/values-mcc716/strings.xml
@@ -24,4 +24,8 @@
     <string name="enable_public_safety_messages_title">Informative message</string>
     <!-- Preference summary for enable public safety messages checkbox. -->
     <string name="enable_public_safety_messages_summary" translatable="false"></string>
+
+    <string name="cmas_presidential_level_alert" translatable="false">@string/emergency_alert</string>
+    <string name="cmas_required_monthly_test">Emergency alert: Test message</string>
+    <string name="cmas_exercise_alert">Emergency alert: Exercise/Simulation message</string>
 </resources>
\ No newline at end of file
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc722-mnc07/config.xml
similarity index 62%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc722-mnc07/config.xml
index 369554d..b6f782a 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc722-mnc07/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,11 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
+-->
 
-<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">"Critical emergency alert"</string>
+<resources>
+    <string-array name="additional_cbs_channels_strings" translatable="false">
+        <!-- Channel 50 for area update info -->
+        <item>0x032:type=area, emergency=false</item>
+    </string-array>
 </resources>
diff --git a/res/values-mcc730/config.xml b/res/values-mcc730/config.xml
index 47c3a7b..1623df1 100644
--- a/res/values-mcc730/config.xml
+++ b/res/values-mcc730/config.xml
@@ -21,7 +21,7 @@
 
     <string-array name="public_safety_messages_channels_range_strings" translatable="false">
         <!-- Channel 919 and 921 are required by Chile -->
-        <item>0x0397:type=other, emergency=false</item>
+        <item>0x0397:type=other, emergency=true</item>
         <item>0x0399:type=other, emergency=false</item>
     </string-array>
 
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc732-mnc123/config.xml
similarity index 62%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc732-mnc123/config.xml
index 369554d..b6f782a 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc732-mnc123/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,11 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
+-->
 
-<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">"Critical emergency alert"</string>
+<resources>
+    <string-array name="additional_cbs_channels_strings" translatable="false">
+        <!-- Channel 50 for area update info -->
+        <item>0x032:type=area, emergency=false</item>
+    </string-array>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc740-mnc00/config.xml
similarity index 62%
copy from res/values-mcc450-en-rCA/strings.xml
copy to res/values-mcc740-mnc00/config.xml
index 369554d..b6f782a 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc740-mnc00/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,9 +12,11 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
+-->
 
-<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">"Critical emergency alert"</string>
+<resources>
+    <string-array name="additional_cbs_channels_strings" translatable="false">
+        <!-- Channel 50 for area update info -->
+        <item>0x032:type=area, emergency=false</item>
+    </string-array>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 6bef983..b10fa6b 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Предупредување за итни случаи (оператор)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Пораки за емитување"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Порака за јавна безбедност"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Државен/локален тест"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Предупредувања за итни случаи"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Предупредувања"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Пораки за емитување"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Задолжително месечно тестирање"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 4d82d31..17d269c 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"അടിയന്തര അലേർട്ട് (ഓപ്പറേറ്റർ)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"പ്രക്ഷേപണ സന്ദേശങ്ങൾ"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"പൊതു സുരക്ഷാ സന്ദേശം"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"സംസ്ഥാന/പ്രാദേശിക പരീക്ഷണ മുന്നറിയിപ്പുകൾ"</string>
     <string name="emergency_alert" msgid="624783871477634263">"അടിയന്തര മുന്നറിയിപ്പ്"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"അലേർട്ടുകൾ"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"പ്രക്ഷേപണ സന്ദേശങ്ങൾ"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"പ്രതിമാസ പരിശോധന ആവശ്യമാണ്"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 28796d0..9731ec2 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Онцгой байдлын сэрэмжлүүлэг (оператор)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Зурвас дамжуулах"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Нийтийн аюулгүй байдлын мессеж"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Муж/Орон нутгийн туршилт"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Онцгой байдлын сэрэмжлүүлэг"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Дохио"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Зурвас дамжуулах"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Сар тутмын туршилт шаардлагатай"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index c53392a..7923fd9 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"आणीबाणी सूचना (ऑपरेटर)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"प्रसारण केलेले मेसेज"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"सार्वजनिक सुरक्षितता मेसेज"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"राज्य/स्थानिक चाचणी"</string>
     <string name="emergency_alert" msgid="624783871477634263">"आणीबाणीच्या सूचना"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"सूचना"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"प्रसारण मेसेज"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"आवश्यक मासिक चाचणी"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index ef45e31..c2c098b 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Isyarat kecemasan (pengendali)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Mesej siaran"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Mesej keselamatan awam"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Ujian negeri/setempat"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Amaran kecemasan"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Makluman"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mesej siaran"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Beri amaran tentang ancaman keselamatan hampir"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Mesej keselamatan awam"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Tindakan yang disyorkan untuk menyelamatkan nyawa atau harta"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Ujian negeri dan setempat"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Terima mesej teks daripada pihak berkuasa negeri dan setempat"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Makluman kecemasan"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Beri amaran tentang peristiwa yang mengancam nyawa"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Ujian bulanan diperlukan"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index efed665..04ea56a 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"အရေးပေါ် သတိပေးချက် (အော်ပရေတာ)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"မက်ဆေ့ဂျ်များ ထုတ်လွှင့်ခြင်း"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"လူထုလုံခြုံရေးဆိုင်ရာ မက်ဆေ့ဂျ်"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"ပြည်နယ်/ဒေသတွင်း စမ်းသပ်မှု"</string>
     <string name="emergency_alert" msgid="624783871477634263">"အရေးပေါ် သတိပေးချက်များ"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"သတိပေးချက်များ"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"မက်ဆေ့ဂျ်များ ထုတ်လွှင့်ခြင်း"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"လစဉ်စစ်ဆေးမှု လိုအပ်သည်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 33bdbdd..f86ee22 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Nødvarsel (operatør)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Kringkastingsmeldinger"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Offentlig sikkerhetsmelding"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Statlig/lokal test"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Nødvarsel"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Varsler"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Kringkastingsmeldinger"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Advar om umiddelbare sikkerhetstrusler"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Offentlige sikkerhetsmeldinger"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Anbefalte handlinger som kan redde liv eller eiendom"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Statlige og lokale tester"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Motta testmeldinger fra statlige og lokale myndigheter"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Nødvarsler"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Advar om livstruende hendelser"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Obligatorisk månedlig test"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 95878c6..2018582 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"आपतकालीन सतर्कता (अपरेटर)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"प्रसारण गर्ने सन्देशहरू"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"सार्वजनिक सुरक्षासम्बन्धी सन्देश"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"राज्यस्तरीय/स्थानीय परीक्षण"</string>
     <string name="emergency_alert" msgid="624783871477634263">"आपतकालीन सतर्कता"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"अलर्टहरू"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"प्रसारण गर्ने सन्देशहरू"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"मासिक परीक्षण आवश्यक छ"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index dd354e5..2b501cc 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Noodmelding (provider)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Cell broadcasts"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Openbare calamiteitenberichten"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Nationale/lokale test"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Noodmelding"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Waarschuwingen"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast-berichten"</string>
@@ -66,9 +67,11 @@
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER Alerts"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Noodberichten over ontvoering van kinderen"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"Waarschuwingsberichten"</string>
-    <string name="enable_alert_message_summary" msgid="6525664541696985610">"Waarschuwen over directe beveiligingsdreigingen"</string>
+    <string name="enable_alert_message_summary" msgid="6525664541696985610">"Waarschuwen over directe beveiligingsrisico\'s"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Openbare calamiteitenberichten"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Aanbevolen acties die levens of eigendommen kunnen redden"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Nationale en lokale tests"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Testberichten ontvangen van nationale en lokale overheden"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Noodmeldingen"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Waarschuwen over levensbedreigende situaties"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Vereiste maandelijkse test"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
deleted file mode 100644
index 55de48b..0000000
--- a/res/values-or/strings.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<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="7559008249836700599">"ସେଲ୍‌ ବ୍ରୋଡକାଷ୍ଟ"</string>
-    <string name="sms_cb_settings" msgid="3795852619005211509">"ଆପାତକାଳୀନ ଅଲର୍ଟ"</string>
-    <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"ଏହି ୟୁଜରଙ୍କ ପାଇଁ ସେଲ୍‌ ବ୍ରୋଡକାଷ୍ଟ ସେଟିଙ୍ଗ ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="button_dismiss" msgid="1234221657930516287">"ଠିକ ଅଛି"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"ଆପଣଙ୍କ ଅଞ୍ଚଳରେ କୌଣସି ସକ୍ରିୟ ଅଲର୍ଟ ନାହିଁ। ସେଟିଙ୍ଗ ମେନୁ ବିକଳ୍ପକୁ ବ୍ୟବହାର କରି ଆପଣ ଅଲର୍ଟ ସେଟିଙ୍ଗକୁ ବଦଳାଇ ପାରିବେ।"</string>
-    <string name="menu_delete_all" msgid="3940997343921149800">"ବ୍ରୋଡକାଷ୍ଟକୁ ଡିଲିଟ୍‌ କରନ୍ତୁ"</string>
-    <string name="message_options" msgid="3178489901903589574">"ମେସେଜ୍‌ ବିକଳ୍ପ"</string>
-    <string name="menu_view_details" msgid="1040989019045280975">"ବିବରଣୀ ଦେଖନ୍ତୁ"</string>
-    <string name="menu_delete" msgid="128380070910799366">"ବ୍ରୋଡକାଷ୍ଟକୁ ଡିଲିଟ୍‌ କରନ୍ତୁ"</string>
-    <string name="view_details_title" msgid="1780427629491781473">"ଅଲର୍ଟ ବିବରଣୀ"</string>
-    <string name="confirm_delete_broadcast" msgid="2540199303730232322">"ଏହି ବ୍ରୋଡକାଷ୍ଟକୁ ଡିଲିଟ୍‌ କରିବେ?"</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>
-    <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="cmas_presidential_level_alert" msgid="1209234030582361001">"ପ୍ରେସିଡେନ୍‌ଶିଅଲ ଅଲର୍ଟ"</string>
-    <string name="cmas_extreme_alert" msgid="2588720613319969289">"ଅପାତକାଳୀନ ଅଲର୍ଟ: ସାଂଘାତିକ"</string>
-    <string name="cmas_extreme_immediate_observed_alert" msgid="2328845915287460780">"ଅପାତକାଳୀନ ଅଲର୍ଟ: ସାଂଘାତିକ"</string>
-    <string name="cmas_extreme_immediate_likely_alert" msgid="1859702950323471778">"ଅପାତକାଳୀନ ଅଲର୍ଟ: ସାଂଘାତିକ"</string>
-    <string name="cmas_severe_alert" msgid="4135809475315826913">"ଅପାତକାଳୀନ ଅଲର୍ଟ: ଗମ୍ଭୀର"</string>
-    <string name="cmas_amber_alert" msgid="6154867710264778887">"ଶିଶୁ ଅପହରଣ (ଅମ୍ବର୍‌ ଅଲର୍ଟ)"</string>
-    <string name="cmas_required_monthly_test" msgid="1890205712251132193">"ମାସିକ ଯାଞ୍ଚ ଆବଶ୍ୟକ"</string>
-    <string name="cmas_exercise_alert" msgid="2892255514938370321">"ଅପାତକାଳୀନ ଅଲର୍ଟ (ବ୍ୟାୟାମ)"</string>
-    <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"ଅପାତକାଳୀନ ଅଲର୍ଟ (ଅପରେଟର୍)"</string>
-    <string name="cb_other_message_identifiers" msgid="5790068194529377210">"ବ୍ରୋଡକାଷ୍ଟ ମେସେଜ୍‌"</string>
-    <string name="public_safety_message" msgid="9119928798786998252">"ଜନସୁରକ୍ଷା ମେସେଜ୍"</string>
-    <string name="emergency_alert" msgid="624783871477634263">"ଅପାତକାଳୀନ ଆଲର୍ଟ"</string>
-    <string name="emergency_alerts_title" msgid="6605036374197485429">"ଅଲର୍ଟ"</string>
-    <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"ବ୍ରୋଡକାଷ୍ଟ ମେସେଜ୍‌"</string>
-    <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"ଆପାତକାଳୀନ ଆଲର୍ଟ"</string>
-    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"ଆଲର୍ଟକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="699552922381916044">"ଆପାତକାଳୀନ ବିଜ୍ଞପ୍ତି ପାଆନ୍ତୁ"</string>
-    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"ଆଲର୍ଟ ରିମାଇଣ୍ଡର୍ ସାଉଣ୍ଡ"</string>
-    <string name="enable_alert_speech_title" msgid="8052104771053526941">"ଆଲର୍ଟ ମେସେଜ୍‌ କୁହନ୍ତୁ"</string>
-    <string name="enable_alert_speech_summary" msgid="356086178962268831">"ଆପାତକାଳୀନ ଆଲର୍ଟ ମେସେଜ୍‌ କହିବା ପାଇଁ \"ଟେକ୍ସଟ୍‌-ଟୁ-ସ୍ପୀଚ୍\" ବ୍ୟବହାର କରନ୍ତୁ"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"ଆପାତକାଳୀନ ଆଲର୍ଟ ହିଷ୍ଟୋରୀ"</string>
-    <string name="alert_preferences_title" msgid="6001469026393248468">"ନିଜ ପସନ୍ଦର ଆଲର୍ଟ"</string>
-    <string name="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">"ଅମ୍ବର୍‌ ଆଲର୍ଟ"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"ଶିଶୁ ଅପହରଣର ଅପାତକାଳୀନ ବୁଲେଟିନ୍"</string>
-    <string name="enable_alert_message_title" msgid="2939830587633599352">"ଆଲର୍ଟ ମେସେଜ୍"</string>
-    <string name="enable_alert_message_summary" msgid="6525664541696985610">"ଏପରି ବିଷୟରେ ସୂଚନା ଦେବା, ଯେଉଁ କାରଣରୁ ସୁରକ୍ଷା ଉପରେ ବିପଦ ଆସିପାରେ"</string>
-    <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"ଜନସୁରକ୍ଷା ମେସେଜ୍"</string>
-    <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"ସୁପାରିସକୃତ କାର୍ଯ୍ୟ, ଯାହା ଜୀବନ କିମ୍ୱା ସମ୍ପତ୍ତି ବଞ୍ଚାଇପାରିବ"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"ଆପାତକାଳୀନ ଆଲର୍ଟ"</string>
-    <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"ପ୍ରାଣଘାତକ ଘଟଣା ବିଷୟରେ ଚେତାବନୀ"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"ମାସିକ ଯାଞ୍ଚ ଆବଶ୍ୟକ"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="588517403520088484">"ସୁରକ୍ଷା ଆଲର୍ଟ ସିଷ୍ଟମ୍ ପାଇଁ ପରୀକ୍ଷାମୂଳକ ମେସେଜ୍ ପ୍ରାପ୍ତ କରନ୍ତୁ"</string>
-    <string name="enable_alert_vibrate_title" msgid="982817538757982090">"ଭାଇବ୍ରେଟ୍‌"</string>
-    <string name="use_full_volume_title" msgid="8581439612945182255">"ପୂର୍ଣ୍ଣ ଭଲ୍ୟୁମ୍‌କୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
-    <string name="use_full_volume_summary" msgid="3560764277281704697">"ଅନ୍ୟ ଭଲ୍ୟୁମ୍‌କୁ ଏବଂ \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ପସନ୍ଦକୁ ଅଣଦେଖା କରନ୍ତୁ"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"ଅଞ୍ଚଳ ଅପଡେଟ୍‍ ବ୍ରୋଡକାଷ୍ଟକରିବା"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"SIM ଷ୍ଟାଟସରେ ଅପଡେଟ୍‍ ସୂଚନା ଦେଖାନ୍ତୁ"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"ଡେଭଲପରଙ୍କ ବିକଳ୍ପ"</string>
-    <string name="cmas_category_heading" msgid="3923503130776640717">"ଅଲର୍ଟ ବର୍ଗ:"</string>
-    <string name="cmas_category_geo" msgid="4979494217069688527">"ଜିଓଫିଜିକାଲ"</string>
-    <string name="cmas_category_met" msgid="7563732573851773537">"ପାଣିପାଗ ସମ୍ବନ୍ଧୀୟ"</string>
-    <string name="cmas_category_safety" msgid="2986472639641883453">"ନିରାପତ୍ତା"</string>
-    <string name="cmas_category_security" msgid="2549520159044403704">"ସୁରକ୍ଷା"</string>
-    <string name="cmas_category_rescue" msgid="4907571719983321086">"ଉଦ୍ଧାର"</string>
-    <string name="cmas_category_fire" msgid="3331981591918341119">"ନିଆଁ"</string>
-    <string name="cmas_category_health" msgid="312569774587117324">"ସ୍ଵାସ୍ଥ୍ୟ"</string>
-    <string name="cmas_category_env" msgid="9213088574227522961">"ପରିବେଶ ସମ୍ବନ୍ଧୀୟ"</string>
-    <string name="cmas_category_transport" msgid="5014901635987361642">"ପରିବହନ"</string>
-    <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_shelter" msgid="7301175579079615909">"ଆଶ୍ରୟ"</string>
-    <string name="cmas_response_evacuate" msgid="5833170084430021095">"ଖାଲି କରନ୍ତୁ"</string>
-    <string name="cmas_response_prepare" msgid="8428073909753758319">"ପ୍ରସ୍ତୁତ"</string>
-    <string name="cmas_response_execute" msgid="284719420769568493">"ନିଷ୍ପାଦନ କରନ୍ତୁ"</string>
-    <string name="cmas_response_monitor" msgid="681400164440495749">"ନୀରିକ୍ଷଣ"</string>
-    <string name="cmas_response_avoid" msgid="156419597612629270">"ଏଡ଼ାଇ ଯାଆନ୍ତୁ"</string>
-    <string name="cmas_response_assess" msgid="9043534222710563415">"ଆକଳନ"</string>
-    <string name="cmas_response_none" msgid="5149009359674452959">"କିଛିନୁହେଁ"</string>
-    <string name="cmas_severity_heading" msgid="8437057117822305243">"ଗମ୍ଭୀରତା:"</string>
-    <string name="cmas_severity_extreme" msgid="1312013282860183082">"ସାଂଘାତିକ"</string>
-    <string name="cmas_severity_severe" msgid="7504359209737074524">"ଗମ୍ଭୀର"</string>
-    <string name="cmas_urgency_heading" msgid="8218282767913431492">"ଜରୁରୀ:"</string>
-    <string name="cmas_urgency_immediate" msgid="1577485208196449288">"ତାତ୍କାଳିକ"</string>
-    <string name="cmas_urgency_expected" msgid="6830831119872375936">"ପ୍ରତ୍ୟାଶିତ"</string>
-    <string name="cmas_certainty_heading" msgid="8374669249736439193">"ନିଶ୍ଚିତ:"</string>
-    <string name="cmas_certainty_observed" msgid="3668549749352106472">"ପରିଲକ୍ଷିତ"</string>
-    <string name="cmas_certainty_likely" msgid="4254497828943291749">"ପ୍ରାୟତଃ"</string>
-    <string name="delivery_time_heading" msgid="5980836543433619329">"ପ୍ରାପ୍ତ ହୋଇଛି:"</string>
-    <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g>ଟି ପଢ଼ାଯାଇନଥିବା ଅଲର୍ଟ।"</string>
-    <string name="notification_multiple_title" msgid="1523638925739947855">"ନୂଆ ଅଲର୍ଟ"</string>
-    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"ପ୍ରଥମ ଆଲର୍ଟ ପ୍ରଦର୍ଶନ ପରେ ବାହାରିଯିବା ଡାୟଲଗ୍‌ ଦେଖାନ୍ତୁ (ପ୍ରେସିଡେନଶିଅଲ୍ ଆଲର୍ଟ ଛଡ଼ା)।"</string>
-    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"ଅପ୍ଟ-ଆଉଟ୍ ଡାୟଲଗ୍‌ ଦେଖାନ୍ତୁ"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"ବର୍ତ୍ତମାନ ଆପଣ ଅପାତକାଳୀନ ଅଲର୍ଟ ପ୍ରାପ୍ତ କରୁଛନ୍ତି। ଆପଣଙ୍କୁ ପ୍ରାପ୍ତ ହେଉଥିବା ଅପାତକାଳୀନ ଅଲର୍ଟକୁ ଜାରିରଖିବାକୁ ଚାହୁଁଛନ୍ତି କି?"</string>
-    <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"ହଁ"</string>
-    <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"ନାଁ"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"ଅପାତକାଳୀନ ଆଲର୍ଟ ହିଷ୍ଟୋରୀ"</string>
-  <string-array name="alert_reminder_interval_entries">
-    <item msgid="6595211083588795160">"ଥରେ"</item>
-    <item msgid="9097229303902157183">"ପ୍ରତି 2 ମିନିଟରେ"</item>
-    <item msgid="5718214950343391480">"ପ୍ରତି 5 ମିନିଟରେ"</item>
-    <item msgid="3863339891188103437">"ପ୍ରତି 15 ମିନିଟରେ"</item>
-    <item msgid="6868848414437854609">"ଅଫ୍‌"</item>
-  </string-array>
-    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"ୱେୟାରଲେସ୍‌ ଅପାତକାଳୀନ ଅଲର୍ଟ"</string>
-</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index eb7d290..2246cc1 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"ਸੰਕਟਕਾਲੀਨ ਚਿਤਾਵਨੀ (ਓਪਰੇਟਰ)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"ਪ੍ਰਸਾਰਣ ਸੁਨੇਹੇ"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"ਜਨਤਕ ਸੁਰੱਖਿਆ ਸੰਬੰਧੀ ਸੁਨੇਹਾ"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"ਰਾਜ ਜਾਂ ਸਥਾਨਕ ਟੈਸਟ"</string>
     <string name="emergency_alert" msgid="624783871477634263">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"ਸੁਚੇਤਨਾਵਾਂ"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"ਪ੍ਰਸਾਰਿਤ ਸੁਨੇਹੇ"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"ਮਹੀਨਾਵਾਰ ਜਾਂਚ ਦੀ ਲੋੜ ਹੈ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 485402f..eb04ffa 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alert o zagrożeniu (operator)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Komunikaty"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Wiadomość dotycząca bezpieczeństwa publicznego"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Test stanowy/lokalny"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Alert o zagrożeniu"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alerty"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Komunikaty"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Ostrzegaj o bezpośrednich zagrożeniach"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Wiadomości dotyczące bezpieczeństwa publicznego"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Zalecane działania pomagające ocalić życie lub mienie"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Testy stanowe i lokalne"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Otrzymuj wiadomości testowe od władz stanowych i lokalnych"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alerty o zagrożeniu"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Ostrzegaj o wydarzeniach zagrażających życiu"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Wymagany comiesięczny test"</string>
@@ -126,5 +129,5 @@
     <item msgid="3863339891188103437">"Co 15 minut"</item>
     <item msgid="6868848414437854609">"Wył."</item>
   </string-array>
-    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Bezprzewodowe alerty o zagrożeniu"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Alerty o zagrożeniu"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 1761c5c..7b1df36 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alerta de emergência (Operador)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Mensagens de difusão"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Mensagem de segurança pública"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Teste local/estatal"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Alerta de emergência"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertas"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mensagens de difusão"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Avisar acerca de ameaças à segurança iminentes"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Mensagens de segurança pública"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Ações recomendadas que podem salvar vidas ou propriedades."</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Testes locais e estatais"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Receber mensagens de teste de autoridades locais e estatais"</string>
     <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="1319231576046146463">"Teste mensal obrigatório"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 7d8e89b..27bfdb0 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alerta de emergência (telefonista)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Transmitir mensagens"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Mensagem de segurança pública"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Teste estadual/local"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Alerta de emergência"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertas"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Transmitir mensagens"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Aviso sobre ameaças iminentes à segurança"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Mensagens de segurança pública"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Ações recomendadas que podem salvar vidas ou propriedades"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Testes estaduais e locais"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Receber mensagens de teste das autoridades estaduais e locais"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alertas de emergência"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Aviso sobre eventos perigosos"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Teste mensal obrigatório"</string>
@@ -77,7 +80,7 @@
     <string name="use_full_volume_title" msgid="8581439612945182255">"Usar volume máximo"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorar outras preferências de \"Não perturbe\" e volume"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Transmissões de atualização de área"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Mostrar informações de atualização no status do SIM"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Mostrar informações de atualização no status do chip"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opções do desenvolvedor"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoria de alerta:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofísico"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 7d13d83..670f687 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alertă de urgență (operator)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Mesaje difuzate"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Mesaj de siguranță publică"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Testare națională/locală"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Alertă de urgenţă"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alerte"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mesaje privind difuzarea"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Avertizează cu privire la amenințările iminente la adresa siguranței"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Mesaje de siguranță publică"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Acțiuni recomandate care pot salva vieți sau bunuri"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Testări naționale și locale"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Primiți mesaje de testare de la autoritățile de stat și locale"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alerte de urgență"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Avertizează cu privire la evenimentele care pun în pericol viața"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Testul lunar obligatoriu"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 886ea8c..21b8e25 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Экстренное оповещение (оператор)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Сообщения оповещения"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Сообщение об угрозе общественной безопасности"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Государственные и местные тестовые оповещения"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Экстренное оповещение"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Оповещения"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Сообщения о трансляции"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Обязательное тестовое оповещение раз в месяц"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 9ef1a9b..71f5c76 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"හදිසි ඇඟවීම (ක්‍රියාකරු)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"විකාශ පණිවිඩ"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"මහජන ආරක්ෂක පණිවිඩය"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"රාජ්‍ය/පළාත් පරීක්ෂණය"</string>
     <string name="emergency_alert" msgid="624783871477634263">"හදිසි අවස්ථා ඇඟවීම"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"ඇඟවීම්"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"විකාශ පණිවිඩ"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"අවශ්‍ය මාසික පරීක්ෂාව"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index bb241f8..cfb1788 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Tiesňové upozornenie (operátor)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Správy vysielania"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Správa verejnej bezpečnosti"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Štátny/miestny test"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Tiesňové upozornenie"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Upozornenia"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Správy vysielania"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Upozorňovať na bezprostredné ohrozenia bezpečnosti"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Správy verejnej bezpečnosti"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Odporúčané akcie, ktoré môžu zachrániť životy alebo majetok"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Štátne a miestne testy"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Získavajte testovacie správy od štátnych aj miestnych úradov"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Tiesňové upozornenia"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Upozorňovať na udalosti ohrozujúce život"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Povinný mesačný test"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 6a1b41b..834c11e 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Opozorilo v sili (operater)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Sporočila mobilnega operaterja"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Sporočilo za javno varnost"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Državni/lokalni preskus"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Opozorilo v sili"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Opozorila"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Sporočila mobilnega operaterja"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Opozarjanje na neposredne varnostne grožnje"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Sporočila za javno varnost"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Priporočena dejanja, ki lahko rešijo življenja ali premoženje"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Državni in lokalni preskusi"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Prejemanje preskusih sporočil državne in lokalne oblasti"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Nujna opozorila"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Opozarjanje na smrtno nevarne dogodke"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Obvezen mesečni preskus"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 7f831c1..96cb729 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alarmi i urgjencës (operatori)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Mesazhet e transmetimit"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Mesazh për sigurinë publike"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Alarm testimi shtetëror/lokal"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Sinjalizimi i urgjencës"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Sinjalizimet"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mesazhet e transmetimit"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Paralajmëro për kërcënime të menjëhershme të sigurisë"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Mesazhe të sigurisë publike"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Veprime të rekomanduara që mund të shpëtojnë jetën ose pronën"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Alarme testimi shtetërore dhe lokale"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Merr mesazhe testimi nga autoritetet shtetërore dhe lokale"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Sinjalizimet e urgjencës"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Paralajmëro për ngjarje kërcënuese për jetën"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Kërkohet testi mujor"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 05bffb3..9867f83 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Обавештење о хитном случају (оператер)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Поруке о емитовању"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Порука о јавној безбедности"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Проба државних/локалних органа"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Обавештење о хитном случају"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Обавештења"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Поруке о емитовању"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Обавезан месечни тест"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 57d8002..bcc652b 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Varning om nödsituation (operatör)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Sändningsmeddelanden"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Viktigt meddelande till allmänheten"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Statliga/lokala tester"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Varning om nödsituation"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Varningar"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Sändningsmeddelanden"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Varna om överhängande säkerhetshot"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Viktiga meddelande till allmänheten"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Rekommenderade åtgärder som kan rädda liv eller egendom"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Statliga och lokala tester"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Få testmeddelanden från statliga och lokala myndigheter"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Varningar vid nödsituationer"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Varna om livshotande händelser"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Obligatoriskt månadstest"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index fde0493..8320f3a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Arifa ya dharura (mtoa huduma)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Ujumbe kwa wapokeaji wengi"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Ujumbe wa usalama kwa umma"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Jaribio la Jimbo/Serikali ya mitaa"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Arifa ya dharura"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Arifa"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Ujumbe kwa wapokeaji wengi"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Itoe tahadhari kuhusu hatari za usalama zinazokaribia kutokea"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Ujumbe wa usalama kwa umma"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Hatua zinazopendekezwa ambazo zinaweza kuokoa maisha na mali"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Majaribio katika jimbo na setikali za mitaa"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Pokea ujumbe wa majaribio kutoka kwa mamlaka ya jimbo na serikali za mitaa"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Arifa za dharura"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Itoe tahadhari kuhusu matukio yanayohatarisha maisha"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Jaribio la kila mwezi linalohitajika"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 22d746f..578e8f8 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"அவசரகால எச்சரிக்கை (ஆபரேட்டர்)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"வலைபரப்புச் செய்திகள்"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"பொதுமக்களுக்கான பாதுகாப்புச் செய்தி"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"மாநில/உள்ளூர் சோதனை மெசேஜ்கள்"</string>
     <string name="emergency_alert" msgid="624783871477634263">"அவசரகால எச்சரிக்கை"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"எச்சரிக்கைகள்"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"வலைபரப்புச் செய்திகள்"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"அவசியமான மாதாந்திரச் சோதனை"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 162ace8..422f836 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"అత్యవసర హెచ్చరిక (ఆపరేటర్)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"ప్రసార సందేశాలు"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"ప్రజా భద్రత సందేశం"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"రాష్ట్రీయ/స్థానిక పరీక్ష"</string>
     <string name="emergency_alert" msgid="624783871477634263">"అత్యవసర హెచ్చరిక"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"హెచ్చరికలు"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"ప్రసార సందేశాలు"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"నెలవారీ పరీక్ష అవసరం"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 693b537..3228366 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"การแจ้งเตือนฉุกเฉิน (ผู้ให้บริการ)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"ข้อความการแจ้งเตือน"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"ข้อความความปลอดภัยสาธารณะ"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"การทดสอบระดับมลรัฐ/ท้องถิ่น"</string>
     <string name="emergency_alert" msgid="624783871477634263">"การแจ้งเตือนฉุกเฉิน"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"การแจ้งเตือน"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"ข้อความการออกอากาศ"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"การทดสอบรายเดือนที่จำเป็น"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 9f09104..d938788 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alertong pang-emergency (tagapagpatakbo)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Mga mensahe ng broadcast"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Mensahe para sa pampublikong kaligtasan"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Pagsubok sa estado/lokal na pagsubok"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Alertong pang-emergency"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Mga Alerto"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mga mensahe ng broadcast"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Magbabala tungkol sa mga nakaambang banta sa kaligtasan"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Mga mensahe para sa pampublikong kaligtasan"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Mga inirerekomendang pagkilos na makakaligtas ng mga buhay o pag-aari"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Mga pagsubok sa estado at lokal na pagsubok"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Makatanggap ng mga pansubok na mensahe mula sa mga awtoridad ng estado at lokal na awtoridad"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Mga alerto sa emergency"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Magbabala tungkol sa mga nakamamatay na event"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Kinakailangang buwanang pagsubok"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5db0d0c..6852990 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Acil durum uyarısı (operatör)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Yayın mesajları"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Kamu güvenliği mesajı"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Devlet testi/yerel test"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Acil durum uyarısı"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Uyarılar"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Yayın mesajları"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Yaklaşan güvenlik tehditleri hakkında uyarılar alın"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Kamu güvenliği mesajları"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Hayatları veya malları kurtarabilecek önerilen eylemler"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Devlet testleri ve yerel testler"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Devlet kurumlarından ve yerel kurumlardan test mesajları alın"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Acil durum uyarıları"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Hayati tehlike yaratabilecek olaylar hakkında uyarılar alın"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Zorunlu aylık test"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 42d9fe8..d587236 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Сповіщення про надзвичайну ситуацію (оператор)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Широкомовні сповіщення"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Повідомлення щодо громадської безпеки"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Державні/місцеві тестові сповіщення"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Екстрене сповіщення"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Сповіщення"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Широкомовні повідомлення"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Обов’язковий щомісячний тест"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index b09473c..ca10ab9 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"ہنگامی الرٹ (آپریٹر)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"براڈ کاسٹ کے پیغامات"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"عوامی حفاظتی پیغام"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"ریاستی/مقامی ٹیسٹ"</string>
     <string name="emergency_alert" msgid="624783871477634263">"ہنگامی الرٹ"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"الرٹس"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"براڈ کاسٹ کے پیغامات"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"ماہانہ جانچ درکار ہے"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index e61be35..42b4082 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -23,7 +23,7 @@
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Ayni paytda siz joylashgan hudud uchun hech qanday faol ogohlantirish yo‘q. Ogohlantirish parametrlarini Sozlamalar menyusidan o‘zgartirish mumkin."</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Tarqatma xabarlarni o‘chirish"</string>
     <string name="message_options" msgid="3178489901903589574">"Xabar sozlamalari"</string>
-    <string name="menu_view_details" msgid="1040989019045280975">"Tafsilotlarni ko‘rish"</string>
+    <string name="menu_view_details" msgid="1040989019045280975">"Tafsilotlar"</string>
     <string name="menu_delete" msgid="128380070910799366">"Tarqatma xabarni o‘chirish"</string>
     <string name="view_details_title" msgid="1780427629491781473">"Ogohlantirish tafsilotlari"</string>
     <string name="confirm_delete_broadcast" msgid="2540199303730232322">"Ushbu tarqatma xabar o‘chirib tashlansinmi?"</string>
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Favqulodda ogohlantirish (operator)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Tarqatma xabarlar"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Ommaviy xavfsizlik xabari"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Hududiy yoki mahalliy sinov ogohlantirishi"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Favqulodda ogohlantirish"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Ogohlantirishlar"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Tarqatma xabarlar"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Xavfsizlikka muqarrar tahdidlar haqida ogohlantirilsin"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Ommaviy xavfsizlik xabarlari"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Inson hayoti yoki mulkini asrashga oid tavsiya etiladigan amallar"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Xavfsizlik organlaridan sinov ogohlantirishi"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Davlat va mahalliy xavfsizlik organlaridan sinov ogohlantirishi olish"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Favqulodda ogohlantirishlar"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Hayotga xavf soladigan hodisalar haqida ogohlantirilsin"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Majburiy oylik sinov"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 1f4c4e8..b5c06cb 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Cảnh báo khẩn cấp (nhà cung cấp dịch vụ)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Thông báo truyền phát"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Thông báo an toàn công khai"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Thử nghiệm của tiểu bang/địa phương"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Cảnh báo khẩn cấp"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Cảnh báo"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Thông báo truyền phát"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Cảnh báo về các mối đe dọa đến sự an toàn sắp xảy ra"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Thông báo an toàn công khai"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Hành động được đề xuất có thể bảo vệ tính mạng hoặc tài sản"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Thử nghiệm của tiểu bang và địa phương"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Nhận tin nhắn thử nghiệm từ chính quyền địa phương và tiểu bang"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Cảnh báo khẩn cấp"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Cảnh báo về các sự kiện đe dọa tới mạng sống"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Cần kiểm tra hàng tháng"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2e5ab43..0c701bd 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"紧急警报（操作人员）"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"广播消息"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"公共安全消息"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"州/地方测试"</string>
     <string name="emergency_alert" msgid="624783871477634263">"紧急警报"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"警报"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"广播消息"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"强制执行的每月测试"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index f6037ae..316b488 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"緊急警示 (網絡供應商)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"廣播訊息"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"公共安全訊息"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"州份/地區測試"</string>
     <string name="emergency_alert" msgid="624783871477634263">"緊急警示"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"警報"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"廣播訊息"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"每月測試用訊息"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 1f67ebd..68e403c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"緊急警報 (電信業者自訂)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"廣播訊息"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"公共安全訊息"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"州/地方政府的測試訊息"</string>
     <string name="emergency_alert" msgid="624783871477634263">"緊急警報"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"警示"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"廣播訊息"</string>
@@ -69,6 +70,8 @@
     <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_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>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"每月測試用訊息"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 08d2b1b..e583c02 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -46,6 +46,7 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Isaziso Esiphuthumayo (umqondisi)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Sakaza imilayezo"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Umlayezo wokuphepha komphakathi"</string>
+    <string name="state_local_test_alert" msgid="8003145745857480200">"Ukuhlolwa kombuso/okwasendaweni"</string>
     <string name="emergency_alert" msgid="624783871477634263">"Isaziso Esiphuthumayo"</string>
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Izexwayiso"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Sakaza imilayezo"</string>
@@ -69,6 +70,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Xwayisa mayelana nezinsongo zokuphepha eziseduze"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Imilayezo yokuphepha komphakathi"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Izenzo ezikhethekile ezingalondoloza izimpilo noma indawo"</string>
+    <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Ukuhlolwa kombuso nokwasendaweni"</string>
+    <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Thola imilayezo yokuhlolwa kusukela kwabasemagunyeni bombuso nabasendaweni"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Izexwayiso eziphuthumayo"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Xwayisa mayelana nemicimbi esongela ukuphila"</string>
     <string name="enable_cmas_test_alerts_title" msgid="1319231576046146463">"Uhlolo lwangenyanga oludingekayo"</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index 7fdef0b..2f1d264 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -15,8 +15,6 @@
 -->
 
 <resources>
-    <!-- Whether to enable ETWS settings (Japan) -->
-    <bool name="show_etws_settings">false</bool>
     <!-- Whether to always sound CBS alerts at full volume -->
     <bool name="use_full_volume">false</bool>
     <!-- Whether to enable CMAS settings (United States) -->
@@ -92,6 +90,8 @@
     <string-array name="emergency_alerts_channels_range_strings" translatable="false"></string-array>
     <!-- Channels to receive public safety messages -->
     <string-array name="public_safety_messages_channels_range_strings" translatable="false"></string-array>
+    <!-- Channels to receive state/local test messages -->
+    <string-array name="state_local_test_alert_range_strings" translatable="false"></string-array>
 
     <!-- Values that are retrieved from the ListPreference.
          These must match the alert_reminder_interval_entries list above. -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f88a93c..669fe16 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -90,6 +90,8 @@
     <string name="cb_other_message_identifiers">Broadcast messages</string>
     <!-- Dialog title for all public safety message broadcasts. [CHAR LIMIT=50] -->
     <string name="public_safety_message">Public safety message</string>
+    <!-- Dialog title for all state/local test alerts. [CHAR LIMIT=50] -->
+    <string name="state_local_test_alert">State/Local test</string>
 
     <!-- Dialog title or menu title of emergency alert. [CHAR LIMIT=50] -->
     <string name="emergency_alert">Emergency alert</string>
@@ -145,6 +147,10 @@
     <string name="enable_public_safety_messages_title">Public safety messages</string>
     <!-- Preference summary for enable public safety messages checkbox. [CHAR LIMIT=100] -->
     <string name="enable_public_safety_messages_summary">Recommended actions that can save lives or property</string>
+    <!-- Preference title for enable state/local test alerts checkbox. [CHAR LIMIT=100] -->
+    <string name="enable_state_local_test_alerts_title">State and local tests</string>
+    <!-- Preference summary for enable state/local test alerts checkbox. [CHAR LIMIT=100] -->
+    <string name="enable_state_local_test_alerts_summary">Receive test messages from state and local authorities</string>
     <!-- Preference title for enable emergency alerts messages checkbox. [CHAR LIMIT=100] -->
     <string name="enable_emergency_alerts_message_title">Emergency alerts</string>
     <!-- Preference summary for enable emergency alerts messages checkbox. [CHAR LIMIT=100] -->
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 9fd3228..e72f446 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -58,12 +58,18 @@
                           android:summary="@string/enable_public_safety_messages_summary"
                           android:title="@string/enable_public_safety_messages_title" />
 
-        <!-- Enable receive monthly test -->
+        <!-- Enable required monthly test alerts -->
         <SwitchPreference android:defaultValue="false"
                           android:key="enable_test_alerts"
                           android:summary="@string/enable_cmas_test_alerts_summary"
                           android:title="@string/enable_cmas_test_alerts_title" />
 
+        <!-- Enable state/local test alerts -->
+        <SwitchPreference android:defaultValue="false"
+                          android:key="enable_state_local_test_alerts"
+                          android:summary="@string/enable_state_local_test_alerts_summary"
+                          android:title="@string/enable_state_local_test_alerts_title" />
+
         <!-- Default value is true for Brazil and India. This preference is ignored and hidden
         unless the boolean "config_showAreaUpdateInfoSettings" is set to true in the global resource. -->
         <SwitchPreference android:defaultValue="true"
diff --git a/res/xml/watch_preferences.xml b/res/xml/watch_preferences.xml
index 3077ddf..9e021c8 100644
--- a/res/xml/watch_preferences.xml
+++ b/res/xml/watch_preferences.xml
@@ -69,4 +69,7 @@
                           android:summary="@string/enable_area_update_info_alerts_summary"
                           android:title="@string/enable_area_update_info_alerts_title" />
 
+        <Preference android:key="emergency_alert_history"
+                            android:title="@string/emergency_alert_history_title" />
+
 </PreferenceScreen>
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
index 3875003..b969f62 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
@@ -44,6 +44,7 @@
 import android.telephony.SmsCbLocation;
 import android.telephony.SmsCbMessage;
 import android.telephony.SubscriptionManager;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.cellbroadcastreceiver.CellBroadcastChannelManager.CellBroadcastChannelRange;
@@ -222,6 +223,38 @@
         return time;
     }
 
+    /**
+     * Check if we should display the received cell broadcast message.
+     *
+     * @param cbm Cell broadcast message
+     * @return True if the message should be displayed to the user
+     */
+    private boolean shouldDisplayMessage(CellBroadcastMessage cbm) {
+        // Check if the channel is enabled by the user or configuration.
+        if (!isChannelEnabled(cbm)) {
+            Log.d(TAG, "ignoring alert of type " + cbm.getServiceCategory()
+                    + " by user preference");
+            return false;
+        }
+
+        // Check if we need to perform language filtering.
+        CellBroadcastChannelRange range = CellBroadcastChannelManager
+                .getCellBroadcastChannelRangeFromMessage(getApplicationContext(), cbm);
+        if (range != null && range.mFilterLanguage) {
+            // If the message's language does not match device's message, we don't display the
+            // message.
+            String messageLanguage = cbm.getLanguageCode();
+            String deviceLanguage = Locale.getDefault().getLanguage();
+            if (!TextUtils.isEmpty(messageLanguage)
+                    && !messageLanguage.equalsIgnoreCase(deviceLanguage)) {
+                Log.d(TAG, "ignoring the alert due to language mismatch. Message lang="
+                        + messageLanguage + ", device lang=" + deviceLanguage);
+                return false;
+            }
+        }
+        return true;
+    }
+
     private void handleCellBroadcastIntent(Intent intent) {
         Bundle extras = intent.getExtras();
         if (extras == null) {
@@ -244,9 +277,7 @@
             Log.e(TAG, "Invalid subscription id");
         }
 
-        if (!isMessageEnabled(cbm)) {
-            Log.d(TAG, "ignoring alert of type " + cbm.getServiceCategory() +
-                    " by user preference");
+        if (!shouldDisplayMessage(cbm)) {
             return;
         }
 
@@ -351,13 +382,12 @@
     }
 
     /**
-     * Check if the message is enabled. The message could be enabled or disabled by users or
-     * roaming conditions.
+     * Check if the message's channel is enabled on the device.
      *
      * @param message the message to check
-     * @return true if the user has enabled this message type; false otherwise
+     * @return true if the channel is enabled on the device, otherwise false.
      */
-    private boolean isMessageEnabled(CellBroadcastMessage message) {
+    private boolean isChannelEnabled(CellBroadcastMessage message) {
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         // Check if all emergency alerts are disabled.
@@ -482,6 +512,13 @@
                     .getBoolean(CellBroadcastSettings.KEY_ENABLE_PUBLIC_SAFETY_MESSAGES,
                             true);
         }
+        if (CellBroadcastChannelManager.checkCellBroadcastChannelRange(subId,
+                channel, R.array.state_local_test_alert_range_strings, this)) {
+            return emergencyAlertEnabled
+                    && PreferenceManager.getDefaultSharedPreferences(this)
+                    .getBoolean(CellBroadcastSettings.KEY_ENABLE_STATE_LOCAL_TEST_ALERTS,
+                            false);
+        }
         return true;
     }
 
@@ -528,11 +565,7 @@
         } else {
             int channel = message.getServiceCategory();
             ArrayList<CellBroadcastChannelRange> ranges = CellBroadcastChannelManager
-                    .getInstance().getCellBroadcastChannelRanges(getApplicationContext(),
-                            R.array.additional_cbs_channels_strings);
-            ranges.addAll(CellBroadcastChannelManager
-                    .getInstance().getCellBroadcastChannelRanges(getApplicationContext(),
-                            R.array.public_safety_messages_channels_range_strings));
+                    .getAllCellBroadcastChannelRanges(getApplicationContext());
             if (ranges != null) {
                 for (CellBroadcastChannelRange range : ranges) {
                     if (channel >= range.mStartId && channel <= range.mEndId) {
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java b/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java
index fd716e2..9797155 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java
@@ -62,19 +62,33 @@
                     R.array.operator_defined_alert_range_strings,
                     R.array.etws_alerts_range_strings,
                     R.array.etws_test_alerts_range_strings,
-                    R.array.public_safety_messages_channels_range_strings
+                    R.array.public_safety_messages_channels_range_strings,
+                    R.array.state_local_test_alert_range_strings
             ));
+
+    private static ArrayList<CellBroadcastChannelRange> sAllCellBroadcastChannelRanges = null;
+
     /**
      * Cell broadcast channel range
      * A range is consisted by starting channel id, ending channel id, and the alert type
      */
     public static class CellBroadcastChannelRange {
-
+        /** Defines the type of the alert. */
         private static final String KEY_TYPE = "type";
+        /** Defines if the alert is emergency. */
         private static final String KEY_EMERGENCY = "emergency";
+        /** Defines the network RAT for the alert. */
         private static final String KEY_RAT = "rat";
+        /** Defines the scope of the alert. */
         private static final String KEY_SCOPE = "scope";
+        /** Defines the vibration pattern of the alert. */
         private static final String KEY_VIBRATION = "vibration";
+        /**
+         * Defines whether the channel needs language filter or not. True indicates that the alert
+         * will only pop-up when the alert's language matches the device's language.
+         */
+        private static final String KEY_FILTER_LANGUAGE = "filter_language";
+
 
         public static final int SCOPE_UNKNOWN       = 0;
         public static final int SCOPE_CARRIER       = 1;
@@ -92,6 +106,7 @@
         public int mRat;
         public int mScope;
         public int[] mVibrationPattern;
+        public boolean mFilterLanguage;
 
         public CellBroadcastChannelRange(Context context, String channelRange) throws Exception {
 
@@ -101,6 +116,7 @@
             mScope = SCOPE_UNKNOWN;
             mVibrationPattern = context.getResources().getIntArray(
                     R.array.default_vibration_pattern);
+            mFilterLanguage = false;
 
             int colonIndex = channelRange.indexOf(':');
             if (colonIndex != -1) {
@@ -147,6 +163,11 @@
                                     }
                                 }
                                 break;
+                            case KEY_FILTER_LANGUAGE:
+                                if (value.equalsIgnoreCase("true")) {
+                                    mFilterLanguage = true;
+                                }
+                                break;
                         }
                     }
                 }
@@ -209,6 +230,26 @@
     }
 
     /**
+     * Get all cell broadcast channels
+     *
+     * @param context Application context
+     * @return all cell broadcast channels
+     */
+    public static ArrayList<CellBroadcastChannelRange> getAllCellBroadcastChannelRanges(
+            Context context) {
+        if (sAllCellBroadcastChannelRanges != null) return sAllCellBroadcastChannelRanges;
+
+        ArrayList<CellBroadcastChannelRange> result = new ArrayList<>();
+
+        for (int key : sCellBroadcastRangeResourceKeys) {
+            result.addAll(getCellBroadcastChannelRanges(context, key));
+        }
+
+        sAllCellBroadcastChannelRanges = result;
+        return result;
+    }
+
+    /**
      * @param subId Subscription index
      * @param channel Cell broadcast message channel
      * @param context Application context
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
index 95d7154..196d529 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
@@ -154,10 +154,12 @@
                 && prefs.getBoolean(CellBroadcastSettings.KEY_ENABLE_AREA_UPDATE_INFO_ALERTS,
                 false);
 
-        // Non-CMAS channels
         boolean enablePublicSafetyMessagesChannelAlerts = enableAlertsMasterToggle
                 && prefs.getBoolean(CellBroadcastSettings.KEY_ENABLE_PUBLIC_SAFETY_MESSAGES,
                 true);
+        boolean enableStateLocalTestAlerts = enableAlertsMasterToggle
+                && prefs.getBoolean(CellBroadcastSettings.KEY_ENABLE_STATE_LOCAL_TEST_ALERTS,
+                false);
 
         boolean enableEmergencyAlerts = enableAlertsMasterToggle && prefs.getBoolean(
                 CellBroadcastSettings.KEY_ENABLE_EMERGENCY_ALERTS, true);
@@ -173,6 +175,7 @@
             log("enableAreaUpdateInfoAlerts = " + enableAreaUpdateInfoAlerts);
             log("enablePublicSafetyMessagesChannelAlerts = "
                     + enablePublicSafetyMessagesChannelAlerts);
+            log("enableStateLocalTestAlerts = " + enableStateLocalTestAlerts);
             log("enableEmergencyAlerts = " + enableEmergencyAlerts);
         }
 
@@ -224,6 +227,11 @@
                 CellBroadcastChannelManager.getInstance().getCellBroadcastChannelRanges(this,
                         R.array.public_safety_messages_channels_range_strings));
 
+        // Enable/Disable GSM state/local test alerts.
+        setCellBroadcastRange(manager, enableStateLocalTestAlerts,
+                CellBroadcastChannelManager.getInstance().getCellBroadcastChannelRanges(this,
+                        R.array.state_local_test_alert_range_strings));
+
         /** Enable non-CMAS series messages. */
 
         setCellBroadcastRange(manager, enableEmergencyAlerts,
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java b/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java
index e6cabe8..2816a4b 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java
@@ -315,6 +315,10 @@
                 serviceCategory, R.array.public_safety_messages_channels_range_strings, context)) {
             return R.string.public_safety_message;
         }
+        if (CellBroadcastChannelManager.checkCellBroadcastChannelRange(subId,
+                serviceCategory, R.array.state_local_test_alert_range_strings, context)) {
+            return R.string.state_local_test_alert;
+        }
 
         if (CellBroadcastChannelManager.isEmergencyMessage(context, cbm)) {
             ArrayList<CellBroadcastChannelRange> ranges = CellBroadcastChannelManager
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
index 803a436..0f63573 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
@@ -28,17 +28,17 @@
 import android.os.PersistableBundle;
 import android.os.UserManager;
 import android.provider.Settings;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.preference.TwoStatePreference;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
 import android.util.Log;
 import android.view.MenuItem;
 
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
 
 /**
  * Settings activity for the cell broadcast receiver.
@@ -90,6 +90,10 @@
     // Whether to display monthly test messages (default is disabled).
     public static final String KEY_ENABLE_TEST_ALERTS = "enable_test_alerts";
 
+    // Whether to display state/local test messages (default disabled).
+    public static final String KEY_ENABLE_STATE_LOCAL_TEST_ALERTS =
+            "enable_state_local_test_alerts";
+
     // Preference key for whether to enable area update information notifications
     // Enabled by default for phones sold in Brazil and India, otherwise this setting may be hidden.
     public static final String KEY_ENABLE_AREA_UPDATE_INFO_ALERTS =
@@ -158,6 +162,7 @@
         private TwoStatePreference mFullVolumeCheckBox;
         private TwoStatePreference mAreaUpdateInfoCheckBox;
         private TwoStatePreference mTestCheckBox;
+        private TwoStatePreference mStateLocalTestCheckBox;
         private Preference mAlertHistory;
         private PreferenceCategory mAlertCategory;
         private PreferenceCategory mAlertPreferencesCategory;
@@ -202,6 +207,8 @@
                     findPreference(KEY_ENABLE_AREA_UPDATE_INFO_ALERTS);
             mTestCheckBox = (TwoStatePreference)
                     findPreference(KEY_ENABLE_TEST_ALERTS);
+            mStateLocalTestCheckBox = (TwoStatePreference)
+                    findPreference(KEY_ENABLE_STATE_LOCAL_TEST_ALERTS);
             mAlertHistory = findPreference(KEY_EMERGENCY_ALERT_HISTORY);
             mDevSettingCategory = (PreferenceCategory)
                     findPreference(KEY_CATEGORY_DEV_SETTINGS);
@@ -316,6 +323,8 @@
                 }
             }
 
+
+
             if (!Resources.getSystem().getBoolean(
                     com.android.internal.R.bool.config_showAreaUpdateInfoSettings)) {
                 if (mAlertCategory != null) {
@@ -347,6 +356,17 @@
                 }
             }
 
+            if (CellBroadcastChannelManager.getCellBroadcastChannelRanges(
+                    this.getContext(),
+                    R.array.state_local_test_alert_range_strings).isEmpty()) {
+                // Remove state local test messages
+                if (mAlertCategory != null) {
+                    if (mStateLocalTestCheckBox != null) {
+                        mAlertCategory.removePreference(mStateLocalTestCheckBox);
+                    }
+                }
+            }
+
             if (mAreaUpdateInfoCheckBox != null) {
                 mAreaUpdateInfoCheckBox.setOnPreferenceChangeListener(startConfigServiceListener);
             }
@@ -374,6 +394,10 @@
             if (mTestCheckBox != null) {
                 mTestCheckBox.setOnPreferenceChangeListener(startConfigServiceListener);
             }
+            if (mStateLocalTestCheckBox != null) {
+                mStateLocalTestCheckBox.setOnPreferenceChangeListener(
+                        startConfigServiceListener);
+            }
 
             if (mAlertHistory != null) {
                 mAlertHistory.setOnPreferenceClickListener(
@@ -467,6 +491,10 @@
                 mPublicSafetyMessagesChannelCheckBox.setEnabled(alertsEnabled);
                 mPublicSafetyMessagesChannelCheckBox.setChecked(alertsEnabled);
             }
+            if (mStateLocalTestCheckBox != null) {
+                mStateLocalTestCheckBox.setEnabled(alertsEnabled);
+                mStateLocalTestCheckBox.setChecked(alertsEnabled);
+            }
         }
     }
 
diff --git a/tests/testapp/res/layout/test_buttons.xml b/tests/testapp/res/layout/test_buttons.xml
index 5e3d26f..f43b360 100644
--- a/tests/testapp/res/layout/test_buttons.xml
+++ b/tests/testapp/res/layout/test_buttons.xml
@@ -168,12 +168,19 @@
         android:layout_marginLeft="20dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
+
     <Button android:id="@+id/button_gsm_public_safety_message"
         android:text="@string/button_gsm_public_safety_message"
         android:layout_marginLeft="20dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
 
+    <Button android:id="@+id/button_gsm_state_local_test_alert"
+        android:text="@string/button_gsm_state_local_test_alert"
+        android:layout_marginLeft="20dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
     <!-- Other Alerts -->
     <Button android:id="@+id/button_gsm_7bit_type"
         android:text="@string/button_gsm_7bit_type"
diff --git a/tests/testapp/res/values/strings.xml b/tests/testapp/res/values/strings.xml
index a9bb60c..f96c1d9 100644
--- a/tests/testapp/res/values/strings.xml
+++ b/tests/testapp/res/values/strings.xml
@@ -33,6 +33,7 @@
     <string name="button_gsm_cmas_amber_alert" translatable="false">Send GSM CMAS AMBER Alert</string>
     <string name="button_gsm_cmas_monthly_test" translatable="false">Send GSM CMAS Monthly Test Alert</string>
     <string name="button_gsm_public_safety_message" translatable="false">Send GSM Public Safety Message</string>
+    <string name="button_gsm_state_local_test_alert" translatable="false">Send State/Local Test Alert</string>
     <string name="button_gsm_7bit_type" translatable="false">Send GSM 7 Bit Test Broadcast</string>
     <string name="button_gsm_7bit_umts_type" translatable="false">Send UMTS 7 Bit Test Broadcast</string>
     <string name="button_gsm_7bit_nopadding_type" translatable="false">Send GSM 7 Bit Full Length Broadcast</string>
diff --git a/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendGsmCmasMessages.java b/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendGsmCmasMessages.java
index 87cbeb4..fb4aa36 100644
--- a/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendGsmCmasMessages.java
+++ b/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendGsmCmasMessages.java
@@ -53,6 +53,8 @@
 
     private static final String PUBLIC_SAFETY_MESSAGE = "This is a public safety message.";
 
+    private static final String STATE_LOCAL_ALERT = "This is a state/local test message.";
+
     private static void sendBroadcast(Activity activity, SmsCbMessage cbMessage) {
         Intent intent = new Intent(Telephony.Sms.Intents.SMS_EMERGENCY_CB_RECEIVED_ACTION);
         intent.putExtra("message", cbMessage);
@@ -114,7 +116,7 @@
 
     public static void testSendPublicSafetyMessagesAlert(Activity activity, int serialNumber) {
         SmsCbMessage cbMessage = createCmasSmsMessage(
-                911, serialNumber, "en",
+                SmsCbConstants.MESSAGE_ID_CMAS_ALERT_PUBLIC_SAFETY, serialNumber, "en",
                 PUBLIC_SAFETY_MESSAGE, SmsCbCmasInfo.CMAS_SEVERITY_UNKNOWN,
                 SmsCbCmasInfo.CMAS_URGENCY_UNKNOWN, SmsCbCmasInfo.CMAS_CERTAINTY_UNKNOWN,
                 SmsCbMessage.MESSAGE_PRIORITY_NORMAL);
@@ -122,6 +124,15 @@
         sendBroadcast(activity, cbMessage);
     }
 
+    public static void testSendStateLocalTestAlert(Activity activity, int serialNumber) {
+        SmsCbMessage cbMessage = createCmasSmsMessage(
+                SmsCbConstants.MESSAGE_ID_CMAS_ALERT_STATE_LOCAL_TEST, serialNumber, "en",
+                STATE_LOCAL_ALERT, SmsCbCmasInfo.CMAS_SEVERITY_UNKNOWN,
+                SmsCbCmasInfo.CMAS_URGENCY_UNKNOWN, SmsCbCmasInfo.CMAS_CERTAINTY_UNKNOWN,
+                SmsCbMessage.MESSAGE_PRIORITY_NORMAL);
+
+        sendBroadcast(activity, cbMessage);
+    }
 
     /**
      * Create a new SmsCbMessage for testing GSM CMAS support.
diff --git a/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendTestBroadcastActivity.java b/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendTestBroadcastActivity.java
index d41427c..38c68a6 100644
--- a/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendTestBroadcastActivity.java
+++ b/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendTestBroadcastActivity.java
@@ -339,6 +339,21 @@
             }
         });
 
+        /* Send a GSM state/local test alert to app. */
+        Button GsmStateLocalTestAlertButton = findViewById(
+                R.id.button_gsm_state_local_test_alert);
+        GsmStateLocalTestAlertButton.setOnClickListener(new OnClickListener() {
+            public void onClick(View v) {
+                if (mDelayBeforeSending && v != null) {
+                    Message msg = mDelayHandler.obtainMessage(0, this);
+                    mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
+                } else {
+                    SendGsmCmasMessages.testSendStateLocalTestAlert(
+                            SendTestBroadcastActivity.this, getSerialNumber());
+                }
+            }
+        });
+
         /* Send a GSM 7-bit broadcast message to app. */
         Button gsm7bitTypeButton = (Button) findViewById(R.id.button_gsm_7bit_type);
         gsm7bitTypeButton.setOnClickListener(new OnClickListener() {
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/CellBroadcastAlertServiceTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/CellBroadcastAlertServiceTest.java
index b9c566d..727df07 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/CellBroadcastAlertServiceTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/CellBroadcastAlertServiceTest.java
@@ -152,7 +152,7 @@
     // Test if we ignore the duplicate message
     public void testDuplicateMessage() throws Exception {
         sendMessage(4321);
-        waitForMs(200);
+        waitForMs(500);
 
         assertEquals(SHOW_NEW_ALERT_ACTION, mServiceIntentToVerify.getAction());
 
@@ -171,7 +171,7 @@
         intent.putExtra("message", m);
 
         startService(intent);
-        waitForMs(200);
+        waitForMs(500);
 
         // If the duplicate detection is working, the service should not pop-up the dialog and
         // play the alert tones.
@@ -228,7 +228,7 @@
         doReturn(b).when(mMockedCarrierConfigManager).getConfigForSubId(anyInt());
 
         sendMessage(91924);
-        waitForMs(100);
+        waitForMs(500);
 
         CellBroadcastMessage cbmTest =
                 (CellBroadcastMessage) mServiceIntentToVerify.getExtras().get("message");