Merge 599929c062be56d0c4d06f22eb931c6654526e17 on remote branch Change-Id: I44895419bdf3ebd4becb2db7b0bcdf5304a9a429

commit: 581eaf321712de5baee4dae6e86db5792c871e4b [log] [tgz]
author: Linux Build Service Account <lnxbuild@localhost> Thu Feb 04 03:50:29 2021 -0800
committer: Linux Build Service Account <lnxbuild@localhost> Thu Feb 04 03:50:29 2021 -0800
tree: c418756078ace3608ee6392395ac862fa8bb96c7
parent: ec7e70a0b1b97f884e4b483780519cd008494054 [diff]
parent: 599929c062be56d0c4d06f22eb931c6654526e17 [diff]
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e592ba9..30adbc2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml

@@ -79,7 +79,7 @@
 
         <activity android:name="com.android.cellbroadcastreceiver.CellBroadcastListActivity"
                   android:label="@string/app_label"
-                  android:theme="@style/CellBroadcastSettingsTheme"
+                  android:theme="@style/CellBroadcastListActivityTheme"
                   android:configChanges="orientation|keyboardHidden" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/RROSampleTestApp/res/values/themes.xml b/RROSampleTestApp/res/values/themes.xml
new file mode 100644
index 0000000..95de137
--- /dev/null
+++ b/RROSampleTestApp/res/values/themes.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2019 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>
+    <!--RED-->
+    <style name="CellBroadcastListActivityTheme">
+        <item name="android:colorPrimary">#FFDB4437</item>
+        <item name="android:colorSecondary">#FFDB4437</item>
+        <item name="android:colorAccent">#FFDB4437</item>
+        <item name="android:colorError">#FFDB4437</item>
+        <item name="android:colorPrimaryDark">#FFDB4437</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowShowWallpaper">true</item>
+        <item name="android:statusBarColor">#FFDB4437</item>
+        <item name="android:navigationBarColor">#FFDB4437</item>
+        <item name="android:textColor">#FFDB4437</item>
+    </style>
+
+    <!--BLUE-->
+    <style name="CellBroadcastSettingsTheme">
+        <item name="android:colorPrimary">#FF377CDB</item>
+        <item name="android:colorSecondary">#FF377CDB</item>
+        <item name="android:colorAccent">#FF377CDB</item>
+        <item name="android:colorError">#FF377CDB</item>
+        <item name="android:colorPrimaryDark">#FF377CDB</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowShowWallpaper">true</item>
+        <item name="android:statusBarColor">#FF377CDB</item>
+        <item name="android:navigationBarColor">#FF377CDB</item>
+        <item name="android:textColor">#FF377CDB</item>
+    </style>
+</resources>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 616937b..b81f4a1 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -75,7 +75,7 @@
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"استلام رسائل اختبارية من سلطات الولاية والسلطات المحلية"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"إنذارات الطوارئ"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"إرسال تحذير بشأن الأحداث التي تهدد الحياة"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"تنبيهات اختبارية"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"رسائل تجريبية"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"تلقّي اختبارات مشغّل شبكة الجوّال والاختبارات الشهرية من نظام تنبيهات السلامة"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"الاهتزاز"</string>
     <string name="override_dnd_title" msgid="5120805993144214421">"التذكير دائمًا باستخدام أعلى مستوى صوت"</string>

diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index d021549..7e68a5d 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml

@@ -57,7 +57,7 @@
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Simsiz həyəcan siqnalı bildirişlərini əldə edin"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Siqnal xatırladıcısı"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Müntəzəm səs səviyyəsində xatırlatma səsi veriləcək"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Təcili siqnal tarixçəsi"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Fövqəladə hal xəbərdarlıq tarixçəsi"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Siqnal tərcihləri"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ZSXS test yayımları"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Zəlzələ Sunami Xəbərdarlıq Sistemi üçün test yayımı"</string>

diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 2c0daaf..3f836df 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml

@@ -72,7 +72,7 @@
     <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_state_local_test_alerts_summary" msgid="780298327377950187">"Jaso probako mezuak estatuko eta tokiko agintaritzengandik"</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="7194966927004755266">"Testu-mezu bidezko alertak"</string>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 75bd7d9..4b097c3 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -49,7 +49,7 @@
     <string name="public_safety_message" msgid="9119928798786998252">"सार्वजनिक सुरक्षा से जुड़ा मैसेज"</string>
     <string name="state_local_test_alert" msgid="8003145745857480200">"राज्य/स्थानीय टेस्ट"</string>
     <string name="emergency_alert" msgid="624783871477634263">"इमरजेंसी के समय सूचनाएं"</string>
-    <string name="emergency_alerts_title" msgid="6605036374197485429">"सूचनाएं"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"चेतावनियां"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"प्रसारण संदेश"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"इमरजेंसी के समय सूचनाएं"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"वॉयस कॉल के दौरान आपातकालीन चेतावनियां"</string>
@@ -57,7 +57,7 @@
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"वायरलेस इमरजेंसी अलर्ट की चेतावनी पाएं"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"याद दिलाने के लिए अलर्ट"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"रिमांइडर की रिंगटोन की आवाज़ सामान्य रहेगी"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"इमरजेंसी के समय की सूचनाओं का इतिहास"</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>
@@ -75,7 +75,7 @@
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"राज्य और स्थानीय अधिकारियों से टेस्ट मैसेज पाना"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"इमरजेंसी के समय सूचनाएं"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"ऐसे मामलों के बारे में चेतावनी देना, जिनकी वजह से जान का खतरा हो सकता है"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"जांच करने के लिए भेजी जाने वाली सूचनाएं"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"जांच करने के लिया भेजी जाने वाली चेतावनियां"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"सुरक्षा चेतावनी वाले सिस्टम से हर महीने टेस्ट मैसेज पाएं. साथ ही, मोबाइल कैरियर से टेस्ट मैसेज पाएं"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"वाइब्रेशन"</string>
     <string name="override_dnd_title" msgid="5120805993144214421">"हमेशा सबसे तेज़ आवाज़ (फ़ुल वॉल्यूम) में सूचना दें"</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a3a1fa8..2d5d911 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -54,11 +54,11 @@
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"긴급 경보"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"음성 통화 중 응급 상황 알림"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"경보 허용"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"무선 긴급 경보 알림 수신"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"경보 알림"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"재난문자 알림 수신"</string>
+    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"재난문자 알림음"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"경보 알림음이 보통 볼륨으로 재생됨"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"긴급 경보 기록"</string>
-    <string name="alert_preferences_title" msgid="6001469026393248468">"경보 환경설정"</string>
+    <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>
@@ -121,7 +121,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"현재 무선 긴급 경보를 수신하고 있습니다. 무선 긴급 경보를 계속 수신하시겠습니까?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"예"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"아니요"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"긴급 경보 기록"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"수신된 재난문자"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"한 번"</item>
     <item msgid="9097229303902157183">"2분마다"</item>

diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index a8c8a46..45b61f0 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml

@@ -105,7 +105,7 @@
     <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_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>

diff --git a/res/values-mcc001-af/config.xml b/res/values-mcc001-af/config.xml
deleted file mode 100644
index e464b3b..0000000
--- a/res/values-mcc001-af/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Ander toetse"</string>
-</resources>

diff --git a/res/values-mcc001-am/config.xml b/res/values-mcc001-am/config.xml
deleted file mode 100644
index 6dbb0ce..0000000
--- a/res/values-mcc001-am/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"ሌሎች ሙከራዎች"</string>
-</resources>

diff --git a/res/values-mcc001-ar/config.xml b/res/values-mcc001-ar/config.xml
deleted file mode 100644
index e65d29f..0000000
--- a/res/values-mcc001-ar/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"الاختبارات الأخرى"</string>
-</resources>

diff --git a/res/values-mcc001-as/config.xml b/res/values-mcc001-as/config.xml
deleted file mode 100644
index c0330d0..0000000
--- a/res/values-mcc001-as/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"অন্য পৰীক্ষাসমূহ"</string>
-</resources>

diff --git a/res/values-mcc001-az/config.xml b/res/values-mcc001-az/config.xml
deleted file mode 100644
index c1d6ad7..0000000
--- a/res/values-mcc001-az/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Digər sınaqlar"</string>
-</resources>

diff --git a/res/values-mcc001-b+sr+Latn/config.xml b/res/values-mcc001-b+sr+Latn/config.xml
deleted file mode 100644
index b301505..0000000
--- a/res/values-mcc001-b+sr+Latn/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Drugi testovi"</string>
-</resources>

diff --git a/res/values-mcc001-be/config.xml b/res/values-mcc001-be/config.xml
deleted file mode 100644
index dcbf6fe..0000000
--- a/res/values-mcc001-be/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Іншыя тэсты"</string>
-</resources>

diff --git a/res/values-mcc001-bg/config.xml b/res/values-mcc001-bg/config.xml
deleted file mode 100644
index 0c741cf..0000000
--- a/res/values-mcc001-bg/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Други тестове"</string>
-</resources>

diff --git a/res/values-mcc001-bn/config.xml b/res/values-mcc001-bn/config.xml
deleted file mode 100644
index 4b9e337..0000000
--- a/res/values-mcc001-bn/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"অন্য পরীক্ষা"</string>
-</resources>

diff --git a/res/values-mcc001-bs/config.xml b/res/values-mcc001-bs/config.xml
deleted file mode 100644
index b301505..0000000
--- a/res/values-mcc001-bs/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Drugi testovi"</string>
-</resources>

diff --git a/res/values-mcc001-ca/config.xml b/res/values-mcc001-ca/config.xml
deleted file mode 100644
index 2e8acef..0000000
--- a/res/values-mcc001-ca/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Altres proves"</string>
-</resources>

diff --git a/res/values-mcc001-cs/config.xml b/res/values-mcc001-cs/config.xml
deleted file mode 100644
index 06a74ff..0000000
--- a/res/values-mcc001-cs/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Jiné testy"</string>
-</resources>

diff --git a/res/values-mcc001-da/config.xml b/res/values-mcc001-da/config.xml
deleted file mode 100644
index da175c8..0000000
--- a/res/values-mcc001-da/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Andre test"</string>
-</resources>

diff --git a/res/values-mcc001-de/config.xml b/res/values-mcc001-de/config.xml
deleted file mode 100644
index 9c7f1a9..0000000
--- a/res/values-mcc001-de/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Andere Tests"</string>
-</resources>

diff --git a/res/values-mcc001-el/config.xml b/res/values-mcc001-el/config.xml
deleted file mode 100644
index 5d175e1..0000000
--- a/res/values-mcc001-el/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Άλλες δοκιμές"</string>
-</resources>

diff --git a/res/values-mcc001-en-rAU/config.xml b/res/values-mcc001-en-rAU/config.xml
deleted file mode 100644
index 77bd56d..0000000
--- a/res/values-mcc001-en-rAU/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Other tests"</string>
-</resources>

diff --git a/res/values-mcc001-en-rCA/config.xml b/res/values-mcc001-en-rCA/config.xml
deleted file mode 100644
index 77bd56d..0000000
--- a/res/values-mcc001-en-rCA/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Other tests"</string>
-</resources>

diff --git a/res/values-mcc001-en-rGB/config.xml b/res/values-mcc001-en-rGB/config.xml
deleted file mode 100644
index 77bd56d..0000000
--- a/res/values-mcc001-en-rGB/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Other tests"</string>
-</resources>

diff --git a/res/values-mcc001-en-rIN/config.xml b/res/values-mcc001-en-rIN/config.xml
deleted file mode 100644
index 77bd56d..0000000
--- a/res/values-mcc001-en-rIN/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Other tests"</string>
-</resources>

diff --git a/res/values-mcc001-en-rXC/config.xml b/res/values-mcc001-en-rXC/config.xml
deleted file mode 100644
index 5233b74..0000000
--- a/res/values-mcc001-en-rXC/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎Other tests‎‏‎‎‏‎"</string>
-</resources>

diff --git a/res/values-mcc001-es-rUS/config.xml b/res/values-mcc001-es-rUS/config.xml
deleted file mode 100644
index 3bc3abf..0000000
--- a/res/values-mcc001-es-rUS/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Otras pruebas"</string>
-</resources>

diff --git a/res/values-mcc001-es/config.xml b/res/values-mcc001-es/config.xml
deleted file mode 100644
index 3bc3abf..0000000
--- a/res/values-mcc001-es/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Otras pruebas"</string>
-</resources>

diff --git a/res/values-mcc001-et/config.xml b/res/values-mcc001-et/config.xml
deleted file mode 100644
index 2832d84..0000000
--- a/res/values-mcc001-et/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Muud testid"</string>
-</resources>

diff --git a/res/values-mcc001-eu/config.xml b/res/values-mcc001-eu/config.xml
deleted file mode 100644
index 96b70f4..0000000
--- a/res/values-mcc001-eu/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Beste proba batzuk"</string>
-</resources>

diff --git a/res/values-mcc001-fa/config.xml b/res/values-mcc001-fa/config.xml
deleted file mode 100644
index ee54161..0000000
--- a/res/values-mcc001-fa/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"آزمایش‌های دیگر"</string>
-</resources>

diff --git a/res/values-mcc001-fi/config.xml b/res/values-mcc001-fi/config.xml
deleted file mode 100644
index f40fc88..0000000
--- a/res/values-mcc001-fi/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Muut testit"</string>
-</resources>

diff --git a/res/values-mcc001-fr-rCA/config.xml b/res/values-mcc001-fr-rCA/config.xml
deleted file mode 100644
index db2ac57..0000000
--- a/res/values-mcc001-fr-rCA/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Autres tests"</string>
-</resources>

diff --git a/res/values-mcc001-fr/config.xml b/res/values-mcc001-fr/config.xml
deleted file mode 100644
index db2ac57..0000000
--- a/res/values-mcc001-fr/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Autres tests"</string>
-</resources>

diff --git a/res/values-mcc001-gl/config.xml b/res/values-mcc001-gl/config.xml
deleted file mode 100644
index c7e425c..0000000
--- a/res/values-mcc001-gl/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Outras probas"</string>
-</resources>

diff --git a/res/values-mcc001-gu/config.xml b/res/values-mcc001-gu/config.xml
deleted file mode 100644
index 1371f80..0000000
--- a/res/values-mcc001-gu/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"અન્ય પરીક્ષણો"</string>
-</resources>

diff --git a/res/values-mcc001-hi/config.xml b/res/values-mcc001-hi/config.xml
deleted file mode 100644
index 9f8343c..0000000
--- a/res/values-mcc001-hi/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"दूसरे टेस्ट"</string>
-</resources>

diff --git a/res/values-mcc001-hr/config.xml b/res/values-mcc001-hr/config.xml
deleted file mode 100644
index b301505..0000000
--- a/res/values-mcc001-hr/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Drugi testovi"</string>
-</resources>

diff --git a/res/values-mcc001-hu/config.xml b/res/values-mcc001-hu/config.xml
deleted file mode 100644
index 24e778f..0000000
--- a/res/values-mcc001-hu/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Egyéb tesztek"</string>
-</resources>

diff --git a/res/values-mcc001-hy/config.xml b/res/values-mcc001-hy/config.xml
deleted file mode 100644
index f28d500..0000000
--- a/res/values-mcc001-hy/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Այլ փորձնական ծանուցումներ"</string>
-</resources>

diff --git a/res/values-mcc001-in/config.xml b/res/values-mcc001-in/config.xml
deleted file mode 100644
index 87cb955..0000000
--- a/res/values-mcc001-in/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Pengujian lainnya"</string>
-</resources>

diff --git a/res/values-mcc001-is/config.xml b/res/values-mcc001-is/config.xml
deleted file mode 100644
index 1fddda4..0000000
--- a/res/values-mcc001-is/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Aðrar prófanir"</string>
-</resources>

diff --git a/res/values-mcc001-it/config.xml b/res/values-mcc001-it/config.xml
deleted file mode 100644
index 5a328fd..0000000
--- a/res/values-mcc001-it/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Altri test"</string>
-</resources>

diff --git a/res/values-mcc001-iw/config.xml b/res/values-mcc001-iw/config.xml
deleted file mode 100644
index 7214719..0000000
--- a/res/values-mcc001-iw/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"בדיקות אחרות"</string>
-</resources>

diff --git a/res/values-mcc001-ja/config.xml b/res/values-mcc001-ja/config.xml
deleted file mode 100644
index 1edfa22..0000000
--- a/res/values-mcc001-ja/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"その他のテスト"</string>
-</resources>

diff --git a/res/values-mcc001-ka/config.xml b/res/values-mcc001-ka/config.xml
deleted file mode 100644
index ab3c66c..0000000
--- a/res/values-mcc001-ka/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"სხვა ტესტები"</string>
-</resources>

diff --git a/res/values-mcc001-kk/config.xml b/res/values-mcc001-kk/config.xml
deleted file mode 100644
index 8207efd..0000000
--- a/res/values-mcc001-kk/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Басқа сынақ ескертулері"</string>
-</resources>

diff --git a/res/values-mcc001-km/config.xml b/res/values-mcc001-km/config.xml
deleted file mode 100644
index 9e6d2c2..0000000
--- a/res/values-mcc001-km/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"ការសាកល្បងផ្សេងទៀត"</string>
-</resources>

diff --git a/res/values-mcc001-kn/config.xml b/res/values-mcc001-kn/config.xml
deleted file mode 100644
index af85c9e..0000000
--- a/res/values-mcc001-kn/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"ಇತರ ಪರೀಕ್ಷೆಗಳು"</string>
-</resources>

diff --git a/res/values-mcc001-ko/config.xml b/res/values-mcc001-ko/config.xml
deleted file mode 100644
index 265b0dc..0000000
--- a/res/values-mcc001-ko/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"기타 테스트"</string>
-</resources>

diff --git a/res/values-mcc001-ky/config.xml b/res/values-mcc001-ky/config.xml
deleted file mode 100644
index 5f597e8..0000000
--- a/res/values-mcc001-ky/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Башка сыноолор"</string>
-</resources>

diff --git a/res/values-mcc001-lo/config.xml b/res/values-mcc001-lo/config.xml
deleted file mode 100644
index 5fc33fc..0000000
--- a/res/values-mcc001-lo/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"ການທົດສອບອື່ນໆ"</string>
-</resources>

diff --git a/res/values-mcc001-lt/config.xml b/res/values-mcc001-lt/config.xml
deleted file mode 100644
index 10b97f7..0000000
--- a/res/values-mcc001-lt/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Kiti bandymai"</string>
-</resources>

diff --git a/res/values-mcc001-lv/config.xml b/res/values-mcc001-lv/config.xml
deleted file mode 100644
index a603b49..0000000
--- a/res/values-mcc001-lv/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Citi testi"</string>
-</resources>

diff --git a/res/values-mcc001-mk/config.xml b/res/values-mcc001-mk/config.xml
deleted file mode 100644
index b99f48c..0000000
--- a/res/values-mcc001-mk/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Други пробни предупредувања"</string>
-</resources>

diff --git a/res/values-mcc001-ml/config.xml b/res/values-mcc001-ml/config.xml
deleted file mode 100644
index 9062ed1..0000000
--- a/res/values-mcc001-ml/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"മറ്റ് പരിശോധനകൾ"</string>
-</resources>

diff --git a/res/values-mcc001-mn/config.xml b/res/values-mcc001-mn/config.xml
deleted file mode 100644
index 976ca13..0000000
--- a/res/values-mcc001-mn/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Бусад туршилт"</string>
-</resources>

diff --git a/res/values-mcc001-mr/config.xml b/res/values-mcc001-mr/config.xml
deleted file mode 100644
index 8bf49d7..0000000
--- a/res/values-mcc001-mr/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"इतर चाचण्या"</string>
-</resources>

diff --git a/res/values-mcc001-ms/config.xml b/res/values-mcc001-ms/config.xml
deleted file mode 100644
index 3776e9d..0000000
--- a/res/values-mcc001-ms/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Ujian lain"</string>
-</resources>

diff --git a/res/values-mcc001-my/config.xml b/res/values-mcc001-my/config.xml
deleted file mode 100644
index 83061e2..0000000
--- a/res/values-mcc001-my/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"အခြားစမ်းသပ်မှုများ"</string>
-</resources>

diff --git a/res/values-mcc001-nb/config.xml b/res/values-mcc001-nb/config.xml
deleted file mode 100644
index fa02613..0000000
--- a/res/values-mcc001-nb/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Andre tester"</string>
-</resources>

diff --git a/res/values-mcc001-ne/config.xml b/res/values-mcc001-ne/config.xml
deleted file mode 100644
index 2c42c41..0000000
--- a/res/values-mcc001-ne/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"अन्य परीक्षणहरू"</string>
-</resources>

diff --git a/res/values-mcc001-nl/config.xml b/res/values-mcc001-nl/config.xml
deleted file mode 100644
index 5a9b6c3..0000000
--- a/res/values-mcc001-nl/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Andere tests"</string>
-</resources>

diff --git a/res/values-mcc001-or/config.xml b/res/values-mcc001-or/config.xml
deleted file mode 100644
index 3de2cb2..0000000
--- a/res/values-mcc001-or/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"ଅନ୍ୟ ପରୀକ୍ଷାଗୁଡ଼ିକ"</string>
-</resources>

diff --git a/res/values-mcc001-pa/config.xml b/res/values-mcc001-pa/config.xml
deleted file mode 100644
index a01a81c..0000000
--- a/res/values-mcc001-pa/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"ਹੋਰ ਜਾਂਚਾਂ"</string>
-</resources>

diff --git a/res/values-mcc001-pl/config.xml b/res/values-mcc001-pl/config.xml
deleted file mode 100644
index a4a46cc..0000000
--- a/res/values-mcc001-pl/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Inne testy"</string>
-</resources>

diff --git a/res/values-mcc001-pt-rPT/config.xml b/res/values-mcc001-pt-rPT/config.xml
deleted file mode 100644
index a07f722..0000000
--- a/res/values-mcc001-pt-rPT/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Outros testes"</string>
-</resources>

diff --git a/res/values-mcc001-pt/config.xml b/res/values-mcc001-pt/config.xml
deleted file mode 100644
index a07f722..0000000
--- a/res/values-mcc001-pt/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Outros testes"</string>
-</resources>

diff --git a/res/values-mcc001-ro/config.xml b/res/values-mcc001-ro/config.xml
deleted file mode 100644
index b88b00f..0000000
--- a/res/values-mcc001-ro/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Alte teste"</string>
-</resources>

diff --git a/res/values-mcc001-ru/config.xml b/res/values-mcc001-ru/config.xml
deleted file mode 100644
index cd38d1a..0000000
--- a/res/values-mcc001-ru/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Другие тестовые оповещения"</string>
-</resources>

diff --git a/res/values-mcc001-si/config.xml b/res/values-mcc001-si/config.xml
deleted file mode 100644
index 0ea46ea..0000000
--- a/res/values-mcc001-si/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"වෙනත් පරීක්ෂා"</string>
-</resources>

diff --git a/res/values-mcc001-sk/config.xml b/res/values-mcc001-sk/config.xml
deleted file mode 100644
index 968f44c..0000000
--- a/res/values-mcc001-sk/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Iné testy"</string>
-</resources>

diff --git a/res/values-mcc001-sl/config.xml b/res/values-mcc001-sl/config.xml
deleted file mode 100644
index 99e1a2d..0000000
--- a/res/values-mcc001-sl/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Drugi preizkusi"</string>
-</resources>

diff --git a/res/values-mcc001-sq/config.xml b/res/values-mcc001-sq/config.xml
deleted file mode 100644
index 42d7e1c..0000000
--- a/res/values-mcc001-sq/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Testet e tjera"</string>
-</resources>

diff --git a/res/values-mcc001-sr/config.xml b/res/values-mcc001-sr/config.xml
deleted file mode 100644
index 810e07a..0000000
--- a/res/values-mcc001-sr/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Други тестови"</string>
-</resources>

diff --git a/res/values-mcc001-sv/config.xml b/res/values-mcc001-sv/config.xml
deleted file mode 100644
index 6a76327..0000000
--- a/res/values-mcc001-sv/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Andra tester"</string>
-</resources>

diff --git a/res/values-mcc001-sw/config.xml b/res/values-mcc001-sw/config.xml
deleted file mode 100644
index 3fd6bd4..0000000
--- a/res/values-mcc001-sw/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Majaribio mengine"</string>
-</resources>

diff --git a/res/values-mcc001-ta/config.xml b/res/values-mcc001-ta/config.xml
deleted file mode 100644
index 9a641fb..0000000
--- a/res/values-mcc001-ta/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"பிற சோதனைகள்"</string>
-</resources>

diff --git a/res/values-mcc001-te/config.xml b/res/values-mcc001-te/config.xml
deleted file mode 100644
index cf2c87e..0000000
--- a/res/values-mcc001-te/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"ఇతర పరీక్షలు"</string>
-</resources>

diff --git a/res/values-mcc001-th/config.xml b/res/values-mcc001-th/config.xml
deleted file mode 100644
index a1d4f42..0000000
--- a/res/values-mcc001-th/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"การทดสอบอื่นๆ"</string>
-</resources>

diff --git a/res/values-mcc001-tl/config.xml b/res/values-mcc001-tl/config.xml
deleted file mode 100644
index 193ac1d..0000000
--- a/res/values-mcc001-tl/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Iba pang pagsubok"</string>
-</resources>

diff --git a/res/values-mcc001-tr/config.xml b/res/values-mcc001-tr/config.xml
deleted file mode 100644
index f37c77c..0000000
--- a/res/values-mcc001-tr/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Diğer testler"</string>
-</resources>

diff --git a/res/values-mcc001-uk/config.xml b/res/values-mcc001-uk/config.xml
deleted file mode 100644
index c54c9a8..0000000
--- a/res/values-mcc001-uk/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Інші тести"</string>
-</resources>

diff --git a/res/values-mcc001-ur/config.xml b/res/values-mcc001-ur/config.xml
deleted file mode 100644
index c6a63d5..0000000
--- a/res/values-mcc001-ur/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"دیگر ٹیسٹس"</string>
-</resources>

diff --git a/res/values-mcc001-uz/config.xml b/res/values-mcc001-uz/config.xml
deleted file mode 100644
index 3fcbc5a..0000000
--- a/res/values-mcc001-uz/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Boshqa sinov xabarlari"</string>
-</resources>

diff --git a/res/values-mcc001-vi/config.xml b/res/values-mcc001-vi/config.xml
deleted file mode 100644
index 515a1c9..0000000
--- a/res/values-mcc001-vi/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Các cảnh báo kiểm tra khác"</string>
-</resources>

diff --git a/res/values-mcc001-zh-rCN/config.xml b/res/values-mcc001-zh-rCN/config.xml
deleted file mode 100644
index 3938ff6..0000000
--- a/res/values-mcc001-zh-rCN/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"其他测试"</string>
-</resources>

diff --git a/res/values-mcc001-zh-rHK/config.xml b/res/values-mcc001-zh-rHK/config.xml
deleted file mode 100644
index 4af659c..0000000
--- a/res/values-mcc001-zh-rHK/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"其他測試"</string>
-</resources>

diff --git a/res/values-mcc001-zh-rTW/config.xml b/res/values-mcc001-zh-rTW/config.xml
deleted file mode 100644
index 4af659c..0000000
--- a/res/values-mcc001-zh-rTW/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"其他測試"</string>
-</resources>

diff --git a/res/values-mcc001-zu/config.xml b/res/values-mcc001-zu/config.xml
deleted file mode 100644
index 4c5a35a..0000000
--- a/res/values-mcc001-zu/config.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 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_test_alerts_title" msgid="7552567512178490413">"Okunye ukuhlolwa"</string>
-</resources>

diff --git a/res/values-mcc260/config.xml b/res/values-mcc260/config.xml
new file mode 100644
index 0000000..dbb4a32
--- /dev/null
+++ b/res/values-mcc260/config.xml

@@ -0,0 +1,12 @@
+<resources>
+  <!-- Disable emergency alerts -->
+  <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false"></string-array>
+  <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false"></string-array>
+  <string-array name="cmas_alerts_severe_range_strings" translatable="false"></string-array>
+  <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false"></string-array>
+  <string-array name="required_monthly_test_range_strings" translatable="false"></string-array>
+  <string-array name="exercise_alert_range_strings" translatable="false"></string-array>
+  <string-array name="operator_defined_alert_range_strings" translatable="false"></string-array>
+  <string-array name="etws_test_alerts_range_strings" translatable="false"></string-array>
+  <string-array name="etws_alerts_range_strings" translatable="false"></string-array>
+</resources>

diff --git a/res/values-mcc262/config.xml b/res/values-mcc262/config.xml
new file mode 100644
index 0000000..2687178
--- /dev/null
+++ b/res/values-mcc262/config.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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>
+    <!-- Disable emergency alerts -->
+    <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false"></string-array>
+    <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false"></string-array>
+    <string-array name="cmas_alerts_severe_range_strings" translatable="false"></string-array>
+    <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false"></string-array>
+    <string-array name="required_monthly_test_range_strings" translatable="false"></string-array>
+    <string-array name="exercise_alert_range_strings" translatable="false"></string-array>
+    <string-array name="operator_defined_alert_range_strings" translatable="false"></string-array>
+    <string-array name="etws_test_alerts_range_strings" translatable="false"></string-array>
+    <string-array name="etws_alerts_range_strings" translatable="false"></string-array>
+</resources>

diff --git a/res/values-mcc310-en-rXC/strings.xml b/res/values-mcc310-en-rXC/strings.xml
index d002191..0c15b1b 100644
--- a/res/values-mcc310-en-rXC/strings.xml
+++ b/res/values-mcc310-en-rXC/strings.xml

@@ -20,8 +20,7 @@
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎‎‎‏‎‎‎‏‎‏‎‎‏‎Spanish‎‏‎‎‏‎"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎Receive emergency alerts in Spanish when possible‎‏‎‎‏‎"</string>
     <string name="confirm_delete_broadcast" msgid="6808374217554967811">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎Delete this alert?‎‏‎‎‏‎"</string>
-    <!-- no translation found for confirm_delete_all_broadcasts (4748571670736214158) -->
-    <skip />
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‎‎‎‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‏‎‎‎‏‏‏‎‎Delete all received alerts?‎‏‎‎‏‎"</string>
     <string name="menu_delete" msgid="2691868773984777519">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎Delete alert‎‏‎‎‏‎"</string>
     <string name="menu_delete_all" msgid="8991615021908376216">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎Delete alerts‎‏‎‎‏‎"</string>
 </resources>

diff --git a/res/values-mcc310-uz/strings.xml b/res/values-mcc310-uz/strings.xml
index 1321c8f..0847889 100644
--- a/res/values-mcc310-uz/strings.xml
+++ b/res/values-mcc310-uz/strings.xml

@@ -20,8 +20,7 @@
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Ispan"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Imkoni boʻlsa, favqulodda ogohlantirishlar Ispan tilida kelsin"</string>
     <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Bu bildirishnoma oʻchirilsinmi?"</string>
-    <!-- no translation found for confirm_delete_all_broadcasts (4748571670736214158) -->
-    <skip />
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Barcha qabul qilingan ogohlantirishlar oʻchirilsinmi?"</string>
     <string name="menu_delete" msgid="2691868773984777519">"Bildirishnoma oʻchirilsinmi"</string>
     <string name="menu_delete_all" msgid="8991615021908376216">"Bildirishnomalarni oʻchirish"</string>
 </resources>

diff --git a/res/values-mcc310-zh-rCN/strings.xml b/res/values-mcc310-zh-rCN/strings.xml
index 0e84bbb..b831746 100644
--- a/res/values-mcc310-zh-rCN/strings.xml
+++ b/res/values-mcc310-zh-rCN/strings.xml

@@ -20,8 +20,7 @@
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"西班牙语"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"接收西班牙语的紧急警报（如有可能）"</string>
     <string name="confirm_delete_broadcast" msgid="6808374217554967811">"要删除此警报吗？"</string>
-    <!-- no translation found for confirm_delete_all_broadcasts (4748571670736214158) -->
-    <skip />
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"要删除收到的所有警报吗？"</string>
     <string name="menu_delete" msgid="2691868773984777519">"删除警报"</string>
     <string name="menu_delete_all" msgid="8991615021908376216">"删除警报"</string>
 </resources>

diff --git a/res/values-mcc310-zh-rHK/strings.xml b/res/values-mcc310-zh-rHK/strings.xml
index a92c488..082d9a6 100644
--- a/res/values-mcc310-zh-rHK/strings.xml
+++ b/res/values-mcc310-zh-rHK/strings.xml

@@ -20,8 +20,7 @@
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"西班牙文"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"接收西班牙文的緊急警示 (如有)"</string>
     <string name="confirm_delete_broadcast" msgid="6808374217554967811">"要刪除這個警示嗎？"</string>
-    <!-- no translation found for confirm_delete_all_broadcasts (4748571670736214158) -->
-    <skip />
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"要刪除所有收到的警示嗎？"</string>
     <string name="menu_delete" msgid="2691868773984777519">"刪除警示"</string>
     <string name="menu_delete_all" msgid="8991615021908376216">"刪除警示"</string>
 </resources>

diff --git a/res/values-mcc310-zh-rTW/strings.xml b/res/values-mcc310-zh-rTW/strings.xml
index 4a26441..5335d90 100644
--- a/res/values-mcc310-zh-rTW/strings.xml
+++ b/res/values-mcc310-zh-rTW/strings.xml

@@ -20,8 +20,7 @@
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"西班牙文"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"接收西班牙文的緊急警報 (如果有的話)"</string>
     <string name="confirm_delete_broadcast" msgid="6808374217554967811">"要刪除這則警報嗎？"</string>
-    <!-- no translation found for confirm_delete_all_broadcasts (4748571670736214158) -->
-    <skip />
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"要刪除所有收到的警報嗎？"</string>
     <string name="menu_delete" msgid="2691868773984777519">"刪除警報"</string>
     <string name="menu_delete_all" msgid="8991615021908376216">"刪除警報"</string>
 </resources>

diff --git a/res/values-mcc420-ml/strings.xml b/res/values-mcc420-ml/strings.xml
index b9c3184..8766ca6 100644
--- a/res/values-mcc420-ml/strings.xml
+++ b/res/values-mcc420-ml/strings.xml

@@ -22,7 +22,7 @@
     <string name="cmas_severe_alert" msgid="1611418922477376647">"അടിയന്തര മുന്നറിയിപ്പുകൾ"</string>
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"മുന്നറിയിപ്പുകൾ"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"മുന്നറിയിപ്പുകൾ"</string>
-    <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"ജീവിതമോ സ്വത്തോ സംരക്ഷിക്കാനുതകുന്ന, ശുപാർശ ചെയ്‌തിരിക്കുന്ന നടപടികൾ"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"ജീവനോ സ്വത്തോ സംരക്ഷിക്കാൻ ശുപാർശ ചെയ്‌തിരിക്കുന്ന പ്രവൃത്തികൾ"</string>
     <string name="cmas_required_monthly_test" msgid="197559096432885563">"പരിശോധനാ മുന്നറിയിപ്പുകൾ"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"വ്യായാമങ്ങൾ"</string>
 </resources>

diff --git a/res/values-mcc422-fi/strings.xml b/res/values-mcc422-fi/strings.xml
index 8bd2fb7..b02ac2a 100644
--- a/res/values-mcc422-fi/strings.xml
+++ b/res/values-mcc422-fi/strings.xml

@@ -13,7 +13,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="3211812107922643307">"Hätätilannehälytys"</string>
+    <string name="cmas_presidential_level_alert" msgid="3211812107922643307">"Vaaratiedote"</string>
     <string name="pws_other_message_identifiers" msgid="7325727748670134223">"Varoitus"</string>
     <string name="cmas_exercise_alert" msgid="8865117243431902282">"Harjoitushälytys"</string>
 </resources>

diff --git a/res/values-mcc424-af/strings.xml b/res/values-mcc424-af/strings.xml
index 07b8690..c380646 100644
--- a/res/values-mcc424-af/strings.xml
+++ b/res/values-mcc424-af/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Nasionale noodberig"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Waarskuwingsberig"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Publiekeveiligheidswaarskuwing"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Nasionale noodberig"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Noodberig"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Noodberig"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Noodberig"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Noodberig"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Waarskuwing"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Publiekeveiligheidwaarskuwing"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Oefen"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Toetswaarskuwing"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Toetswaarskuwing"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Waarskuwings"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Publiekeveiligheidswaarskuwings"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Toetswaarskuwing"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Toetswaarskuwing"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Waarskuwings"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Publiekeveiligheidwaarskuwings"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Toetswaarskuwings"</string>
 </resources>

diff --git a/res/values-mcc424-am/strings.xml b/res/values-mcc424-am/strings.xml
index 69ac3f2..d1fde6a 100644
--- a/res/values-mcc424-am/strings.xml
+++ b/res/values-mcc424-am/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ብሔራዊ የአደጋ ጊዜ ማንቂያ"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"የማስጠንቀቂያ ማንቂያ"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"የሕዝባዊ ደህንነት ማንቂያ"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ብሔራዊ የአደጋ ጊዜ ማንቂያ"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"የአደጋ ጊዜ ማንቂያ"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"የአደጋ ጊዜ ማንቂያ"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"የአደጋ ጊዜ ማንቂያ"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"የአደጋ ጊዜ ማንቂያ"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"የማስጠንቀቂያ ማንቂያ"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"የሕዝባዊ ደህንነት ማንቂያ"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ልምምድ"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ማንቂያን ፈትሽ"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"ማንቂያን ሞክር"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"ማስጠንቀቂያ ማንቂያዎች"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"የሕዝባዊ ደህንነት ማንቂያዎች"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"ማንቂያን ሞክር"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"ማንቂያን ሞክር"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"ማስጠንቀቂያ ማንቂያዎች"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"የሕዝባዊ ደህንነት ማንቂያዎች"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"የሙከራ ማንቂያዎች"</string>
 </resources>

diff --git a/res/values-mcc424-ar/strings.xml b/res/values-mcc424-ar/strings.xml
index 4a54605..b165605 100644
--- a/res/values-mcc424-ar/strings.xml
+++ b/res/values-mcc424-ar/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"تحذير طارئ وطني"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"تنبيه تحذيري"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"تنبيه السلامة العامة"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"تحذير طارئ وطني"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"تحذير طارئ"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"تحذير طارئ"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"تحذير طارئ"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"تحذير طارئ"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"رسالة تحذيرية"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"تحذير: السلامة العامة"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"تمرين"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"رسالة تجريبية"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"تنبيه تجريبي"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"التنبيهات التحذيرية"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"تنبيهات السلامة العامة"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"رسالة تجريبية"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"رسالة تجريبية"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"رسالة تحذيرية"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"تحذير: السلامة العامة"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"رسالة تجريبية"</string>
 </resources>

diff --git a/res/values-mcc424-as/strings.xml b/res/values-mcc424-as/strings.xml
index a2971ad..e07c623 100644
--- a/res/values-mcc424-as/strings.xml
+++ b/res/values-mcc424-as/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ৰাষ্ট্ৰীয় জৰুৰীকালীন সতর্কতা"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"সকীয়নিমূলক সতৰ্কবাৰ্তা"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"ৰাজহুৱা সুৰক্ষা সতৰ্কবাৰ্তা"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ৰাষ্ট্ৰীয় জৰুৰীকালীন সতৰ্কবাৰ্তা"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"জৰুৰীকালীন সতৰ্কবাৰ্তা"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"জৰুৰীকালীন সতৰ্কবাৰ্তা"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"জৰুৰীকালীন সতৰ্কবাৰ্তা"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"জৰুৰীকালীন সতৰ্কবাৰ্তা"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"সকীয়নিমূলক সতৰ্কবাৰ্তা"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"ৰাজহুৱা সুৰক্ষা বিষয়ক সতৰ্কবাৰ্তা"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"অনুশীলন"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"পৰীক্ষামূলক সতৰ্কতা"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"পৰীক্ষামূলক সতৰ্কবার্তা"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"সকীয়নিমূলক সতৰ্কবাৰ্তাসমূহ"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"ৰাজহুৱা সুৰক্ষা সতৰ্কবাৰ্তাসমূহ"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"পৰীক্ষামূলক সতৰ্কবাৰ্তা"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"পৰীক্ষামূলক সতৰ্কবাৰ্তা"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"সকীয়নিমূলক সতৰ্কবাৰ্তাসমূহ"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"ৰাজহুৱা সুৰক্ষা বিষয়ক সতৰ্কবাৰ্তাসমূহ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"পৰীক্ষামূলক সতৰ্কবাৰ্তাসমূহ"</string>
 </resources>

diff --git a/res/values-mcc424-az/strings.xml b/res/values-mcc424-az/strings.xml
index 359824c..45221c3 100644
--- a/res/values-mcc424-az/strings.xml
+++ b/res/values-mcc424-az/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Yerli həyəcan siqnalı"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Xəbərdarlıq siqnalı"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"İctimai təhlükəsizlik siqnalı"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Milli Həyəcan Siqnalı"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Həyəcan Siqnalı"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Həyəcan Siqnalı"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Həyəcan Siqnalı"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Həyəcan Siqnalı"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Xəbərdarlıq Siqnalı"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"İctimai Təhlükəsizlik Siqnalı"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Məşq"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test siqnalı"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Test siqnalı"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Xəbərdarlıq siqnalları"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"İctimai təhlükəsizlik siqnalları"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Test Siqnalı"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Test Siqnalı"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Xəbərdarlıq Siqnalları"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"İctimai Təhlükəsizlik Siqnalları"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Test Siqnalları"</string>
 </resources>

diff --git a/res/values-mcc424-b+sr+Latn/strings.xml b/res/values-mcc424-b+sr+Latn/strings.xml
index 391f512..9f16886 100644
--- a/res/values-mcc424-b+sr+Latn/strings.xml
+++ b/res/values-mcc424-b+sr+Latn/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Obaveštenje o hitnom slučaju na nivou zemlje"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Obaveštenje o upozorenju"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Obaveštenje o javnoj bezbednosti"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Obaveštenje o hitnom slučaju na nivou zemlje"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Obaveštenje o hitnom slučaju"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Obaveštenje o hitnom slučaju"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Obaveštenje o hitnom slučaju"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Obaveštenje o hitnom slučaju"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Obaveštenje o upozorenju"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Obaveštenje o javnoj bezbednosti"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Vežbanje"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test obaveštenje"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Probno obaveštenje"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Obaveštenja o upozorenjima"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Obaveštenja o javnoj bezbednosti"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Probno obaveštenje"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Probno obaveštenje"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Obaveštenja o upozorenjima"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Obaveštenja o javnoj bezbednosti"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Probna obaveštenja"</string>
 </resources>

diff --git a/res/values-mcc424-be/strings.xml b/res/values-mcc424-be/strings.xml
index 2e08054..da49cbf 100644
--- a/res/values-mcc424-be/strings.xml
+++ b/res/values-mcc424-be/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Дзяржаўная абвестка пра надзвычайную сітуацыю"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Папераджальная абвестка"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Абвестка пра пагрозу грамадскай бяспецы"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Дзяржаўная абвестка пра надзвычайную сітуацыю"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Аварыйная абвестка"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Аварыйная абвестка"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Аварыйная абвестка"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Аварыйная абвестка"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Папераджальная абвестка"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Абвестка пра пагрозу грамадскай бяспецы"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Практыкаванне"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Тэставая абвестка"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Тэставая абвестка"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Папераджальныя абвесткі"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Абвесткі пра пагрозу грамадскай бяспецы"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Тэставая абвестка"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Тэставая абвестка"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Папераджальныя абвесткі"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Абвесткі пра пагрозу грамадскай бяспецы"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Тэставыя абвесткі"</string>
 </resources>

diff --git a/res/values-mcc424-bg/strings.xml b/res/values-mcc424-bg/strings.xml
index cb50a3d..e193419 100644
--- a/res/values-mcc424-bg/strings.xml
+++ b/res/values-mcc424-bg/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Сигнал при спешни случаи на национално ниво"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Сигнал за предупреждение"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Сигнал за обществена безопасност"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Сигнал при спешни случаи на национално ниво"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Сигнал при спешни случаи"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Сигнал при спешни случаи"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Сигнал при спешни случаи"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Сигнал при спешни случаи"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Сигнал за предупреждение"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Сигнал за обществена безопасност"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Упражняване"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Тестови сигнал"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Тестови сигнал"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Сигнали за предупреждение"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Сигнали за обществена безопасност"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Тестови сигнал"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Тестови сигнал"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Сигнали за предупреждение"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Сигнали за обществена безопасност"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Тестови сигнали"</string>
 </resources>

diff --git a/res/values-mcc424-bn/strings.xml b/res/values-mcc424-bn/strings.xml
index 26eed55..189f664 100644
--- a/res/values-mcc424-bn/strings.xml
+++ b/res/values-mcc424-bn/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"জাতীয় স্তরে জরুরি সতর্কতা"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"সতর্কতা সংক্রান্ত বিজ্ঞপ্তি"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"সর্বজনীন নিরাপত্তা সম্পর্কিত বিজ্ঞপ্তি"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"জাতীয় স্তরে জরুরি সতর্কতা"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"জরুরি সতর্কতা"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"জরুরি সতর্কতা"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"জরুরি সতর্কতা"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"জরুরি সতর্কতা"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"সতর্কতা সংক্রান্ত বিজ্ঞপ্তি"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"সর্বজনীন নিরাপত্তা সম্পর্কিত বিজ্ঞপ্তি"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ব্যায়াম"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"পরীক্ষামূলকভাবে সতর্কতা জারি"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"পরীক্ষামূলকভাবে সতর্কতা জারি"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"সতর্কতা সংক্রান্ত বিজ্ঞপ্তি"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"সর্বজনীন নিরাপত্তা সম্পর্কিত বিজ্ঞপ্তি"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"পরীক্ষামূলকভাবে জারি সতর্কতা"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"পরীক্ষামূলকভাবে জারি সতর্কতা"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"সতর্কতা সম্পর্কিত বিজ্ঞপ্তি"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"সর্বজনীন নিরাপত্তা সম্পর্কিত বিজ্ঞপ্তি"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"পরীক্ষামূলকভাবে জারি সতর্কতা"</string>
 </resources>

diff --git a/res/values-mcc424-bs/strings.xml b/res/values-mcc424-bs/strings.xml
index f445c03..2d2c6ff 100644
--- a/res/values-mcc424-bs/strings.xml
+++ b/res/values-mcc424-bs/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Državno upozorenje za hitan slučaj"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Upozorenje"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Upozorenje o javnoj sigurnosti"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Državno upozorenje za hitan slučaj"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Upozorenje za hitan slučaj"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Upozorenje za hitan slučaj"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Upozorenje za hitan slučaj"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Upozorenje za hitan slučaj"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Upozorenje"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Upozorenje o javnoj sigurnosti"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Vježbanje"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testno upozorenje"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Testno upozorenje"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Upozorenja"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Upozorenja o javnoj sigurnosti"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testno upozorenje"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testno upozorenje"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Upozorenja"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Upozorenja o javnoj sigurnosti"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testna upozorenja"</string>
 </resources>

diff --git a/res/values-mcc424-ca/strings.xml b/res/values-mcc424-ca/strings.xml
index e766867..058a683 100644
--- a/res/values-mcc424-ca/strings.xml
+++ b/res/values-mcc424-ca/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerta d\'emergència nacional"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Alerta"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Alerta de seguretat pública"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alerta d\'emergències nacional"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alerta d\'emergències"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alerta d\'emergències"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alerta d\'emergències"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alerta d\'emergències"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alerta"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alerta de seguretat pública"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercici"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerta de prova"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Alerta de prova"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alertes"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Alertes de seguretat públiques"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alerta de prova"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alerta de prova"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alertes"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alertes de seguretat públiques"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alertes de prova"</string>
 </resources>

diff --git a/res/values-mcc424-cs/strings.xml b/res/values-mcc424-cs/strings.xml
index 31041b7..e7d8ed1 100644
--- a/res/values-mcc424-cs/strings.xml
+++ b/res/values-mcc424-cs/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Celostátní výstražná zpráva"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Upozornění"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Upozornění ohledně veřejné bezpečnosti"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Celostátní výstražná zpráva"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Výstražná zpráva"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Výstražná zpráva"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Výstražná zpráva"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Výstražná zpráva"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Upozornění"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Upozornění ohledně veřejné bezpečnosti"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Cvičení"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testovací výstraha"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Testovací upozornění"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Varování"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Upozornění ohledně veřejné bezpečnosti"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testovací upozornění"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testovací upozornění"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Varování"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Upozornění ohledně veřejné bezpečnosti"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testovací upozornění"</string>
 </resources>

diff --git a/res/values-mcc424-da/strings.xml b/res/values-mcc424-da/strings.xml
index fbac5a6..cfdce4c 100644
--- a/res/values-mcc424-da/strings.xml
+++ b/res/values-mcc424-da/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"National nødalarm"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Advarselsalarm"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Offentlig sikkerhedsadvarsel"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"National nødunderretning"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Nødunderretning"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Nødunderretning"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Nødunderretning"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Nødunderretning"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Advarselsunderretning"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Offentlig sikkerhedsunderretninger"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Motion"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testalarm"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Testalarm"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Advarsler"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Offentlige sikkerhedsadvarsler"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testunderretning"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testunderretning"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Advarselsunderretninger"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Offentlige sikkerhedsunderretninger"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testunderretninger"</string>
 </resources>

diff --git a/res/values-mcc424-de/strings.xml b/res/values-mcc424-de/strings.xml
index dd78cae..cea642c 100644
--- a/res/values-mcc424-de/strings.xml
+++ b/res/values-mcc424-de/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Nationale Notfallwarnung"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Warnmeldung"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Warnung zur öffentlichen Sicherheit"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Nationale Notfallwarnung"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Notfallwarnung"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Notfallwarnung"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Notfallwarnung"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Notfallwarnung"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Warnung"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Warnung zur öffentlichen Sicherheit"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Sport"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testwarnung"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Testwarnung"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Warnungen"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Warnungen zur öffentlichen Sicherheit"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testwarnung"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testwarnung"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Warnungen"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Warnungen zur öffentlichen Sicherheit"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testwarnungen"</string>
 </resources>

diff --git a/res/values-mcc424-el/strings.xml b/res/values-mcc424-el/strings.xml
index 9a2edc9..9d718d2 100644
--- a/res/values-mcc424-el/strings.xml
+++ b/res/values-mcc424-el/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Ειδοποίηση κατάστασης εθνικής έκτακτης ανάγκης"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Ειδοποίηση προειδοποίησης"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Ειδοποίηση δημόσιας ασφάλειας"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Ειδοποίηση κατάστασης εθνικής έκτακτης ανάγκης"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Ειδοποίηση έκτακτης ανάγκης"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Ειδοποίηση έκτακτης ανάγκης"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Ειδοποίηση έκτακτης ανάγκης"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Ειδοποίηση έκτακτης ανάγκης"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Ειδοποίηση προειδοποίησης"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Ειδοποίηση δημόσιας ασφάλειας"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Άσκηση"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Δοκιμαστική ειδοποίηση"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Δοκιμαστική ειδοποίηση"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Ειδοποιήσεις προειδοποίησης"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Ειδοποιήσεις δημόσιας ασφάλειας"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Δοκιμαστική ειδοποίηση"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Δοκιμαστική ειδοποίηση"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Ειδοποιήσεις προειδοποίησης"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Ειδοποιήσεις δημόσιας ασφάλειας"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Δοκιμαστικές ειδοποιήσεις"</string>
 </resources>

diff --git a/res/values-mcc424-en-rAU/strings.xml b/res/values-mcc424-en-rAU/strings.xml
index dc185b0..bc9c30e 100644
--- a/res/values-mcc424-en-rAU/strings.xml
+++ b/res/values-mcc424-en-rAU/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"National emergency alert"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Warning alert"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Public safety alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"National emergency alert"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Emergency alert"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Emergency alert"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Emergency alert"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Emergency alert"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Warning alert"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Public safety alert"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercise"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test alert"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Test alert"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Warning alerts"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Public safety alerts"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Test alert"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Test alert"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Warning alerts"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Public safety alerts"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Test alerts"</string>
 </resources>

diff --git a/res/values-mcc424-en-rCA/strings.xml b/res/values-mcc424-en-rCA/strings.xml
index dc185b0..bc9c30e 100644
--- a/res/values-mcc424-en-rCA/strings.xml
+++ b/res/values-mcc424-en-rCA/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"National emergency alert"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Warning alert"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Public safety alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"National emergency alert"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Emergency alert"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Emergency alert"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Emergency alert"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Emergency alert"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Warning alert"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Public safety alert"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercise"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test alert"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Test alert"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Warning alerts"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Public safety alerts"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Test alert"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Test alert"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Warning alerts"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Public safety alerts"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Test alerts"</string>
 </resources>

diff --git a/res/values-mcc424-en-rGB/strings.xml b/res/values-mcc424-en-rGB/strings.xml
index dc185b0..bc9c30e 100644
--- a/res/values-mcc424-en-rGB/strings.xml
+++ b/res/values-mcc424-en-rGB/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"National emergency alert"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Warning alert"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Public safety alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"National emergency alert"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Emergency alert"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Emergency alert"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Emergency alert"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Emergency alert"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Warning alert"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Public safety alert"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercise"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test alert"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Test alert"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Warning alerts"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Public safety alerts"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Test alert"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Test alert"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Warning alerts"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Public safety alerts"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Test alerts"</string>
 </resources>

diff --git a/res/values-mcc424-en-rIN/strings.xml b/res/values-mcc424-en-rIN/strings.xml
index dc185b0..bc9c30e 100644
--- a/res/values-mcc424-en-rIN/strings.xml
+++ b/res/values-mcc424-en-rIN/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"National emergency alert"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Warning alert"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Public safety alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"National emergency alert"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Emergency alert"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Emergency alert"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Emergency alert"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Emergency alert"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Warning alert"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Public safety alert"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercise"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test alert"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Test alert"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Warning alerts"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Public safety alerts"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Test alert"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Test alert"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Warning alerts"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Public safety alerts"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Test alerts"</string>
 </resources>

diff --git a/res/values-mcc424-en-rXC/strings.xml b/res/values-mcc424-en-rXC/strings.xml
index 882a020..48b2be4 100644
--- a/res/values-mcc424-en-rXC/strings.xml
+++ b/res/values-mcc424-en-rXC/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎National emergency alert‎‏‎‎‏‎"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‏‎‏‏‎‏‎‏‏‎‏‏‎‏‎‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎Warning alert‎‏‎‎‏‎"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‎‎‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎Public safety alert‎‏‎‎‏‎"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‎‎National Emergency Alert‎‏‎‎‏‎"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎Emergency Alert‎‏‎‎‏‎"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‏‎Emergency Alert‎‏‎‎‏‎"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎Emergency Alert‎‏‎‎‏‎"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‎‎‏‎‏‎‎‏‏‎‎‏‎‎‎‎‎‎‎‎Emergency Alert‎‏‎‎‏‎"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎Warning Alert‎‏‎‎‏‎"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‏‏‎Public Safety Alert‎‏‎‎‏‎"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‎Exercise‎‏‎‎‏‎"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‎‏‏‏‏‏‎‎‎‎‏‎Test alert‎‏‎‎‏‎"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‏‎‎‎‎‏‎‎‏‎‏‎‏‎‏‏‏‎‎‏‎Test alert‎‏‎‎‏‎"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‏‏‎Warning alerts‎‏‎‎‏‎"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎Public safety alerts‎‏‎‎‏‎"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‎‎‎Test Alert‎‏‎‎‏‎"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‏‎‎‎‎‏‎‏‎‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‏‏‎‎‎Test Alert‎‏‎‎‏‎"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎Warning Alerts‎‏‎‎‏‎"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‏‏‏‏‎‎Public Safety Alerts‎‏‎‎‏‎"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‏‏‏‎‏‎Test Alerts‎‏‎‎‏‎"</string>
 </resources>

diff --git a/res/values-mcc424-es-rUS/strings.xml b/res/values-mcc424-es-rUS/strings.xml
index 3e62418..762f51f 100644
--- a/res/values-mcc424-es-rUS/strings.xml
+++ b/res/values-mcc424-es-rUS/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerta de emergencia nacional"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Alerta de advertencia"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Alerta de seguridad pública"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alerta de emergencia nacional"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alerta de emergencia"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alerta de emergencia"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alerta de emergencia"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alerta de emergencia"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alerta de advertencia"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alerta de seguridad pública"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Ejercicio"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerta de prueba"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Alerta de prueba"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alertas de advertencia"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Alertas de seguridad pública"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alerta de prueba"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alerta de prueba"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alertas de advertencia"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alertas de seguridad pública"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alertas de prueba"</string>
 </resources>

diff --git a/res/values-mcc424-es/strings.xml b/res/values-mcc424-es/strings.xml
index b11e3aa..21a686b 100644
--- a/res/values-mcc424-es/strings.xml
+++ b/res/values-mcc424-es/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerta de emergencia nacional"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Alerta de advertencia"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Alerta de seguridad pública"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alerta de emergencia nacional"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alerta de emergencia"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alerta de emergencia"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alerta de emergencia"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alerta de emergencia"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alerta de advertencia"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alerta de seguridad pública"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Deporte"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerta de prueba"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Alerta de prueba"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alertas de advertencia"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Alertas de seguridad pública"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alerta de prueba"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alerta de prueba"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alertas de advertencia"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alertas de seguridad pública"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alertas de prueba"</string>
 </resources>

diff --git a/res/values-mcc424-et/strings.xml b/res/values-mcc424-et/strings.xml
index a8bc2c4..5a77bb4 100644
--- a/res/values-mcc424-et/strings.xml
+++ b/res/values-mcc424-et/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Riiklik hädaolukorra märguanne"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Hoiatusmärguanne"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Avalik ohutusmärguanne"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Riiklik hädaolukorra märguanne"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Hädaolukorra märguanne"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Hädaolukorra märguanne"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Hädaolukorra märguanne"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Hädaolukorra märguanne"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Hoiatusmärguanne"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Avalik ohutusmärguanne"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Treening"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testmärguanne"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Testhoiatus"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Hoiatused"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Avalikud ohutusmärguanded"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testhoiatus"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testhoiatus"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Hoiatusmärguanded"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Avalikud ohutusmärguanded"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testhoiatused"</string>
 </resources>

diff --git a/res/values-mcc424-eu/strings.xml b/res/values-mcc424-eu/strings.xml
index a02c4d5..d41a0c9 100644
--- a/res/values-mcc424-eu/strings.xml
+++ b/res/values-mcc424-eu/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Larrialdi-alerta nazionala"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Abisu-alerta"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Segurtasun publikoari buruzko alerta"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Larrialdi-alerta nazionala"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Larrialdi-alerta"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Larrialdi-alerta"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Larrialdi-alerta"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Larrialdi-alerta"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Abisuen alerta"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Segurtasun publikoari buruzko alerta"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Ariketa fisikoa"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Probako alerta"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Probako alerta"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Abisuen alertak"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Segurtasun publikoari buruzko alertak"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testu-mezu bidezko alerta"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testu-mezu bidezko alerta"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Abisuen alertak"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Segurtasun publikoari buruzko alertak"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testu-mezu bidezko alertak"</string>
 </resources>

diff --git a/res/values-mcc424-fa/strings.xml b/res/values-mcc424-fa/strings.xml
index fbf3cbe..a3b9f5a 100644
--- a/res/values-mcc424-fa/strings.xml
+++ b/res/values-mcc424-fa/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"اعلام خطر اضطرای در کشور"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"هشدار خطر"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"هشدار ایمنی عمومی"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"هشدار وضعیت اضطراری ملی"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"هشدار وضعیت اضطراری"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"هشدار وضعیت اضطراری"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"هشدار وضعیت اضطراری"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"هشدار وضعیت اضطراری"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"هشدار خطر"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"هشدار ایمنی عمومی"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"تمرین"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"اعلام خطر آزمایشی"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"هشدار آزمایشی"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"هشدارهای خطر"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"هشدارهای ایمنی عمومی"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"هشدار آزمایشی"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"هشدار آزمایشی"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"هشدارهای خطر"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"هشدارهای ایمنی عمومی"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"هشدارهای آزمایشی"</string>
 </resources>

diff --git a/res/values-mcc424-fi/strings.xml b/res/values-mcc424-fi/strings.xml
index 6ec016b..7d9e39b 100644
--- a/res/values-mcc424-fi/strings.xml
+++ b/res/values-mcc424-fi/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Kansallinen hätäilmoitus"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Varoitus"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Yleistä turvallisuutta koskeva hälytys"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Kansallinen vaaratiedote"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Vaaratiedote"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Vaaratiedote"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Vaaratiedote"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Vaaratiedote"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Varoitus"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Yleistä turvallisuutta koskeva tiedote"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Liikunta"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testihälytys"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Testihälytys"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Varoitukset"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Yleistä turvallisuutta koskevat hälytykset"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testitiedote"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testitiedote"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Varoitukset"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Yleistä turvallisuutta koskevat tiedotteet"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testitiedotteet"</string>
 </resources>

diff --git a/res/values-mcc424-fr-rCA/strings.xml b/res/values-mcc424-fr-rCA/strings.xml
index dd11f98..c440c67 100644
--- a/res/values-mcc424-fr-rCA/strings.xml
+++ b/res/values-mcc424-fr-rCA/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerte d\'urgence nationale"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Alerte d\'avertissement"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Alerte relative à la sécurité publique"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alerte d\'urgence nationale"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alerte d\'urgence"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alerte d\'urgence"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alerte d\'urgence"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alerte d\'urgence"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alerte d\'avertissement"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alerte relative à la sécurité publique"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercice"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerte test"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Alerte test"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alertes d\'avertissement"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Alertes relatives à la sécurité publique"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alerte test"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alerte test"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alertes d\'avertissement"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alertes relatives à la sécurité publique"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alertes tests"</string>
 </resources>

diff --git a/res/values-mcc424-fr/strings.xml b/res/values-mcc424-fr/strings.xml
index 899c9af..05a4298 100644
--- a/res/values-mcc424-fr/strings.xml
+++ b/res/values-mcc424-fr/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerte d\'urgence nationale"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Alerte d\'avertissement"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Alerte de sécurité publique"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alerte d\'urgence nationale"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alerte d\'urgence"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alerte d\'urgence"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alerte d\'urgence"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alerte d\'urgence"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alerte d\'avertissement"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alerte de sécurité publique"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercice"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerte test"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Alerte de test"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alertes d\'avertissement"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Alertes de sécurité publique"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alerte de test"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alerte de test"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alertes d\'avertissement"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alertes de sécurité publique"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alertes de test"</string>
 </resources>

diff --git a/res/values-mcc424-gl/strings.xml b/res/values-mcc424-gl/strings.xml
index f807567..e9bb2ee 100644
--- a/res/values-mcc424-gl/strings.xml
+++ b/res/values-mcc424-gl/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerta nacional de emerxencia"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Alerta de advertencia"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Alerta de seguranza pública"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alerta nacional de emerxencia"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alerta de emerxencia"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alerta de emerxencia"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alerta de emerxencia"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alerta de emerxencia"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alerta de advertencia"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alerta de seguranza pública"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercicio"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerta de proba"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Alerta de proba"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alertas de advertencia"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Alertas de seguranza pública"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alerta de proba"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alerta de proba"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alertas de advertencia"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alertas de seguranza pública"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alertas de proba"</string>
 </resources>

diff --git a/res/values-mcc424-gu/strings.xml b/res/values-mcc424-gu/strings.xml
index 57c4444..8770f3b 100644
--- a/res/values-mcc424-gu/strings.xml
+++ b/res/values-mcc424-gu/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"રાષ્ટ્રીય કટોકટીની અલર્ટ"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"ચેતવણી માટે અલર્ટ"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"સાર્વજનિક સલામતીનું અલર્ટ"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"રાષ્ટ્રીય ઇમર્જન્સી માટે અલર્ટ"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"ઇમર્જન્સી માટે અલર્ટ"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"ઇમર્જન્સી માટે અલર્ટ"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"ઇમર્જન્સી માટે અલર્ટ"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"ઇમર્જન્સી માટે અલર્ટ"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"ચેતવણી માટે અલર્ટ"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"લોકોની સલામતી માટે અલર્ટ"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"વ્યાયામ"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"પરીક્ષણ અલર્ટ"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"પરીક્ષણ માટે અલર્ટ"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"ચેતવણીના અલર્ટ"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"સાર્વજનિક સલામતીના અલર્ટ"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"પરીક્ષણ માટે અલર્ટ"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"પરીક્ષણ માટે અલર્ટ"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"ચેતવણી માટે અલર્ટ"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"લોકોની સલામતી માટે અલર્ટ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"પરીક્ષણ માટે અલર્ટ"</string>
 </resources>

diff --git a/res/values-mcc424-hi/strings.xml b/res/values-mcc424-hi/strings.xml
index 2b4c5e8..0188b81 100644
--- a/res/values-mcc424-hi/strings.xml
+++ b/res/values-mcc424-hi/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"राष्ट्रीय आपातकालीन अलर्ट"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"चेतावनी की सूचना"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"सार्वजनिक सुरक्षा की चेतावनी"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"आपातकालीन स्थिति के लिए राष्ट्रीय स्तर पर चेतावनी"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"आपातकालीन स्थिति के लिए चेतावनी"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"आपातकालीन स्थिति के लिए चेतावनी"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"आपातकालीन स्थिति के लिए चेतावनी"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"आपातकालीन स्थिति के लिए चेतावनी"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"चेतावनी की सूचना"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"सार्वजनिक सुरक्षा की चेतावनी"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"व्यायाम"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"टेस्ट अलर्ट"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"टेस्ट अलर्ट"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"चेतावनियां"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"सार्वजनिक सुरक्षा की चेतावनियां"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"टेस्ट अलर्ट"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"टेस्ट अलर्ट"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"चेतावनी की सूचना"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"सार्वजनिक सुरक्षा की चेतावनियां"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"टेस्ट अलर्ट"</string>
 </resources>

diff --git a/res/values-mcc424-hr/strings.xml b/res/values-mcc424-hr/strings.xml
index 854621b..aa8f37d 100644
--- a/res/values-mcc424-hr/strings.xml
+++ b/res/values-mcc424-hr/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Nacionalno hitno upozorenje"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Upozorenje"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Upozorenje o javnoj sigurnosti"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Nacionalno hitno upozorenje"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Hitno upozorenje"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Hitno upozorenje"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Hitno upozorenje"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Hitno upozorenje"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Upozorenje o opasnosti"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Upozorenje o javnoj sigurnosti"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Vježba"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testno upozorenje"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Testno upozorenje"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Upozorenja o opasnosti"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Upozorenja o javnoj sigurnosti"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testno upozorenje"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testno upozorenje"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Upozorenja o opasnosti"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Upozorenja o javnoj sigurnosti"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testna upozorenja"</string>
 </resources>

diff --git a/res/values-mcc424-hu/strings.xml b/res/values-mcc424-hu/strings.xml
index 9a7348c..bf0bcdc 100644
--- a/res/values-mcc424-hu/strings.xml
+++ b/res/values-mcc424-hu/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Országos szükségállapotról szóló riasztás"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Figyelmeztető riasztás"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Közbiztonsággal kapcsolatos riasztás"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Országos szükségállapotról szóló riasztás"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Vészjelzés"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Vészjelzés"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Vészjelzés"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Vészjelzés"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Figyelmeztető riasztás"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Közbiztonsággal kapcsolatos riasztás"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Edzés"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Próbariasztás"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Próbariasztás"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Figyelmeztető riasztások"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Közbiztonsággal kapcsolatos riasztások"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Próbariasztás"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Próbariasztás"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Figyelmeztető riasztások"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Közbiztonsággal kapcsolatos riasztások"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Próbariasztások"</string>
 </resources>

diff --git a/res/values-mcc424-hy/strings.xml b/res/values-mcc424-hy/strings.xml
index 9c56a55..6a68c0d 100644
--- a/res/values-mcc424-hy/strings.xml
+++ b/res/values-mcc424-hy/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Արտակարգ իրավիճակի համապետական ահազանգ"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Զգուշացում"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Ազդարարում հանրային անվտանգության սպառնալիքի մասին"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Արտակարգ իրավիճակի համապետական ազդարարում"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Արտակարգ իրավիճակի ազդարարում"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Արտակարգ իրավիճակի ազդարարում"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Արտակարգ իրավիճակի ազդարարում"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Արտակարգ իրավիճակի ազդարարում"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Նախազգուշացում"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Ազդարարում հանրային անվտանգության սպառնալիքի մասին"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Վարժություն"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Փորձնական ահազանգ"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Փորձնական ազդարարում"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Նախազգուշացումներ"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Ազդարարումներ հանրային անվտանգության սպառնալիքի մասին"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Փորձնական ազդարարում"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Փորձնական ազդարարում"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Նախազգուշացումներ"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Ազդարարումներ հանրային անվտանգության սպառնալիքի մասին"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Փորձնական ազդարարումներ"</string>
 </resources>

diff --git a/res/values-mcc424-in/strings.xml b/res/values-mcc424-in/strings.xml
index 37692ea..75dbeba 100644
--- a/res/values-mcc424-in/strings.xml
+++ b/res/values-mcc424-in/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Peringatan darurat nasional"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Peringatan"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Peringatan keamanan publik"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Peringatan Darurat Nasional"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Notifikasi Darurat"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Notifikasi Darurat"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Notifikasi Darurat"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Notifikasi Darurat"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Notifikasi Peringatan"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Peringatan Keamanan Publik"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Latihan"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Uji peringatan"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Uji peringatan"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Notifikasi peringatan"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Peringatan keamanan publik"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Uji Peringatan"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Uji Peringatan"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Notifikasi Peringatan"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Peringatan Keamanan Publik"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Uji Peringatan"</string>
 </resources>

diff --git a/res/values-mcc424-is/strings.xml b/res/values-mcc424-is/strings.xml
index 3ff267a..97a2288 100644
--- a/res/values-mcc424-is/strings.xml
+++ b/res/values-mcc424-is/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Innlend neyðarviðvörun"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Viðvörun"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Almannavarnatilkynning"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Innlend neyðarviðvörun"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Neyðarviðvörun"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Neyðarviðvörun"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Neyðarviðvörun"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Neyðarviðvörun"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Viðvörun"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Almannavarnatilkynning"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Æfingar"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Prufuviðvörun"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Prufuviðvörun"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Viðvaranir"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Almannavarnatilkynningar"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Prufuviðvörun"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Prufuviðvörun"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Viðvaranir"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Almannavarnatilkynningar"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Prufuviðvaranir"</string>
 </resources>

diff --git a/res/values-mcc424-it/strings.xml b/res/values-mcc424-it/strings.xml
index f400204..bcccc5e 100644
--- a/res/values-mcc424-it/strings.xml
+++ b/res/values-mcc424-it/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Avviso d\'emergenza nazionale"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Allerta"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Allerta sicurezza pubblica"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Avviso di emergenza nazionale"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Avviso di emergenza"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Avviso di emergenza"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Avviso di emergenza"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Avviso di emergenza"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Allerta"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Allerta sicurezza pubblica"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Esercitazione"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Avviso di prova"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Allerta di prova"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Avvisi"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Allerte sicurezza pubblica"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Avviso di prova"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Avviso di prova"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Allerte"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Allerte sicurezza pubblica"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Avvisi di prova"</string>
 </resources>

diff --git a/res/values-mcc424-iw/strings.xml b/res/values-mcc424-iw/strings.xml
index f8e62be..ee2b8da 100644
--- a/res/values-mcc424-iw/strings.xml
+++ b/res/values-mcc424-iw/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"התרעה על מקרה חירום לאומי"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"התראת אזהרה"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"התראה בנוגע לביטחון הציבור"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"התרעה על מקרה חירום לאומי"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"התראת חירום"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"התראת חירום"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"התראת חירום"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"התראת חירום"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"התראת אזהרה"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"התראה בנוגע לביטחון הציבור"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"פעילות גופנית"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"התראת בדיקה"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"התראת בדיקה"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"התראות אזהרה"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"התראות בנוגע לביטחון הציבור"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"התראת בדיקה"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"התראת בדיקה"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"התראות אזהרה"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"התראות בנוגע לביטחון הציבור"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"התראות בדיקה"</string>
 </resources>

diff --git a/res/values-mcc424-ja/strings.xml b/res/values-mcc424-ja/strings.xml
index 35b5f14..0eaa554 100644
--- a/res/values-mcc424-ja/strings.xml
+++ b/res/values-mcc424-ja/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"緊急速報メール（国内）"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"警告アラート"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"災害情報アラート"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"緊急速報メール（国内）"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"緊急速報メール"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"緊急速報メール"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"緊急速報メール"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"緊急速報メール"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"警告アラート"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"災害情報アラート"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"エクササイズ"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"テストアラート"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"テストアラート"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"警告アラート"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"災害情報に関する通知"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"テストアラート"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"テストアラート"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"警告アラート"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"災害情報アラート"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"テストアラート"</string>
 </resources>

diff --git a/res/values-mcc424-ka/strings.xml b/res/values-mcc424-ka/strings.xml
index 60c63c6..d28c5dc 100644
--- a/res/values-mcc424-ka/strings.xml
+++ b/res/values-mcc424-ka/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ეროვნული საგანგებო გაფრთხილება"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"გამაფრთხილებელი განგაში"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"საჯარო უსაფრთხოების გაფრთხილება"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ეროვნული საგანგებო გაფრთხილება"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"საგანგებო გაფრთხილება"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"საგანგებო გაფრთხილება"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"საგანგებო გაფრთხილება"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"საგანგებო გაფრთხილება"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"გამაფრთხილებელი განგაში"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"საჯარო უსაფრთხოების გაფრთხილება"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ვარჯიში"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"სატესტო გაფრთხილება"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"სატესტო გაფრთხილება"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"გამაფრთხილებელი განგაშის სიგნალები"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"საჯარო უსაფრთხოების გაფრთხილებები"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"სატესტო გაფრთხილება"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"სატესტო გაფრთხილება"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"გამაფრთხილებელი შეტყობინებები"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"საჯარო უსაფრთხოების გაფრთხილებები"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"სატესტო გაფრთხილებები"</string>
 </resources>

diff --git a/res/values-mcc424-kk/strings.xml b/res/values-mcc424-kk/strings.xml
index 62a8c99..6d7044b 100644
--- a/res/values-mcc424-kk/strings.xml
+++ b/res/values-mcc424-kk/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Елдегі төтенше жағдай туралы ескерту"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Ескерту"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Жалпы қауіпсіздік ескертуі"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Елдегі төтенше жағдай туралы ескерту"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Төтенше жағдай дабылы"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Төтенше жағдай дабылы"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Төтенше жағдай дабылы"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Төтенше жағдай дабылы"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Ескерту"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Жалпы қауіпсіздік ескертуі"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Жаттығу"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Сынақ ескерту"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Сынақ ескерту"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Хабарландыру ескертулері"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Жалпы қауіпсіздік ескертулері"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Сынақ ескерту"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Сынақ ескерту"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Ескертулер"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Жалпы қауіпсіздік ескертулері"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Сынақ ескертулер"</string>
 </resources>

diff --git a/res/values-mcc424-km/strings.xml b/res/values-mcc424-km/strings.xml
index 1278553..aaf6090 100644
--- a/res/values-mcc424-km/strings.xml
+++ b/res/values-mcc424-km/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ការជូនដំណឹងពេលអាសន្នថ្នាក់ជាតិ"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"ការជូនដំណឹងអំពីការព្រមាន"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"ការជូនដំណឹងអំពីសុវត្ថិភាពសាធារណៈ"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ការជូនដំណឹងពេលអាសន្នថ្នាក់ជាតិ"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"ការជូនដំណឹងពេលអាសន្ន"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"ការជូនដំណឹងពេលអាសន្ន"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"ការជូនដំណឹងពេលអាសន្ន"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"ការជូនដំណឹងពេលអាសន្ន"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"ការជូនដំណឹងអំពីការព្រមាន"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"ការជូនដំណឹងអំពីសុវត្ថិភាពសាធារណៈ"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"លំហាត់"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ការជូនដំណឹងសាកល្បង"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"ការជូនដំណឹងសាកល្បង"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"ការជូនដំណឹងអំពីការព្រមាន"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"ការជូនដំណឹងអំពីសុវត្ថិភាពសាធារណៈ"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"ការជូនដំណឹងសាកល្បង"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"ការជូនដំណឹងសាកល្បង"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"ការជូនដំណឹងអំពីការព្រមាន"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"ការជូនដំណឹងអំពីសុវត្ថិភាពសាធារណៈ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"ការជូនដំណឹងសាកល្បង"</string>
 </resources>

diff --git a/res/values-mcc424-kn/strings.xml b/res/values-mcc424-kn/strings.xml
index 3068f49..21453a3 100644
--- a/res/values-mcc424-kn/strings.xml
+++ b/res/values-mcc424-kn/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ರಾಷ್ಟ್ರೀಯ ತುರ್ತು ಎಚ್ಚರಿಕೆ"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"ಮುನ್ಸೂಚನೆಯ ಎಚ್ಚರಿಕೆ"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"ಸಾರ್ವಜನಿಕ ಸುರಕ್ಷತೆಯ ಎಚ್ಚರಿಕೆ"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ರಾಷ್ಟ್ರೀಯ ತುರ್ತು ಎಚ್ಚರಿಕೆ"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"ತುರ್ತು ಎಚ್ಚರಿಕೆ"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"ತುರ್ತು ಎಚ್ಚರಿಕೆ"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"ತುರ್ತು ಎಚ್ಚರಿಕೆ"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"ತುರ್ತು ಎಚ್ಚರಿಕೆ"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"ಮುನ್ಸೂಚನೆಯ ಎಚ್ಚರಿಕೆ"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"ಸಾರ್ವಜನಿಕ ಸುರಕ್ಷತೆಯ ಎಚ್ಚರಿಕೆ"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ವ್ಯಾಯಾಮ"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ಪರೀಕ್ಷಾ ಎಚ್ಚರಿಕೆ"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"ಪರೀಕ್ಷಾ ಎಚ್ಚರಿಕೆ"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"ಎಚ್ಚರಿಕೆ ಅಲರ್ಟ್‌ಗಳು"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"ಸಾರ್ವಜನಿಕ ಸುರಕ್ಷತೆಯ ಎಚ್ಚರಿಕೆಗಳು"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"ಪರೀಕ್ಷೆ ಎಚ್ಚರಿಕೆ"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"ಪರೀಕ್ಷೆ ಎಚ್ಚರಿಕೆ"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"ಮುನ್ಸೂಚನೆಯ ಎಚ್ಚರಿಕೆಗಳು"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"ಸಾರ್ವಜನಿಕ ಸುರಕ್ಷತೆಯ ಎಚ್ಚರಿಕೆಗಳು"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"ಪರೀಕ್ಷೆ ಎಚ್ಚರಿಕೆಗಳು"</string>
 </resources>

diff --git a/res/values-mcc424-ko/strings.xml b/res/values-mcc424-ko/strings.xml
index d6d667b..e4c5803 100644
--- a/res/values-mcc424-ko/strings.xml
+++ b/res/values-mcc424-ko/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"국가 응급 상황 알림"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"경고 알림"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"안전 안내 알림"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"국가 비상사태 알림"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"비상사태 알림"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"비상사태 알림"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"비상사태 알림"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"비상사태 알림"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"경고 알림"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"공공 안전 알림"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"운동"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"시험 알림"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"테스트 알림"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"경고"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"안전 안내 알림"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"테스트 알림"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"테스트 알림"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"경고 알림"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"공공 안전 알림"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"테스트 알림"</string>
 </resources>

diff --git a/res/values-mcc424-ky/strings.xml b/res/values-mcc424-ky/strings.xml
index 46002c2..4119af7 100644
--- a/res/values-mcc424-ky/strings.xml
+++ b/res/values-mcc424-ky/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Улуттук шашылыш билдирүү"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Шашылыш билдирүү"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Коомдук коопсуздук тууралуу билдирүү"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Жалпы улуттук шашылыш билдирүү"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Шашылыш билдирүү"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Шашылыш билдирүү"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Шашылыш билдирүү"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Шашылыш билдирүү"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Эскертүү"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Коомдук коопсуздукка келтирилип жаткан коркунуч тууралуу билдирүү"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Көнүгүү"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Сынамык шашылыш билдирүү"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Сынамык шашылыш билдирүү"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Эскертүүлөр"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Коомдук коопсуздук тууралуу билдирүүлөр"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Сынамык шашылыш билдирүү"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Сынамык шашылыш билдирүү"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Эскертүүлөр"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Коомдук коопсуздукка келтирилип жаткан коркунуч тууралуу билдирүүлөр"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Сынамык шашылыш билдирүүлөр"</string>
 </resources>

diff --git a/res/values-mcc424-lo/strings.xml b/res/values-mcc424-lo/strings.xml
index 6dd73fd..c10d811 100644
--- a/res/values-mcc424-lo/strings.xml
+++ b/res/values-mcc424-lo/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ການເຕືອນສຸກເສີນລະດັບປະເທດ"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"ການເຕືອນຄຳເຕືອນ"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"ການເຕືອນຄວາມປອດໄພສາທາລະນະ"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ແຈ້ງເຕືອນສຸກເສີນລະດັບປະເທດ"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"ແຈ້ງເຕືອນສຸກເສີນ"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"ແຈ້ງເຕືອນສຸກເສີນ"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"ແຈ້ງເຕືອນສຸກເສີນ"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"ແຈ້ງເຕືອນສຸກເສີນ"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"ແຈ້ງເຕືອນຄຳເຕືອນ"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"ແຈ້ງເຕືອນຄວາມປອດໄພສາທາລະນະ"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ອອກກຳລັງກາຍ"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ທົດສອບການເຕືອນ"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"ທົດສອບການເຕືອນ"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"ຄຳເຕືອນ"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"ການເຕືອນຄວາມປອດໄພສາທາລະນະ"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"ທົດສອບແຈ້ງເຕືອນ"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"ທົດສອບແຈ້ງເຕືອນ"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"ແຈ້ງເຕືອນຄຳເຕືອນ"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"ແຈ້ງເຕືອນຄວາມປອດໄພສາທາລະນະ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"ທົດສອດແຈ້ງເຕືອນ"</string>
 </resources>

diff --git a/res/values-mcc424-lt/strings.xml b/res/values-mcc424-lt/strings.xml
index 9bf0106..5d8a939 100644
--- a/res/values-mcc424-lt/strings.xml
+++ b/res/values-mcc424-lt/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Nacionalinis nepaprastosios padėties įspėjimas"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Įspėjimas"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Visuomenės saugumo įspėjimas"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Nacionalinis įspėjimas apie kritinę padėtį"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Įspėjimas apie kritinę padėtį"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Įspėjimas apie kritinę padėtį"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Įspėjimas apie kritinę padėtį"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Įspėjimas apie kritinę padėtį"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Įspėjimas"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Visuomenės saugumo įspėjimas"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Mankšta"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Bandomasis įspėjimas"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Bandomasis įspėjimas"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Įspėjimai"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Visuomenės saugumo įspėjimai"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Bandomasis įspėjimas"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Bandomasis įspėjimas"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Įspėjimai"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Visuomenės saugumo įspėjimai"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Bandomieji įspėjimai"</string>
 </resources>

diff --git a/res/values-mcc424-lv/strings.xml b/res/values-mcc424-lv/strings.xml
index fd4d6cf..b874682 100644
--- a/res/values-mcc424-lv/strings.xml
+++ b/res/values-mcc424-lv/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Valsts līmeņa ārkārtas brīdinājums"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Brīdinājums"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Brīdinājums par sabiedrisko drošību"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Valsts līmeņa ārkārtas brīdinājums"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Ārkārtas brīdinājums"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Ārkārtas brīdinājums"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Ārkārtas brīdinājums"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Ārkārtas brīdinājums"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Brīdinājums"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Brīdinājums par sabiedrisko drošību"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Vingrošana"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testa brīdinājums"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Testa brīdinājums"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Brīdinājumi"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Brīdinājumi par sabiedrisko drošību"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testa brīdinājums"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testa brīdinājums"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Brīdinājumi"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Brīdinājumi par sabiedrisko drošību"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testa brīdinājumi"</string>
 </resources>

diff --git a/res/values-mcc424-mk/strings.xml b/res/values-mcc424-mk/strings.xml
index cf2778a..67fd37d 100644
--- a/res/values-mcc424-mk/strings.xml
+++ b/res/values-mcc424-mk/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Национално предупредување за итни случаи"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Предупредување за опомена"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Предупредување за јавна безбедност"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Национално предупредување за итни случаи"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Предупредувања за итни случаи"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Предупредувања за итни случаи"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Предупредувања за итни случаи"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Предупредувања за итни случаи"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Предупредување за опомена"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Предупредување за јавна безбедност"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Вежбање"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Предупредување за тестирање"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Предупредување за тестирање"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Известувања за предупредување"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Предупредувања за јавна безбедност"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Пробно предупредување"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Пробно предупредување"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Предупредувања за опомена"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Предупредувања за јавна безбедност"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Пробни предупредувања"</string>
 </resources>

diff --git a/res/values-mcc424-ml/strings.xml b/res/values-mcc424-ml/strings.xml
index 424e4d7..517544a 100644
--- a/res/values-mcc424-ml/strings.xml
+++ b/res/values-mcc424-ml/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ദേശീയ അടിയന്തര അലേർട്ട്"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"മുന്നറിയിപ്പ്"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"പൊതു സുരക്ഷാ മുന്നറിയിപ്പ്"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ദേശീയ അടിയന്തര മുന്നറിയിപ്പ്"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"അടിയന്തര മുന്നറിയിപ്പ്"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"അടിയന്തര മുന്നറിയിപ്പ്"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"അടിയന്തര മുന്നറിയിപ്പ്"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"അടിയന്തര മുന്നറിയിപ്പ്"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"മുന്നറിയിപ്പ്"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"പൊതു സുരക്ഷാ മുന്നറിയിപ്പ്"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"വ്യായാമം"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"പരീക്ഷണ അലേർട്ട്"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"പരീക്ഷണ മുന്നറിയിപ്പ്"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"മുന്നറിയിപ്പുകൾ"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"പൊതു സുരക്ഷാ മുന്നറിയിപ്പുകൾ"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"പരീക്ഷണ മുന്നറിയിപ്പ്"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"പരീക്ഷണ മുന്നറിയിപ്പ്"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"മുന്നറിയിപ്പുകൾ"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"പൊതു സുരക്ഷാ മുന്നറിയിപ്പുകൾ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"പരീക്ഷണ മുന്നറിയിപ്പുകൾ"</string>
 </resources>

diff --git a/res/values-mcc424-mn/strings.xml b/res/values-mcc424-mn/strings.xml
index bdf35e8..7c456aa 100644
--- a/res/values-mcc424-mn/strings.xml
+++ b/res/values-mcc424-mn/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Онцгой байдлын үндэсний сэрэмжлүүлэг"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Анхааруулах сэрэмжлүүлэг"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Олон нийтийн аюулгүй байдлын сэрэмжлүүлэг"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Үндэсний онцгой байдлын сэрэмжлүүлэг"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Онцгой байдлын сэрэмжлүүлэг"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Онцгой байдлын сэрэмжлүүлэг"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Онцгой байдлын сэрэмжлүүлэг"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Онцгой байдлын сэрэмжлүүлэг"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Анхааруулах сэрэмжлүүлэг"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Олон нийтийн аюулгүй байдлын сэрэмжлүүлэг"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Сургуулилт"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Сэрэмжлүүлгийг шалгах"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Туршилтын сэрэмжлүүлэг"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Анхааруулах сэрэмжлүүлэг"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Олон нийтийн аюулгүй байдлын сэрэмжлүүлгүүд"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Туршилтын сэрэмжлүүлэг"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Туршилтын сэрэмжлүүлэг"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Анхааруулах сэрэмжлүүлэг"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Олон нийтийн аюулгүй байдлын сэрэмжлүүлэг"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Туршилтын сэрэмжлүүлэг"</string>
 </resources>

diff --git a/res/values-mcc424-mr/strings.xml b/res/values-mcc424-mr/strings.xml
index 2cffb9a..7c0e647 100644
--- a/res/values-mcc424-mr/strings.xml
+++ b/res/values-mcc424-mr/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"राष्ट्रीय आणीबाणीच्या सूचना"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"चेतावणीची सूचना"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"सार्वजनिक सुरक्षिततेची सूचना"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"राष्ट्रीय आणीबाणीची सूचना"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"आणीबाणीची सूचना"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"आणीबाणीची सूचना"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"आणीबाणीची सूचना"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"आणीबाणीची सूचना"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"चेतावणीची सूचना"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"सार्वजनिक सुरक्षिततेची सूचना"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"एक्ससाइझ"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"चाचणी सूचना"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"चाचणीची सूचना"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"चेतावणी सूचना"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"सार्वजनिक सुरक्षिततेच्या सूचना"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"चाचणीची सूचना"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"चाचणीची सूचना"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"चेतावणीच्या सूचना"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"सार्वजनिक सुरक्षिततेच्या सूचना"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"चाचणीच्या सूचना"</string>
 </resources>

diff --git a/res/values-mcc424-ms/strings.xml b/res/values-mcc424-ms/strings.xml
index 962469a..f4f6061 100644
--- a/res/values-mcc424-ms/strings.xml
+++ b/res/values-mcc424-ms/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Amaran kecemasan nasional"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Makluman amaran"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Makluman keselamatan awam"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Amaran Kecemasan Nasional"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Amaran Kecemasan"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Amaran Kecemasan"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Amaran Kecemasan"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Amaran Kecemasan"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Makluman Amaran"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Makluman Keselamatan Awam"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Senaman"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Makluman ujian"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Makluman ujian"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Makluman amaran"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Makluman keselamatan awam"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Makluman Ujian"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Makluman Ujian"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Makluman Amaran"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Makluman Keselamatan Awam"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Makluman Ujian"</string>
 </resources>

diff --git a/res/values-mcc424-my/strings.xml b/res/values-mcc424-my/strings.xml
index 9fd95d8..2560295 100644
--- a/res/values-mcc424-my/strings.xml
+++ b/res/values-mcc424-my/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"နိုင်ငံတော်နှင့်ဆိုင်သော အရေးပေါ် သတိပေးချက်"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"သတိပေး အချက်ပြမှု"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"လူထုလုံခြုံရေး သတိပေးချက်"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"နိုင်ငံတော်နှင့်ဆိုင်သော အရေးပေါ် သတိပေးချက်"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"အရေးပေါ် သတိပေးချက်"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"အရေးပေါ် သတိပေးချက်"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"အရေးပေါ် သတိပေးချက်"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"အရေးပေါ် သတိပေးချက်"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"သတိပေး အချက်ပြမှု"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"လူထုလုံခြုံရေး သတိပေးချက်"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ကိုယ်ကာယလေ့ကျင့်ခန်း"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"စမ်းသပ် သတိပေးချက်"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"စမ်းသပ် သတိပေးချက်"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"သတိပေးချက်များ"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"လူထုလုံခြုံရေး သတိပေးချက်များ"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"စမ်းသပ် သတိပေးချက်"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"စမ်းသပ် သတိပေးချက်"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"သတိပေး အချက်ပြမှုများ"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"လူထုလုံခြုံရေး သတိပေးချက်များ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"စမ်းသပ် သတိပေးချက်များ"</string>
 </resources>

diff --git a/res/values-mcc424-nb/strings.xml b/res/values-mcc424-nb/strings.xml
index efd0360..5dacdb3 100644
--- a/res/values-mcc424-nb/strings.xml
+++ b/res/values-mcc424-nb/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Nasjonalt nødvarsel"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Advarsel"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Offentlig sikkerhetsvarsel"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Nasjonalt nødvarsel"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Nødvarsel"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Nødvarsel"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Nødvarsel"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Nødvarsel"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Advarsel"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Offentlig sikkerhetsvarsel"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Trening"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testvarsel"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Testvarsel"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Varsler"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Offentlige sikkerhetsvarsler"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testvarsel"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testvarsel"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Varsler"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Offentlige sikkerhetsvarsler"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testvarsler"</string>
 </resources>

diff --git a/res/values-mcc424-ne/strings.xml b/res/values-mcc424-ne/strings.xml
index 8007bd8..6ee7181 100644
--- a/res/values-mcc424-ne/strings.xml
+++ b/res/values-mcc424-ne/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"राष्ट्रिय आपातकालीन अलर्ट"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"चेतावनीसम्बन्धी अलर्ट"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"सार्वजनिक सुरक्षासम्बन्धी अलर्ट"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"राष्ट्रिय आपात्‌कालीन अलर्ट"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"आपत्‌कालीन अलर्ट"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"आपत्‌कालीन अलर्ट"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"आपत्‌कालीन अलर्ट"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"आपत्‌कालीन अलर्ट"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"चेतावनीसम्बन्धी अलर्ट"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"सार्वजनिक सुरक्षासम्बन्धी अलर्ट"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"व्यायाम"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"परीक्षण अलर्ट"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"परीक्षणसम्बन्धी अलर्ट"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"चेतावनीसम्बन्धी सतर्कताहरू"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"सार्वजनिक सुरक्षासम्बन्धी अलर्टहरू"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"परीक्षणसम्बन्धी अलर्ट"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"परीक्षणसम्बन्धी अलर्ट"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"चेतावनीसम्बन्धी अलर्टहरू"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"सार्वजनिक सुरक्षासम्बन्धी अलर्टहरू"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"जाँचसम्बन्धी अलर्टहरू"</string>
 </resources>

diff --git a/res/values-mcc424-nl/strings.xml b/res/values-mcc424-nl/strings.xml
index 19f783e..b8e2da4 100644
--- a/res/values-mcc424-nl/strings.xml
+++ b/res/values-mcc424-nl/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Nationale noodmelding"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Waarschuwingsmelding"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Openbare veiligheidsmelding"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Nationale noodmelding"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Noodmelding"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Noodmelding"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Noodmelding"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Noodmelding"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Waarschuwingsmelding"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Openbare veiligheidsmelding"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Bewegen"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testmelding"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Testmelding"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Waarschuwingsmeldingen"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Openbare veiligheidsmeldingen"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testmelding"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testmelding"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Waarschuwingsmeldingen"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Openbare veiligheidsmeldingen"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testmeldingen"</string>
 </resources>

diff --git a/res/values-mcc424-or/strings.xml b/res/values-mcc424-or/strings.xml
index 2d79ee7..ed3790d 100644
--- a/res/values-mcc424-or/strings.xml
+++ b/res/values-mcc424-or/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ରାଷ୍ଟ୍ରୀୟ ଅପାତକାଳୀନ ଆଲର୍ଟ"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"ଚେତାବନୀ ଆଲର୍ଟ"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"ଜନସାଧାରଣଙ୍କ ପାଇଁ ସୁରକ୍ଷା ଆଲର୍ଟ"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ଜାତୀୟ ଜରୁରୀକାଳୀନ ଆଲର୍ଟ"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟ"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟ"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟ"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟ"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"ଚେତାବନୀ ଆଲର୍ଟ"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"ଜନସାଧାରଣଙ୍କ ପାଇଁ ସୁରକ୍ଷା ଆଲର୍ଟ"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ବ୍ୟାୟାମ"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ପରୀକ୍ଷା ଆଲର୍ଟ"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"ଟେଷ୍ଟ ଆଲର୍ଟ"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"ଚେତାବନୀ ଆଲର୍ଟ"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"ଜନସାଧାରଣଙ୍କ ପାଇଁ ସୁରକ୍ଷା ଆଲର୍ଟ"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"ଟେଷ୍ଟ ଆଲର୍ଟ"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"ଟେଷ୍ଟ ଆଲର୍ଟ"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"ଚେତାବନୀ ଆଲର୍ଟ"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"ଜନସାଧାରଣଙ୍କ ପାଇଁ ସୁରକ୍ଷା ଆଲର୍ଟ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"ଟେଷ୍ଟ ଆଲର୍ଟ"</string>
 </resources>

diff --git a/res/values-mcc424-pa/strings.xml b/res/values-mcc424-pa/strings.xml
index 25749b0..77f60a2 100644
--- a/res/values-mcc424-pa/strings.xml
+++ b/res/values-mcc424-pa/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ਕੌਮੀ ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"ਚਿਤਾਵਨੀ ਸੁਚੇਤਨਾ"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"ਜਨਤਕ ਸੁਰੱਖਿਆ ਸੁਚੇਤਨਾ"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ਕੌਮੀ ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"ਚਿਤਾਵਨੀ ਸੁਚੇਤਨਾ"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"ਜਨਤਕ ਸੁਰੱਖਿਆ ਸੁਚੇਤਨਾ"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ਕਸਰਤ"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ਟੈਸਟ ਸੁਚੇਤਨਾ"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"ਜਾਂਚ ਸੁਚੇਤਨਾ"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"ਚਿਤਾਵਨੀ ਸੁਚੇਤਨਾਵਾਂ"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"ਜਨਤਕ ਸੁਰੱਖਿਆ ਸੁਚੇਤਨਾਵਾਂ"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"ਜਾਂਚ ਸੁਚੇਤਨਾ"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"ਜਾਂਚ ਸੁਚੇਤਨਾ"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"ਚਿਤਾਵਨੀ ਸੁਚੇਤਨਾਵਾਂ"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"ਜਨਤਕ ਸੁਰੱਖਿਆ ਸੁਚੇਤਨਾਵਾਂ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"ਜਾਂਚ ਸੁਚੇਤਨਾਵਾਂ"</string>
 </resources>

diff --git a/res/values-mcc424-pl/strings.xml b/res/values-mcc424-pl/strings.xml
index 82fd3e6..33a57b6 100644
--- a/res/values-mcc424-pl/strings.xml
+++ b/res/values-mcc424-pl/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alert o zagrożeniu krajowym"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Ostrzeżenie"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Alert dotyczący bezpieczeństwa publicznego"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alert o zagrożeniu krajowym"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alert o zagrożeniu"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alert o zagrożeniu"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alert o zagrożeniu"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alert o zagrożeniu"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Ostrzeżenie"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alert dotyczący bezpieczeństwa publicznego"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Trening"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alert testowy"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Alert testowy"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alerty z ostrzeżeniami"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Alerty dotyczące bezpieczeństwa publicznego"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alert testowy"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alert testowy"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alerty z ostrzeżeniami"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alerty dotyczące bezpieczeństwa publicznego"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alerty testowe"</string>
 </resources>

diff --git a/res/values-mcc424-pt-rPT/strings.xml b/res/values-mcc424-pt-rPT/strings.xml
index 7e860de..2da39a5 100644
--- a/res/values-mcc424-pt-rPT/strings.xml
+++ b/res/values-mcc424-pt-rPT/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerta de emergência nacional"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Alerta de aviso"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Alerta de segurança pública"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alerta de emergência nacional"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alerta de emergência"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alerta de emergência"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alerta de emergência"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alerta de emergência"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alerta de aviso"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alerta de segurança pública"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercício"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerta de teste"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Alerta de teste"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alertas de aviso"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Alertas de segurança pública"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alerta de teste"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alerta de teste"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alertas de aviso"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alertas de segurança pública"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alertas de teste"</string>
 </resources>

diff --git a/res/values-mcc424-pt/strings.xml b/res/values-mcc424-pt/strings.xml
index 2c9c836..84fc0b2 100644
--- a/res/values-mcc424-pt/strings.xml
+++ b/res/values-mcc424-pt/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerta de emergência nacional"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Alerta de aviso"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Alerta de segurança pública"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alerta de emergência nacional"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alerta de emergência"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alerta de emergência"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alerta de emergência"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alerta de emergência"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alerta de aviso"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alerta de segurança pública"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercícios"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerta de teste"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Alerta de teste"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alertas de aviso"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Alertas de segurança pública"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alerta de teste"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alerta de teste"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alertas de aviso"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alertas de segurança pública"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alertas de teste"</string>
 </resources>

diff --git a/res/values-mcc424-ro/strings.xml b/res/values-mcc424-ro/strings.xml
index b3e56db..5dc7936 100644
--- a/res/values-mcc424-ro/strings.xml
+++ b/res/values-mcc424-ro/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alertă națională de urgență"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Alertă de atenționare"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Alertă publică privind siguranța"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alertă de urgență națională"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alertă de urgență"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alertă de urgență"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alertă de urgență"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alertă de urgență"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alertă de atenționare"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alertă publică privind siguranța"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exerciții fizice"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alertă de testare"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Alertă de testare"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alerte de atenționare"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Alerte publice privind siguranța"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alertă de testare"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alertă de testare"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alerte de atenționare"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alerte publice privind siguranța"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alerte de testare"</string>
 </resources>

diff --git a/res/values-mcc424-ru/strings.xml b/res/values-mcc424-ru/strings.xml
index 15d461a..28c94f6 100644
--- a/res/values-mcc424-ru/strings.xml
+++ b/res/values-mcc424-ru/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Федеральное экстренное оповещение"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Предупреждение"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Оповещение об угрозе общественной безопасности"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Общенациональное экстренное оповещение"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Аварийное оповещение"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Аварийное оповещение"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Аварийное оповещение"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Аварийное оповещение"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Предупреждение"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Оповещение об угрозе общественной безопасности"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Упражнение"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Тестовое оповещение"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Тестовое оповещение"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Предупреждения"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Оповещения об угрозе общественной безопасности"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Тестовое оповещение"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Тестовое оповещение"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Предупреждения"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Оповещения об угрозе общественной безопасности"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Тестовые оповещения"</string>
 </resources>

diff --git a/res/values-mcc424-si/strings.xml b/res/values-mcc424-si/strings.xml
index 40aee2f..3dec842 100644
--- a/res/values-mcc424-si/strings.xml
+++ b/res/values-mcc424-si/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ජාතික හදිසි අවස්ථා ඇඟවීම"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"අනතුරු ඇඟවීම"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"පොදු ආරක්ෂාව පිළිබඳ ඇඟවීම"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ජාතික හදිසි අවස්ථා ඇඟවීම"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"හදිසි අවස්ථා ඇඟවීම"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"හදිසි අවස්ථා ඇඟවීම"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"හදිසි අවස්ථා ඇඟවීම"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"හදිසි අවස්ථා ඇඟවීම"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"අනතුරු ඇඟවීම"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"පොදු ආරක්ෂාව පිළිබඳ ඇඟවීම"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ව්‍යායාමය"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"පරීක්ෂණ ඇඟවීම"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"පරීක්ෂණ ඇඟවීම"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"අනතුරු ඇඟවීම්"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"පොදු ආරක්ෂාව පිළිබඳ ඇඟවීම්"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"පරීක්ෂණ ඇඟවීම"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"පරීක්ෂණ ඇඟවීම"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"අනතුරු ඇඟවීම්"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"පොදු ආරක්ෂාව පිළිබඳ ඇඟවීම්"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"පරීක්ෂණ ඇඟවීම්"</string>
 </resources>

diff --git a/res/values-mcc424-sk/strings.xml b/res/values-mcc424-sk/strings.xml
index b097db0..ba9f823 100644
--- a/res/values-mcc424-sk/strings.xml
+++ b/res/values-mcc424-sk/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Celoštátne núdzové varovanie"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Varovanie"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Varovanie verejnej bezpečnosti"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Celoštátne tiesňové varovanie"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Tiesňové varovanie"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Tiesňové varovanie"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Tiesňové varovanie"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Tiesňové varovanie"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Upozornenie"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Varovanie verejnej bezpečnosti"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Cvičenie"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testovacie varovanie"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Testovacie varovanie"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Upozornenia"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Varovania verejnej bezpečnosti"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testovacie varovanie"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testovacie varovanie"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Upozornenia"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Varovania verejnej bezpečnosti"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testovacie varovania"</string>
 </resources>

diff --git a/res/values-mcc424-sl/strings.xml b/res/values-mcc424-sl/strings.xml
index 62eaf09..f8a0bbf 100644
--- a/res/values-mcc424-sl/strings.xml
+++ b/res/values-mcc424-sl/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Državno opozorilo v sili"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Opozorilno obvestilo"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Opozorilo za javno varnost"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Državno opozorilo v sili"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Opozorilo v sili"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Opozorilo v sili"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Opozorilo v sili"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Opozorilo v sili"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Opozorilno obvestilo"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Opozorilo za javno varnost"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Vaja"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Preskusno opozorilo"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Preizkusno opozorilo"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Opozorila"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Opozorila za javno varnost"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Preizkusno opozorilo"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Preizkusno opozorilo"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Opozorilna obvestila"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Opozorila za javno varnost"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Preizkusna opozorila"</string>
 </resources>

diff --git a/res/values-mcc424-sq/strings.xml b/res/values-mcc424-sq/strings.xml
index 9104627..4e08dde 100644
--- a/res/values-mcc424-sq/strings.xml
+++ b/res/values-mcc424-sq/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Sinjalizim urgjence kombëtare"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Sinjalizim paralajmërues"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Sinjalizim i sigurisë publike"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Sinjalizim urgjence kombëtare"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Sinjalizim urgjence"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Sinjalizim urgjence"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Sinjalizim urgjence"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Sinjalizim urgjence"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Sinjalizim paralajmërues"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Sinjalizim i sigurisë publike"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Ushtrimi"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Sinjalizim testimi"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Sinjalizim testimi"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Sinjalizimet paralajmëruese"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Sinjalizime të sigurisë publike"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Sinjalizim testimi"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Sinjalizim testimi"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Sinjalizime paralajmëruese"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Sinjalizime të sigurisë publike"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Sinjalizime testimi"</string>
 </resources>

diff --git a/res/values-mcc424-sr/strings.xml b/res/values-mcc424-sr/strings.xml
index c9f126c..e3017d5 100644
--- a/res/values-mcc424-sr/strings.xml
+++ b/res/values-mcc424-sr/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Обавештење о хитном случају на нивоу земље"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Обавештење о упозорењу"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Обавештење о јавној безбедности"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Обавештење о хитном случају на нивоу земље"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Обавештење о хитном случају"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Обавештење о хитном случају"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Обавештење о хитном случају"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Обавештење о хитном случају"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Обавештење о упозорењу"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Обавештење о јавној безбедности"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Вежбање"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Тест обавештење"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Пробно обавештење"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Обавештења о упозорењима"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Обавештења о јавној безбедности"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Пробно обавештење"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Пробно обавештење"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Обавештења о упозорењима"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Обавештења о јавној безбедности"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Пробна обавештења"</string>
 </resources>

diff --git a/res/values-mcc424-sv/strings.xml b/res/values-mcc424-sv/strings.xml
index d05ef40..3ee5656 100644
--- a/res/values-mcc424-sv/strings.xml
+++ b/res/values-mcc424-sv/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Varning om nationell nödsituation"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Varningsmeddelande"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Säkerhetsvarning till allmänheten"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Varning om nationell nödsituation"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Varning om nödsituation"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Varning om nödsituation"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Varning om nödsituation"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Varning om nödsituation"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Varningsmeddelande"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Säkerhetsvarning till allmänheten"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Övning"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testvarning"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Testvarning"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Varningsmeddelanden"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Säkerhetsvarningar till allmänheten"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testvarning"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testvarning"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Varningsmeddelanden"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Säkerhetsvarningar till allmänheten"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testvarningar"</string>
 </resources>

diff --git a/res/values-mcc424-sw/strings.xml b/res/values-mcc424-sw/strings.xml
index ac035ec..90a36e2 100644
--- a/res/values-mcc424-sw/strings.xml
+++ b/res/values-mcc424-sw/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Tahadhari kuhusu dharura ya kitaifa"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Tahadhari"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Tahadhari ya usalama kwa umma"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Tahadhari ya Dharura ya Kitaifa"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Tahadhari ya Dharura"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Tahadhari ya Dharura"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Tahadhari ya Dharura"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Tahadhari ya Dharura"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"TahadharI"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Tahadhari ya Usalama kwa Umma"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Mazoezi"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Jaribio la tahadhari"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Tahadhari ya jaribio"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Arifa za onyo"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Tahadhari za usalama kwa umma"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Tahadhari ya Jaribio"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Tahadhari ya Jaribio"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Tahadhari"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Tahadhari za Usalama kwa Umma"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Tahadhari za Majaribio"</string>
 </resources>

diff --git a/res/values-mcc424-ta/strings.xml b/res/values-mcc424-ta/strings.xml
index 400131d..ec3db25 100644
--- a/res/values-mcc424-ta/strings.xml
+++ b/res/values-mcc424-ta/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"தேசிய அளவிலான அவசரக்கால எச்சரிக்கை"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"எச்சரிக்கை விழிப்பூட்டல்"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"பொதுப் பாதுகாப்பு விழிப்பூட்டல்"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"தேசிய அளவிலான அவசரகால விழிப்பூட்டல்"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"அவசரகால விழிப்பூட்டல்"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"அவசரகால விழிப்பூட்டல்"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"அவசரகால விழிப்பூட்டல்"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"அவசரகால விழிப்பூட்டல்"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"எச்சரிக்கை விழிப்பூட்டல்"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"பொதுப் பாதுகாப்பு விழிப்பூட்டல்"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"உடற்பயிற்சி"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"சோதனை எச்சரிக்கை"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"சோதனை எச்சரிக்கை"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"எச்சரிக்கை விழிப்பூட்டல்கள்"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"பொதுப் பாதுகாப்பு விழிப்பூட்டல்கள்"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"சோதனை விழிப்பூட்டல்"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"சோதனை விழிப்பூட்டல்"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"எச்சரிக்கை விழிப்பூட்டல்கள்"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"பொதுப் பாதுகாப்பு விழிப்பூட்டல்கள்"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"சோதனை விழிப்பூட்டல்கள்"</string>
 </resources>

diff --git a/res/values-mcc424-te/strings.xml b/res/values-mcc424-te/strings.xml
index a97c4ec..4d5953f 100644
--- a/res/values-mcc424-te/strings.xml
+++ b/res/values-mcc424-te/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"జాతీయ అత్యవసర హెచ్చరిక"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"హెచ్చరిక అలర్ట్"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"పబ్లిక్ భద్రత అలర్ట్"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"జాతీయ అత్యవసర అలర్ట్"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"అత్యవసర అలర్ట్"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"అత్యవసర అలర్ట్"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"అత్యవసర అలర్ట్"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"అత్యవసర అలర్ట్"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"హెచ్చరిక అలర్ట్"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"పబ్లిక్ భద్రత అలర్ట్"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"వ్యాయామం"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"పరీక్ష హెచ్చరిక"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"పరీక్ష అలర్ట్"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"హెచ్చరిక అలర్ట్‌లు"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"పబ్లిక్ భద్రత అలర్ట్‌లు"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"పరీక్ష అలర్ట్"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"పరీక్ష అలర్ట్"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"హెచ్చరిక అలర్ట్‌లు"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"పబ్లిక్ భద్రత అలర్ట్‌లు"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"పరీక్ష అలర్ట్‌లు"</string>
 </resources>

diff --git a/res/values-mcc424-th/strings.xml b/res/values-mcc424-th/strings.xml
index 0b51668..b413e3b 100644
--- a/res/values-mcc424-th/strings.xml
+++ b/res/values-mcc424-th/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"การแจ้งเหตุฉุกเฉินระดับชาติ"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"การเตือนภัย"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"การแจ้งเตือนด้านความปลอดภัยสาธารณะ"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"การแจ้งเตือนเหตุฉุกเฉินระดับชาติ"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"การแจ้งเตือนเหตุฉุกเฉิน"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"การแจ้งเตือนเหตุฉุกเฉิน"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"การแจ้งเตือนเหตุฉุกเฉิน"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"การแจ้งเตือนเหตุฉุกเฉิน"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"การแจ้งเตือนภัย"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"การแจ้งเตือนด้านความปลอดภัยสาธารณะ"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ออกกำลังกาย"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ทดสอบการแจ้งเหตุ"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"ทดสอบการแจ้งเหตุ"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"การแจ้งเตือน"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"การแจ้งเตือนด้านความปลอดภัยสาธารณะ"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"การแจ้งเตือนการทดสอบ"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"การแจ้งเตือนการทดสอบ"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"การแจ้งเตือนภัย"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"การแจ้งเตือนด้านความปลอดภัยสาธารณะ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"การแจ้งเตือนการทดสอบ"</string>
 </resources>

diff --git a/res/values-mcc424-tl/strings.xml b/res/values-mcc424-tl/strings.xml
index 86a2596..747fc89 100644
--- a/res/values-mcc424-tl/strings.xml
+++ b/res/values-mcc424-tl/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerto para sa pambansang emergency"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Alertong babala"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Alerto sa pampublikong kaligtasan"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alerto para sa Pambansang Emergency"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alertong Pang-emergency"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alertong Pang-emergency"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alertong Pang-emergency"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alertong Pang-emergency"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alertong Babala"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alerto para sa Pampublikong Kaligtasan"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Mag-ehersisyo"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Pansubok na alerto"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Pansubok na alerto"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Mga alertong babala"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Mga alerto sa pampublikong kaligtasan"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Pansubok na Alerto"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Pansubok na Alerto"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Mga Alertong Babala"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Mga Alerto para sa Pampublikong Kaligtasan"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Mga Pansubok na Alerto"</string>
 </resources>

diff --git a/res/values-mcc424-tr/strings.xml b/res/values-mcc424-tr/strings.xml
index c8d3d7e..fa617ab 100644
--- a/res/values-mcc424-tr/strings.xml
+++ b/res/values-mcc424-tr/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Ulusal acil durum uyarısı"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Uyarı"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Kamu güvenliği uyarısı"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Ulusal Düzeyde Acil Durum Uyarısı"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Acil Durum Uyarısı"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Acil Durum Uyarısı"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Acil Durum Uyarısı"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Acil Durum Uyarısı"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"İkaz Uyarısı"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Kamu Güvenliği Uyarısı"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Spor"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test amaçlı uyarı"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Test amaçlı uyarı"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Uyarı alarmları"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Kamu güvenliği uyarıları"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Test Amaçlı Uyarı"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Test Amaçlı Uyarı"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"İkaz Uyarıları"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Kamu Güvenliği Uyarıları"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Test Amaçlı Uyarılar"</string>
 </resources>

diff --git a/res/values-mcc424-uk/strings.xml b/res/values-mcc424-uk/strings.xml
index ffb43da..a195f5b 100644
--- a/res/values-mcc424-uk/strings.xml
+++ b/res/values-mcc424-uk/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Екстрене сповіщення для всієї країни"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Застереження"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Сповіщення щодо громадської безпеки"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Екстрене сповіщення для всієї країни"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Екстрене сповіщення"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Екстрене сповіщення"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Екстрене сповіщення"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Екстрене сповіщення"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Застереження"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Сповіщення щодо громадської безпеки"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Вправа"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Тестове сповіщення"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Тестове сповіщення"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Сповіщення з попередженнями"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Сповіщення щодо громадської безпеки"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Тестове сповіщення"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Тестове сповіщення"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Застереження"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Сповіщення щодо громадської безпеки"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Тестові сповіщення"</string>
 </resources>

diff --git a/res/values-mcc424-ur/strings.xml b/res/values-mcc424-ur/strings.xml
index 54d7e0b..760bdb6 100644
--- a/res/values-mcc424-ur/strings.xml
+++ b/res/values-mcc424-ur/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"قومی ہنگامی الرٹ"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"وارننگ الرٹ"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"عوامی حفاظتی الرٹ"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"قومی ہنگامی الرٹ"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"ہنگامی الرٹ"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"ہنگامی الرٹ"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"ہنگامی الرٹ"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"ہنگامی الرٹ"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"وارننگ الرٹ"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"عوامی حفاظتی الرٹ"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ورزش"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ٹیسٹ الرٹ"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"ٹیسٹ الرٹ"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"انتباہی الرٹس"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"عوامی حفاظتی الرٹس"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"ٹیسٹ الرٹ"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"ٹیسٹ الرٹ"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"وارننگ الرٹس"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"عوامی حفاظتی الرٹس"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"ٹیسٹ الرٹس"</string>
 </resources>

diff --git a/res/values-mcc424-uz/strings.xml b/res/values-mcc424-uz/strings.xml
index b0bd798..5c9814e 100644
--- a/res/values-mcc424-uz/strings.xml
+++ b/res/values-mcc424-uz/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Milliy favqulodda ogohlantirish"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Ogohlantirish"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Ommaviy xavfsizlik haqida ogohlantirish"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Milliy favqulodda ogohlantirish"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Favqulodda ogohlantirish"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Favqulodda ogohlantirish"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Favqulodda ogohlantirish"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Favqulodda ogohlantirish"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Ogohlantirish"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Ommaviy xavfsizlik haqida ogohlantirish"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Sinov"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Sinov ogohlantirishi"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Sinov ogohlantirishi"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Ogohlantirishlar"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Ommaviy xavfsizlik haqida ogohlantirishlar"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Sinov ogohlantirishi"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Sinov ogohlantirishi"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Ogohlantirishlar"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Ommaviy xavfsizlik haqida ogohlantirishlar"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Sinov ogohlantirishlari"</string>
 </resources>

diff --git a/res/values-mcc424-vi/strings.xml b/res/values-mcc424-vi/strings.xml
index 31c4b82..b6af09c 100644
--- a/res/values-mcc424-vi/strings.xml
+++ b/res/values-mcc424-vi/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Cảnh báo khẩn cấp của quốc gia"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Cảnh báo"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Cảnh báo chung về an toàn"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Cảnh báo khẩn cấp của quốc gia"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Cảnh báo khẩn cấp"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Cảnh báo khẩn cấp"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Cảnh báo khẩn cấp"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Cảnh báo khẩn cấp"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Cảnh báo"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Cảnh báo chung về an toàn"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Tập thể dục"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Cảnh báo thử nghiệm"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Cảnh báo thử nghiệm"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Cảnh báo"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Cảnh báo chung về an toàn"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Cảnh báo thử nghiệm"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Cảnh báo thử nghiệm"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Cảnh báo"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Cảnh báo chung về an toàn"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Cảnh báo thử nghiệm"</string>
 </resources>

diff --git a/res/values-mcc424-zh-rCN/strings.xml b/res/values-mcc424-zh-rCN/strings.xml
index abec86c..148e55a 100644
--- a/res/values-mcc424-zh-rCN/strings.xml
+++ b/res/values-mcc424-zh-rCN/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"国家紧急警报"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"警报"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"公共安全警报"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"国家紧急警示"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"紧急警示"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"紧急警示"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"紧急警示"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"紧急警示"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"警示"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"公共安全警示"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"锻炼"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"测试警报"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"测试警报"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"警报"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"公共安全警报"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"测试警示"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"测试警示"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"警示"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"公共安全警示"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"测试警示"</string>
 </resources>

diff --git a/res/values-mcc424-zh-rHK/strings.xml b/res/values-mcc424-zh-rHK/strings.xml
index 2c6234c..17a9ec1 100644
--- a/res/values-mcc424-zh-rHK/strings.xml
+++ b/res/values-mcc424-zh-rHK/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"國家/地區緊急警示"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"警示"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"公共安全警報"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"國家/地區緊急警示"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"緊急警示"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"緊急警示"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"緊急警示"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"緊急警示"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"警示"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"公共安全警報"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"運動"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"測試警示"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"測試警示"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"警示"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"公共安全警報"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"測試警示"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"測試警示"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"警示"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"公共安全警報"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"測試警示"</string>
 </resources>

diff --git a/res/values-mcc424-zh-rTW/strings.xml b/res/values-mcc424-zh-rTW/strings.xml
index b8f35bb..b4e27c1 100644
--- a/res/values-mcc424-zh-rTW/strings.xml
+++ b/res/values-mcc424-zh-rTW/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"國家/地區緊急警報"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"警報"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"公共安全警報"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"國家/地區緊急警示"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"緊急警示"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"緊急警示"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"緊急警示"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"緊急警示"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"警示"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"公共安全警示"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"運動"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"測試警報"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"測試警報"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"警示快訊"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"公共安全警報"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"測試警示"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"測試警示"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"警示"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"公共安全警示"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"測試警示"</string>
 </resources>

diff --git a/res/values-mcc424-zu/strings.xml b/res/values-mcc424-zu/strings.xml
index 693b268..37f73a9 100644
--- a/res/values-mcc424-zu/strings.xml
+++ b/res/values-mcc424-zu/strings.xml

@@ -16,12 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Isaziso esiphuthumayo sikazwelonke"</string>
-    <string name="pws_other_message_identifiers" msgid="9062780351883657067">"Isexwayiso sokuxwayisa"</string>
-    <string name="public_safety_message" msgid="2187283654023170988">"Isexwayiso sokuphepha esidlangalaleni"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Isexwayiso Esiphuthumayo Sikazwelonke"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Isexwayiso Esiphuthumayo"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Isexwayiso Esiphuthumayo"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Isexwayiso Esiphuthumayo"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Isexwayiso Esiphuthumayo"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Isexwayiso Sokuxwayisa"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Isexwayiso Sokuphepha Esidlangalaleni"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Ukuzivocavoca"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Isixwayiso sokuhlola"</string>
-    <string name="state_local_test_alert" msgid="3092681020067564217">"Isixwayiso sokuhlola"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Izexwayiso"</string>
-    <string name="enable_public_safety_messages_title" msgid="4810131816678424099">"Izexwayiso zokuphepha esidlangalaleni"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Isexwayiso Sokuhlola"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Isexwayiso Sokuhlola"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Izexwayiso Zokuxwayisa"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Izexwayiso Zokuphepha Esidlangalaleni"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Izexwayiso Zokuhlola"</string>
 </resources>

diff --git a/res/values-mcc424/config.xml b/res/values-mcc424/config.xml
index 6cf58bf..acf794b 100644
--- a/res/values-mcc424/config.xml
+++ b/res/values-mcc424/config.xml

@@ -56,6 +56,8 @@
     </string-array>
     <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false">
     </string-array>
+    <string-array name="operator_defined_alert_range_strings" translatable="false">
+    </string-array>
     <!-- Whether to always receive exercise alerts regardless of test alerts toggle state -->
     <!-- By default it's true for United Arab Emirates users -->
     <bool name="always_enable_exercise_alert">true</bool>

diff --git a/res/values-mcc424/strings.xml b/res/values-mcc424/strings.xml
index 0e4a1c0..8e8f521 100644
--- a/res/values-mcc424/strings.xml
+++ b/res/values-mcc424/strings.xml

@@ -16,20 +16,34 @@
 
 <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>
+    <!-- [BACKUP_MESSAGE_ID: 175237477015066795] -->
+    <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>
-    <!-- Dialog titles for alerta -->
-    <string name="pws_other_message_identifiers">Warning alert</string>
-    <string name="public_safety_message">Public safety alert</string>
+    <!-- [BACKUP_MESSAGE_ID: 624783871477634263] -->
+    <string name="cmas_extreme_alert">Emergency Alert</string>
+    <!-- [BACKUP_MESSAGE_ID: 624783871477634263] -->
+    <string name="cmas_extreme_immediate_observed_alert">Emergency Alert</string>
+    <!-- [BACKUP_MESSAGE_ID: 624783871477634263] -->
+    <string name="cmas_extreme_immediate_likely_alert">Emergency Alert</string>
+    <!-- [BACKUP_MESSAGE_ID: 624783871477634263] -->
+    <string name="cmas_severe_alert">Emergency Alert</string>
+
+    <!-- Dialog titles for alert -->
+    <!-- [BACKUP_MESSAGE_ID: 9062780351883657067] -->
+    <string name="pws_other_message_identifiers">Warning Alert</string>
+    <!-- [BACKUP_MESSAGE_ID: 2187283654023170988] -->
+    <string name="public_safety_message">Public Safety Alert</string>
     <string name="cmas_exercise_alert">Exercise</string>
-    <string name="cmas_required_monthly_test">Test alert</string>
-    <string name="state_local_test_alert">Test alert</string>
+    <!-- [BACKUP_MESSAGE_ID: 7606843318721168353] -->
+    <string name="cmas_required_monthly_test">Test Alert</string>
+    <!-- [BACKUP_MESSAGE_ID: 3092681020067564217] -->
+    <string name="state_local_test_alert">Test Alert</string>
 
     <!-- Emergency alert settings menu -->
-    <string name="enable_emergency_alerts_message_title">Warning alerts</string>
-    <string name="enable_public_safety_messages_title">Public safety alerts</string>
+    <!-- [BACKUP_MESSAGE_ID: 876981179796412627] -->
+    <string name="enable_emergency_alerts_message_title">Warning Alerts</string>
+    <!-- [BACKUP_MESSAGE_ID: 4810131816678424099] -->
+    <string name="enable_public_safety_messages_title">Public Safety Alerts</string>
+    <!-- [BACKUP_MESSAGE_ID: 7194966927004755266] -->
+    <string name="enable_cmas_test_alerts_title">Test Alerts</string>
 </resources>

diff --git a/res/values-mcc450-fi/strings.xml b/res/values-mcc450-fi/strings.xml
index 8aa1dc9..c09b3da 100644
--- a/res/values-mcc450-fi/strings.xml
+++ b/res/values-mcc450-fi/strings.xml

@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Kriittinen hätätilannevaroitus"</string>
+    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Kriittinen vaaratiedote"</string>
 </resources>

diff --git a/res/values-mcc466-vi/strings.xml b/res/values-mcc466-vi/strings.xml
index d20509b..428d427 100644
--- a/res/values-mcc466-vi/strings.xml
+++ b/res/values-mcc466-vi/strings.xml

@@ -17,6 +17,6 @@
 <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">"Thông báo cảnh báo"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="4165080207837566277">"Kiểm tra hàng tháng bắt buộc"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4165080207837566277">"Cần phải kiểm tra hằng tháng"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="1339769389077152402">"Nhận thông báo kiểm tra của hệ thống cảnh báo an toàn"</string>
 </resources>

diff --git a/res/values-mcc716-fi/strings.xml b/res/values-mcc716-fi/strings.xml
index 15902fa..330613e 100644
--- a/res/values-mcc716-fi/strings.xml
+++ b/res/values-mcc716-fi/strings.xml

@@ -18,7 +18,7 @@
     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="3061507852301643814">"Hätähälytys: harjoitusviesti"</string>
-    <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Hätähälytys: koeviesti"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Vaaratiedote: testiviesti"</string>
+    <string name="cmas_exercise_alert" msgid="3061507852301643814">"Vaaratiedote: harjoitusviesti"</string>
+    <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Vaaratiedote: testiviesti"</string>
 </resources>

diff --git a/res/values-mcc730/config.xml b/res/values-mcc730/config.xml
index 11ea120..82fa8ac 100644
--- a/res/values-mcc730/config.xml
+++ b/res/values-mcc730/config.xml

@@ -24,7 +24,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=true, alert_duration=86400000</item>
+        <item>0x0397:rat=gsm, emergency=true, alert_duration=86400000</item>
         <item>0x0399:type=other, emergency=false</item>
     </string-array>
     <!-- 4370, 4383 -->
@@ -47,8 +47,8 @@
     </string-array>
     <!-- 4380~4382, 519 -->
     <string-array name="required_monthly_test_range_strings" translatable="false">
-        <item>0x111C:rat=gsm, emergency=true, alert_duration=86400000</item>
-        <item>0x207:rat=gsm, emergency=true, alert_duration=86400000</item>
+        <item>0x111C:rat=gsm, type=info, emergency=true, alert_duration=86400000</item>
+        <item>0x207:rat=gsm, type=info, emergency=true, alert_duration=86400000</item>
     </string-array>
     <string-array name="exercise_alert_range_strings" translatable="false">
         <item>0x111D:rat=gsm, emergency=true, alert_duration=86400000</item>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e351457..8e1205c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -116,8 +116,8 @@
     <string name="delivery_time_heading" msgid="5980836543433619329">"Ontvangen:"</string>
     <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> ongelezen waarschuwingen."</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"Nieuwe waarschuwingen"</string>
-    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Een afmeldvenster weergeven na de eerste melding (geen nationale melding)."</string>
-    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Afmeldvenster weergeven"</string>
+    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Een toestemmingsvenster weergeven na de eerste melding (geen nationale melding)."</string>
+    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Toestemmingsvenster weergeven"</string>
     <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"Je ontvangt momenteel meldingen voor noodwaarschuwingen. Wil je meldingen voor noodwaarschuwingen blijven ontvangen?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Ja"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Nee"</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index cb8a48a..51b07e9 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -27,8 +27,8 @@
     <string name="menu_delete" msgid="128380070910799366">"Futa tangazo"</string>
     <string name="view_details_title" msgid="1780427629491781473">"Maelezo ya arifa"</string>
     <string name="view_details_debugging_title" msgid="5699927030805114173">"Maelezo ya arifa za utatuzi"</string>
-    <string name="confirm_delete_broadcast" msgid="2540199303730232322">"Futa matangazo haya?"</string>
-    <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"Futa jumbe zote zilizopokewa za matangazo?"</string>
+    <string name="confirm_delete_broadcast" msgid="2540199303730232322">"Ifute tangazo hili?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"Ifute ujumbe wote wa watu wengi uliopokea?"</string>
     <string name="button_delete" msgid="4672451757925194350">"Futa"</string>
     <string name="button_cancel" msgid="7479958360523246140">"Ghairi"</string>
     <string name="etws_earthquake_warning" msgid="6428741104423152511">"Onyo la tetemeko la ardhi"</string>
@@ -54,7 +54,7 @@
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Arifa za dharura"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Arifa za dharura kupitia simu ya sauti"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Ruhusu arifa"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Pokea arifa za tahadhari za dharura kupitia vifaa visivyotumia waya"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Pokea arifa za dharura kupitia vifaa visivyotumia waya"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Kikumbusho cha arifa"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Sauti ya kikumbusho itacheza kwa kiwango cha kawaida cha sauti"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historia ya arifa za dharura"</string>

diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index a1fbbcf..a0b8a3f 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml

@@ -16,9 +16,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2008319089248760277">"Simsiz favqulodda ogohlantirishlar"</string>
-    <string name="sms_cb_settings" msgid="9021266457863671070">"Simsiz favqulodda ogohlantirishlar"</string>
-    <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Simsiz favqulodda ogohlantirishlar sozlamalari bu foydalanuvchi uchun yopiq"</string>
+    <string name="app_label" msgid="2008319089248760277">"Favqulodda ogohlantirishlar"</string>
+    <string name="sms_cb_settings" msgid="9021266457863671070">"Favqulodda ogohlantirishlar"</string>
+    <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Simsiz tarmoqlar orqali favqulodda ogohlantirish sozlamalari bu foydalanuvchi uchun yopiq"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Hech qanday ogohlantirish topilmadi"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Tarqatma xabarlarni o‘chirish"</string>
@@ -54,7 +54,7 @@
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Favqulodda ogohlantirishlar"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Ovozli chaqiruvlar vaqtida favqulodda ogohlantirish"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Ogohlantirishlarga ruxsat"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Simsiz favqulodda ogohlantirishlar qabul qilish"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Simsiz tarmoqlar orqali favqulodda ogohlantirishlarni qabul qilish"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Eslatmalar davriyligi"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Eslatma tovushi odatdagi balandlikda yangraydi"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Favqulodda xabarlar arxivi"</string>
@@ -118,7 +118,7 @@
     <string name="notification_multiple_title" msgid="1523638925739947855">"Yangi ogohlantirishlar"</string>
     <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Birinchi ogohlantirishdan keyin favqulodda holatlar bildirishnomalarini faolsizlantirishni taklif qilish"</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Ogohlantirish kelmaydigan qilish"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"Simsiz favqulodda ogohlantirishlar kelishi yoniq. Simsiz favqulodda ogohlantirishlar kelishda davom etaversinmi?"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"Simsiz tarmoqlar orqali favqulodda ogohlantirishlar kelishi yoniq. Bunday ogohlantirishlar kelishda davom etaversinmi?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Ha"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Yo‘q"</string>
     <string name="cb_list_activity_title" msgid="1433502151877791724">"Favqulodda ogohlantirish tarixi"</string>
@@ -129,7 +129,7 @@
     <item msgid="3863339891188103437">"Har 15 daqiqada"</item>
     <item msgid="7388573183644474611">"Hech qachon"</item>
   </string-array>
-    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Simsiz favqulodda ogohlantirishlar"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Favqulodda ogohlantirishlar"</string>
     <string name="enable_cmas_presidential_alerts_title" msgid="7293800023375154256">"Prezidentdan ogohlantirishlar"</string>
     <string name="enable_cmas_presidential_alerts_summary" msgid="7900094335808247024">"Prezidentdan favqulodda xabar. Uni faolsizlantirish imkonsiz."</string>
     <string name="receive_cmas_in_second_language_title" msgid="1223260365527361964"></string>

diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml
index b1be57b..fbfee87 100644
--- a/res/values/overlayable.xml
+++ b/res/values/overlayable.xml

@@ -23,7 +23,7 @@
         <policy type="product|system|vendor">
             <!-- START THEME / STYLE -->
             <item type="style" name="CellBroadcastAlertTheme"/>
-            <item type="style" name="PreferenceTheme"/>
+            <item type="style" name="CellBroadcastListActivityTheme"/>
             <item type="style" name="CellBroadcastSettingsTheme"/>
             <!-- END THEME / STYLE -->
 
@@ -63,4 +63,4 @@
 
     </overlayable>
 
-</resources>
\ No newline at end of file
+</resources>

diff --git a/res/values/themes.xml b/res/values/themes.xml
index 2028aa5..059c72f 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml

@@ -21,15 +21,14 @@
 <resources>
     <style name="CellBroadcastAlertTheme" parent="android:Theme.DeviceDefault.Light.Dialog" />
 
-    <style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.v14.Material">
+    <style name="CellBroadcastSettingsTheme" parent="@style/PreferenceThemeOverlay.v14.Material">
         <item name="switchPreferenceStyle">@style/SettingsSwitchPreference</item>
         <item name="preferenceCategoryStyle">@style/Preference.Category.Material</item>
         <item name="preferenceStyle">@style/SettingsPreference</item>
         <item name="dialogPreferenceStyle">@style/SettingsDialogPreference</item>
     </style>
 
-    <style name="CellBroadcastSettingsTheme" parent="@android:style/Theme.DeviceDefault.Settings">
-        <item name="preferenceTheme">@style/PreferenceTheme</item>
+    <style name="CellBroadcastListActivityTheme" parent="@android:style/Theme.DeviceDefault.Settings">
     </style>
 
 </resources>

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
index d8cc2c4..3c277f5 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java

@@ -238,7 +238,7 @@
                         if (mMessageBody != null && mTtsEngineReady && mTtsLanguageSupported) {
                             if (DBG) log("Speaking broadcast text: " + mMessageBody);
 
-                            mTts.setAudioAttributes(getAlertAudioAttributes(mAlertType));
+                            mTts.setAudioAttributes(getAlertAudioAttributes());
                             res = mTts.speak(mMessageBody, 2, null, TTS_UTTERANCE_ID);
                             mState = STATE_SPEAKING;
                         }
@@ -424,8 +424,7 @@
             }
 
             AudioAttributes.Builder attrBuilder = new AudioAttributes.Builder();
-            attrBuilder.setUsage(alertType == AlertType.INFO
-                    ? AudioAttributes.USAGE_NOTIFICATION : AudioAttributes.USAGE_ALARM);
+            attrBuilder.setUsage(AudioAttributes.USAGE_ALARM);
             if (mOverrideDnd) {
                 // Set the flags to bypass DnD mode if override dnd is turned on.
                 attrBuilder.setFlags(AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY
@@ -501,8 +500,8 @@
                 // Request audio focus (though we're going to play even if we don't get it)
                 mAudioManager.requestAudioFocus(null, AudioManager.STREAM_ALARM,
                         AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);
-                mMediaPlayer.setAudioAttributes(getAlertAudioAttributes(mAlertType));
-                setAlertVolume(mAlertType);
+                mMediaPlayer.setAudioAttributes(getAlertAudioAttributes());
+                setAlertVolume();
 
                 // If we are using the custom alert duration, set looping to true so we can repeat
                 // the alert. The tone playing will stop when ALERT_SOUND_FINISHED arrives.
@@ -584,7 +583,7 @@
         mHandler.removeMessages(ALERT_PAUSE_FINISHED);
         mHandler.removeMessages(ALERT_LED_FLASH_TOGGLE);
 
-        resetAlarmStreamVolume(mAlertType);
+        resetAlarmStreamVolume();
 
         if (mState == STATE_ALERTING) {
             // Stop audio playing
@@ -618,12 +617,11 @@
     /**
      * Get audio attribute for the alarm.
      */
-    private AudioAttributes getAlertAudioAttributes(AlertType alertType) {
+    private AudioAttributes getAlertAudioAttributes() {
         AudioAttributes.Builder builder = new AudioAttributes.Builder();
 
         builder.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION);
-        builder.setUsage((alertType == AlertType.INFO
-                ? AudioAttributes.USAGE_NOTIFICATION : AudioAttributes.USAGE_ALARM));
+        builder.setUsage(AudioAttributes.USAGE_ALARM);
         if (mOverrideDnd) {
             // Set FLAG_BYPASS_INTERRUPTION_POLICY and FLAG_BYPASS_MUTE so that it enables
             // audio in any DnD mode, even in total silence DnD mode (requires MODIFY_PHONE_STATE).
@@ -637,7 +635,7 @@
     /**
      * Set volume for alerts.
      */
-    private void setAlertVolume(AlertType alertType) {
+    private void setAlertVolume() {
         if (mTelephonyManager.getCallState() != TelephonyManager.CALL_STATE_IDLE
                 || isOnEarphone()) {
             // If we are in a call, play the alert
@@ -648,7 +646,7 @@
             // If override DnD is turned on,
             // we overwrite volume setting of STREAM_ALARM to full, play at
             // max possible volume, and reset it after it's finished.
-            setAlarmStreamVolumeToFull(alertType);
+            setAlarmStreamVolumeToFull();
         }
     }
 
@@ -671,10 +669,9 @@
     /**
      * Set volume of STREAM_ALARM to full.
      */
-    private void setAlarmStreamVolumeToFull(AlertType alertType) {
+    private void setAlarmStreamVolumeToFull() {
         log("setting alarm volume to full for cell broadcast alerts.");
-        int streamType = (alertType == AlertType.INFO)
-                ? AudioManager.STREAM_NOTIFICATION : AudioManager.STREAM_ALARM;
+        int streamType = AudioManager.STREAM_ALARM;
         mUserSetAlarmVolume = mAudioManager.getStreamVolume(streamType);
         mResetAlarmVolumeNeeded = true;
         mAudioManager.setStreamVolume(streamType,
@@ -684,12 +681,10 @@
     /**
      * Reset volume of STREAM_ALARM, if needed.
      */
-    private void resetAlarmStreamVolume(AlertType alertType) {
+    private void resetAlarmStreamVolume() {
         if (mResetAlarmVolumeNeeded) {
             log("resetting alarm volume to back to " + mUserSetAlarmVolume);
-            mAudioManager.setStreamVolume(alertType == AlertType.INFO
-                            ? AudioManager.STREAM_NOTIFICATION : AudioManager.STREAM_ALARM,
-                    mUserSetAlarmVolume, 0);
+            mAudioManager.setStreamVolume(AudioManager.STREAM_ALARM, mUserSetAlarmVolume, 0);
             mResetAlarmVolumeNeeded = false;
         }
     }
commit	581eaf321712de5baee4dae6e86db5792c871e4b	[log] [tgz]
author	Linux Build Service Account <lnxbuild@localhost>	Thu Feb 04 03:50:29 2021 -0800
committer	Linux Build Service Account <lnxbuild@localhost>	Thu Feb 04 03:50:29 2021 -0800
tree	c418756078ace3608ee6392395ac862fa8bb96c7
parent	ec7e70a0b1b97f884e4b483780519cd008494054 [diff]
parent	599929c062be56d0c4d06f22eb931c6654526e17 [diff]