Snap for 7478028 from dc412b93510baf619b723280e81eb25d6e6dbeb8 to mainline-adbd-releaseandroid-mainline-12.0.0_r21android-mainline-12.0.0_r1

Change-Id: I455c240e4d939322713ebce2f151962c1ad7bb4f

359 files changed, 5695 insertions, 744 deletions

diff --git a/Android.bp b/Android.bp
index 3990d11ba..b5b9a5f5e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,7 +1,27 @@
 // Copyright 2011 The Android Open Source Project
+package {
+    default_applicable_licenses: [
+        "packages_apps_CellBroadcastReceiver_license",
+    ],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "packages_apps_CellBroadcastReceiver_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 java_defaults {
     name: "CellBroadcastCommon",
-    min_sdk_version: "29",
+    min_sdk_version: "30",
+    target_sdk_version: "31",
     sdk_version: "system_current",
     privileged: true,
     srcs: [
@@ -17,12 +37,18 @@ java_defaults {
         "androidx.preference_preference",
         "androidx.appcompat_appcompat",
         "androidx.legacy_legacy-preference-v14",
+        "SettingsLibSettingsTheme",
+        "SettingsLibCollapsingToolbarBaseActivity",
+        "modules-utils-build_system",
     ],
     optimize: {
        proguard_flags_files: ["proguard.flags"],
     },
     resource_dirs: ["res"],
     plugins: ["java_api_finder"],
+    lint: {
+        strict_updatability_linting: true,
+    },
 }
 
 android_app {
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c6552fd6d..8b6644c39 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -28,17 +28,24 @@
         </intent>
     </queries>
 
+    <!-- Needed for TTS when targetSdkVersion is 30 -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.TTS_SERVICE" />
+        </intent>
+    </queries>
+
+    <uses-permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS" />
     <uses-permission android:name="android.permission.RECEIVE_SMS" />
     <uses-permission android:name="android.permission.RECEIVE_EMERGENCY_BROADCAST" />
     <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
     <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
+    <uses-permission android:name="android.permission.MODIFY_CELL_BROADCASTS" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-    <uses-permission android:name="android.permission.STATUS_BAR" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
     <uses-permission android:name="android.permission.MANAGE_USERS" />
     <uses-permission android:name="android.permission.DEVICE_POWER" />
-    <uses-permission android:name="android.permission.GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS" />
     <uses-permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />
     <uses-permission android:name="android.permission.READ_CELL_BROADCASTS" />
     <uses-permission android:name="android.permission.READ_SMS" />
@@ -46,7 +53,7 @@
     <uses-permission android:name="com.android.cellbroadcastservice.FULL_ACCESS_CELL_BROADCAST_HISTORY" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
+    <uses-sdk android:minSdkVersion="30" />
 
     <application android:name="com.android.cellbroadcastreceiver.CellBroadcastReceiverApp"
             android:label="@string/app_label"
@@ -81,6 +88,7 @@
                   android:label="@string/app_label"
                   android:launchMode="singleTask"
                   android:theme="@style/CellBroadcastListActivityTheme"
+                  android:exported="true"
                   android:configChanges="orientation|keyboardHidden" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -133,7 +141,8 @@
                   android:theme="@style/CellBroadcastOptOutTheme"
                   android:exported="false" />
 
-        <receiver android:name="com.android.cellbroadcastreceiver.CellBroadcastReceiver">
+        <receiver android:name="com.android.cellbroadcastreceiver.CellBroadcastReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED" />
                 <action android:name="android.telephony.action.CARRIER_CONFIG_CHANGED" />
@@ -144,6 +153,7 @@
                 <action android:name="android.intent.action.LOCALE_CHANGED" />
                 <action android:name="android.intent.action.SERVICE_STATE" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.telephony.action.SIM_CARD_STATE_CHANGED" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.telephony.action.SECRET_CODE" />
diff --git a/AndroidManifest_Platform.xml b/AndroidManifest_Platform.xml
index 8d39f804e..3c4cd09aa 100644
--- a/AndroidManifest_Platform.xml
+++ b/AndroidManifest_Platform.xml
@@ -21,12 +21,13 @@
 
   <original-package android:name="com.android.cellbroadcastreceiver" />
 
+  <uses-permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS" />
   <uses-permission android:name="android.permission.RECEIVE_SMS" />
   <uses-permission android:name="android.permission.RECEIVE_EMERGENCY_BROADCAST" />
   <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
   <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
+  <uses-permission android:name="android.permission.MODIFY_CELL_BROADCASTS" />
   <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-  <uses-permission android:name="android.permission.STATUS_BAR" />
   <uses-permission android:name="android.permission.VIBRATE" />
   <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
   <uses-permission android:name="android.permission.MANAGE_USERS" />
@@ -38,7 +39,7 @@
   <uses-permission android:name="com.android.cellbroadcastservice.FULL_ACCESS_CELL_BROADCAST_HISTORY" />
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
-  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
+  <uses-sdk android:minSdkVersion="21"/>
 
   <application android:name="CellBroadcastReceiverApp"
       android:label="@string/app_label"
@@ -69,7 +70,8 @@
 
     <activity android:name="CellBroadcastListActivity"
         android:label="@string/app_label"
-        android:theme="@style/CellBroadcastSettingsTheme"
+        android:theme="@style/CellBroadcastListActivityTheme"
+        android:exported="true"
         android:configChanges="orientation|keyboardHidden" >
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
@@ -105,7 +107,7 @@
         android:exported="true" />
 
     <activity android:name="CellBroadcastAlertDialog"
-        android:theme="@android:style/Theme.DeviceDefault.Light.Dialog"
+        android:theme="@style/CellBroadcastAlertTheme"
         android:launchMode="singleTask"
         android:exported="false"
         android:excludeFromRecents="true"
@@ -119,7 +121,8 @@
     <activity android:name="CellBroadcastOptOutActivity"
         android:exported="false" />
 
-    <receiver android:name="CellBroadcastReceiver">
+    <receiver android:name="CellBroadcastReceiver"
+        android:exported="true">
       <intent-filter>
         <action android:name="android.provider.action.SMS_EMERGENCY_CB_RECEIVED" />
         <action android:name="android.provider.Telephony.SMS_CB_RECEIVED" />
@@ -130,6 +133,7 @@
         <action android:name="android.telephony.action.CARRIER_CONFIG_CHANGED" />
         <action android:name="android.intent.action.SERVICE_STATE" />
         <action android:name="android.intent.action.BOOT_COMPLETED" />
+        <action android:name="android.telephony.action.SIM_CARD_STATE_CHANGED" />
       </intent-filter>
       <intent-filter>
         <action android:name="android.telephony.action.SECRET_CODE" />
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29bb..000000000
--- a/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/RROSampleTestApp/Android.bp b/RROSampleTestApp/Android.bp
index 64f516472..9a6576825 100644
--- a/RROSampleTestApp/Android.bp
+++ b/RROSampleTestApp/Android.bp
@@ -1,3 +1,14 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_CellBroadcastReceiver_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: [
+        "packages_apps_CellBroadcastReceiver_license",
+    ],
+}
+
 runtime_resource_overlay {
     name: "CellBroadcastReceiverRROSample",
     product_specific: true,
diff --git a/apex/Android.bp b/apex/Android.bp
index 6913d6542..02309fc5b 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -1,3 +1,14 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_CellBroadcastReceiver_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: [
+        "packages_apps_CellBroadcastReceiver_license",
+    ],
+}
+
 apex_defaults {
     name: "com.android.cellbroadcast-defaults",
     updatable: true,
diff --git a/apex/AndroidManifest.xml b/apex/AndroidManifest.xml
index adc9daa92..8bcdef634 100644
--- a/apex/AndroidManifest.xml
+++ b/apex/AndroidManifest.xml
@@ -18,8 +18,7 @@
     package="com.android.cellbroadcast">
     <!-- APEX does not have classes.dex -->
     <application android:hasCode="false" />
-    <!-- set target SDK to 30 until S sdk is finalized, see b/182409562 -->
-    <uses-sdk
-        android:targetSdkVersion="30"
-    />
+    <!-- TODO: Uncomment this when the R API level is fixed. b/148281152 -->
+    <!-- Setting maxSdk to lock the module to R. minSdk is auto-set by build system -->
+    <uses-sdk android:targetSdkVersion="31" />
 </manifest>
diff --git a/apex/apex_manifest.json b/apex/apex_manifest.json
index c2b997fb2..ebe42ff76 100644
--- a/apex/apex_manifest.json
+++ b/apex/apex_manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.cellbroadcast",
   "version": 309999900
-}
\ No newline at end of file
+}
diff --git a/apex/testing/Android.bp b/apex/testing/Android.bp
index 41b1c2574..4fe163881 100644
--- a/apex/testing/Android.bp
+++ b/apex/testing/Android.bp
@@ -12,6 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_CellBroadcastReceiver_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: [
+        "packages_apps_CellBroadcastReceiver_license",
+    ],
+}
+
 apex_test {
     name: "test_com.android.cellbroadcast",
     visibility: [
diff --git a/legacy/Android.bp b/legacy/Android.bp
index c6b2a4ea9..16d23700d 100644
--- a/legacy/Android.bp
+++ b/legacy/Android.bp
@@ -4,6 +4,17 @@
 // The app is included to system img by default. If OEMs have their own legacy
 // app they can replace this one. If OEMs don't care about data loss or data
 // migration complete, OEMs can remove this app going forward.
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_CellBroadcastReceiver_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: [
+        "packages_apps_CellBroadcastReceiver_license",
+    ],
+}
+
 android_app {
     name: "CellBroadcastLegacyApp",
     manifest: "AndroidManifest.xml",
@@ -23,4 +34,4 @@ android_app {
     ],
     privileged: true,
     sdk_version: "system_current",
-}
\ No newline at end of file
+}
diff --git a/res/drawable/ic_delete_24dp.xml b/res/drawable/ic_delete_24dp.xml
new file mode 100644
index 000000000..3f83bc4e0
--- /dev/null
+++ b/res/drawable/ic_delete_24dp.xml
@@ -0,0 +1,31 @@
+<!--
+Copyright (C) 2015 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V6h1V4H15zM17,19H7V6h10V19z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,8h2v9h-2z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13,8h2v9h-2z"/>
+</vector>
diff --git a/res/drawable/ic_info_24dp.xml b/res/drawable/ic_info_24dp.xml
new file mode 100644
index 000000000..1de4f9faa
--- /dev/null
+++ b/res/drawable/ic_info_24dp.xml
@@ -0,0 +1,25 @@
+<!--
+    Copyright (C) 2016 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+	    android:fillColor="#FF000000"
+        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z"/>
+</vector>
diff --git a/res/layout/cell_broadcast_list_item.xml b/res/layout/cell_broadcast_list_item.xml
index 854b2628d..811a9cf59 100644
--- a/res/layout/cell_broadcast_list_item.xml
+++ b/res/layout/cell_broadcast_list_item.xml
@@ -18,15 +18,19 @@
 -->
 
 <com.android.cellbroadcastreceiver.CellBroadcastListItem xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/CellBroadcastListItemTheme"
-        >
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/colorBackground"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    >
 
     <TextView android:id="@+id/channel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/list_item_internal_line_space_horizontal"
+        android:layout_marginEnd="16dip"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         android:layout_alignWithParentIfMissing="true"
@@ -40,9 +44,10 @@
     <TextView android:id="@+id/date"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:layout_alignParentEnd="true"
+        android:layout_toStartOf="@+id/checkBox"
+        android:layout_alignEnd="@+id/message"
         android:layout_alignBaseline="@id/channel"
-        android:textAppearance="?android:attr/textAppearanceListItemSmall"
+        android:textAppearance="?android:attr/textAppearanceSmall"
         android:singleLine="true"
         />
 
@@ -50,10 +55,20 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/channel"
-        android:layout_marginTop="@dimen/list_item_internal_line_space_vertical"
+        android:layout_toStartOf="@+id/checkBox"
+        android:layout_marginTop="4dp"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:singleLine="true"
         android:ellipsize="marquee"
         />
 
+    <CheckedTextView android:id="@+id/checkBox"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_centerInParent="true"
+        android:checkMark="?android:attr/listChoiceIndicatorMultiple"
+        android:visibility="gone"
+        />
+
 </com.android.cellbroadcastreceiver.CellBroadcastListItem>
diff --git a/res/layout/cell_broadcast_list_screen.xml b/res/layout/cell_broadcast_list_screen.xml
index bd7e20194..c895e5fc5 100644
--- a/res/layout/cell_broadcast_list_screen.xml
+++ b/res/layout/cell_broadcast_list_screen.xml
@@ -26,7 +26,8 @@
                 android:layout_height="match_parent"
                 android:drawSelectorOnTop="false"
                 android:scrollbarStyle="insideOverlay"
-                android:theme="@style/CellBroadcastListViewTheme"
+                android:divider="@null"
+                android:dividerHeight="0dp"
                 />
 
         <TextView android:id="@+id/empty"
diff --git a/res/menu/cell_broadcast_list_action_menu.xml b/res/menu/cell_broadcast_list_action_menu.xml
new file mode 100644
index 000000000..1afd5f279
--- /dev/null
+++ b/res/menu/cell_broadcast_list_action_menu.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2021 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.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:appcompat="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <item
+        android:id="@+id/action_delete"
+        android:icon="@drawable/ic_delete_24dp"
+        android:orderInCategory="60"
+        android:title="@string/action_delete"
+        android:showAsAction="collapseActionView|ifRoom"/>
+    <item
+        android:id="@+id/action_detail_info"
+        android:icon="@drawable/ic_info_24dp"
+        android:orderInCategory="50"
+        android:title="@string/action_detail_info"
+        android:showAsAction="collapseActionView|ifRoom"/>
+</menu>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 5c14683bd..7101c251b 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Waarsku oor dreigende veiligheidskwessies"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Publiekeveiligheidsboodskappe"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Aanbevole handelinge wat lewens of eiendom kan red"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Wys volskermboodskappe"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Skakel af sodat publiekeveiligheidsboodskappe net na jou SMS-program toe gestuur word"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Deelstaat- en plaaslike toetse"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Ontvang toetsboodskappe van deelstaat- en plaaslike owerhede af"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Noodwaarskuwings"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 2190aa821..c5cb6eea0 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"ስለተቃረቡ የደህንነት አደጋዎች አስጠንቀቅ"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"የሕዝባዊ ደህንነት መልዕክቶች"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"ህይወትን ወይም ንብረትን ሊያድኑ የሚችሉ የሚመከሩ እርምጃዎች"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"ባለሙሉ ማያ ገጽ መልዕክቶችን ያሳይ"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"የሕዝባዊ ደህንነት መልዕክቶች ወደ እርስዎ ኤስኤምኤስ መተግበሪያ ብቻ እንዲላኩልዎ ያጥፉ"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"የግዛት እና አካባቢያዊ ሙከራዎች"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"ከግዛት እና የአካባቢ ባለሥልጣናት የሙከራ መልዕክቶችን ተቀበል"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"የድንገተኛ አደጋ ማንቂያዎች"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3bd180325..4de016294 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"إرسال تحذير بشأن التهديدات الوشيكة للسلامة"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"رسائل السلامة العامة"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"الإجراءات المقترحة التي يمكن أن تنقذ الأرواح أو الممتلكات"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"إظهار الرسائل في وضع ملء الشاشة"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"‏إيقاف هذا الإعداد ليتم إرسال رسائل السلامة العامة إلى تطبيق SMS فقط"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"اختبارات الولاية والاختبارات المحلية"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"استلام رسائل اختبارية من سلطات الولاية والسلطات المحلية"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"إنذارات الطوارئ"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 7d8178ee1..daac00405 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -24,7 +24,7 @@
     <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"তথ্যসমৃদ্ধ জাননী"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"এই ব্যৱহাৰকাৰীৰ বাবে অনাতাঁৰ জৰুৰীকালীন সতৰ্কবাৰ্তাৰ ছেটিংসমূহ উপলব্ধ নহয়"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ঠিক আছে"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"পূৰ্বৰ কোনো সতৰ্কতা নাই"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"পূৰ্বৰ কোনো সতৰ্কবাণী নাই"</string>
     <string name="menu_preferences" msgid="3596514894131599202">"ছেটিংসমূহ"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"সম্প্ৰচাৰসমূহ মচক"</string>
     <string name="message_options" msgid="3178489901903589574">"বাৰ্তাৰ বিকল্পসমূহ"</string>
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"আসন্ন বিপদাশংকাৰ বিষয়ে সতৰ্ক কৰক"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"ৰাজহুৱা নিৰাপত্তা বিষয়ক বাৰ্তাসমূহ"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"জীৱন বা সম্পত্তি ৰক্ষা কৰিব পৰা অনুমোদিত কাৰ্যসমূহ"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"পূৰ্ণ স্ক্ৰীনত বাৰ্তা দেখুৱাওক"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"ৰাজহুৱা সুৰক্ষা বিষয়ক বাৰ্তা কেৱল আপোনাৰ এছএমএছ এপ্‌টোলৈ প্ৰেৰণ কৰিবলৈ অফ কৰক"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"ৰাজ্যিক আৰু স্থানীয় পৰীক্ষামূলক সতৰ্কবাণী"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"ৰাজ্য চৰকাৰ আৰু স্থানীয় কৰ্তৃপক্ষৰ পৰা পৰীক্ষামূলক বাৰ্তা লাভ কৰক"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"জৰুৰীকালীন সতৰ্কবাণীসমূহ"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 04b68c16e..66a306dd6 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -16,11 +16,11 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2008319089248760277">"Simsiz həyəcan siqnalları"</string>
-    <string name="sms_cb_settings" msgid="9021266457863671070">"Simsiz həyəcan siqnalları"</string>
-    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Simsiz fövqəladə siqnallar"</string>
-    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Simsiz fövqəladə siqnallar"</string>
-    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Simsiz fövqəladə siqnallar"</string>
+    <string name="app_label" msgid="2008319089248760277">"Fövqəladə hal xəbərdarlıqları"</string>
+    <string name="sms_cb_settings" msgid="9021266457863671070">"Fövqəladə hal xəbərdarlıqları"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Fövqəladə hal xəbərdarlıqları"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Fövqəladə hal xəbərdarlıqları"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Fövqəladə hal xəbərdarlıqları"</string>
     <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Məlumat bildirişi"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Simsiz həyəcan siqnalı ayarları bu istifadəçi üçün əlçatan deyil"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
@@ -34,7 +34,7 @@
     <string name="view_details_debugging_title" msgid="5699927030805114173">"Sazlama üçün bildiriş detalları"</string>
     <string name="confirm_delete_broadcast" msgid="2540199303730232322">"Bu yayım silinsin?"</string>
     <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"Qəbul olunmuş bütün yayım mesajları silinsin?"</string>
-    <string name="button_delete" msgid="4672451757925194350">"Sil"</string>
+    <string name="button_delete" msgid="4672451757925194350">"Silin"</string>
     <string name="button_cancel" msgid="7479958360523246140">"Ləğv et"</string>
     <string name="etws_earthquake_warning" msgid="6428741104423152511">"Zəlzələ xəbərdarlığı"</string>
     <string name="etws_tsunami_warning" msgid="6173964105145900312">"Sunami xəbərdarlığı"</string>
@@ -60,32 +60,34 @@
     <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Təsdiqlənməmiş Fövqəladə Hal xəbərdarlıqları"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Səsli zəngdə fövqəladə siqnallar"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"SIM əsasında avtomatik WEA Ayarları dəyişiklikləri"</string>
-    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Siqnallara icazə verin"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Simsiz həyəcan siqnalı bildirişlərini əldə edin"</string>
+    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Xəbərdarlığa icazə verin"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Fövqəladə hal xəbərdarlığı alın"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Siqnal xatırladıcısı"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Siqnal mesajını səsləndirin"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Simsiz həyəcan siqnalı mesajlarını oxutmaq üçün \"mətndən nitqə\" funksiyasından istifadə edin"</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">"Fövqəladə hal xəbərdarlıq tarixçəsi"</string>
+    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Xatırlatma adi səs həcmində olsun"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Fövqəladə 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>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Ciddi təhlükə"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Həyat və mülkiyyət üçün ciddi təhlükələr"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Dəhşətli təhlükə"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Həyat və mülkiyyət üçün dəhşətli təhlükə"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Dəhşətli təhlükə"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Həyat və mülkiyyətə dəhşətli təhlükə"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ciddi təhlükə"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Həyat və mülkiyyətə ciddi təhlükə"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"KƏHRƏBAYI siqnallar"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Uşaq qaçırma həyəcan siqnalı bülletenləri"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"Xəbərdarlıq mesajları"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Qaçılmaz təhlükələr ilə bağlı xəbərdarlıq edin"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"İctimai təhlükəsizlik mesajları"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Həyat və mülkiyyətinin qorunması ilə bağlı məsləhətli əməliyyatlar"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Tam ekran mesajlarını göstərin"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"İctimai təhlükəsizlik mesajlarının yalnız SMS tətbiqinizə göndərilməsi üçün söndürün"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Dövlət və yerli testlər"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Dövlət və yerli orqanlardan mətn mesajları alın"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Həyəcan siqnalı"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Həyati təhlükəsi olan hadisələrlə bağlı xəbərdarlıq edin"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Sınaq siqnalları"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Təhlükəsizlik xəbərdarlığı sistemindən operator sınaqları və aylıq sınaq bildirişləri alın"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Fövqəladə xəbərdarlıq sistemi (ayda bir dəfə) və operator sınaq bildirişləri göndərsin"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
     <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Fövqəladə hal siqnalı alın: Məşr/Təlim mesajı"</string>
@@ -137,7 +139,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"Hazırda simsiz həyəcan siqnalları əldə edirsiniz. Simsiz həyəcan siqnalları əldə etməyə davam etmək istəyirsiniz?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Bəli"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Xeyr"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Təcili siqnal tarixçəsi"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Fövqəladə xəbərdarlıq tarixçəsi"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Bir dəfə"</item>
     <item msgid="9097229303902157183">"Hər 2 dəqiqə"</item>
@@ -145,7 +147,7 @@
     <item msgid="3863339891188103437">"Hər 15 dəqiqə"</item>
     <item msgid="7388573183644474611">"Heç vaxt"</item>
   </string-array>
-    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Simsiz təcili siqnallar"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Fövqəladə hal xəbərdarlıqları"</string>
     <string name="enable_cmas_presidential_alerts_title" msgid="7293800023375154256">"Prezident xəbərdarlıqları"</string>
     <string name="enable_cmas_presidential_alerts_summary" msgid="7900094335808247024">"Prezidentin çatdırdığı milli xəbərdarlıq mesajları Deaktiv edilə bilməz."</string>
     <string name="receive_cmas_in_second_language_title" msgid="1223260365527361964"></string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index bc03573ab..83e6db1d8 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Upozoravaj me na neposredne bezbednosne pretnje"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Poruke o javnoj bezbednosti"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Preporučene radnje koje mogu da sačuvaju živote ili imovinu"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Prikazuj poruke na celom ekranu"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Isključite da bi se poruke o javnoj bezbednosti slale samo u aplikaciju za SMS poruke"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Probne poruke državnih i lokalnih organa"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Primaj probne poruke od državnih i lokalnih organa"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Obaveštenja o hitnim slučajevima"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index f34f3a53a..0b955c18c 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -65,8 +65,8 @@
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Напаміны"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Прагаворваць апавяшчэнні"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Выкарыстоўваць сінтэз маўлення, каб прагаворваць аварыйныя апавяшчэнні па бесправадных сетках"</string>
-    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Гук напамінаў будзе прайгравацца са звычайнай гучнасцю"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Гісторыя аварыйных абвестак"</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="enable_etws_test_alerts_title" msgid="3593533226735441539">"Тэставыя рассылкі ETWS"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Тэставыя рассылкі сістэмы папярэджання аб землятрусах і цунамі"</string>
@@ -80,12 +80,14 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Папярэджваць пра непасрэдныя пагрозы бяспекі"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Паведамленні аб пагрозе грамадскай бяспецы"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Рэкамендаваныя дзеянні, якія могуць выратаваць жыцці або маёмасць"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Паказваць паведамленні ў поўнаэкранным рэжыме"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Выключыце, каб паведамленні аб пагрозе грамадскай бяспецы адпраўляліся толькі ў праграму для SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Дзяржаўныя і мясцовыя тэставыя паведамленні"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Атрымліваць тэставыя паведамленні ад дзяржаўных і мясцовых органаў улады"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Абвесткі аб надзвычайных сітуацыях"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Папярэджваць пра небяспечныя для жыцця падзеі"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Тэставыя абвесткі"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Атрымліваць тэсты аператараў і штомесячныя тэсты ад сістэмы абвяшчэння бяспекі"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Атрымліваць тэставыя абвесткі ад аператараў і штомесячныя тэставыя абвесткі ад сістэмы экстраннага апавяшчэння"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
     <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Атрымаць абвестку пра надзвычайную сітуацыю: вучэбнае/трэніровачнае паведамленне"</string>
@@ -137,7 +139,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"Вы цяпер атрымліваеце абвесткі пра надзвычайныя сітуацыі па бесправадных сетках. Хочаце і далей атрымліваць такія абвесткі па бесправадных сетках?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Так"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Не"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Гісторыя аварыйных абвестак"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Гісторыя экстранных абвестак"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Адзiн раз"</item>
     <item msgid="9097229303902157183">"Кожныя 2 хвіліны"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index db9e99a85..3471a3467 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Предупреждаване за непосредствени заплахи за безопасността"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Съобщения за обществена безопасност"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Препоръчителни действия, които могат да спасят животи или имущество"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Показване на съобщенията на цял екран"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Изключете опцията, за да получавате съобщения за обществена безопасност само в приложението за SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Тестове на щатско и местно ниво"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Получаване на тестови съобщения от държавните и местните власти"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Сигнали при спешни случаи"</string>
@@ -137,7 +139,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"Понастоящем получавате безжични сигнали при спешни случаи. Искате ли да продължите да ги получавате?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Да"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Не"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Ист. на сигнали при спешност"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Ист. на сигнали при спешни случаи"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Веднъж"</item>
     <item msgid="9097229303902157183">"На всеки 2 минути"</item>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 0803bd1f7..dc214f3b5 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"আসন্ন নিরাপত্তা ঝুঁকির বিষয়ে সতর্কতা পান"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"সর্বজনীন নিরাপত্তা মেসেজ"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"জীবন অথবা সম্পত্তি রক্ষা করতে পারে, এমন কাজের প্রস্তাবনা"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"ফুল-স্ক্রিন মেসেজ দেখুন"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"শুধুমাত্র আপনার এসএমএস অ্যাপে সর্বজনীন নিরাপত্তা মেসেজ পাওয়ার জন্য এই সুবিধা বন্ধ করুন"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"রাজ্য ও স্থানীয় পরীক্ষা"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"রাজ্য ও স্থানীয় কর্তৃপক্ষের কাছ থেকে পরীক্ষামূলক মেসেজ পান"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"জরুরি সতর্কতা"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index a9945f82b..5f247dc5f 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -61,7 +61,7 @@
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Hitna upozorenja u glasovnom pozivu"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Automatske postavke hitnih upozorenja putem bežične mrežne zasnovanih na SIM-u"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Dozvoli upozorenja"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Šalji obavještenja o hitnim upozorenjima bežičnim putem"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Primajte obavještenja o hitnim upozorenjima bežičnim putem"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Podsjetnik za upozorenja"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Izgovaraj poruke upozorenja"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Korištenje pretvaranja teksta u govor za izgovaranje hitnih upozorenja putem bežične mreže"</string>
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Upozori na neposredne sigurnosne prijetnje"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Poruke za javnu sigurnost"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Preporučene radnje kojim se mogu spasiti životi ili imovina"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Prikaži poruke preko cijelog ekrana"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Isključite i poruke za javnu sigurnost će vam se slati samo putem aplikacije za SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Državni i lokalni testovi"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Primajte probne poruke od državnih i lokalnih vlasti"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Hitna upozorenja"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 89a3ac1fd..120b16485 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -65,7 +65,7 @@
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Recordatori d\'alertes"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Enuncia el missatge d\'alerta"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Utilitza text a parla per enunciar els missatges d\'alertes d\'emergència sense fil"</string>
-    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Un so de recordatori es reproduirà a un volum normal"</string>
+    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Reprodueix un so de recordatori a un volum normal"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historial d\'alertes d\'emergència"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Preferències d\'alertes"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Difusions de prova de l\'ETWS"</string>
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Avisa\'m quan hi hagi amenaces de seguretat imminents"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Missatges de seguretat pública"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Accions recomanades que poden salvar vides o propietats"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Mostra els missatges en pantalla completa"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Desactiva per rebre els missatges de seguretat pública només a la teva aplicació d\'SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Proves locals i estatals"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Vull rebre missatges de prova de les autoritats locals i estatals"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alertes d\'emergència"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 337fab50e..a3bc36e4a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Dostávat upozornění na bezprostřední bezpečnostní hrozby"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Zprávy o veřejné bezpečnosti"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Doporučené akce, které mohou zachránit životy či majetek"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Zobrazovat celoobrazovkové zprávy"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Vypněte, pokud zprávy o veřejné bezpečnosti chcete zasílat pouze do aplikace pro SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Státní a místní testy"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Dostávat testovací zprávy od státních a místních úřadů"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Výstražné zprávy"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a0d470bed..a4e100e9f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Advar om overhængende sikkerhedstrusler"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Meddelelser om offentlig sikkerhed"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Anbefalede handlinger, der kan redde liv eller ejendom"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Vis meddelelser i fuld skærm"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Deaktiver, hvis meddelelser om offentlig sikkerhed kun skal sendes til din sms-app"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Centrale og lokale testadvarsler"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Modtag testmeddelelser fra centrale og lokale myndigheder"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Nødalarmer"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index dc85cc7b4..36759fba6 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -62,11 +62,11 @@
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Automatische Änderungen an Einstellungen für Notfallbenachrichtigungen für Mobilgeräte je nach SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Notfallbenachrichtigungen zulassen"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Notfallbenachrichtigungen für Mobilgeräte erhalten"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Benachrichtigungserinnerung"</string>
+    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Benachrichtigungserinnerungen"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Benachrichtigung vorlesen"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Notfallbenachrichtigungen für Mobilgeräte via Sprachausgabe vorlesen"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Benachrichtigungserinnerung ertönt in normaler Lautstärke"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Notfallbenachrichtigungen"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Bisherige Notfall­benachrichtigungen"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Benachrichtigungseinstellungen"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS-Testnachrichten"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Testnachrichten für Erdbeben-/Tsunami-Warnsystem"</string>
@@ -74,12 +74,14 @@
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Extreme Gefahren für Leben und Eigentum"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Erhebliche Gefahren"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Erhebliche Gefahren für Leben und Eigentum"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER Alerts"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER-Benachrichtigungen"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Notfallmeldungen bei Kindesentführung"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"Warnmeldungen"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Vor akuten Sicherheitsbedrohungen warnen"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Nachrichten zur öffentlichen Sicherheit"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Empfohlene Maßnahmen, die Leben oder Eigentum retten können"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Nachrichten im Vollbildmodus anzeigen"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Deaktivieren, damit Nachrichten zu öffentlichen Not-Infos nur an deine SMS-App gesendet werden"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Staatliche und lokale Tests"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Testnachrichten von staatlichen und lokalen Behörden erhalten"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Notfallbenachrichtigungen"</string>
@@ -95,7 +97,7 @@
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibration"</string>
     <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Immer mit voller Lautstärke benachrichtigen"</string>
-    <string name="override_dnd_summary" msgid="9026675822792800258">"\"Bitte nicht stören\" und andere Lautstärkeeinstellungen ignorieren"</string>
+    <string name="override_dnd_summary" msgid="9026675822792800258">"„Bitte nicht stören“ und andere Lautstärkeeinstellungen ignorieren"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Aktuelle Gebietsinformationen"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Aktuelle Informationen im SIM-Status anzeigen"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Warnungskategorie:"</string>
@@ -135,9 +137,9 @@
     <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Nach erster Warnung Deaktivierungsoption anzeigen (außer bei Warnung auf höchster Stufe)"</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Option zum Deaktivieren anzeigen"</string>
     <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"Du erhältst derzeit Notfallbenachrichtigungen für Mobilgeräte. Möchtest du das weiterhin?"</string>
-    <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"\"Ja\""</string>
+    <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Ja"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Nein"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Notfallbenachrichtigungen"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Bisherige Notfall­benachrichtigungen"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Einmal"</item>
     <item msgid="9097229303902157183">"Alle 2 Minuten"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0efbee196..ba58e065e 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2008319089248760277">"Ειδοποιήσεις έκτακτης ανάγκης μέσω ασύρματου δικτύου"</string>
-    <string name="sms_cb_settings" msgid="9021266457863671070">"Ειδοποιήσεις έκτακτης ανάγκης μέσω ασύρματου δικτύου"</string>
+    <string name="app_label" msgid="2008319089248760277">"Ασύρματες ειδοποιήσεις έκτακτης ανάγκης"</string>
+    <string name="sms_cb_settings" msgid="9021266457863671070">"Ασύρματες ειδοποιήσεις έκτακτης ανάγκης"</string>
     <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Ασύρματες ειδοποιήσεις έκτακτης ανάγκης"</string>
     <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Ασύρματες ειδοποιήσεις έκτακτης ανάγκης"</string>
     <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Ασύρματες ειδοποιήσεις έκτακτης ανάγκης"</string>
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Προειδοποίηση σχετικά με επικείμενες απειλές ασφάλειας"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Μηνύματα δημόσιας ασφάλειας"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Προτεινόμενες ενέργειες που μπορεί να σώσουν ζωές ή να προστατεύσουν περιουσίες"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Εμφάνιση μηνυμάτων πλήρους οθόνης"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Απενεργοποιήστε για να αποστέλλονται τα μηνύματα δημόσιας ασφάλειας μόνο στην Εφαρμογή SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Κρατικές και τοπικές δοκιμές"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Λάβετε δοκιμαστικά μηνύματα από κρατικές και τοπικές αρχές"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Ειδοποιήσεις έκτακτης ανάγκης"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 4d052917c..fca8395b4 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Warn about imminent safety threats"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Public safety messages"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Recommended actions that can save lives or property"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Show full-screen messages"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Turn off to have public safety messages sent only to your SMS app"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Regional and local tests"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Receive test messages from regional and local authorities"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Emergency alerts"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 4d052917c..fca8395b4 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Warn about imminent safety threats"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Public safety messages"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Recommended actions that can save lives or property"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Show full-screen messages"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Turn off to have public safety messages sent only to your SMS app"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Regional and local tests"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Receive test messages from regional and local authorities"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Emergency alerts"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 4d052917c..fca8395b4 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Warn about imminent safety threats"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Public safety messages"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Recommended actions that can save lives or property"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Show full-screen messages"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Turn off to have public safety messages sent only to your SMS app"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Regional and local tests"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Receive test messages from regional and local authorities"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Emergency alerts"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 4d052917c..fca8395b4 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Warn about imminent safety threats"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Public safety messages"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Recommended actions that can save lives or property"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Show full-screen messages"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Turn off to have public safety messages sent only to your SMS app"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Regional and local tests"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Receive test messages from regional and local authorities"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Emergency alerts"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index f19610415..73a35d3d3 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‎‎‎‎‏‎‏‎‎‎‎‎‏‎‏‎‎Warn about imminent safety threats‎‏‎‎‏‎"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎Public safety messages‎‏‎‎‏‎"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‎‏‎Recommended actions that can save lives or property‎‏‎‎‏‎"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‎Show full-screen messages‎‏‎‎‏‎"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‎‏‎‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎Turn off to have public safety messages sent only to your SMS app‎‏‎‎‏‎"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‎State and local tests‎‏‎‎‏‎"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎Receive test messages from state and local authorities‎‏‎‎‏‎"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎Emergency alerts‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 2ee4eec55..5bd6b7072 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -65,7 +65,7 @@
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Recordatorio de alertas"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Voz para los mensajes de alerta"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Utilizar texto a voz para los mensajes de alertas de emergencia inalámbricas"</string>
-    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Se reproducirá un sonido de recordatorio a un volumen regular"</string>
+    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Reproducir un sonido de recordatorio a un volumen normal"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historial de alertas de emergencia"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Preferencias de alertas"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Emisiones de prueba del ETWS"</string>
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Alertar sobre amenazas de seguridad inminentes"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Mensajes de seguridad pública"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Acciones recomendadas que pueden salvar vidas o propiedades"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Mostrar mensajes en pantalla completa"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Desactivar para recibir mensajes de seguridad pública únicamente en la app de SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Pruebas locales y estatales"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Recibir mensajes de prueba de autoridades locales y estatales"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alertas de emergencia"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 07159a7f2..3ff775270 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -64,8 +64,8 @@
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Recibe notificaciones de alerta de emergencia inalámbricas"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Recordatorio de alertas"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Enunciar mensaje de alerta"</string>
-    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Enunciar los mensajes de alertas de emergencia con la síntesis de voz"</string>
-    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Sonará un recordatorio al volumen normal"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Enunciar los mensajes de alertas de emergencia con la conversión de texto a voz"</string>
+    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Reproducir un recordatorio a volumen normal"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historial de alertas de emergencia"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Preferencias de alertas"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Difusiones de prueba del ETWS"</string>
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Advertencia sobre amenazas de seguridad inminentes"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Mensajes de seguridad pública"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Acciones recomendadas que pueden salvar vidas o propiedades"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Mostrar mensajes en pantalla completa"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Si lo desactivas, los mensajes de seguridad pública se enviarán solo a tu aplicación de SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Pruebas locales y estatales"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Recibir mensajes de prueba de autoridades locales y estatales"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alertas de emergencias"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index aca186867..a4cab9c08 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -16,15 +16,15 @@
 
 <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">"Juhtmevabad hädaolukorra teatised"</string>
-    <string name="sms_cb_settings" msgid="9021266457863671070">"Juhtmevabad hädaolukorra teatised"</string>
-    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Juhtmevabad hädaolukorra hoiatused"</string>
-    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Juhtmevabad hädaolukorra hoiatused"</string>
-    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Juhtmevabad hädaolukorra hoiatused"</string>
+    <string name="app_label" msgid="2008319089248760277">"Eriolukorra raadiosideteatised"</string>
+    <string name="sms_cb_settings" msgid="9021266457863671070">"Eriolukorra raadiosideteatised"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Eriolukorra raadiosideteatised"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Eriolukorra raadiosideteatised"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Eriolukorra raadiosideteatised"</string>
     <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Informatiivne märguanne"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Juhtmevabade hädaolukorra teatiste seaded pole selle kasutaja puhul saadaval"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"Varasemaid hoiatusi ei ole"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"Varasemaid teatisi ei ole"</string>
     <string name="menu_preferences" msgid="3596514894131599202">"Seaded"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Kustuta saated"</string>
     <string name="message_options" msgid="3178489901903589574">"Sõnumite valikud"</string>
@@ -66,7 +66,7 @@
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Märguandesõnumi esitamine kõnena"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Kõnesünteesi funktsiooni kasutamine juhtmevabade hädaolukorra teatiste esitamiseks kõnena"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Meeldetuletuse heli esitatakse tavapärase helitugevusega"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Hädaolukorra hoiatuste ajalugu"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Eriolukorra teatiste ajalugu"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Teatiste eelistused"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS-i katseteatised"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Maavärina ja hiidlaine hoiatussüsteemi katseteatised"</string>
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Hoiatused eelseisvate turvaohtude puhul"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Avalikud turvateadaanded"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Soovitatud toimingud, mis võivad päästa elusid või vara"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Kuva teadaanded täisekraanil"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Lülitage välja, et avalikke turvateadaandeid saada ainult SMS-i teel"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Riiklikud ja kohalikud testid"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Saate riiklikelt ja kohalikelt ametkondadelt testsõnumeid"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Hädaolukorra hoiatused"</string>
@@ -137,7 +139,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"Saate praegu juhtmevabalt hädaolukorra teatisi. Kas soovite ka edaspidi juhtmevabalt hädaolukorra teatisi saada?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Jah"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Ei"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Hädaolukorra hoiatuste ajalugu"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Eriolukorra teatiste ajalugu"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Üks kord"</item>
     <item msgid="9097229303902157183">"Iga 2 minuti järel"</item>
@@ -145,7 +147,7 @@
     <item msgid="3863339891188103437">"Iga 15 minuti järel"</item>
     <item msgid="7388573183644474611">"Mitte kunagi"</item>
   </string-array>
-    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Juhtmevabad hädaolukorra teatised"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Eriolukorra raadiosideteatised"</string>
     <string name="enable_cmas_presidential_alerts_title" msgid="7293800023375154256">"Presidendi edastatud hoiatused"</string>
     <string name="enable_cmas_presidential_alerts_summary" msgid="7900094335808247024">"Presidendi edastatud riiklikud hoiatussõnumid. Ei saa välja lülitada."</string>
     <string name="receive_cmas_in_second_language_title" msgid="1223260365527361964"></string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 8cac0973d..a76167223 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -80,11 +80,13 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Ohartarazi berehalako segurtasun-arriskuei buruz"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Segurtasun publikoari buruzko mezuak"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Bizia edo ondasunak salbatzeko ekintza gomendatuak"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Erakutsi mezuak pantaila osoan"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Desaktibatu hau segurtasun publikoari buruzko mezuak SMS mezuetarako aplikaziora soilik bidaltzeko"</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 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>
+    <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Probako alertak"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Jaso segurtasun-alerten sistemaren operadore-probak eta hileroko probak"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 97d1d4abd..255ea699c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -24,7 +24,7 @@
     <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"اعلان اطلاعاتی"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"تنظیمات مربوط به هشدارهای اضطراری بی‌سیم برای این کاربر در دسترس نیست"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"تأیید"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"هیچ هشداری از قبل وجود ندارد"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"هشداری ازقبل وجود ندارد"</string>
     <string name="menu_preferences" msgid="3596514894131599202">"تنظیمات"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"حذف پخش ها"</string>
     <string name="message_options" msgid="3178489901903589574">"گزینه‌های پیام"</string>
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"هشدار درباره تهدیدهای ایمنی قریب‌الوقوع"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"پیام‌های امنیت عمومی"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"اقدام‌های توصیه‌شده که می‌تواند جان افراد یا اموال آن‌ها را حفظ کند"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"نمایش پیام‌ها به‌صورت تمام‌صفحه"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"با خاموش کردن این گزینه، پیام‌های امنیت عمومی فقط به برنامه پیامک ارسال می‌شود"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"آزمایش‌های ایالتی و محلی"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"دریافت پیام‌های آزمایشی از مقامات ایالتی و محلی"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"هشدارهای اضطراری"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index af7398a87..8259dea78 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Varoita välittömistä turvallisuusuhista"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Yleistä turvallisuutta koskevat viestit"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Toimintasuositukset, joilla voidaan suojata ihmishenkiä tai omaisuutta"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Näytä viestit koko näytön tilassa"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Poista käytöstä, niin yleistä turvallisuutta koskevat viestit lähetetään vain tekstiviesteinä"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Paikalliset testit"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Vastaanota koeviestejä paikallisilta viranomaisilta"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Hätätiedotteet"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index e9369924b..01955d02d 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Avertir des menaces de sécurité imminentes"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Messages de sécurité publique"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Actions recommandées pouvant sauver des vies ou des biens"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Afficher les messages en mode plein écran"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Désactiver pour n\'envoyer les messages de sécurité publique qu\'à votre application de messagerie texte"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Tests des autorités nationales et locales"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Recevoir des messages de test des autorités nationales et locales"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alertes d\'urgence"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 576dae3aa..e3ee6ef14 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Recevoir des avertissements relatifs aux menaces de sécurité imminentes"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Messages de sécurité publique"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Actions recommandées susceptibles de sauver des vies ou des biens"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Afficher les messages en plein écran"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Désactiver pour envoyer les messages de sécurité publique uniquement sur votre appli de SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Tests à l\'échelle nationale et locale"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Recevoir des messages tests des autorités nationales et locales"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alertes d\'urgence"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 1ffb66379..fede4c5c9 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -64,7 +64,7 @@
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Recibe alertas de emerxencia sen fíos"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Recordatorio de alerta"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Ler mensaxe de alerta"</string>
-    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Usa a síntese de voz para ler as mensaxes de alertas de emerxencia sen fíos"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Usa a conversión de texto a voz para ler as mensaxes de alertas de emerxencia sen fíos"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Reproducirase un son de recordatorio co volume habitual"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historial de alertas de emerxencia"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Preferencias de alertas"</string>
@@ -75,11 +75,13 @@
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ameazas graves"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Ameazas graves para a vida e a propiedade"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Alertas AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Avisos de emerxencia de secuestro de menores"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Boletíns de emerxencia sobre secuestro de menores"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"Mensaxes de alerta"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Recibe advertencias de ameazas de seguranza inminentes"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Mensaxes de seguranza pública"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Accións recomendadas que poden salvar vidas ou propiedades"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Mostrar mensaxes a pantalla completa"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Se se desactiva, as mensaxes de seguranza pública envíanse unicamente á aplicación de SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Probas procedentes de autoridades locais e estatais"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Recibe mensaxes de proba procedentes de autoridades locais e estatais"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alertas de emerxencia"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 302c11b87..1c590f56d 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -54,32 +54,34 @@
     <string name="public_safety_message" msgid="9119928798786998252">"સાર્વજનિક સુરક્ષા સંદેશ"</string>
     <string name="state_local_test_alert" msgid="8003145745857480200">"રાજ્ય/સ્થાનિક પરીક્ષણ"</string>
     <string name="emergency_alert" msgid="624783871477634263">"કટોકટીની ચેતવણી"</string>
-    <string name="emergency_alerts_title" msgid="6605036374197485429">"ચેતવણીઓ"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"અલર્ટ"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"બ્રોડકાસ્ટના સંદેશા"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"કટોકટીની ચેતવણીઓ"</string>
     <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"અસ્વીકૃત ઇમર્જન્સી અલર્ટ"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"વૉઇસ કૉલ દરમ્યાન ઇમર્જન્સી અલર્ટ"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"ઑટોમૅટિક WEAના સેટિંગ સિમના આધારે બદલાય છે"</string>
-    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"ચેતવણીઓને મંજૂરી આપો"</string>
+    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"અલર્ટને મંજૂરી આપો"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"વાયરલેસ ઇમર્જન્સી અલર્ટના નોટિફિકેશન પ્રાપ્ત કરો"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"ચેતવણી આપતું રિમાઇન્ડર"</string>
+    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"અલર્ટ રિમાઇન્ડર"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"ચેતવણી સંદેશ બોલો"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"વાયરલેસ ઇમર્જન્સી અલર્ટ સંદેશા બોલવા માટે ટેક્સ્ટ ટૂ સ્પીચનો ઉપયોગ કરો"</string>
-    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"રીમાઇન્ડરનો સાઉન્ડ નિયમિત વૉલ્યૂમ પર વાગશે"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"કટોકટીની ચેતવણીનો ઇતિહાસ"</string>
-    <string name="alert_preferences_title" msgid="6001469026393248468">"ચેતવણીની પસંદગીઓ"</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="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWSના પરીક્ષણ બ્રોડકાસ્ટ"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"ભૂકંપ ત્સુનામીની ચેતવણી આપતી સિસ્ટમ માટેનાં પરીક્ષણ બ્રોડકાસ્ટ"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"આત્યંતિક જોખમો"</string>
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"જીવન અને સંપત્તિના આત્યંતિક જોખમો"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"ગંભીર જોખમો"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"જીવન અને સંપત્તિના ગંભીર જોખમો"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER ચેતવણીઓ"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"બાળ અપહરણની કટોકટીના બુલેટિન્સ"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER અલર્ટ"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"બાળ અપહરણની કટોકટીના બુલેટિન"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"અલર્ટ સંદેશા"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"નિકટવર્તી સલામતી જોખમો વિશે ચેતવો"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"સાર્વજનિક સુરક્ષા સંદેશા"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"સુઝાવ આપેલ ક્રિયાઓ જે જીંદગીઓ અથવા મિલ્કતને બચાવી શકે"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"સંદેશા પૂર્ણ સ્ક્રીનમાં બતાવો"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"સલામતીના સાર્વજનિક સંદેશા માત્ર તમારી SMS ઍપમાં મોકલવા માટે, આ ચેકમાર્ક બંધ કરો"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"રાજ્ય અને સ્થાનિક પરીક્ષણો"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"રાજ્ય અને સ્થાનિક સત્તાવાળાઓ પાસેથી પરીક્ષણ સંદેશા પ્રાપ્ત કરો"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"કટોકટીની ચેતવણીઓ"</string>
@@ -137,7 +139,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"તમે હાલમાં વાયરલેસ ઇમર્જન્સી અલર્ટ પ્રાપ્ત કરી રહ્યાં છો. તમે વાયરલેસ ઇમર્જન્સી અલર્ટ પ્રાપ્ત કરવાનું ચાલુ રાખવા માગો છો?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"હા"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"નહીં"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"કટોકટીની ચેતવણીનો ઇતિહાસ"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"ઇમર્જન્સી અલર્ટનો ઇતિહાસ"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"એકવાર"</item>
     <item msgid="9097229303902157183">"દર 2 મિનિટે"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 7fbd2c82a..d58488661 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -61,13 +61,13 @@
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"वॉयस कॉल के दौरान आपातकालीन चेतावनियां"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"अपने-आप काम करने वाली WEA की सूचनाओं की सेटिंग, सिम के हिसाब से बदल जाती है"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"चेतावनी दिखाए जाने की अनुमति दें"</string>
-    <string name="enable_alerts_master_toggle_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="enable_alert_speech_title" msgid="8052104771053526941">"अलर्ट मैसेज बोलें"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"वायरलेस इमरजेंसी अलर्ट वाला मैसेज बोलने के लिए लिखाई को बोली में बदलने की सुविधा इस्तेमाल करें"</string>
-    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"रिमांइडर की रिंगटोन की आवाज़ सामान्य रहेगी"</string>
+    <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>
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"ऐसे मामलों के बारे में चेतावनी देना, जिनकी वजह से जल्द ही सुरक्षा पर खतरा हो सकता है"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"सभी की सुरक्षा के लिए मैसेज"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"ऐसी कार्रवाइयां जिनसे जीवन या संपत्ति की सुरक्षा की जा सकती है"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"फ़ुल-स्क्रीन पर मैसेज दिखाएं"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"सार्वजनिक सुरक्षा से जुड़े मैसेज सिर्फ़ एसएमएस ऐप्लिकेशन पर पाने के लिए, यह सुविधा बंद करें"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"राज्य और स्थानीय टेस्ट"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"राज्य और स्थानीय अधिकारियों से टेस्ट मैसेज पाना"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"इमरजेंसी के समय सूचनाएं"</string>
@@ -142,7 +144,7 @@
     <item msgid="6595211083588795160">"एक बार"</item>
     <item msgid="9097229303902157183">"हर 2 मिनट में"</item>
     <item msgid="5718214950343391480">"प्रत्‍येक 5 मिनट"</item>
-    <item msgid="3863339891188103437">"हर 15 मिनट"</item>
+    <item msgid="3863339891188103437">"हर 15 मिनट में"</item>
     <item msgid="7388573183644474611">"कभी नहीं"</item>
   </string-array>
     <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"वायरलेस आपातकालीन अलर्ट"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 0c32e83a8..17fe91d68 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -61,7 +61,7 @@
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Hitna upozorenja u glasovnom pozivu"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Automatske promjene postavki WEA-a na temelju SIM-a"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Dopusti upozorenja"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Primanje obavijesti o hitnim upozorenjima"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Primajte obavijesti o hitnim upozorenjima putem bežične mreže"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Podsjetnik upozorenja"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Izgovaranje poruka upozorenja"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Koristi pretvaranje teksta u govor za izgovaranje poruka hitnih upozorenja putem bežične mreže"</string>
@@ -71,15 +71,17 @@
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS-ova probna emitiranja"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Probna emitiranja za sustav upozorenja o potresima i tsunamijima"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Ekstremne prijetnje"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Ekstremne prijetnje životima i imovini"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Ekstremne prijetnje po život i imovinu"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ozbiljne prijetnje"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Ozbiljne prijetnje životima i imovini"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Ozbiljne prijetnje po život i imovinu"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER upozorenja"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Hitni bilteni o otmicama djece"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"Poruke upozorenja"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Upozorenja o neposrednim sigurnosnim prijetnjama"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Poruke o javnoj sigurnosti"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Preporučene radnje koje mogu spasiti živote ili imovinu"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Prikaži poruke na cijelom zaslonu"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Isključite da bi se poruke o javnoj sigurnosti slale samo u vašu aplikaciju za SMS-ove"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Državni i lokalni testovi"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Primajte testne poruke od nadležnih državnih i lokalnih tijela"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Hitna upozorenja"</string>
@@ -137,7 +139,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"Trenutačno primate hitna upozorenja putem bežične mreže. Želite li i dalje primati hitna upozorenja putem bežične mreže?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Da"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Ne"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Upozorenja o hitnim slučajevima"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Povijest hitnih upozorenja"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Jedanput"</item>
     <item msgid="9097229303902157183">"Svake 2 minute"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 499731151..5623c210b 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Közvetlen biztonsági fenyegetésekkel kapcsolatos figyelmeztetés"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Közbiztonsággal kapcsolatos üzenetek"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Élet és anyagi eszközök mentésére szolgáló javasolt intézkedések"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Teljes képernyős üzenetek megjelenítése"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Kapcsolja ki, hogy a közbiztonsággal kapcsolatos üzenetek csak az SMS-alkalmazásába érkezzenek meg"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Állami és helyi tesztek"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Tesztüzenetek fogadása az állami és a helyi hatóságoktól"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Vészriasztások"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index c3a15a4e7..20ddc8b9a 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Զգուշացնել անվտանգության անխուսափելի սպառնալիքների մասին"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Հաղորդագրություններ հանրային անվտանգության սպառնալիքի մասին"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Առաջարկվող գործողություններ, որոնք կօգնեն փրկել կյանքը և գույքը"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Հաղորդագրությունները ցուցադրել լիաէկրան ռեժիմում"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Հանրային անվտանգության հաղորդագրություններն ուղարկել միայն SMS-ների փոխանակման հավելվածին"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Փորձնական ահազանգեր պետական և տեղական կառավարման մարմիններից"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Փորձնական ահազանգեր ստանալ պետական և տեղական կառավարման մարմիններից"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Բնակչության ազդարարման համակարգ"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 8941d8f95..671eb4f60 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -65,7 +65,7 @@
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Pengingat peringatan"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Ucapkan pesan peringatan"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Gunakan text-to-speech untuk mengucapkan pesan notifikasi darurat nirkabel"</string>
-    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Suara pengingat akan diputar dengan volume reguler"</string>
+    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Suara pengingat akan diputar dengan volume sedang"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Histori peringatan darurat"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Preferensi peringatan"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Broadcast uji ETWS"</string>
@@ -80,12 +80,14 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Peringatkan tentang ancaman keamanan yang akan segera terjadi"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Pesan keselamatan publik"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Tindakan yang disarankan untuk menyelamatkan nyawa atau harta benda"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Tampilkan pesan layar penuh"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Nonaktifkan agar pesan keselamatan publik hanya dikirim ke aplikasi SMS Anda"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Peringatan percobaan dari negara bagian dan lokal"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Menerima pesan percobaan dari otoritas negara bagian atau lokal"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Peringatan darurat"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Peringatkan tentang peristiwa yang mengancam jiwa"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Uji peringatan"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Menerima pengujian operator dan pengujian bulanan dari sistem peringatan keselamatan"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Terima pengujian operator dan pengujian bulanan dari sistem peringatan keselamatan"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
     <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Terima notifikasi darurat: Pesan Simulasi"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 6143aebaa..21ceb0120 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -71,15 +71,17 @@
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS-prufuútsendingar"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Prufuútsendingar fyrir viðvaranir um jarðskjálfta og flóð (ETWS)"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Mjög alvarlegar ógnir"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Þegar líf eða eignir eru í mjög alvarlegri hættu"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Líf eða eignir eru í mjög mikilli hættu"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Alvarlegar ógnir"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Líf eða eignir í alvarlegri hættu"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Líf eða eignir í mikilli hættu"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER-viðvaranir"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Neyðartilkynningar um brottnám barna"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"Viðvörunarskilaboð"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Vara við yfirvofandi öryggisógnum"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Skilaboð frá almannavörnum"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Ráðlagðar aðgerðir sem geta bjargað mannslífum og verndað eignir"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Birta skilaboð á öllum skjánum"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Slökktu á þessu til að fá skilaboð frá almannavörnum aðeins send í SMS-forritið þitt"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Staðbundin prufuviðvörun"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Fá prufuskilboð frá ríkis- og staðaryfirvöldum"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Neyðartilkynningar"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 9981ec230..c3672723c 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -16,22 +16,22 @@
 
 <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">"Avvisi di emergenza wireless"</string>
-    <string name="sms_cb_settings" msgid="9021266457863671070">"Avvisi di emergenza wireless"</string>
-    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Avvisi di emergenza wireless"</string>
-    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Avvisi di emergenza wireless"</string>
-    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Avvisi di emergenza wireless"</string>
+    <string name="app_label" msgid="2008319089248760277">"Allerte wireless di emergenza"</string>
+    <string name="sms_cb_settings" msgid="9021266457863671070">"Allerte wireless di emergenza"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Allerte wireless di emergenza"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Allerte wireless di emergenza"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Allerte wireless di emergenza"</string>
     <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Notifica informativa"</string>
-    <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Le impostazioni per gli avvisi di emergenza wireless non sono disponibili per questo utente"</string>
+    <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Le impostazioni per le allerte di emergenza wireless non sono disponibili per questo utente"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"Nessun avviso precedente"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"Nessuna allerta precedente"</string>
     <string name="menu_preferences" msgid="3596514894131599202">"Impostazioni"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Elimina trasmissioni"</string>
     <string name="message_options" msgid="3178489901903589574">"Opzioni messaggio"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Visualizza dettagli"</string>
     <string name="menu_delete" msgid="128380070910799366">"Elimina trasmissione"</string>
-    <string name="view_details_title" msgid="1780427629491781473">"Dettagli avviso"</string>
-    <string name="view_details_debugging_title" msgid="5699927030805114173">"Dettagli degli avvisi per il debug"</string>
+    <string name="view_details_title" msgid="1780427629491781473">"Dettagli allerta"</string>
+    <string name="view_details_debugging_title" msgid="5699927030805114173">"Dettagli allerta per il debug"</string>
     <string name="confirm_delete_broadcast" msgid="2540199303730232322">"Eliminare questo broadcast?"</string>
     <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"Eliminare tutti i messaggi broadcast ricevuti?"</string>
     <string name="button_delete" msgid="4672451757925194350">"Elimina"</string>
@@ -41,64 +41,66 @@
     <string name="etws_earthquake_and_tsunami_warning" msgid="662449983177407681">"Avviso terremoto e tsunami"</string>
     <string name="etws_test_message" msgid="8447820262584381894">"Messaggio di prova ETWS"</string>
     <string name="etws_other_emergency_type" msgid="5233080551309721499">"Allarme di emergenza"</string>
-    <string name="cmas_presidential_level_alert" msgid="1209234030582361001">"Avviso presidenziale"</string>
-    <string name="cmas_extreme_alert" msgid="2588720613319969289">"Avviso di emergenza: estremo"</string>
-    <string name="cmas_extreme_immediate_observed_alert" msgid="2328845915287460780">"Avviso di emergenza: estremo"</string>
-    <string name="cmas_extreme_immediate_likely_alert" msgid="1859702950323471778">"Avviso di emergenza: estremo"</string>
-    <string name="cmas_severe_alert" msgid="4135809475315826913">"Avviso di emergenza: grave"</string>
+    <string name="cmas_presidential_level_alert" msgid="1209234030582361001">"Allerta presidenziale"</string>
+    <string name="cmas_extreme_alert" msgid="2588720613319969289">"Allerta di emergenza: estremo"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="2328845915287460780">"Allerta di emergenza: estremo"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="1859702950323471778">"Allerta di emergenza: estremo"</string>
+    <string name="cmas_severe_alert" msgid="4135809475315826913">"Allerta di emergenza: grave"</string>
     <string name="cmas_amber_alert" msgid="6154867710264778887">"Sottrazione di minori (allerta Amber)"</string>
     <string name="cmas_required_monthly_test" msgid="1890205712251132193">"Test mensile obbligatorio"</string>
-    <string name="cmas_exercise_alert" msgid="2892255514938370321">"Avviso di emergenza (esercitazione)"</string>
-    <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Avviso di emergenza (operatore)"</string>
+    <string name="cmas_exercise_alert" msgid="2892255514938370321">"Allerta di emergenza (esercitazione)"</string>
+    <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Allerta di emergenza (operatore)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Messaggi broadcast"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"Messaggio di sicurezza pubblica"</string>
     <string name="state_local_test_alert" msgid="8003145745857480200">"Test a livello statale/locale"</string>
-    <string name="emergency_alert" msgid="624783871477634263">"Avviso di emergenza"</string>
-    <string name="emergency_alerts_title" msgid="6605036374197485429">"Avvisi"</string>
+    <string name="emergency_alert" msgid="624783871477634263">"Allerta di emergenza"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Allerte"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Messaggi broadcast"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Avvisi di emergenza"</string>
     <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Avvisi di emergenza senza risposta"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Avvisi d\'emergenza in chiamata vocale"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Le impostazioni WEA automatiche cambiano in base alla SIM"</string>
-    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Consenti avvisi"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Ricevi notifiche per avvisi di emergenza wireless"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Promemoria avvisi"</string>
-    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Leggimi messaggio di avviso"</string>
-    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Usa la sintesi vocale per leggermi i messaggi degli avvisi di emergenza wireless"</string>
+    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Consenti allerte"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Ricevi notifiche per allerte wireless di emergenza"</string>
+    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Promemoria allerte"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Leggimi messaggio di allerta"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Usa la sintesi vocale per leggermi i messaggi delle allerte di emergenza wireless"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Verrà riprodotto un suono di promemoria a volume normale"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Cronologia avvisi di emergenza"</string>
-    <string name="alert_preferences_title" msgid="6001469026393248468">"Preferenze per gli avvisi"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Cronologia allerte di emergenza"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Preferenze per le allerte"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Trasmissioni di prova ETWS"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Trasmissioni di prova per il sistema di avviso tsunami e terremoto"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Minacce estreme"</string>
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Minacce estreme alla vita e alle proprietà"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Minacce gravi"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Minacce gravi alla vita e alle proprietà"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Avvisi AMBER"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Allerte AMBER"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Bollettini di emergenza rapimento bambini"</string>
-    <string name="enable_alert_message_title" msgid="2939830587633599352">"Messaggi di avviso"</string>
+    <string name="enable_alert_message_title" msgid="2939830587633599352">"Messaggi di allerta"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Avvisi relativi a imminenti minacce alla sicurezza"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Messaggi di sicurezza pubblica"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Azioni consigliate per salvare vite umane o proteggere cose"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Mostra messaggi a schermo intero"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Disattiva l\'opzione per ricevere messaggi relativi alla sicurezza pubblica soltanto nell\'app per SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Test a livello statale e locale"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Ricevi messaggi di prova da autorità statali e locali"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Avvisi d\'emergenza"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Avvisi relativi a eventi potenzialmente letali"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Allarmi pubblici"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Ricevi test dell\'operatore e test mensili dal sistema di avvisi relativi alla sicurezza"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Allerte di prova"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Ricevi test dell\'operatore e test mensili dal sistema di allerte relative alla sicurezza"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
-    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Ricevi un allarme di emergenza: messaggio di esercitazione"</string>
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Ricevi allerta di emergenza: messaggio di esercitazione"</string>
     <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
     <skip />
-    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Ricevi avviso di emergenza: Operatore definito"</string>
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Ricevi allerta di emergenza: operatore definito"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibrazione"</string>
     <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
-    <string name="override_dnd_title" msgid="5120805993144214421">"Avvisa sempre a tutto volume"</string>
+    <string name="override_dnd_title" msgid="5120805993144214421">"Allerta sempre a tutto volume"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignora l\'impostazione Non disturbare e altre impostazioni del volume"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Trasmissioni degli aggiornamenti relativi alla zona"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Mostra le informazioni di aggiornamento nello stato della SIM"</string>
-    <string name="cmas_category_heading" msgid="3923503130776640717">"Categoria avviso:"</string>
+    <string name="cmas_category_heading" msgid="3923503130776640717">"Categoria allerta:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofisici"</string>
     <string name="cmas_category_met" msgid="7563732573851773537">"Meteorologici"</string>
     <string name="cmas_category_safety" msgid="2986472639641883453">"Sicurezza"</string>
@@ -132,12 +134,12 @@
     <string name="delivery_time_heading" msgid="5980836543433619329">"Ricevuto:"</string>
     <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> avvisi non letti."</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"Nuovi avvisi"</string>
-    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Mostra finestra di disattivazione dopo il primo avviso (diverso da un avviso presidenziale)."</string>
+    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"Mostra finestra di disattivazione dopo la prima allerta (diversa da un\'allerta presidenziale)."</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Mostra finestra di disattivazione"</string>
     <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"Al momento ricevi notifiche per gli avvisi di emergenza wireless. Vuoi continuare a ricevere avvisi di emergenza wireless?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Sì"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"No"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Cronologia avvisi di emergenza"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Cronologia allerte di emergenza"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Una volta"</item>
     <item msgid="9097229303902157183">"Ogni 2 minuti"</item>
@@ -145,7 +147,7 @@
     <item msgid="3863339891188103437">"Ogni 15 minuti"</item>
     <item msgid="7388573183644474611">"Mai"</item>
   </string-array>
-    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Avvisi di emergenza wireless"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Allerte wireless di emergenza"</string>
     <string name="enable_cmas_presidential_alerts_title" msgid="7293800023375154256">"Avvisi del presidente"</string>
     <string name="enable_cmas_presidential_alerts_summary" msgid="7900094335808247024">"Messaggi di allerta nazionale da parte del presidente. Non possono essere disattivati."</string>
     <string name="receive_cmas_in_second_language_title" msgid="1223260365527361964"></string>
@@ -166,5 +168,5 @@
     <string name="seconds" msgid="141450721520515025">"secondi"</string>
     <string name="message_copied" msgid="6922953753733166675">"Messaggio copiato"</string>
     <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Impostazioni modificate dall\'operatore"</string>
-    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Tocca per visualizzare le impostazioni relative agli avvisi di emergenza wireless"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Tocca per visualizzare le impostazioni relative alle allerte di emergenza wireless"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2efe89c97..41ba66cf6 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -16,25 +16,25 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2008319089248760277">"התראות אלחוטיות על מקרי חירום"</string>
-    <string name="sms_cb_settings" msgid="9021266457863671070">"התראות אלחוטיות על מקרי חירום"</string>
-    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"התראות אלחוטיות על מקרי חירום"</string>
-    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"התראות אלחוטיות על מקרי חירום"</string>
-    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"התראות אלחוטיות על מקרי חירום"</string>
+    <string name="app_label" msgid="2008319089248760277">"התרעות אלחוטיות על מקרי חירום"</string>
+    <string name="sms_cb_settings" msgid="9021266457863671070">"התרעות אלחוטיות על מקרי חירום"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"התרעות אלחוטיות על מקרי חירום"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"התרעות אלחוטיות על מקרי חירום"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"התרעות אלחוטיות על מקרי חירום"</string>
     <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"הודעה אינפורמטיבית"</string>
-    <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"הגדרות של התראות אלחוטיות על מקרי חירום לא זמינות למשתמש זה"</string>
+    <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"הגדרות של התרעות אלחוטיות על מקרי חירום לא זמינות למשתמש זה"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"אישור"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"אין התרעות קודמות"</string>
     <string name="menu_preferences" msgid="3596514894131599202">"הגדרות"</string>
-    <string name="menu_delete_all" msgid="3940997343921149800">"מחק את השידורים"</string>
+    <string name="menu_delete_all" msgid="3940997343921149800">"מחיקת השידורים"</string>
     <string name="message_options" msgid="3178489901903589574">"אפשרויות הודעה"</string>
-    <string name="menu_view_details" msgid="1040989019045280975">"הצג פרטים"</string>
-    <string name="menu_delete" msgid="128380070910799366">"מחק שידור"</string>
-    <string name="view_details_title" msgid="1780427629491781473">"פרטי התרעה"</string>
-    <string name="view_details_debugging_title" msgid="5699927030805114173">"פרטי התראות לניפוי באגים"</string>
+    <string name="menu_view_details" msgid="1040989019045280975">"הצגת פרטים"</string>
+    <string name="menu_delete" msgid="128380070910799366">"מחיקת שידור"</string>
+    <string name="view_details_title" msgid="1780427629491781473">"פרטי ההתרעה"</string>
+    <string name="view_details_debugging_title" msgid="5699927030805114173">"פרטי התרעות לניפוי באגים"</string>
     <string name="confirm_delete_broadcast" msgid="2540199303730232322">"למחוק שידור זה?"</string>
     <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"למחוק את כל הודעות השידור שהתקבלו?"</string>
-    <string name="button_delete" msgid="4672451757925194350">"מחק"</string>
+    <string name="button_delete" msgid="4672451757925194350">"מחיקה"</string>
     <string name="button_cancel" msgid="7479958360523246140">"ביטול"</string>
     <string name="etws_earthquake_warning" msgid="6428741104423152511">"אזהרה על רעידת אדמה"</string>
     <string name="etws_tsunami_warning" msgid="6173964105145900312">"אזהרת צונאמי"</string>
@@ -46,7 +46,7 @@
     <string name="cmas_extreme_immediate_observed_alert" msgid="2328845915287460780">"התרעת חירום: חמורה ביותר"</string>
     <string name="cmas_extreme_immediate_likely_alert" msgid="1859702950323471778">"התרעת חירום: חמורה ביותר"</string>
     <string name="cmas_severe_alert" msgid="4135809475315826913">"התרעת חירום: חמורה"</string>
-    <string name="cmas_amber_alert" msgid="6154867710264778887">"‏חטיפת ילד (Amber Alert)"</string>
+    <string name="cmas_amber_alert" msgid="6154867710264778887">"‏חטיפת ילד (התרעת Amber)"</string>
     <string name="cmas_required_monthly_test" msgid="1890205712251132193">"בדיקה חודשית נדרשת"</string>
     <string name="cmas_exercise_alert" msgid="2892255514938370321">"התרעת חירום (תרגיל)"</string>
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"התרעת חירום (מפעיל)"</string>
@@ -57,15 +57,15 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"התרעות"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"הודעות שידור"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"התרעות חירום"</string>
-    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"התראות חירום שלא אושרו"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"התרעות חירום שלא אושרו"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"התרעות על מקרי חירום בשיחה קולית"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"‏שינויים בהגדרות WEA אוטומטיות שמבוססות על כרטיס SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"הצגת התרעות"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"לקבלת התראות אלחוטיות על מקרי חירום"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"תזכורת התרעה"</string>
-    <string name="enable_alert_speech_title" msgid="8052104771053526941">"הודעת התרעה תושמע בקול"</string>
-    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"‏שימוש בהמרת טקסט לדיבור (TTS) להקראה של התראות אלחוטיות על מקרי חירום"</string>
-    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"צליל תזכורת יושמע בעוצמת שמע רגילה"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"קבלת התרעות אלחוטיות על מקרי חירום"</string>
+    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"תזכורת להתרעות"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"הודעת התראה תושמע בקול"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"‏שימוש בהמרת טקסט לדיבור (TTS) להקראה של התרעות אלחוטיות על מקרי חירום"</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="enable_etws_test_alerts_title" msgid="3593533226735441539">"‏שידורי בדיקה של ETWS"</string>
@@ -76,25 +76,27 @@
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"איומים חמורים לנפש ולרכוש"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"‏התרעות AMBER"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"מבזקי חירום על חטיפת ילדים"</string>
-    <string name="enable_alert_message_title" msgid="2939830587633599352">"הודעות התראה"</string>
-    <string name="enable_alert_message_summary" msgid="6525664541696985610">"הזהר אותי מפני איומי אבטחה מיידיים"</string>
+    <string name="enable_alert_message_title" msgid="2939830587633599352">"הודעות התרעה"</string>
+    <string name="enable_alert_message_summary" msgid="6525664541696985610">"אנו רוצה לקבל אזהרות מפני איומי אבטחה מידיים"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"הודעות שקשורות לביטחון הציבור"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"פעולות מומלצות שיכולות לעזור בהצלת חיים או רכוש"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"הצגת ההודעות במסך מלא"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"‏יש לבטל את הסימון כדי שהודעות בנוגע לביטחון הציבור יישלחו רק לאפליקציה ל-SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"בדיקות מקומיות וארציות"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"קבלת הודעות בדיקה מרשויות מקומיות וארציות"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"התרעות חירום"</string>
-    <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"הזהר אותי מפני אירועים מסכני חיים"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"התראות בדיקה"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"יש להזהיר אותי מפני אירועים מסכני חיים"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"התרעות בדיקה"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"קבלת בדיקות של הספק ובדיקות חודשיות ממערכת התרעות האבטחה"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
     <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"קבלת התרעה על מקרה חירום: הודעת תרגול/ניסיון"</string>
     <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
     <skip />
-    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"קבלת התרעה על מקרה חירום: התרעות שמוגדרות על ידי חברת הסלולר"</string>
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"קבלת התראה על מקרה חירום: התראות שמוגדרות על ידי חברת הסלולר"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"רטט"</string>
     <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
-    <string name="override_dnd_title" msgid="5120805993144214421">"צליל ההתראה יושמע תמיד בעוצמת השמע המרבית"</string>
+    <string name="override_dnd_title" msgid="5120805993144214421">"צליל ההתרעה יושמע תמיד בעוצמת הקול המרבית"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"יש להתעלם מהתכונה \'נא לא להפריע\' ומהגדרות אחרות של עוצמת השמע"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"שידורי עדכונים רלוונטיים לאזור"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"‏הצגה של פרטי עדכון בסטטוס ה-SIM"</string>
@@ -113,8 +115,8 @@
     <string name="cmas_category_other" msgid="6158932360790744360">"אחרת"</string>
     <string name="cmas_response_heading" msgid="4205379547245540163">"סוג תגובה:"</string>
     <string name="cmas_response_shelter" msgid="7301175579079615909">"מציאת מחסה"</string>
-    <string name="cmas_response_evacuate" msgid="5833170084430021095">"פנה"</string>
-    <string name="cmas_response_prepare" msgid="8428073909753758319">"התכונן"</string>
+    <string name="cmas_response_evacuate" msgid="5833170084430021095">"פינוי"</string>
+    <string name="cmas_response_prepare" msgid="8428073909753758319">"יש להתכונן"</string>
     <string name="cmas_response_execute" msgid="284719420769568493">"ביצוע"</string>
     <string name="cmas_response_monitor" msgid="681400164440495749">"מעקב"</string>
     <string name="cmas_response_avoid" msgid="156419597612629270">"הימנעות"</string>
@@ -133,8 +135,8 @@
     <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> התרעות שלא נקראו."</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"התרעות חדשות"</string>
     <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"הצגת תיבת דו-שיח לביטול הסכמה לאחר הצגת ההתרעה הראשונה (מלבד התרעה נשיאותית)."</string>
-    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"הצג תיבת דו שיח לביטול הסכמה"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"ההגדרה שלך עכשיו היא לקבל התראות אלחוטיות על מקרי חירום. האם ברצונך להמשיך ולקבל התראות אלחוטיות על מקרי חירום?"</string>
+    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"הצגה של תיבת דו שיח לביטול הסכמה"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"ההגדרה שלך עכשיו היא לקבל התרעות אלחוטיות על מקרי חירום. האם ברצונך להמשיך ולקבל התרעות אלחוטיות על מקרי חירום?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"כן"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"לא"</string>
     <string name="cb_list_activity_title" msgid="1433502151877791724">"היסטוריה של התרעות חירום"</string>
@@ -145,7 +147,7 @@
     <item msgid="3863339891188103437">"כל 15 דקות"</item>
     <item msgid="7388573183644474611">"אף פעם"</item>
   </string-array>
-    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"התראות על מקרי חירום"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"התרעות על מקרי חירום"</string>
     <string name="enable_cmas_presidential_alerts_title" msgid="7293800023375154256">"התרעות נשיאותיות"</string>
     <string name="enable_cmas_presidential_alerts_summary" msgid="7900094335808247024">"הודעות אזהרה לאומיות מהנשיא. לא ניתן להשבית אותן."</string>
     <string name="receive_cmas_in_second_language_title" msgid="1223260365527361964"></string>
@@ -162,9 +164,9 @@
     <string name="location_check_time" msgid="4105326161240531207">"זמן בדיקת מיקום:"</string>
     <string name="message_displayed" msgid="5091678195925617971">"ההודעה המוצגת:"</string>
     <string name="message_coordinates" msgid="356333576818059052">"קואורדינטות:"</string>
-    <string name="maximum_waiting_time" msgid="3504809124079381356">"סמן המתנה מרבי:"</string>
+    <string name="maximum_waiting_time" msgid="3504809124079381356">"זמן המתנה מרבי:"</string>
     <string name="seconds" msgid="141450721520515025">"שניות"</string>
     <string name="message_copied" msgid="6922953753733166675">"ההודעה הועתקה"</string>
     <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"ההגדרות שונו על ידי הספק הסלולרי"</string>
-    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"יש להקיש כדי לראות את ההגדרות של ההתראות האלחוטיות על מקרה חירום"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"צריך להקיש כדי לראות את ההגדרות של ההתרעות האלחוטיות על מקרי חירום"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 82bba5133..09e44bae6 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"差し迫った安全上の脅威に関する警告"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"災害情報メッセージ"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"人命や財産を守るための推奨される対応"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"メッセージの全画面表示"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"OFF にすると、災害情報メッセージは SMS アプリにのみ送信されます"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"国や地方自治体のテスト"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"国や地方自治体からのテスト メッセージを受信する"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"緊急速報メール"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 5961192a7..5164e963d 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"დაუყოვნებელი საფრთხეების შესახებ გაფრთხილება"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"შეტყობინებები საზოგადოებრივ უსაფრთხოებაზე"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"სიცოცხლის ან ქონების გადამრჩენი რეკომენდებული ქმედებები"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"შეტყობინების ჩვენება სრულ ეკრანზე"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"გამორთეთ ეს ფუნქცია, რომ საზოგადოებრივ უსაფრთხოებასთან დაკავშ. შეტყობინებები მხოლოდ SMS აპში მიიღოთ"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"სახელმწიფო და ადგილობრივი სატესტო შეტყობინებები"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"სატესტო შეტყობინებების მიღება სახელმწიფო და ადგილობრივი ორგანოებისგან"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"საგანგებო გაფრთხილებები"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index f44f8f5d0..098c8f730 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -24,7 +24,7 @@
     <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Ақпараттық хабарландыру"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Төтенше жағдай туралы сымсыз хабарландыру параметрлері бұл пайдаланушы үшін қолжетімді емес."</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Жарайды"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"Бұрын хабарландыру берілмеген"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"Бұрын хабарландыру берілмеген."</string>
     <string name="menu_preferences" msgid="3596514894131599202">"Параметрлер"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Таратылымдарды жою"</string>
     <string name="message_options" msgid="3178489901903589574">"Хабар опциялары"</string>
@@ -65,7 +65,7 @@
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Хабарландыру туралы еске салғыш"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Хабарламаны дыбыстау"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Төтенше жағдай туралы сымсыз хабарландыруларды дыбыстау үшін мәтін дыбыстау функциясын пайдаланыңыз."</string>
-    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Еске салғыш дыбысының қаттылығы қалыпты болады"</string>
+    <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="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS сынақ таратылымдары"</string>
@@ -74,18 +74,20 @@
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Өмірге және мүлікке төнген үлкен қауіптер"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ауыр қауіптер"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Өмірге және мүлікке төнген ауыр қауіптер"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER хабарламалары"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER хабарландырулары"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Жоғалған балалар туралы хабарлар"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"Ескерту хабарлары"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Болатын қауіп туралы ескерту"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Жалпы қауіпсіздік хабарлары"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Өмір мен мүлікті сақтауға ұсынылған әрекеттер"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Хабарларды толық экранда көрсету"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Қоғамдық қауіпсіздік хабарларын тек SMS қолданбасы арқылы алу үшін өшіріңіз."</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Мемлекеттік және жергілікті тексерулер"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Мемлекеттік және жергілікті органдардан тексеру хабарларын алу"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Төтенше жағдай туралы хабарламалар"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Өмірге қауіп төндіретін жағдайлар туралы ескерту"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Сынақ хабарландырулары"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Қауіпсіздік жөнінде хабарлау жүйесінен байланыс операторының сынақ хабарландырулары мен ай сайынғы сынақ хабарландыруларын алып отыру"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Байланыс операторының және қауіпсіздік жөнінде хабарлау жүйесінің ай сайынғы сынақ хабарландыруларын алып отыру"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
     <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Төтенше жағдай туралы хабарландыру алу: оқу/жаттығу хабары"</string>
@@ -119,7 +121,7 @@
     <string name="cmas_response_monitor" msgid="681400164440495749">"Бақылау"</string>
     <string name="cmas_response_avoid" msgid="156419597612629270">"Алдын алу"</string>
     <string name="cmas_response_assess" msgid="9043534222710563415">"Бағалау"</string>
-    <string name="cmas_response_none" msgid="5149009359674452959">"Ешқандай"</string>
+    <string name="cmas_response_none" msgid="5149009359674452959">"Жоқ"</string>
     <string name="cmas_severity_heading" msgid="8437057117822305243">"Маңыздылығы:"</string>
     <string name="cmas_severity_extreme" msgid="1312013282860183082">"Аса маңызды"</string>
     <string name="cmas_severity_severe" msgid="7504359209737074524">"Елеулі"</string>
@@ -141,8 +143,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Бір рет"</item>
     <item msgid="9097229303902157183">"2 минут сайын"</item>
-    <item msgid="5718214950343391480">"Әр 5 минут сайын"</item>
-    <item msgid="3863339891188103437">"Әр 15 минут сайын"</item>
+    <item msgid="5718214950343391480">"5 минут сайын"</item>
+    <item msgid="3863339891188103437">"15 минут сайын"</item>
     <item msgid="7388573183644474611">"Ешқашан"</item>
   </string-array>
     <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Төтенше жағдай туралы хабарландырулар"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 506e7a58e..c7faa88e6 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"ព្រមាន​អំពី​ការគំរាម​កំហែងផ្នែក​សុវត្ថិភាព​ដែលនឹង​កើត​មាន"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"សារ​សុវត្ថិភាព​សាធារណៈ"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"សកម្មភាព​ដែលណែនាំ​ឱ្យធ្វើ​ដែលអាច​ជួយសង្គ្រោះ​ជីវិត ឬទ្រព្យ​សម្បត្តិ"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"បង្ហាញសារពេញអេក្រង់"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"បិទដើម្បីផ្ញើសារអំពីសុវត្ថិភាពសាធារណៈទៅ​កម្មវិធី​សារ SMS របស់អ្នកតែប៉ុណ្ណោះ"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"ការសាកល្បងក្នុងមូលដ្ឋាន និងរដ្ឋ"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"ទទួល​សារ​សាកល្បង​ពីអាជ្ញាធរ​មូលដ្ឋាន និងរដ្ឋ"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"ការជូន​ដំណឹង​ពេលអាសន្ន"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 6ad18af26..4be23e352 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"ಸಂಭವನೀಯ ಸುರಕ್ಷತಾ ಬೆದರಿಕೆಗಳ ಕುರಿತು ಎಚ್ಚರಿಕೆ ನೀಡಿ"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"ಸಾರ್ವಜನಿಕ ಸುರಕ್ಷತೆಯ ಸಂದೇಶಗಳು"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"ಜೀವನ ಅಥವಾ ಆಸ್ತಿಯನ್ನು ಉಳಿಸಬಹುದಾದ ಶಿಫಾರಸು ಮಾಡಲಾದ ಕ್ರಮಗಳು"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"ಪೂರ್ಣ ಸ್ಕ್ರೀನ್ ಸಂದೇಶಗಳನ್ನು ತೋರಿಸಿ"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"ನಿಮ್ಮ SMS ಆ್ಯಪ್‌ಗೆ ಮಾತ್ರ ಸಾರ್ವಜನಿಕ ಸುರಕ್ಷತಾ ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಲು ಆಫ್ ಮಾಡಿ"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"ರಾಜ್ಯ ಮತ್ತು ಸ್ಥಳೀಯ ಪರೀಕ್ಷೆಗಳು"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"ರಾಜ್ಯ ಮತ್ತು ಸ್ಥಳೀಯ ಅಧಿಕಾರಿಗಳಿಂದ ಪರೀಕ್ಷಾ ಸಂದೇಶಗಳನ್ನು ಸ್ವೀಕರಿಸಿ"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"ತುರ್ತು ಎಚ್ಚರಿಕೆಗಳು"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 4774e0c39..fc60d10e4 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"임박한 안전 위협 경고"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"안전 안내 문자"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"생명이나 재산을 보호할 수 있는 행동 요령"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"전체 화면 메시지 표시"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"안전 안내 문자가 SMS 앱으로만 전송되도록 하려면 사용 중지하세요."</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"주/지방 테스트 메시지"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"주 및 지방 당국으로부터 테스트 메시지 수신"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"긴급 재난 문자"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index c1593ce08..668dcff40 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -80,12 +80,14 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Коопсуздукка коркунуч туудурган нерселер тууралуу кабарлоо"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Коомдук коопсуздук тууралуу билдирүүлөр"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Бирөөнүн өмүрүн же мүлкүн сактап калууга сунушталган аракеттер"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Толук экран бидирүүлөрүн көрсөтүү"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Коомдук коопсуздук билдирүүлөрүн SMS колдонмоңузда гана алуу үчүн өчүрүңүз"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Мамлекеттик жана жергиликтүү башкаруу органдарынын сынамык билдирүүлөрү"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Мамлекеттик жана жергиликтүү башкаруу органдарынан сынамык билдирүүлөр келип турат"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Шашылыш билдирүүлөр"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Жашоого коркунуч туудурган окуялар тууралуу эскертүү"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Сынамык эскертүүлөр"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"CMAS системасынын шашылыш билдирүүлөрүн байланыш операторунун сыноолору жана ай сайын аткарылуучу сыноолор аркылуу алуу"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Байланыш операторунан сынамык билдирүүлөрдү жана CMAS системасынан ай сайын билдирүүлөрдү алып турасыз"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
     <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Шашылыш билдирүүнү алуу: Көнүгүү/Көнүгүү билдирүүсү"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index e8da3fee1..3acd97458 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -75,11 +75,13 @@
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"​ໄພ​ຄຸກ​ຄາມ​ຮຸນ​ແຮງ"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"ເປັນອັນຕະລາຍຕໍ່ຊີວິດ ແລະ ຊັບສິນຮຸນແຮງ"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"ການ​ແຈ້ງ​ເຕືອນ AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"ປະກາດສຸກເສີກການລັກພາຕົວເດັກນ້ອຍ"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"ປະກາດສຸກເສີນການລັກພາຕົວເດັກນ້ອຍ"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"ຂໍ້ຄວາມເຕືອນ"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"ເຕືອນກ່ຽວກັບຄວາມສ່ຽງດ້ານຄວາມປອດໄພທີ່ໃກ້ຈະເກີດຂຶ້ນ"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"ຂໍ້ຄວາມຄວາມປອດໄພສາທາລະນະ"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"ຄຳສັ່ງທີ່ແນະນຳທີ່ສາມາດຊ່ວຍຊີວິດ ຫຼື ຊັບສິນໄດ້"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"ສະແດງຂໍ້ຄວາມເຕັມຈໍ"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"ປິດໄວ້ເພື່ອສົ່ງຂໍ້ຄວາມຄວາມປອດໄພສາທາລະນະໄປໃຫ້ແອັບ SMS ຂອງທ່ານເທົ່ານັ້ນ"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"ການທົດສອບລັດ ແລະ ທ້ອງຖິ່ນ"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"ຮັບຂໍ້ຄວາມທົດສອບຈາກລັດ ແລະ ເຈົ້າໜ້າທີ່ທ້ອງຖິ່ນ"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"ການເຕືອນສຸກເສີນ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index d40b5ee96..66095f742 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Įspėti apie neišvengiamas saugos grėsmes"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Visuomenės saugumo pranešimai"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Rekomenduojami veiksmai, kuriais galima apsaugoti gyvybę arba nuosavybę"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Rodyti viso ekrano pranešimus"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Išjungti, kad visuomenės saugumo pranešimai būtų siunčiami tik į jūsų SMS programą"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Valstybinių ir vietinių institucijų bandymai"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Gauti bandomuosius pranešimus iš valstybinių ir vietinių institucijų"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Nepaprastosios padėties įspėjimai"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 211f087d0..07e3b43e3 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Brīdināt par nenovēršamu drošības apdraudējumu"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Ziņojumi par sabiedrisko drošību"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Ieteicamās darbības, kas var izglābt dzīvību vai īpašumu"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Rādīt ziņojumus pilnekrāna režīmā"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Lai ziņojumi par sabiedrisko drošību tiktu sūtīti tikai uz jūsu īsziņu lietotni, noņemiet atzīmi"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Valsts un vietējās pārbaudes"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Saņemt pārbaudes ziņojumus no valsts un vietējām varas iestādēm"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Ārkārtas brīdinājumi"</string>
diff --git a/res/values-mcc001/config.xml b/res/values-mcc001/config.xml
index 3e91577ef..a057eabe6 100644
--- a/res/values-mcc001/config.xml
+++ b/res/values-mcc001/config.xml
@@ -89,8 +89,8 @@
     <!-- Whether to show override dnd settings -->
     <bool name="show_override_dnd_settings">false</bool>
 
-    <!-- Show timestamp of the alert -->
-    <bool name="show_date_time_title">true</bool>
+    <!-- Append date-time to the alert title -->
+    <string name="date_time_format" translatable="false">MMM dd, HH:mm a</string>
     <!-- Whether to show CMAS messages by in a different order than received by prioritizing them -->
     <bool name="show_cmas_messages_in_priority_order">true</bool>
     <!-- Whether enable LED flash when playing alert tones -->
diff --git a/res/values-mcc202-it/strings.xml b/res/values-mcc202-it/strings.xml
index e7ba30e8f..f4ed38174 100644
--- a/res/values-mcc202-it/strings.xml
+++ b/res/values-mcc202-it/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="cmas_amber_alert" msgid="8487743009781574082">"GR-Alert: allerta Amber"</string>
-    <string name="cmas_presidential_level_alert" msgid="6341018911042907130">"GR-Alert: allarme presidenziale"</string>
+    <string name="cmas_presidential_level_alert" msgid="6341018911042907130">"GR-Alert: allerta presidenziale"</string>
     <string name="cmas_extreme_alert" msgid="7989498696890004631">"GR-Alert: allerta per condizioni estreme"</string>
     <string name="cmas_extreme_immediate_observed_alert" msgid="3810446910355766140">"GR-Alert: allerta per condizioni estreme"</string>
     <string name="cmas_extreme_immediate_likely_alert" msgid="4723844134984591798">"GR-Alert: allerta per condizioni estreme"</string>
diff --git a/res/values-mcc202-iw/strings.xml b/res/values-mcc202-iw/strings.xml
index c5beff092..7834cd6b8 100644
--- a/res/values-mcc202-iw/strings.xml
+++ b/res/values-mcc202-iw/strings.xml
@@ -16,10 +16,10 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_amber_alert" msgid="8487743009781574082">"התראה ביוון: התראת אמבר"</string>
-    <string name="cmas_presidential_level_alert" msgid="6341018911042907130">"התראה ביוון: התראה נשיאותית"</string>
-    <string name="cmas_extreme_alert" msgid="7989498696890004631">"התראה ביוון: התראה קיצונית"</string>
-    <string name="cmas_extreme_immediate_observed_alert" msgid="3810446910355766140">"התראה ביוון: התראה קיצונית"</string>
-    <string name="cmas_extreme_immediate_likely_alert" msgid="4723844134984591798">"התראה ביוון: התראה קיצונית"</string>
-    <string name="cmas_severe_alert" msgid="3002006180717551407">"התראה ביוון: התראה חמורה"</string>
+    <string name="cmas_amber_alert" msgid="8487743009781574082">"התרעה ביוון: התרעת אמבר"</string>
+    <string name="cmas_presidential_level_alert" msgid="6341018911042907130">"התרעה ביוון: התרעה נשיאותית"</string>
+    <string name="cmas_extreme_alert" msgid="7989498696890004631">"התרעה ביוון: התרעה קיצונית"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="3810446910355766140">"התרעה ביוון: התרעה קיצונית"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="4723844134984591798">"התרעה ביוון: התרעה קיצונית"</string>
+    <string name="cmas_severe_alert" msgid="3002006180717551407">"התרעה ביוון: התרעה חמורה"</string>
 </resources>
diff --git a/res/values-mcc202-th/strings.xml b/res/values-mcc202-th/strings.xml
index 11964469b..bac1ed2ab 100644
--- a/res/values-mcc202-th/strings.xml
+++ b/res/values-mcc202-th/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_amber_alert" msgid="8487743009781574082">"GR-Alert: การแจ้งเตือน Amber"</string>
+    <string name="cmas_amber_alert" msgid="8487743009781574082">"GR-Alert: การแจ้งเตือนเด็กหาย Amber Alert"</string>
     <string name="cmas_presidential_level_alert" msgid="6341018911042907130">"GR-Alert: การแจ้งเตือนระดับสูง"</string>
     <string name="cmas_extreme_alert" msgid="7989498696890004631">"GR-Alert: การแจ้งเตือนระดับสูงสุด"</string>
     <string name="cmas_extreme_immediate_observed_alert" msgid="3810446910355766140">"GR-Alert: การแจ้งเตือนระดับสูงสุด"</string>
diff --git a/res/values-mcc204-iw/strings.xml b/res/values-mcc204-iw/strings.xml
index cbebbdb3a..a12b409af 100644
--- a/res/values-mcc204-iw/strings.xml
+++ b/res/values-mcc204-iw/strings.xml
@@ -16,11 +16,11 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_public_safety_messages_title" msgid="94965677856528234">"התראה בהולנד"</string>
-    <string name="public_safety_message" msgid="4890528871594786094">"התראה בהולנד"</string>
-    <string name="cmas_presidential_level_alert" msgid="9058326958225367870">"התראה בהולנד"</string>
+    <string name="enable_public_safety_messages_title" msgid="94965677856528234">"התרעה בהולנד"</string>
+    <string name="public_safety_message" msgid="4890528871594786094">"התרעה בהולנד"</string>
+    <string name="cmas_presidential_level_alert" msgid="9058326958225367870">"התרעה בהולנד"</string>
     <string name="cmas_extreme_alert" msgid="4868712078881445059">"התראה בהולנד"</string>
-    <string name="cmas_extreme_immediate_observed_alert" msgid="6128062253192348686">"התראה בהולנד"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="6128062253192348686">"התרעה בהולנד"</string>
     <string name="cmas_extreme_immediate_likely_alert" msgid="207796247208986943">"התראה בהולנד"</string>
-    <string name="cmas_severe_alert" msgid="26776277057772591">"התראה בהולנד"</string>
+    <string name="cmas_severe_alert" msgid="26776277057772591">"התרעה בהולנד"</string>
 </resources>
diff --git a/res/values-mcc222-ky/strings.xml b/res/values-mcc222-ky/strings.xml
index 8da2d5596..b05283dd7 100644
--- a/res/values-mcc222-ky/strings.xml
+++ b/res/values-mcc222-ky/strings.xml
@@ -25,6 +25,6 @@
     <skip />
     <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <string name="alerts_header_summary" msgid="5963536832729208581">"Маанилүү жазышуулар колдонуучунун жөндөөлөрүнө карабастан алынат"</string>
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Маанилүү сүйлөшүүлөр колдонуучунун жөндөөлөрүнө карабастан алынат"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Сынамык билдирүүлөр"</string>
 </resources>
diff --git a/res/values-mcc222/config.xml b/res/values-mcc222/config.xml
index b6854c839..bf4879dfb 100644
--- a/res/values-mcc222/config.xml
+++ b/res/values-mcc222/config.xml
@@ -16,8 +16,8 @@
 <resources>
     <!-- Play alert sound in full volume regardless Do Not Disturb is on -->
     <bool name="override_dnd">true</bool>
-    <!-- Whether to append date-time to the alert title -->
-    <bool name="show_date_time_title">true</bool>
+    <!-- Append date-time to the alert title -->
+    <string name="date_time_format" translatable="false">MMM dd, HH:mm a</string>
     <!-- 4371, 4384 -->
     <!-- 4375, 4388 -->
     <!-- 4379, 4392 -->
diff --git a/res/values-mcc226-it/strings.xml b/res/values-mcc226-it/strings.xml
index 10f2acf95..a8a0ed5e3 100644
--- a/res/values-mcc226-it/strings.xml
+++ b/res/values-mcc226-it/strings.xml
@@ -18,10 +18,10 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="enable_public_safety_messages_title" msgid="2315613513862198922">"Allerta arancione"</string>
     <string name="public_safety_message" msgid="2115576467671679192">"RO-Alert: allerta arancione"</string>
-    <string name="cmas_presidential_level_alert" msgid="8476571012670281437">"RO-Alert: allarme presidenziale"</string>
+    <string name="cmas_presidential_level_alert" msgid="8476571012670281437">"RO-Alert: allerta presidenziale"</string>
     <string name="cmas_extreme_alert" msgid="1713701020039340032">"RO-Alert: allerta per condizioni estreme"</string>
     <string name="cmas_extreme_immediate_observed_alert" msgid="9008972835754333116">"RO-Alert: allerta per condizioni estreme"</string>
     <string name="cmas_extreme_immediate_likely_alert" msgid="4535498659302678812">"RO-Alert: allerta per condizioni estreme"</string>
     <string name="cmas_severe_alert" msgid="9170931869067635495">"RO-Alert: allerta per condizioni gravi"</string>
-    <string name="cmas_exercise_alert" msgid="5696553249081579138">"RO-Alert: avviso esercitazione"</string>
+    <string name="cmas_exercise_alert" msgid="5696553249081579138">"RO-Alert: allerta di esercitazione"</string>
 </resources>
diff --git a/res/values-mcc226-iw/strings.xml b/res/values-mcc226-iw/strings.xml
index c5cec4f07..c48265a03 100644
--- a/res/values-mcc226-iw/strings.xml
+++ b/res/values-mcc226-iw/strings.xml
@@ -16,12 +16,12 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_public_safety_messages_title" msgid="2315613513862198922">"התראה כתומה"</string>
-    <string name="public_safety_message" msgid="2115576467671679192">"התראה ברומניה: התראה כתומה"</string>
-    <string name="cmas_presidential_level_alert" msgid="8476571012670281437">"התראה ברומניה: התראה נשיאותית"</string>
-    <string name="cmas_extreme_alert" msgid="1713701020039340032">"התראה ברומניה: התראה קיצונית"</string>
+    <string name="enable_public_safety_messages_title" msgid="2315613513862198922">"התרעה כתומה"</string>
+    <string name="public_safety_message" msgid="2115576467671679192">"התרעה ברומניה: התרעה כתומה"</string>
+    <string name="cmas_presidential_level_alert" msgid="8476571012670281437">"התרעה ברומניה: התרעה נשיאותית"</string>
+    <string name="cmas_extreme_alert" msgid="1713701020039340032">"התרעה ברומניה: התרעה קיצונית"</string>
     <string name="cmas_extreme_immediate_observed_alert" msgid="9008972835754333116">"התראה ברומניה: התראה קיצונית"</string>
-    <string name="cmas_extreme_immediate_likely_alert" msgid="4535498659302678812">"התראה ברומניה: התראה קיצונית"</string>
-    <string name="cmas_severe_alert" msgid="9170931869067635495">"התראה ברומניה: התראה חמורה"</string>
-    <string name="cmas_exercise_alert" msgid="5696553249081579138">"התראה ברומניה: התראת תרגול"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="4535498659302678812">"התרעה ברומניה: התרעה קיצונית"</string>
+    <string name="cmas_severe_alert" msgid="9170931869067635495">"התרעה ברומניה: התרעה חמורה"</string>
+    <string name="cmas_exercise_alert" msgid="5696553249081579138">"התרעה ברומניה: התרעת תרגול"</string>
 </resources>
diff --git a/res/values-mcc234-az/strings.xml b/res/values-mcc234-az/strings.xml
index 229f51a3f..0eb2276bc 100644
--- a/res/values-mcc234-az/strings.xml
+++ b/res/values-mcc234-az/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="8511466399220042295">"Ekstremal hal siqnalları"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Ciddi hal siqnalları"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Test siqnalları"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Sınaq siqnalları"</string>
     <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Məşq siqnalları"</string>
     <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Hökumət Siqnalı"</string>
     <string name="cmas_extreme_alert" msgid="3474352706075109113">"Ekstremal Hal Siqnalı"</string>
diff --git a/res/values-mcc234-es/strings.xml b/res/values-mcc234-es/strings.xml
index 765a33c93..178169e9a 100644
--- a/res/values-mcc234-es/strings.xml
+++ b/res/values-mcc234-es/strings.xml
@@ -32,7 +32,7 @@
     <string name="app_label" msgid="3863159788297913185">"Alertas de emergencia"</string>
     <string name="sms_cb_settings" msgid="4187131985831792308">"Alertas de emergencia"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Recibir notificaciones por alertas de emergencia"</string>
-    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Crear mensajes de alertas de emergencia con la síntesis de voz"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Crear mensajes de alertas de emergencia con la conversión de texto a voz"</string>
     <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Actualmente recibes alertas de emergencia. ¿Quieres seguir recibiéndolas?"</string>
     <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Alertas de emergencia"</string>
     <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Toca para ver los ajustes de las alertas de emergencia"</string>
diff --git a/res/values-mcc234-eu/strings.xml b/res/values-mcc234-eu/strings.xml
index 55b42319e..9d2674125 100644
--- a/res/values-mcc234-eu/strings.xml
+++ b/res/values-mcc234-eu/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="8511466399220042295">"Muturreko alertak"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Alerta larriak"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Testu-mezu bidezko alertak"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Probako alertak"</string>
     <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Ariketa-alertak"</string>
     <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Gobernuaren alerta"</string>
     <string name="cmas_extreme_alert" msgid="3474352706075109113">"Muturreko alerta"</string>
@@ -27,7 +27,7 @@
     <!-- no translation found for cmas_extreme_immediate_likely_alert (1667218798350595295) -->
     <skip />
     <string name="cmas_severe_alert" msgid="6989950459525380066">"Alerta larria"</string>
-    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Testu-mezu bidezko alerta"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Probako alerta"</string>
     <string name="cmas_exercise_alert" msgid="4540370572086918020">"Ariketa-alerta"</string>
     <string name="app_label" msgid="3863159788297913185">"Larrialdi-alertak"</string>
     <string name="sms_cb_settings" msgid="4187131985831792308">"Larrialdi-alertak"</string>
diff --git a/res/values-mcc234-gl/strings.xml b/res/values-mcc234-gl/strings.xml
index 37e9e454c..9c5acebac 100644
--- a/res/values-mcc234-gl/strings.xml
+++ b/res/values-mcc234-gl/strings.xml
@@ -32,7 +32,7 @@
     <string name="app_label" msgid="3863159788297913185">"Alertas de emerxencia"</string>
     <string name="sms_cb_settings" msgid="4187131985831792308">"Alertas de emerxencia"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Recibe notificacións de alertas de emerxencia"</string>
-    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Usa a síntese de voz para ler as mensaxes de alertas de emerxencia"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Usa a conversión de texto a voz para ler as mensaxes de alertas de emerxencia"</string>
     <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Actualmente recibes alertas de emerxencia. Queres seguir recibíndoas?"</string>
     <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Alertas de emerxencia"</string>
     <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Toca para ver a configuración das alertas de emerxencia"</string>
diff --git a/res/values-mcc234-it/strings.xml b/res/values-mcc234-it/strings.xml
index f595c3253..2ca84109c 100644
--- a/res/values-mcc234-it/strings.xml
+++ b/res/values-mcc234-it/strings.xml
@@ -20,20 +20,20 @@
     <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Allerte per condizioni gravi"</string>
     <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Avvisi di prova"</string>
     <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Simulazioni di avvisi"</string>
-    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Avviso governativo"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Allerta governativa"</string>
     <string name="cmas_extreme_alert" msgid="3474352706075109113">"Allerta per condizioni estreme"</string>
     <!-- no translation found for cmas_extreme_immediate_observed_alert (4385654808873824465) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (1667218798350595295) -->
     <skip />
     <string name="cmas_severe_alert" msgid="6989950459525380066">"Allerta per condizioni gravi"</string>
-    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Avviso di prova"</string>
-    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Simulazione di avviso"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Allerta di prova"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Simulazione di allerta"</string>
     <string name="app_label" msgid="3863159788297913185">"Avvisi di emergenza"</string>
     <string name="sms_cb_settings" msgid="4187131985831792308">"Avvisi di emergenza"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Ricevi notifiche per avvisi di emergenza"</string>
-    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Usa la sintesi vocale per farmi ascoltare i messaggi degli avvisi di emergenza"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Ricevi notifiche per allerte di emergenza"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Usa la sintesi vocale per farmi ascoltare i messaggi delle allerte di emergenza"</string>
     <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Stai ricevendo avvisi di emergenza. Vuoi continuare a ricevere questi avvisi?"</string>
     <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Avvisi di emergenza"</string>
-    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Tocca per visualizzare le impostazioni relative agli avvisi di emergenza"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Tocca per visualizzare le impostazioni relative alle allerte di emergenza"</string>
 </resources>
diff --git a/res/values-mcc234-iw/strings.xml b/res/values-mcc234-iw/strings.xml
index d05a5aaf7..967777967 100644
--- a/res/values-mcc234-iw/strings.xml
+++ b/res/values-mcc234-iw/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="8511466399220042295">"התרעות קיצוניות"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="8511466399220042295">"התראות קיצוניות"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"התרעות חמורות"</string>
     <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"התרעות בדיקה"</string>
     <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"התרעות תרגול"</string>
diff --git a/res/values-mcc234-mr/strings.xml b/res/values-mcc234-mr/strings.xml
index 715bacba1..d43cad2d9 100644
--- a/res/values-mcc234-mr/strings.xml
+++ b/res/values-mcc234-mr/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="8511466399220042295">"अतिविषमतेसंबंधित सूचना"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"गंभीर स्थितीशी संबंधित सूचना"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"चाचणीच्या सूचना"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"चाचणी अलर्ट"</string>
     <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"व्यायामासंबंधित सूचना"</string>
     <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"सरकारी सूचना"</string>
     <string name="cmas_extreme_alert" msgid="3474352706075109113">"अतिविषमतेसंबंधित सूचना"</string>
diff --git a/res/values-mcc234/config.xml b/res/values-mcc234/config.xml
index 962b2a820..8f7dc3ad5 100644
--- a/res/values-mcc234/config.xml
+++ b/res/values-mcc234/config.xml
@@ -15,6 +15,8 @@
 -->
 
 <resources>
+  <!-- Whether to disable the opt-out dialog for all channels -->
+  <bool name="disable_opt_out_dialog">true</bool>
   <!-- 4370, 4383 -->
   <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
     <item>0x1112:rat=gsm, emergency=true, always_on=true, override_dnd=true</item>
diff --git a/res/values-mcc246-iw/strings.xml b/res/values-mcc246-iw/strings.xml
index a83200878..8754267b6 100644
--- a/res/values-mcc246-iw/strings.xml
+++ b/res/values-mcc246-iw/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"‏התרעת LT רמה 2"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"‏התראת LT רמה 2"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"‏התרעת LT רמה 3"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
 </resources>
diff --git a/res/values-mcc286/config.xml b/res/values-mcc286/config.xml
index 402ee2f5d..083da0a4f 100644
--- a/res/values-mcc286/config.xml
+++ b/res/values-mcc286/config.xml
@@ -15,16 +15,33 @@
 -->
 
 <resources>
-    <string-array name="public_safety_messages_channels_range_strings" translatable="false">
-        <!-- Public safety messages -->
-        <item>0x112C:rat=gsm, emergency=true</item>
-        <!-- Public safety messages for additional language -->
-        <item>0x112D:rat=gsm, emergency=true</item>
+    <!-- 4370, 4383 State alert notification for Turkey -->
+    <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
+        <item>0x1112:rat=gsm, emergency=true, always_on=true, filter_language=true</item>
+        <!-- additional language -->
+        <item>0x111F:rat=gsm, emergency=true, always_on=true, filter_language=true</item>
     </string-array>
-    <string-array name="state_local_test_alert_range_strings" translatable="false">
-        <!-- state/local test -->
-        <item>0x112E:rat=gsm, emergency=true</item>
-        <!-- state/local test additional language -->
-        <item>0x112F:rat=gsm, emergency=true</item>
+    <!-- 4371~4378, 4384~4391 vital alert notification for Turkey -->
+    <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false">
+        <item>0x1113-0x111A:rat=gsm, emergency=true, filter_language=true</item>
+        <!-- additional language -->
+        <item>0x1120-0x1127:rat=gsm, emergency=true, filter_language=true</item>
     </string-array>
+    <!-- 4379, 4392 loss / hijack alert notification for Turkey -->
+    <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false">
+        <item>0x111B:rat=gsm, emergency=true, filter_language=true</item>
+        <!-- additional language -->
+        <item>0x1128:rat=gsm, emergency=true, filter_language=true</item>
+    </string-array>
+    <!-- Channel 4380~4382, 4393~4395 test notification for Turkey -->
+    <string-array name="required_monthly_test_range_strings" translatable="false">
+        <item>0x111C-0x111E:rat=gsm, emergency=true, filter_language=true</item>
+        <!-- additional language -->
+        <item>0x1129-0x112B:rat=gsm, emergency=true, filter_language=true</item>
+    </string-array>
+    <string-array name="exercise_alert_range_strings" translatable="false" />
+    <string-array name="cmas_alerts_severe_range_strings" translatable="false" />
+    <string-array name="operator_defined_alert_range_strings" translatable="false" />
+    <!-- Whether to show main switch settings at the top -->
+    <bool name="show_main_switch_settings">false</bool>
 </resources>
diff --git a/res/values-mcc286/strings.xml b/res/values-mcc286/strings.xml
new file mode 100644
index 000000000..e3d2c84b8
--- /dev/null
+++ b/res/values-mcc286/strings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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">
+  <!-- CMAS dialog title for state-local alert notification. [CHAR LIMIT=50] -->
+  <!-- Required Turkish (tr) translation for this message: Devlet uyarı -->
+  <string name="cmas_presidential_level_alert">State-local alert</string>
+  <!-- CMAS dialog title for test alert notification. [CHAR LIMIT=50] -->
+  <!-- Required Turkish (tr) translation for this message: Test uyarı -->
+  <string name="cmas_required_monthly_test">Test alert</string>
+  <!-- CMAS dialog title for life threat alert notification. [CHAR LIMIT=50] -->
+  <!-- Required Turkish (tr) translation for this message: Hayati uyarı -->
+  <string name="cmas_extreme_alert">Life threat alert</string>
+  <string name="cmas_extreme_immediate_observed_alert">@string/cmas_extreme_alert</string>
+  <string name="cmas_extreme_immediate_likely_alert">@string/cmas_extreme_alert</string>
+  <!-- CMAS dialog title for loss or kidnapping alert notification (amber alert). [CHAR LIMIT=50] -->
+  <!-- Required Turkish (tr) translation for this message: Kayıp/kaçırma uyarı -->
+  <string name="cmas_amber_alert">Loss or kidnapping alert</string>
+  <!-- Preference title for other test alerts checkbox. [CHAR LIMIT=50] -->
+  <string name="enable_cmas_test_alerts_title">@string/cmas_required_monthly_test</string>
+  <!-- Preference summary for other test alerts checkbox. [CHAR LIMIT=125] -->
+  <string name="enable_cmas_test_alerts_summary"/>
+  <!-- Preference title for enable loss or kidnapping alert notification checkbox. [CHAR LIMIT=50] -->
+  <string name="enable_cmas_amber_alerts_title">@string/cmas_amber_alert</string>
+  <!-- Preference title for enable life threat alert notification checkbox. [CHAR LIMIT=50] -->
+  <string name="enable_cmas_extreme_threat_alerts_title">@string/cmas_extreme_alert</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-mcc302-mnc64/config.xml b/res/values-mcc302-mnc64/config.xml
index d6a0503a7..89fafb5a4 100644
--- a/res/values-mcc302-mnc64/config.xml
+++ b/res/values-mcc302-mnc64/config.xml
@@ -17,4 +17,6 @@
 <resources>
     <!-- Allow user to enable/disable audio speech alert (text-to-speech for received messages)-->
     <bool name="show_alert_speech_setting">true</bool>
+    <!-- Default value which determines whether spoken alerts enabled -->
+    <bool name="enable_alert_speech_default">false</bool>
 </resources>
diff --git a/res/values-mcc302/config.xml b/res/values-mcc302/config.xml
index 90f1575cf..7858937fb 100644
--- a/res/values-mcc302/config.xml
+++ b/res/values-mcc302/config.xml
@@ -52,4 +52,12 @@
      </integer-array>
     <!-- Do not interrupt active voice call -->
     <bool name="enable_alert_handling_during_call">true</bool>
+
+    <!-- CA has 4396~4399 reserved for future use-->
+    <string-array name="additional_cbs_channels_strings" translatable="false">
+        <item>0x112C-0x112F:rat=gsm, emergency=true</item>
+    </string-array>
+
+    <!-- Whether enabling copy message text into clipboard by long press -->
+    <bool name="enable_text_copy">false</bool>
 </resources>
diff --git a/res/values-mcc001-pa/config.xml b/res/values-mcc310-af/config.xml
index a01a81c02..4530dc6d2 100644
--- a/res/values-mcc001-pa/config.xml
+++ b/res/values-mcc310-af/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 The Android Open Source Project
+<!--  Copyright (C) 2018 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -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="enable_cmas_test_alerts_title" msgid="7552567512178490413">"ਹੋਰ ਜਾਂਚਾਂ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Ander toetse"</string>
 </resources>
diff --git a/res/values-mcc001-hi/config.xml b/res/values-mcc310-am/config.xml
index 9f8343c17..d9e1f1c53 100644
--- a/res/values-mcc001-hi/config.xml
+++ b/res/values-mcc310-am/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 The Android Open Source Project
+<!--  Copyright (C) 2018 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -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="enable_cmas_test_alerts_title" msgid="7552567512178490413">"दूसरे टेस्ट"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"ሌሎች ሙከራዎች"</string>
 </resources>
diff --git a/res/values-mcc505-mnc01/config.xml b/res/values-mcc310-ar/config.xml
index 367aa2f14..6069aedcd 100644
--- a/res/values-mcc505-mnc01/config.xml
+++ b/res/values-mcc310-ar/config.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,15 +12,9 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
--->
+ -->
 
-<resources>
-    <!-- Whether to show extreme alert settings -->
-    <bool name="show_extreme_alert_settings">false</bool>
-    <!-- Whether to show severe alert settings -->
-    <bool name="show_severe_alert_settings">false</bool>
-    <!-- Whether to show amber alert settings -->
-    <bool name="show_amber_alert_settings">false</bool>
-    <!-- Whether to show main switch settings at the top -->
-    <bool name="show_main_switch_settings">false</bool>
+<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="7215672102140788183">"الاختبارات الأخرى"</string>
 </resources>
diff --git a/res/values-mcc310-as/config.xml b/res/values-mcc310-as/config.xml
new file mode 100644
index 000000000..8dbba5787
--- /dev/null
+++ b/res/values-mcc310-as/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"অন্য পৰীক্ষাসমূহ"</string>
+</resources>
diff --git a/res/values-mcc001-mr/config.xml b/res/values-mcc310-az/config.xml
index 8bf49d7c8..33cdf1501 100644
--- a/res/values-mcc001-mr/config.xml
+++ b/res/values-mcc310-az/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2020 The Android Open Source Project
+<!--  Copyright (C) 2018 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -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="enable_cmas_test_alerts_title" msgid="7552567512178490413">"इतर चाचण्या"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Digər sınaqlar"</string>
 </resources>
diff --git a/res/values-mcc310-b+sr+Latn/config.xml b/res/values-mcc310-b+sr+Latn/config.xml
new file mode 100644
index 000000000..12a8cfb92
--- /dev/null
+++ b/res/values-mcc310-b+sr+Latn/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Drugi testovi"</string>
+</resources>
diff --git a/res/values-mcc310-be/config.xml b/res/values-mcc310-be/config.xml
new file mode 100644
index 000000000..3c48c0cdd
--- /dev/null
+++ b/res/values-mcc310-be/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Іншыя тэсты"</string>
+</resources>
diff --git a/res/values-mcc310-bg/config.xml b/res/values-mcc310-bg/config.xml
new file mode 100644
index 000000000..2e33e8735
--- /dev/null
+++ b/res/values-mcc310-bg/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Други тестове"</string>
+</resources>
diff --git a/res/values-mcc310-bn/config.xml b/res/values-mcc310-bn/config.xml
new file mode 100644
index 000000000..4e85e5468
--- /dev/null
+++ b/res/values-mcc310-bn/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"অন্য পরীক্ষা"</string>
+</resources>
diff --git a/res/values-mcc310-bs/config.xml b/res/values-mcc310-bs/config.xml
new file mode 100644
index 000000000..12a8cfb92
--- /dev/null
+++ b/res/values-mcc310-bs/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Drugi testovi"</string>
+</resources>
diff --git a/res/values-mcc310-ca/config.xml b/res/values-mcc310-ca/config.xml
new file mode 100644
index 000000000..dbf9afb3f
--- /dev/null
+++ b/res/values-mcc310-ca/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Altres proves"</string>
+</resources>
diff --git a/res/values-mcc310-cs/config.xml b/res/values-mcc310-cs/config.xml
new file mode 100644
index 000000000..1c36e22e2
--- /dev/null
+++ b/res/values-mcc310-cs/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Jiné testy"</string>
+</resources>
diff --git a/res/values-mcc310-da/config.xml b/res/values-mcc310-da/config.xml
new file mode 100644
index 000000000..0f8544f47
--- /dev/null
+++ b/res/values-mcc310-da/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Andre test"</string>
+</resources>
diff --git a/res/values-mcc310-de/config.xml b/res/values-mcc310-de/config.xml
new file mode 100644
index 000000000..d3fd18477
--- /dev/null
+++ b/res/values-mcc310-de/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Andere Tests"</string>
+</resources>
diff --git a/res/values-mcc310-el/config.xml b/res/values-mcc310-el/config.xml
new file mode 100644
index 000000000..f45747295
--- /dev/null
+++ b/res/values-mcc310-el/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Άλλες δοκιμές"</string>
+</resources>
diff --git a/res/values-mcc310-en-rAU/config.xml b/res/values-mcc310-en-rAU/config.xml
new file mode 100644
index 000000000..98128642a
--- /dev/null
+++ b/res/values-mcc310-en-rAU/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Other tests"</string>
+</resources>
diff --git a/res/values-mcc310-en-rCA/config.xml b/res/values-mcc310-en-rCA/config.xml
new file mode 100644
index 000000000..98128642a
--- /dev/null
+++ b/res/values-mcc310-en-rCA/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Other tests"</string>
+</resources>
diff --git a/res/values-mcc310-en-rGB/config.xml b/res/values-mcc310-en-rGB/config.xml
new file mode 100644
index 000000000..98128642a
--- /dev/null
+++ b/res/values-mcc310-en-rGB/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Other tests"</string>
+</resources>
diff --git a/res/values-mcc310-en-rIN/config.xml b/res/values-mcc310-en-rIN/config.xml
new file mode 100644
index 000000000..98128642a
--- /dev/null
+++ b/res/values-mcc310-en-rIN/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Other tests"</string>
+</resources>
diff --git a/res/values-mcc310-en-rXC/config.xml b/res/values-mcc310-en-rXC/config.xml
new file mode 100644
index 000000000..c41f6fbdc
--- /dev/null
+++ b/res/values-mcc310-en-rXC/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎Other tests‎‏‎‎‏‎"</string>
+</resources>
diff --git a/res/values-mcc310-es-rUS/config.xml b/res/values-mcc310-es-rUS/config.xml
new file mode 100644
index 000000000..446c25eac
--- /dev/null
+++ b/res/values-mcc310-es-rUS/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Otras pruebas"</string>
+</resources>
diff --git a/res/values-mcc310-es/config.xml b/res/values-mcc310-es/config.xml
new file mode 100644
index 000000000..446c25eac
--- /dev/null
+++ b/res/values-mcc310-es/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Otras pruebas"</string>
+</resources>
diff --git a/res/values-mcc310-et/config.xml b/res/values-mcc310-et/config.xml
new file mode 100644
index 000000000..16c59b94f
--- /dev/null
+++ b/res/values-mcc310-et/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Muud testid"</string>
+</resources>
diff --git a/res/values-mcc310-eu/config.xml b/res/values-mcc310-eu/config.xml
new file mode 100644
index 000000000..37800d9b0
--- /dev/null
+++ b/res/values-mcc310-eu/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Beste proba batzuk"</string>
+</resources>
diff --git a/res/values-mcc310-fa/config.xml b/res/values-mcc310-fa/config.xml
new file mode 100644
index 000000000..d42308920
--- /dev/null
+++ b/res/values-mcc310-fa/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"آزمایش‌های دیگر"</string>
+</resources>
diff --git a/res/values-mcc310-fi/config.xml b/res/values-mcc310-fi/config.xml
new file mode 100644
index 000000000..2d4b3b66b
--- /dev/null
+++ b/res/values-mcc310-fi/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Muut testit"</string>
+</resources>
diff --git a/res/values-mcc310-fr-rCA/config.xml b/res/values-mcc310-fr-rCA/config.xml
new file mode 100644
index 000000000..ecf378cba
--- /dev/null
+++ b/res/values-mcc310-fr-rCA/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Autres tests"</string>
+</resources>
diff --git a/res/values-mcc310-fr/config.xml b/res/values-mcc310-fr/config.xml
new file mode 100644
index 000000000..ecf378cba
--- /dev/null
+++ b/res/values-mcc310-fr/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Autres tests"</string>
+</resources>
diff --git a/res/values-mcc310-gl/config.xml b/res/values-mcc310-gl/config.xml
new file mode 100644
index 000000000..f671d3ea5
--- /dev/null
+++ b/res/values-mcc310-gl/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Outras probas"</string>
+</resources>
diff --git a/res/values-mcc310-gu/config.xml b/res/values-mcc310-gu/config.xml
new file mode 100644
index 000000000..022590b5d
--- /dev/null
+++ b/res/values-mcc310-gu/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"અન્ય પરીક્ષણો"</string>
+</resources>
diff --git a/res/values-mcc310-hi/config.xml b/res/values-mcc310-hi/config.xml
new file mode 100644
index 000000000..08b81c156
--- /dev/null
+++ b/res/values-mcc310-hi/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"अन्य टेस्ट"</string>
+</resources>
diff --git a/res/values-mcc310-hr/config.xml b/res/values-mcc310-hr/config.xml
new file mode 100644
index 000000000..12a8cfb92
--- /dev/null
+++ b/res/values-mcc310-hr/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Drugi testovi"</string>
+</resources>
diff --git a/res/values-mcc310-hu/config.xml b/res/values-mcc310-hu/config.xml
new file mode 100644
index 000000000..a1deea63e
--- /dev/null
+++ b/res/values-mcc310-hu/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Egyéb tesztek"</string>
+</resources>
diff --git a/res/values-mcc310-hy/config.xml b/res/values-mcc310-hy/config.xml
new file mode 100644
index 000000000..e66419aa4
--- /dev/null
+++ b/res/values-mcc310-hy/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Այլ փորձնական ծանուցումներ"</string>
+</resources>
diff --git a/res/values-mcc310-in/config.xml b/res/values-mcc310-in/config.xml
new file mode 100644
index 000000000..80370abec
--- /dev/null
+++ b/res/values-mcc310-in/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Pengujian lainnya"</string>
+</resources>
diff --git a/res/values-mcc310-is/config.xml b/res/values-mcc310-is/config.xml
new file mode 100644
index 000000000..afbb8d708
--- /dev/null
+++ b/res/values-mcc310-is/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Aðrar prófanir"</string>
+</resources>
diff --git a/res/values-mcc310-it/config.xml b/res/values-mcc310-it/config.xml
new file mode 100644
index 000000000..ca70bc6e7
--- /dev/null
+++ b/res/values-mcc310-it/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Altri test"</string>
+</resources>
diff --git a/res/values-mcc310-it/strings.xml b/res/values-mcc310-it/strings.xml
index 43950fec7..283975d72 100644
--- a/res/values-mcc310-it/strings.xml
+++ b/res/values-mcc310-it/strings.xml
@@ -18,11 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Spagnolo"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Ricevi avvisi d\'emergenza in spagnolo quando è possibile"</string>
-    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Eliminare questo avviso?"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Eliminare questa allerta?"</string>
     <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Vuoi eliminare tutti gli avvisi ricevuti?"</string>
-    <string name="menu_delete" msgid="2691868773984777519">"Elimina avviso"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Elimina allerta"</string>
     <string name="menu_delete_all" msgid="8991615021908376216">"Elimina avvisi"</string>
     <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
     <skip />
-    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Ricevi test mensili obbligatori dal sistema di avvisi relativi alla sicurezza"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Ricevi test mensili obbligatori dal sistema di allerte per la sicurezza"</string>
 </resources>
diff --git a/res/values-mcc310-iw/config.xml b/res/values-mcc310-iw/config.xml
new file mode 100644
index 000000000..031cf165c
--- /dev/null
+++ b/res/values-mcc310-iw/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"בדיקות אחרות"</string>
+</resources>
diff --git a/res/values-mcc310-iw/strings.xml b/res/values-mcc310-iw/strings.xml
index d8ac38559..9e3baa4f4 100644
--- a/res/values-mcc310-iw/strings.xml
+++ b/res/values-mcc310-iw/strings.xml
@@ -18,11 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"ספרדית"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"קבלת התרעות על מקרי חירום בספרדית כשזה אפשרי"</string>
-    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"למחוק את ההתראה הזו?"</string>
-    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"למחוק את כל ההתראות שהתקבלו?"</string>
-    <string name="menu_delete" msgid="2691868773984777519">"מחיקת ההתראה"</string>
-    <string name="menu_delete_all" msgid="8991615021908376216">"מחיקת ההתראות"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"למחוק את ההתרעה הזו?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"למחוק את כל ההתרעות שהתקבלו?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"מחיקת ההתרעה"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"מחיקת ההתרעות"</string>
     <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
     <skip />
-    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"קבלת בדיקות חודשיות דרושות ממערכת התרעות האבטחה"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"קבלת בדיקות חודשיות דרושות ממערכת התראות האבטחה"</string>
 </resources>
diff --git a/res/values-mcc310-ja/config.xml b/res/values-mcc310-ja/config.xml
new file mode 100644
index 000000000..d8a28085f
--- /dev/null
+++ b/res/values-mcc310-ja/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"その他のテスト"</string>
+</resources>
diff --git a/res/values-mcc310-ka/config.xml b/res/values-mcc310-ka/config.xml
new file mode 100644
index 000000000..22fa2b236
--- /dev/null
+++ b/res/values-mcc310-ka/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"სხვა ტესტები"</string>
+</resources>
diff --git a/res/values-mcc310-kk/config.xml b/res/values-mcc310-kk/config.xml
new file mode 100644
index 000000000..d417a354a
--- /dev/null
+++ b/res/values-mcc310-kk/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Басқа сынақ ескертулері"</string>
+</resources>
diff --git a/res/values-mcc310-km/config.xml b/res/values-mcc310-km/config.xml
new file mode 100644
index 000000000..56ef1a8b8
--- /dev/null
+++ b/res/values-mcc310-km/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"ការសាកល្បង​ផ្សេងទៀត"</string>
+</resources>
diff --git a/res/values-mcc310-kn/config.xml b/res/values-mcc310-kn/config.xml
new file mode 100644
index 000000000..78b6b426d
--- /dev/null
+++ b/res/values-mcc310-kn/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"ಇತರ ಪರೀಕ್ಷೆಗಳು"</string>
+</resources>
diff --git a/res/values-mcc310-ko/config.xml b/res/values-mcc310-ko/config.xml
new file mode 100644
index 000000000..72ec9bc27
--- /dev/null
+++ b/res/values-mcc310-ko/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"기타 테스트"</string>
+</resources>
diff --git a/res/values-mcc310-ky/config.xml b/res/values-mcc310-ky/config.xml
new file mode 100644
index 000000000..e2f7a7bdd
--- /dev/null
+++ b/res/values-mcc310-ky/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Башка сыноолор"</string>
+</resources>
diff --git a/res/values-mcc310-ky/strings.xml b/res/values-mcc310-ky/strings.xml
index 0c4c93f01..8c776973f 100644
--- a/res/values-mcc310-ky/strings.xml
+++ b/res/values-mcc310-ky/strings.xml
@@ -24,5 +24,5 @@
     <string name="menu_delete_all" msgid="8991615021908376216">"Эскертүүлөрдү жок кылуу"</string>
     <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
     <skip />
-    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"CMAS системасынын шашылыш билдирүүлөрүн ай сайын аткарылуучу сыноолор аркылуу алуу"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"CMAS системасынан ай сайын сынамык шашылыш билдирүүлөрдү алып турасыз"</string>
 </resources>
diff --git a/res/values-mcc310-lo/config.xml b/res/values-mcc310-lo/config.xml
new file mode 100644
index 000000000..c52dfd580
--- /dev/null
+++ b/res/values-mcc310-lo/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"ການທົດສອບອື່ນໆ"</string>
+</resources>
diff --git a/res/values-mcc310-lt/config.xml b/res/values-mcc310-lt/config.xml
new file mode 100644
index 000000000..b74985ef7
--- /dev/null
+++ b/res/values-mcc310-lt/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Kiti bandymai"</string>
+</resources>
diff --git a/res/values-mcc310-lv/config.xml b/res/values-mcc310-lv/config.xml
new file mode 100644
index 000000000..f43aad0e8
--- /dev/null
+++ b/res/values-mcc310-lv/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Citi testi"</string>
+</resources>
diff --git a/res/values-mcc310-mk/config.xml b/res/values-mcc310-mk/config.xml
new file mode 100644
index 000000000..4a136cc32
--- /dev/null
+++ b/res/values-mcc310-mk/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Други тест-предупредувања"</string>
+</resources>
diff --git a/res/values-mcc310-ml/config.xml b/res/values-mcc310-ml/config.xml
new file mode 100644
index 000000000..accb00e0e
--- /dev/null
+++ b/res/values-mcc310-ml/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"മറ്റ് പരിശോധനകൾ"</string>
+</resources>
diff --git a/res/values-mcc310-mn/config.xml b/res/values-mcc310-mn/config.xml
new file mode 100644
index 000000000..0c3d1d52d
--- /dev/null
+++ b/res/values-mcc310-mn/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Бусад туршилт"</string>
+</resources>
diff --git a/res/values-mcc310-mnc410/config.xml b/res/values-mcc310-mnc410/config.xml
index 3bd30f767..a7e36adee 100644
--- a/res/values-mcc310-mnc410/config.xml
+++ b/res/values-mcc310-mnc410/config.xml
@@ -17,8 +17,8 @@
 <resources>
     <!-- Whether to display presidential alert in the settings -->
     <bool name="show_presidential_alerts_settings">true</bool>
-    <!-- Show timestamp of the alert -->
-    <bool name="show_date_time_title">true</bool>
+    <!-- Append date-time to the alert title -->
+    <string name="date_time_format" translatable="false">MMM dd, HH:mm a</string>
     <!-- Whether to show CMAS messages by in a different order than received by prioritizing them -->
     <bool name="show_cmas_messages_in_priority_order">true</bool>
     <!-- AT&T want to show separate testing toggles for monthly test, operator defined and exercise -->
diff --git a/res/values-mcc310-mr/config.xml b/res/values-mcc310-mr/config.xml
new file mode 100644
index 000000000..9eceacf52
--- /dev/null
+++ b/res/values-mcc310-mr/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"इतर चाचण्या"</string>
+</resources>
diff --git a/res/values-mcc310-ms/config.xml b/res/values-mcc310-ms/config.xml
new file mode 100644
index 000000000..e0d6c8e07
--- /dev/null
+++ b/res/values-mcc310-ms/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Ujian lain"</string>
+</resources>
diff --git a/res/values-mcc310-my/config.xml b/res/values-mcc310-my/config.xml
new file mode 100644
index 000000000..bb61468a4
--- /dev/null
+++ b/res/values-mcc310-my/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"အခြားစမ်းသပ်မှုများ"</string>
+</resources>
diff --git a/res/values-mcc310-nb/config.xml b/res/values-mcc310-nb/config.xml
new file mode 100644
index 000000000..b64a00359
--- /dev/null
+++ b/res/values-mcc310-nb/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Andre tester"</string>
+</resources>
diff --git a/res/values-mcc310-ne/config.xml b/res/values-mcc310-ne/config.xml
new file mode 100644
index 000000000..eee285924
--- /dev/null
+++ b/res/values-mcc310-ne/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"अन्य परीक्षणहरू"</string>
+</resources>
diff --git a/res/values-mcc310-nl/config.xml b/res/values-mcc310-nl/config.xml
new file mode 100644
index 000000000..b55b731df
--- /dev/null
+++ b/res/values-mcc310-nl/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Andere tests"</string>
+</resources>
diff --git a/res/values-mcc310-or/config.xml b/res/values-mcc310-or/config.xml
new file mode 100644
index 000000000..6842d3d45
--- /dev/null
+++ b/res/values-mcc310-or/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"ଅନ୍ୟ ପରୀକ୍ଷାଗୁଡ଼ିକ"</string>
+</resources>
diff --git a/res/values-mcc310-pa/config.xml b/res/values-mcc310-pa/config.xml
new file mode 100644
index 000000000..56faf4ff0
--- /dev/null
+++ b/res/values-mcc310-pa/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"ਹੋਰ ਜਾਂਚਾਂ"</string>
+</resources>
diff --git a/res/values-mcc310-pl/config.xml b/res/values-mcc310-pl/config.xml
new file mode 100644
index 000000000..6d7209566
--- /dev/null
+++ b/res/values-mcc310-pl/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Inne testy"</string>
+</resources>
diff --git a/res/values-mcc310-pt-rPT/config.xml b/res/values-mcc310-pt-rPT/config.xml
new file mode 100644
index 000000000..48b7a5d8f
--- /dev/null
+++ b/res/values-mcc310-pt-rPT/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Outros testes"</string>
+</resources>
diff --git a/res/values-mcc310-pt/config.xml b/res/values-mcc310-pt/config.xml
new file mode 100644
index 000000000..48b7a5d8f
--- /dev/null
+++ b/res/values-mcc310-pt/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Outros testes"</string>
+</resources>
diff --git a/res/values-mcc310-ro/config.xml b/res/values-mcc310-ro/config.xml
new file mode 100644
index 000000000..f93123351
--- /dev/null
+++ b/res/values-mcc310-ro/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Alte teste"</string>
+</resources>
diff --git a/res/values-mcc310-ru/config.xml b/res/values-mcc310-ru/config.xml
new file mode 100644
index 000000000..f8b115f2a
--- /dev/null
+++ b/res/values-mcc310-ru/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Другие тестовые оповещения"</string>
+</resources>
diff --git a/res/values-mcc310-ru/strings.xml b/res/values-mcc310-ru/strings.xml
index 104e5ddee..1caab904c 100644
--- a/res/values-mcc310-ru/strings.xml
+++ b/res/values-mcc310-ru/strings.xml
@@ -24,5 +24,5 @@
     <string name="menu_delete_all" msgid="8991615021908376216">"Удалить оповещения"</string>
     <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
     <skip />
-    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Получать обязательные ежемесячные тестовые оповещения системы CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Получать обязательные ежемесячные тестовые оповещения системы экстренного оповещения"</string>
 </resources>
diff --git a/res/values-mcc310-si/config.xml b/res/values-mcc310-si/config.xml
new file mode 100644
index 000000000..894fb4120
--- /dev/null
+++ b/res/values-mcc310-si/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"වෙනත් පරීක්ෂා"</string>
+</resources>
diff --git a/res/values-mcc310-sk/config.xml b/res/values-mcc310-sk/config.xml
new file mode 100644
index 000000000..9d4965c2e
--- /dev/null
+++ b/res/values-mcc310-sk/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Iné testy"</string>
+</resources>
diff --git a/res/values-mcc310-sl/config.xml b/res/values-mcc310-sl/config.xml
new file mode 100644
index 000000000..bfaaf91ab
--- /dev/null
+++ b/res/values-mcc310-sl/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Drugi preizkusi"</string>
+</resources>
diff --git a/res/values-mcc310-sq/config.xml b/res/values-mcc310-sq/config.xml
new file mode 100644
index 000000000..dd5525b84
--- /dev/null
+++ b/res/values-mcc310-sq/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Testet e tjera"</string>
+</resources>
diff --git a/res/values-mcc310-sr/config.xml b/res/values-mcc310-sr/config.xml
new file mode 100644
index 000000000..d7570e15a
--- /dev/null
+++ b/res/values-mcc310-sr/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Други тестови"</string>
+</resources>
diff --git a/res/values-mcc310-sv/config.xml b/res/values-mcc310-sv/config.xml
new file mode 100644
index 000000000..d245f7b5d
--- /dev/null
+++ b/res/values-mcc310-sv/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Andra tester"</string>
+</resources>
diff --git a/res/values-mcc310-sw/config.xml b/res/values-mcc310-sw/config.xml
new file mode 100644
index 000000000..b470296f9
--- /dev/null
+++ b/res/values-mcc310-sw/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Majaribio mengine"</string>
+</resources>
diff --git a/res/values-mcc310-ta/config.xml b/res/values-mcc310-ta/config.xml
new file mode 100644
index 000000000..54d9ef6aa
--- /dev/null
+++ b/res/values-mcc310-ta/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"பிற சோதனைகள்"</string>
+</resources>
diff --git a/res/values-mcc310-te/config.xml b/res/values-mcc310-te/config.xml
new file mode 100644
index 000000000..508d9a1ea
--- /dev/null
+++ b/res/values-mcc310-te/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"ఇతర పరీక్షలు"</string>
+</resources>
diff --git a/res/values-mcc310-th/config.xml b/res/values-mcc310-th/config.xml
new file mode 100644
index 000000000..eabeca263
--- /dev/null
+++ b/res/values-mcc310-th/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"การทดสอบอื่นๆ"</string>
+</resources>
diff --git a/res/values-mcc310-tl/config.xml b/res/values-mcc310-tl/config.xml
new file mode 100644
index 000000000..07751f64c
--- /dev/null
+++ b/res/values-mcc310-tl/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Iba pang pagsubok"</string>
+</resources>
diff --git a/res/values-mcc310-tr/config.xml b/res/values-mcc310-tr/config.xml
new file mode 100644
index 000000000..0b789c67d
--- /dev/null
+++ b/res/values-mcc310-tr/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Diğer testler"</string>
+</resources>
diff --git a/res/values-mcc310-uk/config.xml b/res/values-mcc310-uk/config.xml
new file mode 100644
index 000000000..eb5e8d756
--- /dev/null
+++ b/res/values-mcc310-uk/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Інші тестові сповіщення"</string>
+</resources>
diff --git a/res/values-mcc310-ur/config.xml b/res/values-mcc310-ur/config.xml
new file mode 100644
index 000000000..5138de00d
--- /dev/null
+++ b/res/values-mcc310-ur/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"دیگر ٹیسٹس"</string>
+</resources>
diff --git a/res/values-mcc310-uz/config.xml b/res/values-mcc310-uz/config.xml
new file mode 100644
index 000000000..92b934ae2
--- /dev/null
+++ b/res/values-mcc310-uz/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Boshqa sinov xabarlar"</string>
+</resources>
diff --git a/res/values-mcc310-vi/config.xml b/res/values-mcc310-vi/config.xml
new file mode 100644
index 000000000..b598caaf6
--- /dev/null
+++ b/res/values-mcc310-vi/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Các cảnh báo thử nghiệm khác"</string>
+</resources>
diff --git a/res/values-mcc310-zh-rCN/config.xml b/res/values-mcc310-zh-rCN/config.xml
new file mode 100644
index 000000000..ffac0711c
--- /dev/null
+++ b/res/values-mcc310-zh-rCN/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"其他测试"</string>
+</resources>
diff --git a/res/values-mcc310-zh-rHK/config.xml b/res/values-mcc310-zh-rHK/config.xml
new file mode 100644
index 000000000..e1b4132c6
--- /dev/null
+++ b/res/values-mcc310-zh-rHK/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"其他測試"</string>
+</resources>
diff --git a/res/values-mcc310-zh-rTW/config.xml b/res/values-mcc310-zh-rTW/config.xml
new file mode 100644
index 000000000..e1b4132c6
--- /dev/null
+++ b/res/values-mcc310-zh-rTW/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"其他測試"</string>
+</resources>
diff --git a/res/values-mcc310-zu/config.xml b/res/values-mcc310-zu/config.xml
new file mode 100644
index 000000000..8bcc3bf03
--- /dev/null
+++ b/res/values-mcc310-zu/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Okunye ukuhlolwa"</string>
+</resources>
diff --git a/res/values-mcc330/config.xml b/res/values-mcc330/config.xml
index f3d2608cb..07f7b90df 100644
--- a/res/values-mcc330/config.xml
+++ b/res/values-mcc330/config.xml
@@ -15,8 +15,8 @@
 -->
 
 <resources>
-  <!-- Whether to append date-time to the alert title -->
-  <bool name="show_date_time_title">true</bool>
+  <!-- Append date-time to the alert title -->
+  <string name="date_time_format" translatable="false">MMM dd, HH:mm a</string>
   <!-- Whether to show test settings, enabled by dialer code -->
   <bool name="show_test_settings">false</bool>
 </resources>
diff --git a/res/values-mcc420-iw/strings.xml b/res/values-mcc420-iw/strings.xml
index 255c24c57..d989a8dc4 100644
--- a/res/values-mcc420-iw/strings.xml
+++ b/res/values-mcc420-iw/strings.xml
@@ -13,16 +13,16 @@
 
 <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="5922755396541728069">"התראות אזהרה ארציות"</string>
-    <string name="cmas_extreme_alert" msgid="2666370743728576543">"התראות אזהרה במקרה חירום קיצוני"</string>
+    <string name="cmas_presidential_level_alert" msgid="5922755396541728069">"התרעות אזהרה ארציות"</string>
+    <string name="cmas_extreme_alert" msgid="2666370743728576543">"התרעות אזהרה במקרה חירום קיצוני"</string>
     <!-- no translation found for cmas_extreme_immediate_observed_alert (9214912512697774351) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5872678423468023949) -->
     <skip />
-    <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="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="cmas_required_monthly_test" msgid="5733131786754331921">"התראות לבדיקה"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"התרעות לבדיקה"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"תרגילים"</string>
 </resources>
diff --git a/res/values-mcc422-it/strings.xml b/res/values-mcc422-it/strings.xml
index 0c995de2a..070b19c53 100644
--- a/res/values-mcc422-it/strings.xml
+++ b/res/values-mcc422-it/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">"Avviso di emergenza"</string>
-    <string name="pws_other_message_identifiers" msgid="7325727748670134223">"Avviso"</string>
-    <string name="cmas_exercise_alert" msgid="8865117243431902282">"Simulazione di avviso"</string>
+    <string name="cmas_presidential_level_alert" msgid="3211812107922643307">"Allerta di emergenza"</string>
+    <string name="pws_other_message_identifiers" msgid="7325727748670134223">"Allerta"</string>
+    <string name="cmas_exercise_alert" msgid="8865117243431902282">"Simulazione di allerta"</string>
 </resources>
diff --git a/res/values-mcc422-iw/strings.xml b/res/values-mcc422-iw/strings.xml
index 1dd7f6b25..9a06d376a 100644
--- a/res/values-mcc422-iw/strings.xml
+++ b/res/values-mcc422-iw/strings.xml
@@ -14,6 +14,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="cmas_presidential_level_alert" msgid="3211812107922643307">"התרעה על מקרה חירום"</string>
-    <string name="pws_other_message_identifiers" msgid="7325727748670134223">"התראת אזהרה"</string>
-    <string name="cmas_exercise_alert" msgid="8865117243431902282">"התראת תרגול"</string>
+    <string name="pws_other_message_identifiers" msgid="7325727748670134223">"התרעת אזהרה"</string>
+    <string name="cmas_exercise_alert" msgid="8865117243431902282">"התרעת תרגול"</string>
 </resources>
diff --git a/res/values-mcc424-az/strings.xml b/res/values-mcc424-az/strings.xml
index 45221c3f2..a32e9e8cd 100644
--- a/res/values-mcc424-az/strings.xml
+++ b/res/values-mcc424-az/strings.xml
@@ -28,5 +28,5 @@
     <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>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Sınaq siqnalları"</string>
 </resources>
diff --git a/res/values-mcc424-eu/strings.xml b/res/values-mcc424-eu/strings.xml
index d41a0c949..ad266492f 100644
--- a/res/values-mcc424-eu/strings.xml
+++ b/res/values-mcc424-eu/strings.xml
@@ -24,9 +24,9 @@
     <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="638043663020315444">"Testu-mezu bidezko alerta"</string>
-    <string name="state_local_test_alert" msgid="5347253401221487116">"Testu-mezu bidezko alerta"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Probako alerta"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Probako 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>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Probako alertak"</string>
 </resources>
diff --git a/res/values-mcc424-it/strings.xml b/res/values-mcc424-it/strings.xml
index bcccc5e3d..56d793b09 100644
--- a/res/values-mcc424-it/strings.xml
+++ b/res/values-mcc424-it/strings.xml
@@ -16,16 +16,16 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"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="cmas_presidential_level_alert" msgid="569470769079166304">"Allerta di emergenza nazionale"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Allerta di emergenza"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Allerta di emergenza"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Allerta di emergenza"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Allerta 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="638043663020315444">"Avviso di prova"</string>
-    <string name="state_local_test_alert" msgid="5347253401221487116">"Avviso di prova"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Allerta di prova"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Allerta 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>
diff --git a/res/values-mcc424-iw/strings.xml b/res/values-mcc424-iw/strings.xml
index ee2b8da39..812002f08 100644
--- a/res/values-mcc424-iw/strings.xml
+++ b/res/values-mcc424-iw/strings.xml
@@ -17,16 +17,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="cmas_presidential_level_alert" msgid="569470769079166304">"התרעה על מקרה חירום לאומי"</string>
-    <string name="cmas_extreme_alert" msgid="9135130008703049274">"התראת חירום"</string>
-    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"התראת חירום"</string>
-    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"התראת חירום"</string>
-    <string name="cmas_severe_alert" msgid="6255792641522355328">"התראת חירום"</string>
-    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"התראת אזהרה"</string>
-    <string name="public_safety_message" msgid="6430821308078207535">"התראה בנוגע לביטחון הציבור"</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="638043663020315444">"התראת בדיקה"</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>
+    <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 7c0e6478d..bfd30bc81 100644
--- a/res/values-mcc424-mr/strings.xml
+++ b/res/values-mcc424-mr/strings.xml
@@ -28,5 +28,5 @@
     <string name="state_local_test_alert" msgid="5347253401221487116">"चाचणीची सूचना"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"चेतावणीच्या सूचना"</string>
     <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"सार्वजनिक सुरक्षिततेच्या सूचना"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"चाचणीच्या सूचना"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"चाचणी अलर्ट"</string>
 </resources>
diff --git a/res/values-mcc425-it/strings.xml b/res/values-mcc425-it/strings.xml
index 171a0bdbe..065066d4a 100644
--- a/res/values-mcc425-it/strings.xml
+++ b/res/values-mcc425-it/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_severe_alert" msgid="4470698515511189493">"Allarme"</string>
+    <string name="cmas_severe_alert" msgid="4470698515511189493">"Allerta"</string>
     <string name="public_safety_message" msgid="7373019453807671797">"Messaggio informativo"</string>
     <string name="cmas_amber_alert" msgid="740474290634511931">"Messaggio di richiesta di assistenza sociale"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="4570611095431464471">"Allarmi"</string>
diff --git a/res/values-mcc425-iw/strings.xml b/res/values-mcc425-iw/strings.xml
index 21486742b..132d92ae0 100644
--- a/res/values-mcc425-iw/strings.xml
+++ b/res/values-mcc425-iw/strings.xml
@@ -16,10 +16,10 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_severe_alert" msgid="4470698515511189493">"התראת אזהרה"</string>
+    <string name="cmas_severe_alert" msgid="4470698515511189493">"התרעת אזהרה"</string>
     <string name="public_safety_message" msgid="7373019453807671797">"מידע לציבור"</string>
     <string name="cmas_amber_alert" msgid="740474290634511931">"הודעה עם בקשת עזרה מהציבור"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="4570611095431464471">"התראות אזהרה"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="4570611095431464471">"התרעות אזהרה"</string>
     <string name="enable_public_safety_messages_title" msgid="6173886162636474286">"הודעות עם מידע לציבור"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="3896845887375326185">"הודעות עם בקשות עזרה מהציבור"</string>
 </resources>
diff --git a/res/values-mcc440-mnc10/config.xml b/res/values-mcc440-mnc10/config.xml
index c428d8ef4..a8b1b4ef6 100644
--- a/res/values-mcc440-mnc10/config.xml
+++ b/res/values-mcc440-mnc10/config.xml
@@ -23,4 +23,5 @@
         <item>0x1103:rat=gsm, emergency=true</item>
         <item>0xA400-0xA4FF:rat=gsm, emergency=true</item>
     </string-array>
+    <bool name="allow_testing_mode_on_user_build">true</bool>
 </resources>
diff --git a/res/values-mcc450-it/strings.xml b/res/values-mcc450-it/strings.xml
index 263083fa9..b7d43df85 100644
--- a/res/values-mcc450-it/strings.xml
+++ b/res/values-mcc450-it/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Avviso di emergenza critico"</string>
+    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Allerta di emergenza critico"</string>
     <string name="alerts_header_summary" msgid="8898082819299479687">"Il telefono può inviarti allerte, ad esempio indicazioni per l\'evacuazione, durante calamità naturali. Questo servizio è nato dalla collaborazione tra National Emergency Management Agency, fornitori di reti e produttori di dispositivi.\n\nPotresti non ricevere le allerte in caso di problemi con il tuo dispositivo o condizioni non ottimali della rete."</string>
 </resources>
diff --git a/res/values-mcc450-iw/strings.xml b/res/values-mcc450-iw/strings.xml
index d47727bdf..f4378d618 100644
--- a/res/values-mcc450-iw/strings.xml
+++ b/res/values-mcc450-iw/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"התרעה על מקרה חירום קריטי"</string>
-    <string name="alerts_header_summary" msgid="8898082819299479687">"במהלך אסונות טבע, הטלפון יכול לשלוח התראות. למשל, הוראות לפינוי. השירות נוצר מתוך שיתוף פעולה בין הסוכנות הלאומית לניהול חירום, ספקי רשתות ויצרני מכשירים.\n\nייתכן שלא יוצגו לך התראות אם יש בעיה במכשיר או בעיות באיכות הרשת."</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"במהלך אסונות טבע, הטלפון יכול לשלוח הוראות לפינוי והתרעות נוספות. השירות ניתן במסגרת שיתוף פעולה בין הסוכנות הלאומית לניהול מצבי חירום, ספקי רשתות ויצרני מכשירים.\n\nייתכן שלא יוצגו לך התרעות אם יש בעיה במכשיר או בעיות באיכות הרשת."</string>
 </resources>
diff --git a/res/values-mcc450-ne/strings.xml b/res/values-mcc450-ne/strings.xml
index 643d9d49e..25e8dce52 100644
--- a/res/values-mcc450-ne/strings.xml
+++ b/res/values-mcc450-ne/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"महत्वपूर्ण आपातकालीन चेतावनी"</string>
-    <string name="alerts_header_summary" msgid="8898082819299479687">"तपाईंको फोनले तपाईंलाई प्राकृतिक प्रकोपका बेला खतरापूर्ण ठाउँबाट सुरक्षित रूपमा निस्कने निर्देशनहरू जस्ता अलर्टहरू पठाउन सक्छ। यो सेवा राष्ट्रिय आपत्‌काल व्यस्थापन निकाय, नेटवर्क सेवा प्रदायक र यन्त्र उत्पादक कम्पनीहरूबिच सहकार्य गरेर सुरु गरिएको हो।\n\nतपाईंको यन्त्रमा कुनै समस्या छ वा नेटवर्क राम्रो छैन भने तपाईं अलर्टहरू प्राप्त नगर्न पनि सक्नुहुन्छ।"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"तपाईंको फोनले तपाईंलाई प्राकृतिक प्रकोपका बेला खतरापूर्ण ठाउँबाट सुरक्षित रूपमा निस्कने निर्देशनहरू जस्ता अलर्टहरू पठाउन सक्छ। यो सेवा राष्ट्रिय आपत्‌काल व्यस्थापन निकाय, नेटवर्क सेवा प्रदायक र यन्त्र उत्पादक कम्पनीहरूबिच सहकार्य गरेर सुरु गरिएको हो।\n\nतपाईंको डिभाइसमा कुनै समस्या छ वा नेटवर्क राम्रो छैन भने तपाईं अलर्टहरू प्राप्त नगर्न पनि सक्नुहुन्छ।"</string>
 </resources>
diff --git a/res/values-mcc450/config.xml b/res/values-mcc450/config.xml
index 54cf5d7b1..cd8fb0483 100644
--- a/res/values-mcc450/config.xml
+++ b/res/values-mcc450/config.xml
@@ -21,6 +21,10 @@
     <bool name="show_severe_alert_settings">false</bool>
     <!-- Whether to show amber alert settings -->
     <bool name="show_amber_alert_settings">false</bool>
+    <!-- Whether to show settings that allows user to turn off full-screen public safety messages -->
+    <!-- KR want to hide pop-up dialog(full-screen message) but shown from history menu, sms inbox and foreground notification-->
+    <!-- turn this on once we get Gov approval -->
+    <bool name="show_public_safety_full_screen_settings">false</bool>
 
     <!-- 4370, 4383 -->
     <!-- Emergecny alert tone duration set to 1 minute for Korean users -->
diff --git a/res/values-mcc454-it/strings.xml b/res/values-mcc454-it/strings.xml
index c71ca9441..80d98b6d7 100644
--- a/res/values-mcc454-it/strings.xml
+++ b/res/values-mcc454-it/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Avviso di emergenza estrema"</string>
-    <string name="cmas_extreme_alert" msgid="666310502927269524">"Avviso di emergenza"</string>
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Allerta di emergenza estrema"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Allerta di emergenza"</string>
     <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Messaggio di test"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Ricevi avvisi di emergenza"</string>
     <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Messaggi di test"</string>
diff --git a/res/values-mcc454-iw/strings.xml b/res/values-mcc454-iw/strings.xml
index f77239cec..7e6404b1e 100644
--- a/res/values-mcc454-iw/strings.xml
+++ b/res/values-mcc454-iw/strings.xml
@@ -16,10 +16,10 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"התראה על מקרה חירום קיצוני"</string>
-    <string name="cmas_extreme_alert" msgid="666310502927269524">"התראת חירום"</string>
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"התרעה על מקרה חירום קיצוני"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"התרעת חירום"</string>
     <string name="cmas_required_monthly_test" msgid="3412608025684914213">"הודעת בדיקה"</string>
-    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"קבלת התראות חירום"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"קבלת התרעות חירום"</string>
     <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"הודעות בדיקה"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"קבלת הודעות בדיקה"</string>
 </resources>
diff --git a/res/values-mcc466-it/strings.xml b/res/values-mcc466-it/strings.xml
index 6ff4aea46..7cc1aa83e 100644
--- a/res/values-mcc466-it/strings.xml
+++ b/res/values-mcc466-it/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="public_safety_message" msgid="4052407641316309322">"Messaggio di avviso"</string>
+    <string name="public_safety_message" msgid="4052407641316309322">"Messaggio di allerta"</string>
     <string name="enable_cmas_test_alerts_title" msgid="4165080207837566277">"Test mensile obbligatorio"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="1339769389077152402">"Ricevi messaggi di prova per il sistema di avvisi relativi alla sicurezza"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="1339769389077152402">"Ricevi messaggi di prova per il sistema di allerta per la sicurezza"</string>
 </resources>
diff --git a/res/values-mcc466-ru/strings.xml b/res/values-mcc466-ru/strings.xml
index 97c733377..e117d644a 100644
--- a/res/values-mcc466-ru/strings.xml
+++ b/res/values-mcc466-ru/strings.xml
@@ -18,5 +18,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="4052407641316309322">"Оповещение"</string>
     <string name="enable_cmas_test_alerts_title" msgid="4165080207837566277">"Обязательное тестовое оповещение раз в месяц"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="1339769389077152402">"Получать тестовые оповещения системы CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="1339769389077152402">"Получать тестовые сообщения системы экстренного оповещения"</string>
 </resources>
diff --git a/res/values-mcc505-mnc11/config.xml b/res/values-mcc505-mnc11/config.xml
deleted file mode 100644
index 367aa2f14..000000000
--- a/res/values-mcc505-mnc11/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Whether to show extreme alert settings -->
-    <bool name="show_extreme_alert_settings">false</bool>
-    <!-- Whether to show severe alert settings -->
-    <bool name="show_severe_alert_settings">false</bool>
-    <!-- Whether to show amber alert settings -->
-    <bool name="show_amber_alert_settings">false</bool>
-    <!-- Whether to show main switch settings at the top -->
-    <bool name="show_main_switch_settings">false</bool>
-</resources>
diff --git a/res/values-mcc505-mnc71/config.xml b/res/values-mcc505-mnc71/config.xml
deleted file mode 100644
index 367aa2f14..000000000
--- a/res/values-mcc505-mnc71/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Whether to show extreme alert settings -->
-    <bool name="show_extreme_alert_settings">false</bool>
-    <!-- Whether to show severe alert settings -->
-    <bool name="show_severe_alert_settings">false</bool>
-    <!-- Whether to show amber alert settings -->
-    <bool name="show_amber_alert_settings">false</bool>
-    <!-- Whether to show main switch settings at the top -->
-    <bool name="show_main_switch_settings">false</bool>
-</resources>
diff --git a/res/values-mcc505-mnc72/config.xml b/res/values-mcc505-mnc72/config.xml
deleted file mode 100644
index 367aa2f14..000000000
--- a/res/values-mcc505-mnc72/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Whether to show extreme alert settings -->
-    <bool name="show_extreme_alert_settings">false</bool>
-    <!-- Whether to show severe alert settings -->
-    <bool name="show_severe_alert_settings">false</bool>
-    <!-- Whether to show amber alert settings -->
-    <bool name="show_amber_alert_settings">false</bool>
-    <!-- Whether to show main switch settings at the top -->
-    <bool name="show_main_switch_settings">false</bool>
-</resources>
diff --git a/res/values-mcc530/config.xml b/res/values-mcc530/config.xml
index 0576a3978..9e5e927b4 100644
--- a/res/values-mcc530/config.xml
+++ b/res/values-mcc530/config.xml
@@ -20,7 +20,8 @@
         <item>0x1112:rat=gsm, emergency=true, override_dnd=true, always_on=true</item>
     </string-array>
 
-    <bool name="show_date_time_title">true</bool>
+    <!-- Append date-time to the alert title -->
+    <string name="date_time_format" translatable="false">E, MMM dd, HH:mm a</string>
     <!-- Disable Amber alert-->
     <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false"></string-array>
 
@@ -28,4 +29,5 @@
     <bool name="enable_led_flash">true</bool>
     <!-- Whether to disable a grey-out presidential alert -->
     <bool name="show_presidential_alerts_settings">true</bool>
+    <bool name="show_test_settings">false</bool>
 </resources>
diff --git a/res/values-mcc655-mnc10-iw/strings.xml b/res/values-mcc655-mnc10-iw/strings.xml
index b536b92d4..9623c3d4e 100644
--- a/res/values-mcc655-mnc10-iw/strings.xml
+++ b/res/values-mcc655-mnc10-iw/strings.xml
@@ -18,6 +18,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
     <skip />
-    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"התראות מערוץ 50"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"התרעות מערוץ 50"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"הצגת שידורים של ערוץ 50 בדרום אפריקה"</string>
 </resources>
diff --git a/res/values-mcc655-ta/strings.xml b/res/values-mcc655-ta/strings.xml
index 0d00b3f32..82f2ba3dd 100644
--- a/res/values-mcc655-ta/strings.xml
+++ b/res/values-mcc655-ta/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="emergency_alert_history_title" msgid="5166801194974934794">"செல் பிராட்காஸ்ட் வரலாறு"</string>
+    <string name="emergency_alert_history_title" msgid="5166801194974934794">"இதுவரையான செல் பிராட்காஸ்ட் தகவல்"</string>
 </resources>
diff --git a/res/values-mcc716-es-rUS/strings.xml b/res/values-mcc716-es-rUS/strings.xml
index 1629df764..37aab23ba 100644
--- a/res/values-mcc716-es-rUS/strings.xml
+++ b/res/values-mcc716-es-rUS/strings.xml
@@ -19,7 +19,7 @@
     <string name="public_safety_message" msgid="7237115648380675159">"Mensaje Informativo"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Mensaje Informativo"</string>
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alerta de emergencia: mensaje de prueba"</string>
-    <string name="cmas_exercise_alert" msgid="3061507852301643814">"Alerta de emergencia: Mensaje de simulación/entrenamiento"</string>
+    <string name="cmas_exercise_alert" msgid="3061507852301643814">"Alerta de Emergencia – mensaje de Ejercicio/Simulacro"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Alerta de emergencia: mensaje de prueba"</string>
     <string name="button_dismiss" msgid="5823921161712171097">"Ocultar"</string>
 </resources>
diff --git a/res/values-mcc716-es/strings.xml b/res/values-mcc716-es/strings.xml
index 79120917c..f2f277e8d 100644
--- a/res/values-mcc716-es/strings.xml
+++ b/res/values-mcc716-es/strings.xml
@@ -20,6 +20,6 @@
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Mensaje informativo"</string>
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alerta de emergencia: mensaje de prueba"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Alerta de Emergencia – mensaje de Ejercicio/Simulacro"</string>
-    <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Alerta de Emergencia – mensaje de Prueba"</string>
+    <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Alerta de Emergencia"</string>
     <string name="button_dismiss" msgid="5823921161712171097">"Ocultar"</string>
 </resources>
diff --git a/res/values-mcc716-it/strings.xml b/res/values-mcc716-it/strings.xml
index 3e8b3d512..d361283d9 100644
--- a/res/values-mcc716-it/strings.xml
+++ b/res/values-mcc716-it/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Messaggio informativo"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Messaggio informativo"</string>
-    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Avvisi d\'emergenza: messaggio di prova"</string>
-    <string name="cmas_exercise_alert" msgid="3061507852301643814">"Allarme di emergenza: messaggio di esercitazione"</string>
-    <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Allarme di emergenza: messaggio di prova"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Allerta di emergenza: messaggio di prova"</string>
+    <string name="cmas_exercise_alert" msgid="3061507852301643814">"Allerta di emergenza: messaggio di esercitazione"</string>
+    <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Allerta di emergenza: messaggio di prova"</string>
     <string name="button_dismiss" msgid="5823921161712171097">"Nascondi"</string>
 </resources>
diff --git a/res/values-mcc716-iw/strings.xml b/res/values-mcc716-iw/strings.xml
index a3fb3e888..172a82b08 100644
--- a/res/values-mcc716-iw/strings.xml
+++ b/res/values-mcc716-iw/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"מידע לציבור"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"מידע לציבור"</string>
-    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"התרעה על מקרי חירום: הודעת בדיקה"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"התרעה על מקרה חירום: הודעת בדיקה"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"התרעה על מקרה חירום: הודעת תרגול/ניסיון"</string>
-    <string name="pws_other_message_identifiers" msgid="4992476982074198144">"התרעה על מקרי חירום: הודעת בדיקה"</string>
+    <string name="pws_other_message_identifiers" msgid="4992476982074198144">"התראה על מקרי חירום: הודעת בדיקה"</string>
     <string name="button_dismiss" msgid="5823921161712171097">"הסתרה"</string>
 </resources>
diff --git a/res/values-mcc716/config.xml b/res/values-mcc716/config.xml
index db65e108e..a837a737e 100644
--- a/res/values-mcc716/config.xml
+++ b/res/values-mcc716/config.xml
@@ -59,11 +59,8 @@
     <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>
     <string-array name="etws_test_alerts_range_strings" translatable="false"></string-array>
-    <bool name="show_date_time_title">true</bool>
-    <!-- if appending date-time to alert title, whether to include year -->
-    <bool name="show_date_time_with_year_title">true</bool>
-    <!-- if appending date-time to alert title, whether to use numeric format -->
-    <bool name="show_date_in_numeric_format">true</bool>
+    <!-- Append date-time to the alert title -->
+    <string name="date_time_format" translatable="false">dd-MM-yyyy, HH:mm a</string>
 
     <!-- Whether to disable the opt-out dialog for all channels. Peru has no user toggles enabled,
          so we disable the opt-out dialog -->
diff --git a/res/values-mcc730/config.xml b/res/values-mcc730/config.xml
index 877cfb09d..563ddfdb1 100644
--- a/res/values-mcc730/config.xml
+++ b/res/values-mcc730/config.xml
@@ -61,18 +61,11 @@
     <!-- Play alert sound in full volume regardless Do Not Disturb is on -->
     <bool name="override_dnd">true</bool>
     <!-- Append date-time to the alert title -->
-    <bool name="show_date_time_title">true</bool>
-    <!-- if appending date-time to alert title, whether to include year -->
-    <bool name="show_date_time_with_year_title">true</bool>
-    <!-- if appending date-time to alert title, whether to use numeric format -->
-    <bool name="show_date_in_numeric_format">true</bool>
+    <string name="date_time_format" translatable="false">yyyy-MM-dd, HH:mm a</string>
     <!-- Link method -->
     <string name="link_method" translatable="false">none</string>
     <!-- Whether the user can mute the alert by physical button -->
     <bool name="mute_by_physical_button">false</bool>
-    <!-- Whether to disable the status bar while alert is showing, not allow
-    users to interact with other activities until pressing the "ok" button -->
-    <bool name="disable_status_bar">true</bool>
     <!-- Whether to disable the opt-out dialog for all channels -->
     <bool name="disable_opt_out_dialog">true</bool>
     <bool name="show_main_switch_settings">false</bool>
diff --git a/res/values-mcc740-af/strings.xml b/res/values-mcc740-af/strings.xml
new file mode 100644
index 000000000..3c7b21432
--- /dev/null
+++ b/res/values-mcc740-af/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Plaaslike noodwaarskuwing"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"OM TOE TE MAAK"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Toetsboodskap"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Noodwaarskuwing – Oefening-/drilboodskap"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Informatiewe boodskap"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-am/strings.xml b/res/values-mcc740-am/strings.xml
new file mode 100644
index 000000000..ccd284e9c
--- /dev/null
+++ b/res/values-mcc740-am/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"አካባቢያዊ የአደጋ ጊዜ ማስጠንቀቂያ"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ለመዝጋት"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"የሙከራ መልዕክት"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"የአደጋ ጊዜ ማስጠንቀቂያ፦ የልምምድ / የድሪል ልምምድ መልዕክት"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"መረጃ ሰጪ መልዕክት"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-ar/strings.xml b/res/values-mcc740-ar/strings.xml
new file mode 100644
index 000000000..b19cf5fb8
--- /dev/null
+++ b/res/values-mcc740-ar/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"تنبيه طوارئ محلية"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"للإغلاق"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"رسالة اختبار"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"تنبيه الطوارئ: رسالة تدريبية/تجريبية"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"رسالة إعلامية"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-as/strings.xml b/res/values-mcc740-as/strings.xml
new file mode 100644
index 000000000..935e5f9f7
--- /dev/null
+++ b/res/values-mcc740-as/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"স্থানীয় জৰুৰীকালীন সতৰ্কবাৰ্তা"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"বন্ধ কৰিবলৈ"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"পৰীক্ষামূলক বাৰ্তা"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"জৰুৰীকালীন সতৰ্কবাৰ্তা: ব্যায়াম / ড্ৰিলৰ বাৰ্তা"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"তথ্যসমৃদ্ধ বাৰ্তা"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-az/strings.xml b/res/values-mcc740-az/strings.xml
new file mode 100644
index 000000000..684fc2857
--- /dev/null
+++ b/res/values-mcc740-az/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Yerli fövqəladə hal siqnalı"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"BAĞLAMAQ"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Test mesajı"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Fövqəladə hal siqnalı - Tapşırıq/Yığıncaq mesajı"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"İnformativ mesaj"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-b+sr+Latn/strings.xml b/res/values-mcc740-b+sr+Latn/strings.xml
new file mode 100644
index 000000000..b9a65c761
--- /dev/null
+++ b/res/values-mcc740-b+sr+Latn/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Upozorenje o lokalnom hitnom slučaju"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ZATVORI"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Test poruka"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Upozorenje o hitnom slučaju – poruka za vežbu"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Informativna poruka"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-be/strings.xml b/res/values-mcc740-be/strings.xml
new file mode 100644
index 000000000..4748804b2
--- /dev/null
+++ b/res/values-mcc740-be/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Лакальная экстранная абвестка"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ЗАКРЫЦЬ"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Тэставае паведамленне"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Абвестка аб надзвычайнай сітуацыі: вучэбная"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Інфармацыйнае паведамленне"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-bg/strings.xml b/res/values-mcc740-bg/strings.xml
new file mode 100644
index 000000000..04b92cc0f
--- /dev/null
+++ b/res/values-mcc740-bg/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Сигнал за спешен случай на местно ниво"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ЗАТВАРЯНЕ"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Тестово съобщение"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Сигнал при спешност: съобщ. за учение/тренировка"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Информативно съобщение"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-bn/strings.xml b/res/values-mcc740-bn/strings.xml
new file mode 100644
index 000000000..1d99d89ab
--- /dev/null
+++ b/res/values-mcc740-bn/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"স্থানীয় স্তরে জরুরি সতর্কতা"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"বন্ধ করুন"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"পরীক্ষামূলক মেসেজ"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"জরুরি সতর্কতা: এক্সারসাইজ/ড্রিল মেসেজ"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"তথ্যপূর্ণ মেসেজ"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-bs/strings.xml b/res/values-mcc740-bs/strings.xml
new file mode 100644
index 000000000..afbfe3c66
--- /dev/null
+++ b/res/values-mcc740-bs/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Upozorenje za lokalni hitan slučaj"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ZATVORI"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Testna poruka"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Upozorenje za hitan slučaj – vježba/poruka za vježbu"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Informativna poruka"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-ca/strings.xml b/res/values-mcc740-ca/strings.xml
new file mode 100644
index 000000000..4dd35a7af
--- /dev/null
+++ b/res/values-mcc740-ca/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Alerta d\'emergència local"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"TANCA"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Missatge de prova"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Alerta emergència: missatge de simulacre/pràctica"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Missatge informatiu"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-cs/strings.xml b/res/values-mcc740-cs/strings.xml
new file mode 100644
index 000000000..5544d1b78
--- /dev/null
+++ b/res/values-mcc740-cs/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Místní výstražná zpráva"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ZAVŘÍT"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Testovací zpráva"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Výstražná zpráva – testovací zpráva / cvičení"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Informativní zpráva"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-da/strings.xml b/res/values-mcc740-da/strings.xml
new file mode 100644
index 000000000..dc526aeac
--- /dev/null
+++ b/res/values-mcc740-da/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Lokal nødalarm"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"FOR AT LUKKE"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Testmeddelelse"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Nødalarm – Øvelsesmeddelelse"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Informationsmeddelelse"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-de/strings.xml b/res/values-mcc740-de/strings.xml
new file mode 100644
index 000000000..4166919df
--- /dev/null
+++ b/res/values-mcc740-de/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Lokale Notfallbenachrichtigung"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"SCHLIESSEN"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Testnachricht"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Notfallbenachrichtigung: Übungsnachricht"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Öffentliche Sicherheitsinformation"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-el/strings.xml b/res/values-mcc740-el/strings.xml
new file mode 100644
index 000000000..cb28be780
--- /dev/null
+++ b/res/values-mcc740-el/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Ειδοποίηση τοπικού περιστατικού έκτακτης ανάγκης"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ΚΛΕΙΣΙΜΟ"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Μήνυμα κειμένου"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Ειδοποίηση έκτ. ανάγκης: Μήνυμα άσκησης/γυμνασίου"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Ενημερωτικό μήνυμα"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-en-rAU/strings.xml b/res/values-mcc740-en-rAU/strings.xml
new file mode 100644
index 000000000..56d017c86
--- /dev/null
+++ b/res/values-mcc740-en-rAU/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Local emergency alert"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"TO CLOSE"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Test message"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Emergency alert: exercise/drill message"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Informative message"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-en-rCA/strings.xml b/res/values-mcc740-en-rCA/strings.xml
new file mode 100644
index 000000000..56d017c86
--- /dev/null
+++ b/res/values-mcc740-en-rCA/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Local emergency alert"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"TO CLOSE"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Test message"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Emergency alert: exercise/drill message"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Informative message"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-en-rGB/strings.xml b/res/values-mcc740-en-rGB/strings.xml
new file mode 100644
index 000000000..56d017c86
--- /dev/null
+++ b/res/values-mcc740-en-rGB/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Local emergency alert"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"TO CLOSE"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Test message"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Emergency alert: exercise/drill message"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Informative message"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-en-rIN/strings.xml b/res/values-mcc740-en-rIN/strings.xml
new file mode 100644
index 000000000..56d017c86
--- /dev/null
+++ b/res/values-mcc740-en-rIN/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Local emergency alert"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"TO CLOSE"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Test message"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Emergency alert: exercise/drill message"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Informative message"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-en-rXC/strings.xml b/res/values-mcc740-en-rXC/strings.xml
new file mode 100644
index 000000000..443b2d2ea
--- /dev/null
+++ b/res/values-mcc740-en-rXC/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎Local emergency alert‎‏‎‎‏‎"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎TO CLOSE‎‏‎‎‏‎"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎Test message‎‏‎‎‏‎"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‎‏‎‏‎‎‎Emergency Alert - Exercise / Drill message‎‏‎‎‏‎"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎Informative message‎‏‎‎‏‎"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-es-rUS/strings.xml b/res/values-mcc740-es-rUS/strings.xml
new file mode 100644
index 000000000..c87dfdfbb
--- /dev/null
+++ b/res/values-mcc740-es-rUS/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Alerta de emergencia local"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"CERRAR"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Mensaje de prueba"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Alerta de emergencia: Mensaje de simulación/entrenamiento"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Mensaje informativo"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-es/strings.xml b/res/values-mcc740-es/strings.xml
new file mode 100644
index 000000000..36916a0b1
--- /dev/null
+++ b/res/values-mcc740-es/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Alerta Local de Emergencia"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"CERRAR"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Mensaje de Prueba"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Alerta de Emergencia – mensaje de Ejercicio /Simulacro"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Mensaje Informativo"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-et/strings.xml b/res/values-mcc740-et/strings.xml
new file mode 100644
index 000000000..2181dc182
--- /dev/null
+++ b/res/values-mcc740-et/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Kohalik hädaolukorra märguanne"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"SULGE"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Testsõnum"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Hädaolukorra märguanne – proovi-/treeningsõnum"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Teavitussõnum"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-eu/strings.xml b/res/values-mcc740-eu/strings.xml
new file mode 100644
index 000000000..d581295ea
--- /dev/null
+++ b/res/values-mcc740-eu/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Tokiko larrialdi-alerta"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ITXI"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Probako mezua"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Larrialdi-alerta: ariketa/proba motako mezua"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Mezu informatiboa"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-fa/strings.xml b/res/values-mcc740-fa/strings.xml
new file mode 100644
index 000000000..5cc181333
--- /dev/null
+++ b/res/values-mcc740-fa/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"هشدار اضطراری محلی"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"بستن"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"پیام آزمایشی"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"هشدار اضطراری - پیام آزمایشی / تمرینی"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"پیام آگاهی‌دهنده"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-fi/strings.xml b/res/values-mcc740-fi/strings.xml
new file mode 100644
index 000000000..2ddd309c6
--- /dev/null
+++ b/res/values-mcc740-fi/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Paikallinen vaaratiedote"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"SULJE"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Koeviesti"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Vaaratiedote: harjoitusviesti"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Hyödyllinen viesti"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-fr-rCA/strings.xml b/res/values-mcc740-fr-rCA/strings.xml
new file mode 100644
index 000000000..691905008
--- /dev/null
+++ b/res/values-mcc740-fr-rCA/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Alerte d\'urgence locale"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"FERMER"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Message test"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Alerte d\'urgence : message d\'exercice"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Message d\'information"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-fr/strings.xml b/res/values-mcc740-fr/strings.xml
new file mode 100644
index 000000000..8d66746f8
--- /dev/null
+++ b/res/values-mcc740-fr/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Alerte d\'urgence locale"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"POUR FERMER"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Message de test"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Alerte d\'urgence : message d\'exercice"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Message informatif"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-gl/strings.xml b/res/values-mcc740-gl/strings.xml
new file mode 100644
index 000000000..d57d6e4b9
--- /dev/null
+++ b/res/values-mcc740-gl/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Alerta de emerxencia local"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"PECHAR"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Mensaxe de proba"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Alerta de emerxencia: mensaxe simulacro/simulación"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Mensaxe informativa"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-gu/strings.xml b/res/values-mcc740-gu/strings.xml
new file mode 100644
index 000000000..678c58db0
--- /dev/null
+++ b/res/values-mcc740-gu/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"સ્થાનિક ઇમર્જન્સી અલર્ટ"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"બંધ કરો"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"પરીક્ષણ માટેનો સંદેશ"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"ઇમર્જન્સી અલર્ટ - વ્યાયામ / તાલીમ સંબંધિત સંદેશ"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"માહિતીપ્રદ સંદેશ"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-hi/strings.xml b/res/values-mcc740-hi/strings.xml
new file mode 100644
index 000000000..66c144361
--- /dev/null
+++ b/res/values-mcc740-hi/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"स्थानीय आपातकालीन स्थिति की चेतावनी"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"बंद करने के लिए"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"टेस्ट मैसेज"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"आपातकालीन स्थिति की चेतावनी - एक्सरसाइज़ / ड्रिल मैसेज"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"जानकारी देने वाला मैसेज"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-hr/strings.xml b/res/values-mcc740-hr/strings.xml
new file mode 100644
index 000000000..57b0e1c3b
--- /dev/null
+++ b/res/values-mcc740-hr/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Lokalno hitno upozorenje"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ZATVORI"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Testna poruka"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Hitno upozorenje – poruka za vježbu"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Informativna poruka"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-hu/strings.xml b/res/values-mcc740-hu/strings.xml
new file mode 100644
index 000000000..9eb375888
--- /dev/null
+++ b/res/values-mcc740-hu/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Helyi vészjelzés"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"BEZÁRÁS"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Tesztüzenet"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Vészjelzés – Gyakorlati/próbaüzenet"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Tájékoztató üzenet"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-hy/strings.xml b/res/values-mcc740-hy/strings.xml
new file mode 100644
index 000000000..6d409c569
--- /dev/null
+++ b/res/values-mcc740-hy/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Ծանուցում տեղական արտակարգ իրավիճակի մասին"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ՓԱԿԵԼ"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Փորձնական ծանուցում"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Արտակարգ իրավիճակի զգուշացում – ուսումնավարժական ծանուցում"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Տեղեկատվական ծանուցում"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-in/strings.xml b/res/values-mcc740-in/strings.xml
new file mode 100644
index 000000000..7723401e9
--- /dev/null
+++ b/res/values-mcc740-in/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Peringatan darurat lokal"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"TUTUP"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Pesan pengujian"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Peringatan Darurat - Pesan Olahraga/Latihan"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Pesan informatif"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-is/strings.xml b/res/values-mcc740-is/strings.xml
new file mode 100644
index 000000000..9828170d9
--- /dev/null
+++ b/res/values-mcc740-is/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Staðbundin neyðarviðvörun"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"LOKA"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Prufuskilaboð"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Neyðarviðvörun – æfinga-/prufuviðvörun"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Almannatilkynning"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-it/strings.xml b/res/values-mcc740-it/strings.xml
new file mode 100644
index 000000000..dad45d97b
--- /dev/null
+++ b/res/values-mcc740-it/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Allerta di emergenza locale"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"CHIUDI"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Messaggio di test"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Allerta di emergenza: messaggio di esercitazione"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Messaggio informativo"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-iw/strings.xml b/res/values-mcc740-iw/strings.xml
new file mode 100644
index 000000000..77228e708
--- /dev/null
+++ b/res/values-mcc740-iw/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"התרעה על מקרה חירום מקומי"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"סגירה"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"הודעת בדיקה"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"התרעה על מקרה חירום – הודעה לגבי תרגיל/אימון"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"מידע לציבור"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-ja/strings.xml b/res/values-mcc740-ja/strings.xml
new file mode 100644
index 000000000..3b4469185
--- /dev/null
+++ b/res/values-mcc740-ja/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"地域の緊急速報メール"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"閉じる"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"テスト メッセージ"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"緊急速報メール - 訓練用メッセージ"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"災害情報メッセージ"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-ka/strings.xml b/res/values-mcc740-ka/strings.xml
new file mode 100644
index 000000000..a942b6bd8
--- /dev/null
+++ b/res/values-mcc740-ka/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"ადგილობრივი საგანგებო გაფრთხილება"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"დახურვა"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"სატესტო შეტყობინება"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"საგანგებო გაფრთხილება — ვარჯიში/სავარჯიშო შეტყობინება"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"საინფორმაციო შეტყობინება"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-kk/strings.xml b/res/values-mcc740-kk/strings.xml
new file mode 100644
index 000000000..8a549c393
--- /dev/null
+++ b/res/values-mcc740-kk/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Жергілікті төтенше жағдай туралы ескерту"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ЖАБУ"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Сынақ хабары"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Төтенше жағдай туралы ескерту: оқу/жаттығу хабары"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Ақпараттық хабар"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-km/strings.xml b/res/values-mcc740-km/strings.xml
new file mode 100644
index 000000000..deefc1e32
--- /dev/null
+++ b/res/values-mcc740-km/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"ការជូនដំណឹងពេលមានអាសន្នក្នុងតំបន់"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ត្រូវបិទ"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"សារ​សាកល្បង"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"ការជូនដំណឹងពេលមានអាសន្ន - សារនៃការអនុវត្ត/ការហ្វឹកហាត់"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"សារ​ដែលផ្តល់ព័ត៌មាន​ជាប្រយោជន៍"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-kn/strings.xml b/res/values-mcc740-kn/strings.xml
new file mode 100644
index 000000000..d9a60f585
--- /dev/null
+++ b/res/values-mcc740-kn/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"ಸ್ಥಳೀಯ ತುರ್ತು ಎಚ್ಚರಿಕೆ"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ಮುಚ್ಚಲು"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"ಪಠ್ಯ ಸಂದೇಶ"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"ತುರ್ತು ಎಚ್ಚರಿಕೆ - ವ್ಯಾಯಾಮ / ವ್ಯಾಯಾಮ/ಡ್ರಿಲ್ ಸಂದೇಶ"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"ಮಾಹಿತಿಯುಕ್ತ ಸಂದೇಶ"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-ko/strings.xml b/res/values-mcc740-ko/strings.xml
new file mode 100644
index 000000000..4f98b0d9d
--- /dev/null
+++ b/res/values-mcc740-ko/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"지역 긴급 재난 문자"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"닫기"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"테스트 메시지"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"긴급 재난 문자 - 훈련 메시지"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"안내 메시지"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-ky/strings.xml b/res/values-mcc740-ky/strings.xml
new file mode 100644
index 000000000..aec9dd51a
--- /dev/null
+++ b/res/values-mcc740-ky/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Жергиликтүү шашылыш билдирүү"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ЖАБУУ"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Сынамык билдирүү"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Шашылыш билдирүү - Көнүгүү билдирүүсү"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Маалыматтык билдирүү"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-lo/strings.xml b/res/values-mcc740-lo/strings.xml
new file mode 100644
index 000000000..4b22ad69c
--- /dev/null
+++ b/res/values-mcc740-lo/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"ແຈ້ງເຕືອນສຸກເສີນລະດັບທ້ອງຖິ່ນ"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ເພື່ອປິດ"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"ຂໍ້ຄວາມທົດສອບ"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"ແຈ້ງເຕືອນສຸກເສີນ - ຂໍ້ຄວາມທົດສອບ / ເຝິກແອບ"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"ຂໍ້ຄວາມທີ່ເປັນປະໂຫຍດ"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-lt/strings.xml b/res/values-mcc740-lt/strings.xml
new file mode 100644
index 000000000..e112fe9a5
--- /dev/null
+++ b/res/values-mcc740-lt/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Vietinis kritinės padėties įspėjimas"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"UŽDARYTI"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Testinis pranešimas"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Kritinės padėties įspėjimas – mokomasis pranešimas"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Informacinis pranešimas"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-lv/strings.xml b/res/values-mcc740-lv/strings.xml
new file mode 100644
index 000000000..a2c4142d5
--- /dev/null
+++ b/res/values-mcc740-lv/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Vietējs ārkārtas brīdinājums"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"AIZVĒRT"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Pārbaudes ziņojums"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Ārkārtas brīdinājums: vingrinājuma ziņojums"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Informatīvs ziņojums"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-mk/strings.xml b/res/values-mcc740-mk/strings.xml
new file mode 100644
index 000000000..d942b420b
--- /dev/null
+++ b/res/values-mcc740-mk/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Предупредување за локален итен случај"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ЗАТВОРИ"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Тест-порака"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Предупредување за итни случаи: порака за вежба/обука"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Информативна порака"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-ml/strings.xml b/res/values-mcc740-ml/strings.xml
new file mode 100644
index 000000000..5ab58283f
--- /dev/null
+++ b/res/values-mcc740-ml/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"പ്രാദേശിക അടിയന്തര മുന്നറിയിപ്പ്"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"അടയ്ക്കുക"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"ടെസ്റ്റ് സന്ദേശം"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"അടിയന്തര മുന്നറിയിപ്പ് - പരിശീലന / ഡ്രിൽ സന്ദേശം"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"അറിവ് നൽകുന്ന സന്ദേശം"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-mn/strings.xml b/res/values-mcc740-mn/strings.xml
new file mode 100644
index 000000000..74de68d49
--- /dev/null
+++ b/res/values-mcc740-mn/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Орон нутгийн онцгой байдлын сэрэмжлүүлэг"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ХААХЫН ТУЛД"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Туршилтын мессеж"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Онцгой байдлын сэрэмжлүүлэг - Сургуулилалт / Сургалтын мессеж"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Мэдээллийн мессеж"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-mr/strings.xml b/res/values-mcc740-mr/strings.xml
new file mode 100644
index 000000000..5c035c976
--- /dev/null
+++ b/res/values-mcc740-mr/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"आणीबाणीच्या स्थानिक सूचना"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"बंद करण्यासाठी"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"चाचणी मेसेज"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"आणीबाणी सूचना: व्यायाम/ड्रिल मेसेज"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"माहितीपूर्ण मेसेज"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-ms/strings.xml b/res/values-mcc740-ms/strings.xml
new file mode 100644
index 000000000..1ceab2e5e
--- /dev/null
+++ b/res/values-mcc740-ms/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Makluman kecemasan setempat"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"UNTUK MENUTUP"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Mesej ujian"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Makluman Kecemasan - Mesej Latihan / Simulasi"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Mesej bermaklumat"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-my/strings.xml b/res/values-mcc740-my/strings.xml
new file mode 100644
index 000000000..777b5ea0c
--- /dev/null
+++ b/res/values-mcc740-my/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"ဒေသတွင်း အရေးပေါ်သတိပေးချက်"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ပိတ်ရန်"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"စမ်းသပ် မက်ဆေ့ဂ်ျ"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"အရေးပေါ်သတိပေးချက် - လေ့ကျင့်ရေး / သရုပ်ပြ မက်ဆေ့ဂျ်"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"အကူအညီဖြစ်စေသည့် မက်ဆေ့ဂျ်"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-nb/strings.xml b/res/values-mcc740-nb/strings.xml
new file mode 100644
index 000000000..10959b05a
--- /dev/null
+++ b/res/values-mcc740-nb/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Lokalt nødvarsel"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"FOR NÆRT"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Testmelding"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Nødvarsel – øvelse / øvelsesmelding"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Informativ melding"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-ne/strings.xml b/res/values-mcc740-ne/strings.xml
new file mode 100644
index 000000000..cd8985353
--- /dev/null
+++ b/res/values-mcc740-ne/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"स्थानीय आपत्‌कालीन अलर्ट"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"बन्द गर्न"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"परीक्षण म्यासेज"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"आपत्‌कालीन अलर्ट: कसरत / ड्रिलसम्बन्धी म्यासेज"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"सूचनामूलक म्यासेज"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-nl/strings.xml b/res/values-mcc740-nl/strings.xml
new file mode 100644
index 000000000..91d9a7cd5
--- /dev/null
+++ b/res/values-mcc740-nl/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Melding voor lokale noodsituatie"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"TE DICHTBIJ"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Testbericht"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Noodmelding: bericht voor oefening/drill"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Openbaar informatiebericht"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-or/strings.xml b/res/values-mcc740-or/strings.xml
new file mode 100644
index 000000000..1c0c02fb6
--- /dev/null
+++ b/res/values-mcc740-or/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"ସ୍ଥାନୀୟ ଜରୁରୀକାଳୀନ ଆଲର୍ଟ"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ବନ୍ଦ କରିବାକୁ"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"ଟେଷ୍ଟ ମେସେଜ୍"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟ - ବ୍ୟାୟାମ / ଡ୍ରିଲ ସମ୍ବନ୍ଧିତ ମେସେଜ"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"ସୂଚନାମୂଳକ ମେସେଜ୍"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-pa/strings.xml b/res/values-mcc740-pa/strings.xml
new file mode 100644
index 000000000..a0c6927ac
--- /dev/null
+++ b/res/values-mcc740-pa/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"ਸਥਾਨਕ ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ਬੰਦ ਕਰਨ ਲਈ"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"ਜਾਂਚ ਸੁਨੇਹਾ"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ - ਕਸਰਤ / ਡਰਿੱਲ ਸੁਨੇਹਾ"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"ਜਾਣਕਾਰੀ ਭਰਪੂਰ ਸੁਨੇਹਾ"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-pl/strings.xml b/res/values-mcc740-pl/strings.xml
new file mode 100644
index 000000000..cade32d00
--- /dev/null
+++ b/res/values-mcc740-pl/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Alert o lokalnym zagrożeniu"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ZAMYKAĆ"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Wiadomość testowa"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Alert o zagrożeniu – komunikat o ćwiczeniach/symulacji"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Wiadomość informacyjna"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-pt-rPT/strings.xml b/res/values-mcc740-pt-rPT/strings.xml
new file mode 100644
index 000000000..0ff0b43a1
--- /dev/null
+++ b/res/values-mcc740-pt-rPT/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Alerta de emergência local"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"FECHAR"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Mensagem de teste"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Alerta de emerg.: mensagem de simulação/exercício"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Mensagem informativa"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-pt/strings.xml b/res/values-mcc740-pt/strings.xml
new file mode 100644
index 000000000..0fde217c6
--- /dev/null
+++ b/res/values-mcc740-pt/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Alerta de emergência local"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"FECHAR"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Mensagem de teste"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Alerta de emergência: mensagem de exercício/simulação"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Mensagem informativa"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-ro/strings.xml b/res/values-mcc740-ro/strings.xml
new file mode 100644
index 000000000..9c921683b
--- /dev/null
+++ b/res/values-mcc740-ro/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Alertă de urgență locală"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"Închideți"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Mesaj de test"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Alertă de urgență – mesaj de exercițiu / simulare"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Mesaj informativ"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-ru/strings.xml b/res/values-mcc740-ru/strings.xml
new file mode 100644
index 000000000..036327aca
--- /dev/null
+++ b/res/values-mcc740-ru/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Оповещение о местной чрезвычайной ситуации"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ЗАКРЫТЬ"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Тестовое сообщение"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Экстренное оповещение: учебная тревога"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Информационное сообщение"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-si/strings.xml b/res/values-mcc740-si/strings.xml
new file mode 100644
index 000000000..471115373
--- /dev/null
+++ b/res/values-mcc740-si/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"ප්‍රාදේශීය හදිසි අවස්ථා ඇඟවීම"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"වැසීමට"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"පරීක්ෂණ පණිවිඩය"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"හදිසි අවස්ථා ඇඟවීම: ව්‍යායාම / සරඹ පණිවිඩය"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"තොරතුරුමය පණිවිඩය"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-sk/strings.xml b/res/values-mcc740-sk/strings.xml
new file mode 100644
index 000000000..7ac9e4b58
--- /dev/null
+++ b/res/values-mcc740-sk/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Miestne tiesňové upozornenie"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ZAVRIEŤ"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Testovacia správa"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Tiesňové upozornenie – cvičenie či cvičná správa"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Informatívna správa"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-sl/strings.xml b/res/values-mcc740-sl/strings.xml
new file mode 100644
index 000000000..fc18e8af3
--- /dev/null
+++ b/res/values-mcc740-sl/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Lokalno opozorilo v sili"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ZA ZAPRTJE"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Preizkusno sporočilo"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Opozorilo v sili – sporočilo za vajo/simulacijo"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Informativno sporočilo"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-sq/strings.xml b/res/values-mcc740-sq/strings.xml
new file mode 100644
index 000000000..6c3fc59f9
--- /dev/null
+++ b/res/values-mcc740-sq/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Sinjalizimi i urgjencës lokale"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"MBYLL"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Mesazh testimi"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Sinjalizimi i urgjencës - Mesazhi i ushtrimit/stërvitjes"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Mesazh informues"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-sr/strings.xml b/res/values-mcc740-sr/strings.xml
new file mode 100644
index 000000000..127375979
--- /dev/null
+++ b/res/values-mcc740-sr/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Упозорење о локалном хитном случају"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ЗАТВОРИ"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Тест порука"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Упозорење о хитном случају – порука за вежбу"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Информативна порука"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-sv/strings.xml b/res/values-mcc740-sv/strings.xml
new file mode 100644
index 000000000..aacbcdf96
--- /dev/null
+++ b/res/values-mcc740-sv/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Varning om lokal nödsituation"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"STÄNG"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Testmeddelande"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Varning om nödsituation: övnings-/testmeddelande"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Informationsmeddelande"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-sw/strings.xml b/res/values-mcc740-sw/strings.xml
new file mode 100644
index 000000000..e4782fcc9
--- /dev/null
+++ b/res/values-mcc740-sw/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Arifa za dharura za eneo lako"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ILI KUFUNGA"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Ujumbe wa majaribio"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Arifa ya Dharura - Ujumbe wa Mazoezi / Jaribio"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Ujumbe muhimu"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-ta/strings.xml b/res/values-mcc740-ta/strings.xml
new file mode 100644
index 000000000..d306c45c9
--- /dev/null
+++ b/res/values-mcc740-ta/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"உள்ளூர் அவசரகால எச்சரிக்கை"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"மூடுக"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"பயிற்சி குறித்த செய்தி"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"அவசரகால எச்சரிக்கை - பயிற்சி/டிரில் குறித்த செய்தி"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"தகவல் நிறைந்த செய்தி"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-te/strings.xml b/res/values-mcc740-te/strings.xml
new file mode 100644
index 000000000..30cc67752
--- /dev/null
+++ b/res/values-mcc740-te/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"స్థానిక ఎమర్జెన్సీ అలర్ట్"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"షట్ డౌన్"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"టెస్ట్ మెసేజ్"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"ఎమర్జెన్సీ అలర్ట్ వ్యాయామం / డ్రిల్ మెసేజ్"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"సమాచారాత్మక మెసేజ్"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-th/strings.xml b/res/values-mcc740-th/strings.xml
new file mode 100644
index 000000000..e362cafb7
--- /dev/null
+++ b/res/values-mcc740-th/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"การแจ้งเตือนฉุกเฉินระดับท้องถิ่น"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ปิด"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"ข้อความทดสอบ"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"การแจ้งเตือนฉุกเฉิน - ข้อความทดสอบ/ฝึกซ้อม"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"ข้อความที่เป็นประโยชน์"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-tl/strings.xml b/res/values-mcc740-tl/strings.xml
new file mode 100644
index 000000000..92f1c5fd1
--- /dev/null
+++ b/res/values-mcc740-tl/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Lokal na pang-emergency na alerto"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ISARA"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Pansubok na mensahe"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Pang-emergency na Alerto - Mensahe sa Pagsasanay"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Mensaheng nagbibigay ng impormasyon"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-tr/strings.xml b/res/values-mcc740-tr/strings.xml
new file mode 100644
index 000000000..4e96e5096
--- /dev/null
+++ b/res/values-mcc740-tr/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Yerel acil durum uyarısı"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"KAPAT"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Test mesajı"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Acil Durum Uyarısı: Alıştırma/Tatbikat mesajı"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Bilgilendirici mesaj"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-uk/strings.xml b/res/values-mcc740-uk/strings.xml
new file mode 100644
index 000000000..40bbaacd5
--- /dev/null
+++ b/res/values-mcc740-uk/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Локальне екстрене сповіщення"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ЗАКРИТИ"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Тестове повідомлення"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Екстрене сповіщення: тренувальне повідомлення"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Інформативне повідомлення"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-ur/strings.xml b/res/values-mcc740-ur/strings.xml
new file mode 100644
index 000000000..e0bf82d3c
--- /dev/null
+++ b/res/values-mcc740-ur/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"مقامی ہنگامی الرٹ"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"بند کریں"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"ٹیسٹ پیغام"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"ہنگامی الرٹ - ورزش / ڈرِل پیغام"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"معلوماتی پیغام"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-uz/strings.xml b/res/values-mcc740-uz/strings.xml
new file mode 100644
index 000000000..ec802ab3e
--- /dev/null
+++ b/res/values-mcc740-uz/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Hududiy favqulodda ogohlantirish"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"YOPISH"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Sinov xabari"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Favqulodda ogohlantiruv: oʻquv-mashgʻulot xabari"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Axborot xabari"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-vi/strings.xml b/res/values-mcc740-vi/strings.xml
new file mode 100644
index 000000000..25e37fc32
--- /dev/null
+++ b/res/values-mcc740-vi/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Cảnh báo khẩn cấp của địa phương"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"ĐÓNG"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Thông báo thử nghiệm"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Cảnh báo khẩn cấp – Thông báo diễn tập/luyện tập"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Thư thông báo"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-zh-rCN/strings.xml b/res/values-mcc740-zh-rCN/strings.xml
new file mode 100644
index 000000000..a629459a7
--- /dev/null
+++ b/res/values-mcc740-zh-rCN/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"本地紧急警报"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"关闭"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"测试消息"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"紧急警报 - 演习/模拟消息"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"信息性消息"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-zh-rHK/strings.xml b/res/values-mcc740-zh-rHK/strings.xml
new file mode 100644
index 000000000..0f5716cea
--- /dev/null
+++ b/res/values-mcc740-zh-rHK/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"本地緊急警示"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"關閉"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"測試訊息"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"緊急警示 - 模擬/演習訊息"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"資訊型訊息"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-zh-rTW/strings.xml b/res/values-mcc740-zh-rTW/strings.xml
new file mode 100644
index 000000000..ac746a10c
--- /dev/null
+++ b/res/values-mcc740-zh-rTW/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"當地緊急警報"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"關閉"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"測試訊息"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"緊急警報 - 演習/模擬訊息"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"資訊型訊息"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740-zu/strings.xml b/res/values-mcc740-zu/strings.xml
new file mode 100644
index 000000000..e6c7e712b
--- /dev/null
+++ b/res/values-mcc740-zu/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8832531644152117875">"Isexwayiso esiphuthumayo sendawo"</string>
+    <string name="button_dismiss" msgid="5975841666550833732">"UKUZE UVALE"</string>
+    <string name="cmas_required_monthly_test" msgid="2287926047457291638">"Umlayezo wokuhlola"</string>
+    <string name="cmas_exercise_alert" msgid="998005154407142100">"Isexwayiso Esiphuthumayo - Umlayezo Wokujima / we-Drill"</string>
+    <string name="public_safety_message" msgid="6263179411117570932">"Umlayezo owazisayo"</string>
+    <!-- no translation found for enable_public_safety_messages_title (132836010129431792) -->
+    <skip />
+    <string name="enable_public_safety_messages_summary" msgid="5574351338788490055"></string>
+    <!-- no translation found for enable_cmas_test_alerts_title (646840583994486763) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="5860578113408534117"></string>
+    <!-- no translation found for enable_exercise_test_alerts_title (48882912795825583) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4953174638150112137"></string>
+</resources>
diff --git a/res/values-mcc740/config.xml b/res/values-mcc740/config.xml
index 83f798fd5..9aaaa9493 100644
--- a/res/values-mcc740/config.xml
+++ b/res/values-mcc740/config.xml
@@ -17,19 +17,38 @@
 <resources>
     <!-- Channel 4370 -->
     <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
-        <item>0x1112:rat=gsm, emergency=true, alert_duration=86400000, always_on=true</item>
+        <item>0x1112:rat=gsm, emergency=true, alert_duration=180000, always_on=true, override_dnd=true</item>
+    </string-array>
+    <!-- Channel 6400 -->
+    <string-array name="public_safety_messages_channels_range_strings" translatable="false">
+        <item>0x1900:rat=gsm, emergency=true, type=info</item>
+    </string-array>
+    <!-- Channel 4380 -->
+    <string-array name="required_monthly_test_range_strings" translatable="false">
+        <item>0x111C:rat=gsm, emergency=true, type=info</item>
+    </string-array>
+    <!-- Channel 4381 -->
+    <string-array name="exercise_alert_range_strings" translatable="false">
+        <item>0x111D:rat=gsm, emergency=true, type=info</item>
     </string-array>
-
-    <!-- Channel 50 and 919 -->
     <string-array name="additional_cbs_channels_strings" translatable="false">
-        <item>0x397:rat=gsm, emergency=true, alert_duration=86400000</item>
         <!-- Channel 50 for area update info -->
-        <item>0x032:type=area, emergency=false</item>
+        <item>0x50:type=area, emergency=false</item>
     </string-array>
-
-    <!-- Play alert sound in full volume regardless Do Not Disturb is on -->
-    <bool name="override_dnd">true</bool>
-
+    <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false" />
+    <string-array name="cmas_alerts_severe_range_strings" translatable="false" />
+    <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false" />
+    <string-array name="operator_defined_alert_range_strings" translatable="false" />
+    <!-- Whether to show main switch settings at the top -->
+    <bool name="show_main_switch_settings">false</bool>
+    <bool name="show_separate_exercise_settings">true</bool>
+    <!-- Whether to display exercise test settings when testing mode is off. -->
+    <bool name="show_exercise_settings">true</bool>
+    <!-- RMT alerts toggle default value -->
+    <bool name="test_alerts_enabled_default">true</bool>
+    <!-- Exercise test alerts toggle default value -->
+    <bool name="test_exercise_alerts_enabled_default">true</bool>
+    <string name="date_time_format" translatable="false">yyyy-MM-dd, HH:mm a</string>
     <!-- Show area update info settings in CellBroadcastReceiver and information in SIM status in Settings app -->
     <bool name="config_showAreaUpdateInfoSettings">true</bool>
 </resources>
diff --git a/res/values-mcc740/strings.xml b/res/values-mcc740/strings.xml
new file mode 100644
index 000000000..1e4f78427
--- /dev/null
+++ b/res/values-mcc740/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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">
+    <!-- CMAS dialog title for presidential level alert. [CHAR LIMIT=50] -->
+    <!-- Required spanish (es) translation for this message: Alerta Local de Emergencia -->
+    <string name="cmas_presidential_level_alert">Local emergency alert</string>
+    <!-- Text for dismiss button in broadcast message view dialog. [CHAR LIMIT=25] -->
+    <!-- Required spanish (es) translation for this message: CERRAR -->
+    <string name="button_dismiss">TO CLOSE</string>
+    <!-- CMAS dialog title for test alert. [CHAR LIMIT=50] -->
+    <!-- Required spanish (es) translation for this message: Mensaje de Prueba -->
+    <string name="cmas_required_monthly_test">Test message</string>
+    <!-- CMAS dialog title for CMAS Exercise. [CHAR LIMIT=50] -->
+    <!-- Required spanish (es) translation for this message: Alerta de Emergencia – mensaje de Ejercicio /Simulacro -->
+    <string name="cmas_exercise_alert">Emergency Alert - Exercise / Drill message</string>
+    <!-- Dialog title for all public safety message broadcasts. [CHAR LIMIT=50] -->
+    <!-- Required spanish (es) translation for this message: Mensaje Informativo -->
+    <string name="public_safety_message">Informative message</string>
+    <!-- Preference title for enable public safety messages checkbox. [CHAR LIMIT=100] -->
+    <!-- Required spanish (es) translation for this message: Mensaje Informativo -->
+    <string name="enable_public_safety_messages_title">@string/public_safety_message</string>
+    <!-- Preference summary for enable public safety messages checkbox. [CHAR LIMIT=100] -->
+    <string name="enable_public_safety_messages_summary"/>
+    <!-- Preference title for other test alerts checkbox. [CHAR LIMIT=50] -->
+    <string name="enable_cmas_test_alerts_title">@string/cmas_required_monthly_test</string>
+    <!-- Preference summary for other test alerts checkbox. [CHAR LIMIT=125] -->
+    <string name="enable_cmas_test_alerts_summary"/>
+    <!-- Preference title for exercise test alerts checkbox. [CHAR LIMIT=50] -->
+    <string name="enable_exercise_test_alerts_title">@string/cmas_exercise_alert</string>
+    <!-- Preference summary for exercise test alerts checkbox. [CHAR LIMIT=125] -->
+    <string name="enable_exercise_test_alerts_summary"/>
+</resources>
\ No newline at end of file
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 7da134720..e47b74cb2 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -75,11 +75,13 @@
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Сериозна опасност"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Сериозна опасност по животот и имотот"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Предупредувања AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Билтени за итни случаи на грабнување деца"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Билтени за итни случаи со грабнување деца"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"Пораки за предупредување"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Предупреди за непосредни безбедносни закани"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Пораки за јавна безбедност"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Препорачани дејства што може да спасат живот или имот"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Прикажувај пораки на цел екран"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Исклучете за да ви се испраќаат пораки за јавна безбедност само на апликацијата за SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Државни и локални тестови"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Добијте тест пораки од државните и локалните власти"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Предупредувања за итни случаи"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 2ea45048e..f23b90036 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -24,7 +24,7 @@
     <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"വിവരങ്ങളടങ്ങിയ അറിയിപ്പ്"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"ഈ ഉപയോക്താവിന് വയർലെസ് അടിയന്തിര അലേർട്ടുകളുടെ ക്രമീകരണം ലഭ്യമല്ല"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ശരി"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"മുമ്പ് മുന്നറിയിപ്പുകളൊന്നുമില്ല"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"മുമ്പ് അലേർട്ടുകളൊന്നുമില്ല"</string>
     <string name="menu_preferences" msgid="3596514894131599202">"ക്രമീകരണം"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"പ്രക്ഷേപണങ്ങൾ ഇല്ലാതാക്കുക"</string>
     <string name="message_options" msgid="3178489901903589574">"സന്ദേശ ഓപ്‌ഷനുകൾ"</string>
@@ -60,13 +60,13 @@
     <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"അംഗീകരിക്കാത്ത അടിയന്തര മുന്നറിയിപ്പുകൾ"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"വോയ്സ് കോളിലെ അടിയന്തര മുന്നറിയിപ്പുകൾ"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"സിമ്മിന്റെ അടിസ്ഥാനത്തിൽ, WEA ക്രമീകരണത്തിലെ സ്വയമേവയുള്ള മാറ്റങ്ങൾ"</string>
-    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"മുന്നറിയിപ്പുകൾ അനുവദിക്കുക"</string>
+    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"അലേർട്ടുകൾ അനുവദിക്കുക"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"വയർലെസ് അടിയന്തര അലേർട്ട് അറിയിപ്പുകൾ നേടുക"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"അലേർട്ട് റിമൈൻഡർ"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"അലേർട്ട് സന്ദേശങ്ങൾ സംസാരിക്കുക"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"വയർലെസ് അടിയന്തിര അലേർട്ട് സന്ദേശങ്ങൾ പറയാൻ ടെക്‌സ്റ്റ് ടു സ്‌പീച്ച് ഉപയോഗിക്കുക"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"റിമെെൻഡർ ശബ്ദം സാധാരണ ശബ്ദത്തിൽ പ്ലേ ചെയ്യും"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"അടിയന്തര മുന്നറിയിപ്പ് ചരിത്രം"</string>
+    <string name="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,11 +75,13 @@
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"ഗുരുതരമായ ഭീഷണികൾ"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"ജീവനും സ്വത്തിനും നേരെയുള്ള ഗുരുതരമായ ഭീഷണികൾ"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER അലേർട്ടുകൾ"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"കുട്ടികളെ അപഹരിക്കലുമായി ബന്ധപ്പെട്ട അടിയന്തര ബുള്ളറ്റിനുകൾ"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"കുട്ടികളെ തട്ടിക്കൊണ്ടുപോകലുമായി ബന്ധപ്പെട്ട അടിയന്തര ബുള്ളറ്റിനുകൾ"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"മുന്നറിയിപ്പ് സന്ദേശങ്ങൾ"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"ഉടൻ ഉണ്ടായേക്കാവുന്ന സുരക്ഷാ ഭീഷണികളെ കുറിച്ച് മുന്നറിയിപ്പ് നൽകുക"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"പൊതുജനങ്ങൾക്കുള്ള സുരക്ഷാ സന്ദേശങ്ങൾ"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"ജീവനോ സ്വത്തോ സംരക്ഷിക്കാൻ ശുപാർശ ചെയ്‌തിരിക്കുന്ന പ്രവൃത്തികൾ"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"പൂർണ്ണ സ്‌ക്രീൻ സന്ദേശങ്ങൾ കാണിക്കുക"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"പൊതു സുരക്ഷാ സന്ദേശങ്ങൾ നിങ്ങളുടെ SMS ആപ്പിലേക്ക് മാത്രം അയയ്‌ക്കാൻ ഓഫാക്കുക"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"സംസ്ഥാന, പ്രാദേശിക പരീക്ഷണ മുന്നറിയിപ്പുകൾ"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"സംസ്ഥാന, പ്രാദേശിക അധികാരികളിൽ നിന്ന് പരീക്ഷണ സന്ദേശങ്ങൾ സ്വീകരിക്കുക"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"അടിയന്തര മുന്നറിയിപ്പുകൾ"</string>
@@ -137,7 +139,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"നിലവിൽ വയർലെസ് അടിയന്തിര അലേർട്ട് അറിയിപ്പുകളാണ് നിങ്ങൾക്ക് ലഭിക്കുന്നത്. വയർലെസ് അടിയന്തിര അലേർട്ട് അറിയിപ്പുകൾ നേടുന്നത് തുടരാൻ നിങ്ങൾക്ക് താൽപ്പര്യമുണ്ടോ?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"വേണം"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"വേണ്ട"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"അടിയന്തര മുന്നറിയിപ്പ് ചരിത്രം"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"അടിയന്തര അലേർട്ട് ചരിത്രം"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"ഒരിക്കല്‍"</item>
     <item msgid="9097229303902157183">"എല്ലാ 2 മിനിറ്റിലും"</item>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 51212e927..23d641475 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Аюулгүй байдалд учирч болзошгүй арга хэмжээний талаар сэрэмжлүүлэх"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Нийтийн аюулгүй байдлын мессеж"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Амьдрал эсвэл хөрөнгийг хэмнэх боломжтой санал болгосон үйлдэл"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Бүтэн дэлгэцийн мессежийг харуулах"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Олон нийтийн аюулгүй байдлын мессежийг зөвхөн SMS апп руугаа илгээхийн тулд унтраана уу"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Муж ба орон нутгийн туршилтууд"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Муж ба орон нутгийн захиргаанаас туршилтын мессежүүдийг хүлээн авах"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Гамшгийн аюулын дохио"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index ceb3569b7..14e5a81d8 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2008319089248760277">"आणीबाणीमधील वायरलेस इशारा"</string>
-    <string name="sms_cb_settings" msgid="9021266457863671070">"आणीबाणीमधील वायरलेस इशारा"</string>
+    <string name="app_label" msgid="2008319089248760277">"वायरलेस आणीबाणी अलर्ट"</string>
+    <string name="sms_cb_settings" msgid="9021266457863671070">"वायरलेस आणीबाणी अलर्ट"</string>
     <string name="sms_cb_sender_name_default" msgid="972946539768958828">"वायरलेस आणीबाणी सूचना"</string>
     <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"आणीबाणीच्या वायरलेस सूचना"</string>
     <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"आणीबाणीच्या वायरलेस सूचना"</string>
@@ -60,14 +60,14 @@
     <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"आणीबाणीच्या अस्वीकृत सूचना"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"व्हॉइस कॉलमधील आणीबाणी सूचना"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"SIM वर आधारित ऑटोमॅटिक WEA सेटिंग्जमधील बदल"</string>
-    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"सूचनांना अनुमती द्या"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"आणीबाणीमधील वायरलेस इशारा सूचना स्वीकारा"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"सूचना स्मरणपत्र"</string>
+    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"अलर्टना अनुमती द्या"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"वायरलेस आणीबाणी अलर्ट सूचना मिळवा"</string>
+    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"अलर्ट रिमाइंडर"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"सूचना मेसेज बोला"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"आणीबाणीमधील वायरलेस इशारा मेसेज बोलण्यासाठी टेक्स्ट-टू-स्पीच वापरा"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"नियमित व्हॉल्यूमवर एक रिमाइंडर आवाज प्ले होईल"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"आणीबाणी सूचना इतिहास"</string>
-    <string name="alert_preferences_title" msgid="6001469026393248468">"सूचना प्राधान्ये"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"आणीबाणी अलर्ट इतिहास"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"अलर्ट प्राधान्ये"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS चाचणी प्रसारणे"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"भूकंप त्सुनामी चेतावणी सिस्टमसाठी चाचणी प्रसारणे"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"जबर धोके"</string>
@@ -80,19 +80,21 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"सुस्पष्ट सुरक्षा धोक्यांची चेतावणी द्या"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"सार्वजनिक सुरक्षितता मेसेज"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"शिफारस केलेली उपाययोजना जी जीवन किंवा मालमत्ता वाचवू शकते"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"फुल-स्क्रीन मेसेज दाखवा"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"फक्त तुमच्या एसएमएस अ‍ॅपवर सार्वजनिक सुरक्षितता मेसेज पाठवणे बंद करा"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"राज्य आणि स्थानिक चाचण्या"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"राज्य आणि स्थानिक अधिकार्‍यांकडून चाचणी मेसेज मिळवा"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"आणीबाणीच्या सूचना"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"जीवघेण्या घटनांच्या चेतावण्या द्या"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"चाचणीच्या सूचना"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"सुरक्षा सूचना सिस्टमकडून वाहक चाचण्या आणि मासिक चाचण्या मिळवा"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"चाचणी अलर्ट"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"सुरक्षितता अलर्ट सिस्टमकडून वाहक चाचण्या आणि मासिक चाचण्या मिळवा"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
     <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"आणीबाणीच्या सूचना मिळवा: चाचणी/ड्रिल मेसेज"</string>
     <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
     <skip />
     <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"आणीबाणी सूचना मिळवा: ऑपरेटर निर्धारित केला"</string>
-    <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"कंपन"</string>
+    <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"व्हायब्रेशन"</string>
     <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"सूचना नेहमी संपूर्ण व्हॉल्यूमवर द्या"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"व्यत्यय आणू नका कडे दुर्लक्ष करा &amp; इतर व्‍हॉल्‍यूम सेटिंग्ज"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 37f7d48df..8ca31d784 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Beri amaran tentang ancaman keselamatan hampir"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Mesej keselamatan awam"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Tindakan yang disyorkan untuk menyelamatkan nyawa atau harta"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Tunjukkan mesej skrin penuh"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Matikan ciri agar mesej keselamatan awam hanya dihantar kepada apl SMS anda"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Ujian negeri dan setempat"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Terima mesej teks daripada pihak berkuasa negeri dan setempat"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Makluman kecemasan"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 7ac45ecff..6f6db2b41 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"ဖြစ်အံ့ဆဲဆဲ လုံခြုံရေးအန္တရာယ်များအတွက် သတိပေးရန်"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"လူထုလုံခြုံရေးဆိုင်ရာ မက်ဆေ့ဂျ်များ"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"အသက်အိုးအိမ်တို့ကို ကယ်တင်နိုင်သော အကြံပြုထားသည့် လုပ်ဆောင်ချက်များ"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"ဖန်သားပြင်အပြည့် မက်ဆေ့ဂျ်များ ပြခြင်း"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"လူထုလုံခြုံရေးဆိုင်ရာ မက်ဆေ့ဂျ်များကို သင့် SMS အက်ပ်သို့သာ ပို့ရန်အတွက် အမှတ်ခြစ်ရန် နေရာကို ပိတ်ပါ"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"ပြည်နယ်နှင့် ဒေသတွင်း စမ်းသပ်မှုများ"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"ပြည်နယ်နှင့် ဒေသတွင်း အုပ်ချုပ်သူများထံမှ စမ်းသပ်မက်ဆေ့ဂျ်များ ရယူရန်"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"အရေးပေါ်သတိပေးချက်များ"</string>
@@ -119,7 +121,7 @@
     <string name="cmas_response_monitor" msgid="681400164440495749">"စောင့်ကြပ်ခြင်း"</string>
     <string name="cmas_response_avoid" msgid="156419597612629270">"ရှောင်ရှား"</string>
     <string name="cmas_response_assess" msgid="9043534222710563415">"အကဲဖြတ်"</string>
-    <string name="cmas_response_none" msgid="5149009359674452959">"တစ်ခုမှမလို"</string>
+    <string name="cmas_response_none" msgid="5149009359674452959">"မရှိ"</string>
     <string name="cmas_severity_heading" msgid="8437057117822305243">"ပြင်းထန်မှု:"</string>
     <string name="cmas_severity_extreme" msgid="1312013282860183082">"ပြင်းထန်"</string>
     <string name="cmas_severity_severe" msgid="7504359209737074524">"လွန်ကဲ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 77d34096d..c7d645ce5 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -65,7 +65,7 @@
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Påminnelse om varsel"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Snakk inn varselmelding"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Bruk tekst-til-tale for å snakke inn meldinger for trådløse nødvarsler"</string>
-    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"En påminnelseslyd spilles av på vanlig volum"</string>
+    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"En påminnelseslyd spilles av med vanlig volum"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Tidligere nødvarsler"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Innstillinger for varsler"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS-testkringkastinger"</string>
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Advar om umiddelbare sikkerhetstrusler"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Offentlige sikkerhetsmeldinger"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Anbefalte handlinger som kan redde liv eller eiendom"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Vis meldinger i fullskjerm"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Slå av for å få offentlige sikkerhetsmeldinger bare sendt til SMS-appen."</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Statlige og lokale tester"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Motta testmeldinger fra statlige og lokale myndigheter"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Nødvarsler"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index c2299faa9..a8090da97 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -60,12 +60,12 @@
     <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"स्वीकार नगरिएका आपत्कालीन अलर्टहरू"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"भ्वाइस कलका आपत्‌कालीन अलर्टहरू"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"WEA का स्वचालित सेटिङ SIM अनुसार परिवर्तन हुन्छन्"</string>
-    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"अलर्टहरूलाई अनुमति दिनुहोस्"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"आपत्‌कालीन वायरलेस सतर्कता सूचनाहरू प्राप्त गर्नु…"</string>
+    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"अलर्टलाई अनुमति दिइयोस्"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"आपत्‌कालीन वायरलेस अलर्टहरू प्राप्त होस्"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"अलर्ट रिमाइन्डर"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"चेतावनी सन्देश बोल्नुहोस्"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"आपत्‌कालीन वायरलेस सतर्कता सन्देशहरूलाई आवाजमा परिवर्तन गर्न टेक्स्ट-टू-स्पिच सुविधा प्रयोग गर्नुहोस्"</string>
-    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"रिमाइन्डरको आवाज नियमित भोल्युममा बज्ने छ"</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="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS का परीक्षण प्रसारणहरू"</string>
@@ -80,19 +80,21 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"आसन्न सुरक्षासम्बन्धी खतराहरूबारे सचेत गराउनुहोस्"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"सार्वजनिक सुरक्षाका सन्देशहरू"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"जीवन वा सम्पत्तिको सुरक्षा गर्न सक्ने सिफारिस गरिएको कार्य"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"फुल स्क्रिन म्यासेजहरू देखाइऊन्"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"SMS एपमा मात्र सार्वजनिक सुरक्षासम्बन्धी म्यासेज पठाइयोस् भन्ने चाहनुहुन्छ भने यो सेटिङ अफ गर्नुहोस्"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"राज्यस्तरीय र स्थानीय परीक्षण"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"राज्यस्तरीय र स्थानीय अधिकारीहरूबाट परीक्षणसम्बन्धी सन्देशहरू प्राप्त गर्नुहोस्"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"आपत्‌कालीन सतर्कताहरू"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"जीवन जोखिममा पर्न सक्ने घटनाहरूबारे सचेत गराउनुहोस्"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"परीक्षणसम्बन्धी सतर्कताहरू"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"सेवा प्रदायकका परीक्षण र मासिक परीक्षणहरू सुरक्षा सतर्कता प्रणालीबाट प्राप्त गर्नुहोस्"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"सुरक्षा सतर्कता प्रणालीबाट क्यारियर परीक्षण र मासिक परीक्षणहरू प्राप्त होस्"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
     <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"आपत्‌कालीन सतर्कता: व्यायाम/कसरतसम्बन्धी म्यासेज"</string>
     <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
     <skip />
     <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"आपत्‌कालीन अलर्टहरू प्राप्त गर्नुहोस्: अपरेटरबाट प्राप्त हुने अलर्टहरू"</string>
-    <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"कम्पन"</string>
+    <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"भाइब्रेसन"</string>
     <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"सधैँ पूर्ण भोल्युममा सतर्क गराउनुहोस्"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"बाधा नपुऱ्याउनुहोस् नामक सुविधा र भोल्युमसम्बन्धी अन्य सेटिङको बेवास्ता गर्नुहोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e03400412..b4c8e94fa 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -61,12 +61,12 @@
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Noodmeldingen in audiogesprek"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Automatische wijzigingen in instellingen voor meldingen voor noodwaarschuwingen op basis van sim"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Waarschuwingen toestaan"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Meldingen voor noodwaarschuwingen ontvangen"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Krijg meldingen voor noodwaarschuwingen"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Herinnering voor meldingen"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Noodmelding uitspreken"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Tekst-naar-spraak gebruiken om meldingen voor noodwaarschuwingen uit te spreken"</string>
-    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Er wordt een herinneringsgeluid afgespeeld op normaal volume"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Noodmeldingsgeschiedenis"</string>
+    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Een herinneringsgeluid wordt afgespeeld op normaal volume"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Noodmeldings­geschiedenis"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Meldingsvoorkeuren"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS-testberichten"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Testberichten van het waarschuwingssysteem voor tsunami\'s en aardbevingen"</string>
@@ -80,12 +80,14 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Waarschuwen over directe beveiligingsrisico\'s"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Openbare calamiteitenberichten"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Aanbevolen acties die levens of eigendommen kunnen redden"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Berichten op volledig scherm laten zien"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Zet dit uit om berichten over openbare veiligheid alleen naar je sms-app te laten sturen"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Nationale en lokale tests"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Testberichten ontvangen van nationale en lokale overheden"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Noodmeldingen"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Waarschuwen over levensbedreigende situaties"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Testmeldingen"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Providertests en maandelijkse tests van het noodsysteem voor veiligheidsmeldingen ontvangen"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Krijg providertests en maandelijkse tests van het noodsysteem voor veiligheidsmeldingen"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
     <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Noodmelding ontvangen: bericht voor oefening/test"</string>
@@ -137,7 +139,7 @@
     <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>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Noodmeldingsgeschiedenis"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Noodmeldings­geschiedenis"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Eenmalig"</item>
     <item msgid="9097229303902157183">"Elke 2 minuten"</item>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 73c3a889c..c152af928 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"ଏପରି ବିଷୟରେ ସୂଚନା ଦେବା, ଯେଉଁ କାରଣରୁ ସୁରକ୍ଷା ଉପରେ ବିପଦ ଆସିପାରେ"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"ଜନସୁରକ୍ଷା ମେସେଜ୍"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"ସୁପାରିଶ କରାଯାଇଥିବା କାର୍ଯ୍ୟ ଯାହା ଜୀବନ କିମ୍ୱା ସମ୍ପତ୍ତି ବଞ୍ଚାଇପାରିବ"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"ପୂର୍ଣ୍ଣ-ସ୍କ୍ରିନ୍ ମେସେଜଗୁଡ଼ିକ ଦେଖାନ୍ତୁ"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"ସାର୍ବଜନୀନ ସୁରକ୍ଷା ମେସେଜଗୁଡ଼ିକ କେବଳ ଆପଣଙ୍କ SMS ଆପକୁ ପଠାଯିବା ସୁବିଧା ବନ୍ଦ କରନ୍ତୁ"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"ରାଜ୍ୟ ଓ ସ୍ଥାନୀୟ ପରୀକ୍ଷା"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"ରାଜ୍ୟ ଓ ସ୍ଥାନୀୟ କର୍ତ୍ତୃପକ୍ଷଙ୍କ ତରଫରୁ ଟେଷ୍ଟ ମେସେଜ୍ ପ୍ରାପ୍ତ କରନ୍ତୁ"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 7d47dc0da..4717185cc 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -24,7 +24,7 @@
     <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"ਜਾਣਕਾਰੀ ਵਾਲੀ ਸੂਚਨਾ"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਵਾਇਰਲੈੱਸ ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ ਦੀਆਂ ਸੈਟਿੰਗਾਂ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ਠੀਕ"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"ਕੋਈ ਪਿਛਲੀਆਂ ਸੁਚੇਤਨਾਵਾਂ ਨਹੀਂ ਹਨ"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"ਕੋਈ ਪਿਛਲੀ ਸੁਚੇਤਨਾ ਨਹੀਂ ਹੈ"</string>
     <string name="menu_preferences" msgid="3596514894131599202">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"ਪ੍ਰਸਾਰਨ ਮਿਟਾਓ"</string>
     <string name="message_options" msgid="3178489901903589574">"ਸੁਨੇਹਾ ਚੋਣਾਂ"</string>
@@ -62,10 +62,10 @@
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"ਸਿਮ ਦੇ ਆਧਾਰ \'ਤੇ ਸਵੈਚਲਿਤ WEA ਸੈਟਿੰਗਾਂ ਦੀਆਂ ਤਬਦੀਲੀਆਂ"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"ਸੁਚੇਤਨਾਵਾਂ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"ਵਾਇਰਲੈੱਸ ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"ਸੁਚੇਤਨਾ ਯਾਦ-ਸੂਚਨਾ"</string>
+    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"ਸੁਚੇਤਨਾ ਰਿਮਾਈਂਡਰ"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"ਸੁਚੇਤਨਾ ਵਾਲਾ ਸੁਨੇਹਾ ਬੋਲੋ"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"ਵਾਇਰਲੈੱਸ ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ ਵਾਲੇ ਸੁਨੇਹੇ ਬੋਲਣ ਲਈ \'ਲਿਖਤ ਤੋਂ ਬੋਲੀ\' ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
-    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"ਯਾਦ-ਸੂਚਨਾ ਸੰਬੰਧੀ ਧੁਨੀ ਨਿਯਮਿਤ ਅਵਾਜ਼ \'ਤੇ ਚੱਲੇਗੀ"</string>
+    <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="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS ਟੈਸਟ ਪ੍ਰਸਾਰਣ"</string>
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"ਸੰਭਾਵੀ ਸੁਰੱਖਿਆ ਖਤਰਿਆਂ ਬਾਰੇ ਚਿਤਾਵਨੀ ਦਿਓ"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"ਜਨਤਕ ਸੁਰੱਖਿਆ ਸੰਬੰਧੀ ਸੁਨੇਹੇ"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"ਜਾਨ ਜਾਂ ਮਾਲ ਦੀ ਸੁਰੱਖਿਆ ਕਰ ਸਕਣ ਵਾਲੀਆਂ ਸਿਫ਼ਾਰਸ਼ੀ ਕਾਰਵਾਈਆਂ"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"ਪੂਰੀ-ਸਕ੍ਰੀਨ ਵਾਲੇ ਸੁਨੇਹੇ ਦਿਖਾਓ"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"ਜਨਤਕ ਸੁਰੱਖਿਆ ਸੰਬੰਧੀ ਸੁਨੇਹਿਆਂ ਨੂੰ ਸਿਰਫ਼ ਤੁਹਾਡੀ SMS ਐਪ \'ਤੇ ਭੇਜਣਾ ਬੰਦ ਕਰੋ"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"ਰਾਜ ਅਤੇ ਸਥਾਨਕ ਟੈਸਟ"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"ਰਾਜ ਅਤੇ ਸਥਾਨਕ ਅਥਾਰਟੀਆਂ ਤੋਂ ਟੈਸਟ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾਵਾਂ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 2b67863b7..d8daded38 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -60,9 +60,9 @@
     <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Niepotwierdzone alerty o zagrożeniu"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Alert o zagrożeniu podczas połączenia głosowego"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Automatyczne ustawienia WEA zmieniają się w zależności od karty SIM"</string>
-    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Zezwól na alerty"</string>
+    <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Zezwalaj na alerty"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Otrzymuj alerty o zagrożeniu"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alarm z przypomnieniem"</string>
+    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Przypomnienie o alercie"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Czytaj treść alertu"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Użyj zamiany tekstu na mowę do odczytywania wiadomości z alertami o zagrożeniu"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Dźwięk przypomnienia będzie odtwarzany ze zwykłą głośnością"</string>
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Ostrzegaj o bezpośrednich zagrożeniach"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Wiadomości dotyczące bezpieczeństwa publicznego"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Zalecane działania pomagające ocalić życie lub mienie"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Pokazuj komunikaty pełnoekranowe"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Wyłącz, aby komunikaty dotyczące bezpieczeństwa publicznego były wysyłane tylko do aplikacji do SMS-ów"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Testy stanowe i lokalne"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Otrzymuj wiadomości testowe od władz stanowych i lokalnych"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alerty o zagrożeniu"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e2ba06bde..95484939d 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Avisar acerca de ameaças à segurança iminentes"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Mensagens de segurança pública"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Ações recomendadas que podem salvar vidas ou propriedades."</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Mostrar mensagens em ecrã inteiro"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Desative para que as mensagens de segurança pública sejam enviadas apenas para a sua app de SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Testes locais e estatais"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Receber mensagens de teste de autoridades locais e estatais"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alertas de emergência"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index faab43cf7..a62eb7080 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Aviso sobre ameaças iminentes à segurança"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Mensagens de segurança pública"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Ações recomendadas que podem salvar vidas ou propriedades"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Mostrar mensagens em tela cheia"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Desativar essa caixa de seleção para receber mensagens de segurança pública apenas no app de SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Testes estaduais e locais"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Receber mensagens de teste das autoridades estaduais e locais"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alertas de emergência"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 3935750b0..20d9b06c3 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Avertizează cu privire la amenințările iminente la adresa siguranței"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Mesaje de siguranță publică"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Acțiuni recomandate care pot salva vieți sau bunuri"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Afișați mesajele pe ecran complet"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Dezactivați pentru ca mesajele de siguranță să fie trimise numai către aplicația de mesaje SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Testări naționale și locale"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Primiți mesaje de testare de la autoritățile de stat și locale"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Alerte de urgență"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e86c449ea..d49af7db7 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -80,12 +80,14 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Предупреждать об угрозах безопасности"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Сообщения об угрозе общественной безопасности"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Рекомендуемые действия, которые помогут сохранить жизни или имущество"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Показывать сообщения в полноэкранном режиме"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Снимите, чтобы показывать сообщения об угрозе общественной безопасности только в приложении для SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Тестовые оповещения от органов безопасности"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Получать тестовые оповещения от государственных и местных органов безопасности"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Экстренные оповещения"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Предупреждать о событиях, угрожающих жизни"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Тестовые оповещения"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Получать тестовые оповещения от оператора связи и ежемесячные сообщения системы CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Получать тестовые сообщения от системы экстренного оповещения (один раз в месяц) и от оператора связи"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
     <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Получать экстренные оповещения (учебная тревога)"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 1852641ac..eac98cfad 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"අනිවාර්ය ආරක්ෂක තර්ජන ගැන අනතුරු අඟවන්න"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"මහජන ආරක්ෂක පණිවිඩ"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"ජීවිත හෝ දේපළ බේරා ගත හැකි නිර්දේශිත ක්‍රියා"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"පූර්ණ තිර පණිවිඩ පෙන්වන්න"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"ඔබගේ SMS යෙදුමට පමණක් පොදු ආරක්ෂක පණිවිඩ එවීමට ක්‍රියාවිරහිත කරන්න"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"රාජ්‍ය සහ පළාත් පරීක්ෂණ"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"රාජ්‍ය හා පළාත් පාලන ආයතනවලින් පරීක්ෂණ පණිවිඩ ලබා ගන්න"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"හදිසි අනතුරු ඇඟවීම්"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 19700e881..a6bd4b0f8 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -61,7 +61,7 @@
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Tiesňové upozornenia v hlasovom hovore"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Automatické zmeny nastavení bezdrôtových tiesňových upozornení na základe SIM karty"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Povoliť upozornenia"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Prijímanie bezdrôtových tiesňových upozornení"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Prijímať bezdrôtové tiesňové upozornenia"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Pripomínať upozornenia"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Čítať upozornenia"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Čítať bezdrôtové tiesňové upozornenia prevodom textu na reč"</string>
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Upozorňovať na bezprostredné ohrozenia bezpečnosti"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Správy verejnej bezpečnosti"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Odporúčané akcie, ktoré môžu zachrániť životy alebo majetok"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Zobrazovať správy v režime celej obrazovky"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Keď vypnete túto možnosť, správy verejnej bezpečnosti sa budú posielať iba do vašej aplikácie na SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Štátne a miestne testy"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Dostávať testovacie správy zo systému bezpečnostných upozornení"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Tiesňové upozornenia"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f02b775e9..c492b0e1b 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -24,7 +24,7 @@
     <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Obvestilo z informacijami"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Nastavitve brezžičnih nujnih opozoril niso na voljo za tega uporabnika"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"V redu"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"Ni prejšnjih opozoril"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"Ni prejšnjih opozoril."</string>
     <string name="menu_preferences" msgid="3596514894131599202">"Nastavitve"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Izbriši oddaje"</string>
     <string name="message_options" msgid="3178489901903589574">"Možnosti sporočila"</string>
@@ -61,7 +61,7 @@
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Opozorila v sili med glasovnim klicem"</string>
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Samodejne nastavitve brezžičnih nujnih opozoril na podlagi kartice SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Dovoli opozorila"</string>
-    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Prejemanje obvestil o brezžičnih nujnih opozorilih"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Prejemajte obvestila o brezžičnih nujnih opozorilih."</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Opomnik za opozorilo"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Izgovori opozorilno sporočilo"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Za izgovorjavo brezžičnih nujnih opozoril uporabi pretvorbo besedila v govor"</string>
@@ -71,21 +71,23 @@
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Preskusne oddaje ETWS"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Preskusne oddaje sistema za opozarjanje na potrese in cunamije"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Izredno hude nevarnosti"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Izredno hude nevarnosti za življenje in premoženje"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Izredno hude nevarnosti za življenje in premoženje."</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Hude nevarnosti"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Hude nevarnosti za življenje in premoženje"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Hude nevarnosti za življenje in premoženje."</string>
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Opozorila AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Nujna obvestila o ugrabitvah otrok"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Nujna obvestila o ugrabitvah otrok."</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"Sporočila opozoril"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Opozarjanje na neposredne varnostne grožnje"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Sporočila za javno varnost"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Priporočena dejanja, ki lahko rešijo življenja ali premoženje"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Prikaz sporočil v celozaslonskem načinu"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Izklopite, če želite sporočila za javno varnost prejemati le v aplikaciji za sporočila SMS."</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Državni in lokalni preizkusi"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Prejemanje preizkusnih sporočil državne in lokalne oblasti"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Nujna opozorila"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Opozarjanje na smrtno nevarne dogodke"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Preizkusna opozorila"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Prejemanje preizkusov operaterja in mesečnih preizkusov iz sistema varnostnih opozoril"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Prejemajte preizkuse operaterja in mesečne preizkuse iz sistema varnostnih opozoril."</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
     <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Prejemanje nujnega opozorila: Sporočilo za vajo/simulacijo"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 09849db7b..3c33e71c9 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Paralajmëro për kërcënime të menjëhershme të sigurisë"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Mesazhe të sigurisë publike"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Veprime të rekomanduara që mund të shpëtojnë jetën ose pronën"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Shfaq mesazhet në ekranin e plotë"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Çaktivizoje që mesazhet e sigurisë publike të dërgohen vetëm tek aplikacioni yt i mesazheve SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Alarme testimi shtetërore dhe lokale"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Merr mesazhe testimi nga autoritetet shtetërore dhe lokale"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Sinjalizimet e urgjencës"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 0ee537d69..264c9a7c8 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Упозоравај ме на непосредне безбедносне претње"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Поруке о јавној безбедности"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Препоручене радње које могу да сачувају животе или имовину"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Приказуј поруке на целом екрану"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Искључите да би се поруке о јавној безбедности слале само у апликацију за SMS поруке"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Пробне поруке државних и локалних органа"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Примај пробне поруке од државних и локалних органа"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Обавештења о хитним случајевима"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index cde326d7c..10c7ab294 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Varna om överhängande säkerhetshot"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Viktiga meddelanden till allmänheten"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Rekommenderade åtgärder som kan rädda liv eller egendom"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Visa meddelanden i helskärmsläge"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Inaktivera detta om viktiga meddelanden till allmänheten ska skickas enbart till sms-appen"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Statliga och lokala tester"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Få testmeddelanden från statliga och lokala myndigheter"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Varningar vid nödsituationer"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index e1fdb9c6c..d59bb1d41 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Itoe tahadhari kuhusu hatari za usalama zinazokaribia kutokea"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Ujumbe wa usalama kwa umma"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Hatua zinazopendekezwa ambazo zinaweza kuokoa maisha na mali"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Onyesha ujumbe kwenye skrini nzima"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Zima ili ujumbe wa usalama wa umma utumwe kwenye Programu yako ya SMS pekee"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Majaribio katika nchi na majimbo"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Pokea ujumbe wa majaribio kutoka kwa mamlaka ya nchi na majimbo"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Arifa za dharura"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index fbd30995e..1743c644c 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -66,7 +66,7 @@
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"விழிப்பூட்டல் செய்தியைப் படித்துக் காட்டு"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"வயர்லெஸ் அவசரகால விழிப்பூட்டல்கள் மெசேஜ்களை சொல்வதற்கு \'உரையிலிருந்து பேச்சு\' அம்சத்தைப் பயன்படுத்து"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"பொதுவான ஒலியளவில் நினைவூட்டல் சத்தம் ஒன்று இயக்கப்படும்"</string>
-    <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>
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"வரக்கூடிய பாதுகாப்பு அச்சுறுத்தல்கள் பற்றி எச்சரிக்கவும்"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"பொதுமக்களுக்கான பாதுகாப்புச் செய்திகள்"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"உயிர் அல்லது சொத்தைப் பாதுகாப்பதற்குப் பரிந்துரைக்கப்படும் நடவடிக்கைகள்"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"முழுத்திரை மெசேஜ்களைக் காட்டுதல்"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"உங்கள் மெசேஜ் ஆப்ஸில் மட்டும் பொதுப் பாதுகாப்பு மெசேஜ்களைப் பெற ஆஃப் செய்யுங்கள்"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"மாநில மற்றும் உள்ளூர் நிர்வாகங்களின் சோதனை மெசேஜ்கள்"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"மாநில மற்றும் உள்ளூர் நிர்வாகங்களின் சோதனை மெசேஜ்களைப் பெறு"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"அவசரகால விழிப்பூட்டல்கள்"</string>
@@ -137,7 +139,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"தற்போது வயர்லெஸ் அவசரகால விழிப்பூட்டல்களைப் பெற்றுக் கொண்டிருக்கிறீர்கள். அவசரகால விழிப்பூட்டல்களைத் தொடர்ந்து பெற விரும்புகிறீர்களா?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"ஆம்"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"வேண்டாம்"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"அவசரகால எச்சரிக்கை வரலாறு"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"இதுவரையான அவசரகால எச்சரிக்கைகள்"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"ஒருமுறை மட்டும்"</item>
     <item msgid="9097229303902157183">"2 நிமிடங்களுக்கு ஒருமுறை"</item>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 554e31203..a293f86d6 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"తక్షణ భద్రతా ప్రమాదాల గురించి హెచ్చరించు"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"ప్రజా భద్రత సందేశాలు"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"ప్రాణ నష్టం లేదా ఆస్తి నష్టం జరగకుండా కాపాడే సిఫార్సు చేయబడిన చర్యలు"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"ఫుల్ స్క్రీన్ మెసేజ్‌లను చూపించండి"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"పబ్లిక్ భద్రతా మెసేజ్‌లను మీ ఫోన్‌లోని SMS యాప్‌నకు మాత్రమే పంపడానికి ఆఫ్ చేయండి"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"రాష్ట్రీయ మరియు స్థానిక పరీక్షలు"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"రాష్ట్రీయ మరియు స్థానిక అధికార సంస్థల నుండి పరీక్ష సందేశాలను స్వీకరిస్తుంది"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"అత్యవసర హెచ్చరికలు"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 8310a3607..e09ff3cf9 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -74,12 +74,14 @@
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"ภัยคุกคามต่อชีวิตและทรัพย์สินระดับสูงสุด"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"ภัยคุกคามที่ร้ายแรง"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"ภัยคุกคามต่อชีวิตและทรัพย์สินระดับรุนแรง"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"การแจ้งเตือน AMBER"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"การแจ้งเตือนเด็กหาย Amber Alert"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"กระดานข่าวสารเหตุฉุกเฉินการลักพาตัวเด็ก"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"ข้อความแจ้งเตือน"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"เตือนเกี่ยวกับภัยคุกคามความปลอดภัยที่จะเกิดขึ้น"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"ข้อความด้านความปลอดภัยสาธารณะ"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"การดำเนินการที่แนะนำซึ่งจะช่วยรักษาชีวิตหรือทรัพย์สินได้"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"แสดงข้อความแบบเต็มหน้าจอ"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"ปิดเพื่อให้ส่งข้อความด้านความปลอดภัยสาธารณะไปยังแอป SMS เท่านั้น"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"การทดสอบระดับประเทศและระดับท้องถิ่น"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"รับข้อความทดสอบจากหน่วยงานรัฐและหน่วยงานท้องถิ่น"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"การแจ้งเตือนเหตุฉุกเฉิน"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index df684c2b6..a30f4877b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Magbabala tungkol sa mga nakaambang banta sa kaligtasan"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Mga mensahe para sa pampublikong kaligtasan"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Mga inirerekomendang pagkilos na makakaligtas ng mga buhay o pag-aari"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Ipakita ang mga full-screen na mensahe"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"I-off sa SMS app mo lang ipadala ang mga mensahe para sa kaligtasan ng publiko"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Mga pagsubok sa estado at lokal na pagsubok"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Makatanggap ng mga pansubok na mensahe mula sa mga awtoridad ng estado at lokal na awtoridad"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Mga alerto sa emergency"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index f9a4eb6c2..33da03e38 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -65,7 +65,7 @@
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Uyarı hatırlatıcı"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Uyarı mesajını seslendir"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Kablosuz acil durum uyarı mesajları için metin okuma özelliğini kullan"</string>
-    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Normal ses düzeyinde bir hatırlatma sesi çalacak"</string>
+    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Hatırlatma sesi normal ses düzeyinde aşağıdaki gibi çalacak:"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Acil durum uyarı geçmişi"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Uyarı tercihleri"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS test yayınları"</string>
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Yaklaşan güvenlik tehditleri hakkında uyarılar alın"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Kamu güvenliği mesajları"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Hayatları veya malları kurtarabilecek önerilen eylemler"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Mesajları tam ekran göster"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Kamu güvenliği mesajlarının yalnızca SMS uygulamanıza gönderilmesi için kapatın"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Devlet testleri ve yerel testler"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Devlet kurumlarından ve yerel kurumlardan test mesajları alın"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Acil durum uyarıları"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 130734e95..84a423bb0 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -80,12 +80,14 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Застерігати про неминучі загрози безпеці"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Повідомлення щодо громадської безпеки"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Рекомендовані дії, щоб урятувати життя чи власність"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Показувати сповіщення на весь екран"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Зніміть прапорець, щоб повідомлення щодо громадської безпеки надсилалися лише в додаток для SMS"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Тестові сповіщення від державних і місцевих органів влади"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Отримувати тестові повідомлення від державних і місцевих органів влади"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Екстрені сповіщення"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Застерігати про небезпечні для життя події"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Тестові сповіщення"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Отримувати щомісячні тестові сповіщення й тестові сповіщення від оператора для системи безпеки"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Отримувати тестові сповіщення від оператора та щомісячні тестові сповіщення системи безпеки"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
     <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Отримати екстрене сповіщення: тренувальне/симуляційне повідомлення"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 2c1330811..8a983406e 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -66,7 +66,7 @@
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"الرٹ کا پیغام بولیں"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"وائرلیس ہنگامی الرٹ کے پیغامات بولنے کے ليے ٹیکسٹ ٹو اسپیچ کا استعمال کریں"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"ایک یاد دہانی کی آواز ریگولر والیوم پر چلے گی"</string>
-    <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>
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"حفاظت سے متعلق قریب الوقوع خطرات کے بارے میں متنبہ کریں"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"عوامی حفاظتی پیغامات"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"ایسی تجویز کردہ کارروائیاں جو زندگیاں یا ملکیت بچا سکتی ہیں"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"پوری اسکرین پر پیغامات دکھائیں"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"‏عوامی حفاظتی پیغامات صرف آپ کی SMS ایپ پر بھیجنے کے لیے اسے آف کریں"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"ریاستی اور مقامی ٹیسٹس"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"ریاستی اور علاقائی حکام سے ٹیسٹ پیغامات موصول کریں"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"ایمرجنسی الرٹس"</string>
@@ -137,7 +139,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"آپ کو فی الحال وائرلیس ہنگامی الرٹس موصول ہو رہے ہیں۔ کیا آپ وائرلیس ہنگامی الرٹس حاصل کرتے رہنا چاہتے ہیں؟"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"ہاں"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"نہیں"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"ایمرجنسی الرٹ کی سر گزشت"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"ایمرجنسی الرٹ کی سرگزشت"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"ایک بار"</item>
     <item msgid="9097229303902157183">"ہر 2 منٹ بعد"</item>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index dc205d38f..eea84fa11 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Xavfsizlikka muqarrar tahdidlar haqida ogohlantirilsin"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Ommaviy xavfsizlik xabarlari"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Inson hayoti yoki mulkini asrashga oid tavsiya etiladigan amallar"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Xabarlarni butun ekranda chiqarish"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Faqat SMS ilovasiga yuboriladigan ommaviy xavfsizlik xabarlarini faolsizlantirish"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Xavfsizlik organlaridan sinov ogohlantirishi"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Davlat va mahalliy xavfsizlik organlaridan sinov ogohlantirishi olish"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Favqulodda ogohlantirishlar"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index ea3b16926..a6bc97122 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -66,7 +66,7 @@
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Đọc to nội dung cảnh báo"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Dùng tính năng chuyển văn bản sang lời nói để đọc to các cảnh báo khẩn cấp không dây"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Âm báo nhắc nhở sẽ phát ở mức âm lượng bình thường"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Lịch sử cảnh báo khẩn cấp"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Nhật ký cảnh báo khẩn cấp"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Tùy chọn cảnh báo"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Thông báo thử nghiệm cho ETWS"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Thông báo thử nghiệm cho Hệ thống cảnh báo động đất và sóng thần"</string>
@@ -75,17 +75,19 @@
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Mối đe dọa nghiêm trọng"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Mối đe dọa đến sinh mạng và tài sản nghiêm trọng"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Cảnh báo AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Bản tin khẩn cấp vụ việc bắt cóc trẻ em"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Bản tin khẩn cấp về vụ việc bắt cóc trẻ em"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"Tin nhắn cảnh báo"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Cảnh báo về các mối đe dọa đến sự an toàn sắp xảy ra"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Thông báo an toàn công khai"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Hành động được đề xuất có thể bảo vệ tính mạng hoặc tài sản"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Hiện thông báo toàn màn hình"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Tắt để chỉ gửi thông báo an toàn công cộng đến ứng dụng SMS của bạn"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Thử nghiệm của tiểu bang và địa phương"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Nhận tin nhắn thử nghiệm từ chính quyền địa phương và tiểu bang"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Cảnh báo khẩn cấp"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Cảnh báo về các sự kiện đe dọa tới mạng sống"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Cảnh báo thử nghiệm"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Nhận cảnh báo kiểm tra của nhà mạng và cảnh báo kiểm tra hàng tháng của hệ thống cảnh báo an toàn"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Nhận cảnh báo thử nghiệm của nhà mạng và cảnh báo thử nghiệm hằng tháng của hệ thống cảnh báo an toàn"</string>
     <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
     <skip />
     <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Nhận cảnh báo khẩn cấp: Thông báo tập huấn/diễn tập"</string>
@@ -137,7 +139,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"Hiện bạn đang nhận cảnh báo khẩn cấp không dây. Bạn có muốn tiếp tục nhận cảnh báo khẩn cấp không dây không?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Có"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Không"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Lịch sử cảnh báo khẩn cấp"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Nhật ký cảnh báo khẩn cấp"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Một lần"</item>
     <item msgid="9097229303902157183">"2 phút một lần"</item>
@@ -154,7 +156,7 @@
     <string name="testing_mode_enabled" msgid="8296556666392297467">"Đã bật chế độ kiểm tra tính năng truyền phát trên di động."</string>
     <string name="testing_mode_disabled" msgid="8381408377958182661">"Đã tắt chế độ kiểm tra tính năng truyền phát trên di động."</string>
     <string name="show_all_messages" msgid="3780970968167139836">"Hiển thị tất cả thông báo"</string>
-    <string name="show_regular_messages" msgid="7376885150513522515">"Hiển thị thông báo thông thường"</string>
+    <string name="show_regular_messages" msgid="7376885150513522515">"Hiện thông báo thông thường"</string>
     <string name="message_identifier" msgid="5558338496219327850">"Giá trị nhận dạng:"</string>
     <string name="message_serial_number" msgid="3386553658712978964">"Số sê-ri:"</string>
     <string name="data_coding_scheme" msgid="4628901196730870577">"Lược đồ mã hóa dữ liệu:"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 6907c6faf..2fc67af72 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"针对即将发生的安全威胁发出警告"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"公共安全消息"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"可挽救生命或财产的推荐措施"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"以全屏模式显示消息"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"关闭此设置会让公共安全消息仅发送到您的短信应用"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"州和地方测试"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"接收来自州和地方相关机构的测试消息"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"紧急警报"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 7b08dd035..7c65dd016 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"對即將發生的安全威脅發出警告"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"公共安全訊息"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"有助拯救生命或財產的建議措施"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"以全螢幕模式顯示訊息"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"關閉後公共安全訊息就只會傳送到短訊應用程式"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"州份和地區測試"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"接收來自州政府和地區政府的測試訊息"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"緊急警示"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 68b7d3785..5d811a762 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -62,7 +62,7 @@
     <string name="notification_channel_settings_updates" msgid="6779759372516475085">"系統已根據 SIM 卡自動變更 WEA 設定"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"允許接收警示"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"接收無線緊急警報通知"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"快訊提醒"</string>
+    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"警示提醒"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"說出警訊通知"</string>
     <string name="enable_alert_speech_summary" msgid="2855629032890937297">"使用文字轉語音功能朗讀無線緊急警報訊息內容"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"系統將以標準音量播放提醒音效"</string>
@@ -74,12 +74,14 @@
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"重大生命財產威脅"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"嚴重威脅"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"嚴重生命財產威脅"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"安珀警示"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"安珀警報"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"兒童綁架緊急事件公告"</string>
     <string name="enable_alert_message_title" msgid="2939830587633599352">"警訊通知"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"針對迫切的安全性威脅發出警告"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"公共安全訊息"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"可挽救性命或財產的應變措施建議"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"以全螢幕模式顯示訊息"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"關閉之後，公共安全訊息就只會傳送到訊息應用程式"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"州政府和地方政府的測試訊息"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"接收來自州政府和地方政府的測試訊息"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"緊急警報"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index bcd21daf9..272c5a98c 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -80,6 +80,8 @@
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"Xwayisa mayelana nezinsongo zokuphepha eziseduze"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"Imilayezo yokuphepha komphakathi"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"Izenzo ezikhethekile ezingalondoloza izimpilo noma indawo"</string>
+    <string name="enable_full_screen_public_safety_messages_title" msgid="1790574642368284876">"Bonisa imilayezo yesikrini esigcwele"</string>
+    <string name="enable_full_screen_public_safety_messages_summary" msgid="1305786776090796715">"Vala ukuze ube nemilayezo ephephile yasesidlangalaleni ethunyelwe kwi-app yakho ye-SMS kuphela"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"Ukuhlolwa kombuso nokwasendaweni"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"Thola imilayezo yokuhlolwa kusukela kwabasemagunyeni bombuso nabasendaweni"</string>
     <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"Izexwayiso eziphuthumayo"</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index 30ecdbd1b..7017546ec 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -31,14 +31,8 @@
     <bool name="show_amber_alert_settings">true</bool>
     <!-- Whether to show test settings -->
     <bool name="show_test_settings">true</bool>
-    <!-- Whether to show vibration settings -->
-    <bool name="show_vibration_settings">true</bool>
-    <!-- Whether to append date-time to the alert title -->
-    <bool name="show_date_time_title">false</bool>
-    <!-- if appending date-time to alert title, whether to include year -->
-    <bool name="show_date_time_with_year_title">false</bool>
-    <!-- if appending date-time to alert title, whether to use numeric format -->
-    <bool name="show_date_in_numeric_format">false</bool>
+    <!-- append date-time to the alert title with specified format -->
+    <string name="date_time_format" translatable="false"></string>
     <!-- Whether to compare message body when performing message duplicate dection -->
     <bool name="duplicate_compare_body">false</bool>
     <!-- Whether to enable audio alert for non emergency broadcasts on FEATURE_WATCH devices -->
@@ -49,6 +43,8 @@
     <bool name="ignore_messages_in_ecbm">false</bool>
     <!-- Whether to display public safety alert settings, some countries/carriers want to enable it by default and not allow users to disable -->
     <bool name="show_public_safety_settings">true</bool>
+    <!-- Whether to show settings that allows user to turn off full-screen public safety messages -->
+    <bool name="show_public_safety_full_screen_settings">false</bool>
     <!-- Whether to display state/local test settings, some countries/carriers want to enable it by default and not allow users to disable -->
     <bool name="show_state_local_test_settings">true</bool>
     <!-- Whether to display exercise test settings when testing mode is off. -->
@@ -79,7 +75,7 @@
     <bool name="retry_message_history_data_migration">false</bool>
 
     <!-- Section for switch default value -->
-    <!-- Master toggle default value -->
+    <!-- Main toggle default value -->
     <bool name="master_toggle_enabled_default">true</bool>
     <!-- Emergency alerts toggle default value -->
     <bool name="emergency_alerts_enabled_default">true</bool>
@@ -91,6 +87,8 @@
     <bool name="severe_threat_alerts_enabled_default">true</bool>
     <!-- Public safety messages toggle default value -->
     <bool name="public_safety_messages_enabled_default">true</bool>
+    <!-- Public safety full-screen messages toggle default value -->
+    <bool name="public_safety_messages_full_screen_enabled_default">true</bool>
     <!-- State local test alerts toggle default value -->
     <bool name="state_local_test_alerts_enabled_default">false</bool>
     <!-- Other test alerts toggle default value -->
@@ -258,11 +256,6 @@
     This is used to support emergency alert on the companion devices by bridged notification -->
     <bool name="show_alert_dialog_with_notification">false</bool>
 
-    <!-- Whether to disable status bar while alert dialog is showing.
-    Some carriers mandate this to make sure users do not switch to other activities
-    until pressing the "ok" button -->
-    <bool name="disable_status_bar">false</bool>
-
     <!-- Whether to show the alert dialog at the bottom of the screen in order to avoid blocking
          other content -->
     <bool name="alert_dialog_bottom">false</bool>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ddefc58e3..032f024bd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -26,7 +26,4 @@
     <!-- Max height of alert dialog's text content -->
     <dimen name="alert_dialog_maxheight_content_panel">0dip</dimen>
 
-    <!-- dimensions for CellBroadcastListActivity ListItems -->
-    <dimen name="list_item_internal_line_space_horizontal">16dp</dimen>
-    <dimen name="list_item_internal_line_space_vertical">4dp</dimen>
 </resources>
diff --git a/res/values/ids.xml b/res/values/ids.xml
index a9843c1bd..059ab34ee 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -17,4 +17,4 @@
     <item type="id" name="buttonPanel"/>
     <item type="id" name="dismissButton"/>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml
index 33b053d4e..971035782 100644
--- a/res/values/overlayable.xml
+++ b/res/values/overlayable.xml
@@ -26,8 +26,6 @@
             <item type="style" name="CellBroadcastOptOutTheme"/>
             <item type="style" name="CellBroadcastListActivityTheme"/>
             <item type="style" name="CellBroadcastSettingsTheme"/>
-            <item type="style" name="CellBroadcastListViewTheme"/>
-            <item type="style" name="CellBroadcastListItemTheme"/>
 
             <!-- All attributes defined in app level need to exposed to overlay the AlerDialog and
                  CellBroadcastAlertDialog layouts -->
@@ -134,8 +132,6 @@
             messages)-->
             <item type="bool" name="show_alert_speech_setting" />
             <item type="bool" name="show_main_switch_settings" />
-            <!-- Whether to show vibration toggle. some tablet devices does not support vibration -->
-            <item type="bool" name="show_vibration_settings" />
 
             <!-- Whether to enable alert handling during active voice call. OEMs overriding this value
             should note that some countries require that it be turned off by default (e.g. JP).-->
@@ -216,6 +212,8 @@
             <item type="string" name="enable_alert_message_summary"/>
             <item type="string" name="enable_public_safety_messages_title"/>
             <item type="string" name="enable_public_safety_messages_summary"/>
+            <item type="string" name="enable_full_screen_public_safety_messages_title" />
+            <item type="string" name="enable_full_screen_public_safety_messages_summary" />
             <item type="string" name="enable_state_local_test_alerts_title"/>
             <item type="string" name="enable_state_local_test_alerts_summary"/>
             <item type="string" name="enable_emergency_alerts_message_title"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cea1128ec..417f2a3b5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -176,6 +176,10 @@
     <string name="enable_public_safety_messages_title">Public safety messages</string>
     <!-- Preference summary for enable public safety messages checkbox. [CHAR LIMIT=100] -->
     <string name="enable_public_safety_messages_summary">Recommended actions that can save lives or property</string>
+    <!-- Preference title for enable full-screen public safety messages checkbox. [CHAR LIMIT=100] -->
+    <string name="enable_full_screen_public_safety_messages_title">Show full-screen messages</string>
+    <!-- Preference summary for enable full-screen public safety messages checkbox. [CHAR LIMIT=100] -->
+    <string name="enable_full_screen_public_safety_messages_summary">Turn off to have public safety messages sent only to your SMS app</string>
     <!-- Preference title for enable state/local test alerts checkbox. [CHAR LIMIT=100] -->
     <string name="enable_state_local_test_alerts_title">State and local tests</string>
     <!-- Preference summary for enable state/local test alerts checkbox. [CHAR LIMIT=100] -->
@@ -302,6 +306,10 @@
 
     <!-- Title for CellBroadcastListActivity -->
     <string name="cb_list_activity_title">"Emergency alert history"</string>
+    <!-- Action menu title for deleting selected messages in alert history -->
+    <string name="action_delete" translatable="false">Delete</string>
+    <!-- Action menu title for showing the selected message detail in alert history -->
+    <string name="action_detail_info" translatable="false">Show detail</string>
 
     <!-- Entries in the ListPreference for alert reminder intervals. [CHAR LIMIT=30] -->
     <string-array name="alert_reminder_interval_entries">
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a45112b5a..2039a0210 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -23,14 +23,14 @@
     <!-- Preferences -->
     <style name="SettingsPreference" parent="@style/Preference.Material">
         <item name="allowDividerAbove">false</item>
-        <item name="allowDividerBelow">true</item>
+        <item name="allowDividerBelow">false</item>
         <item name="singleLineTitle">false</item>
         <item name="iconSpaceReserved">true</item>
     </style>
 
     <style name="SettingsSwitchPreference" parent="@style/Preference.SwitchPreference.Material">
         <item name="allowDividerAbove">false</item>
-        <item name="allowDividerBelow">true</item>
+        <item name="allowDividerBelow">false</item>
         <item name="iconSpaceReserved">true</item>
         <item name="singleLineTitle">false</item>
     </style>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index adf75fce5..da1e2cfd8 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -26,24 +26,11 @@
         <item name="android:windowIsTranslucent">true</item>
     </style>
 
-    <style name="CellBroadcastSettingsTheme" parent="@android:style/Theme.DeviceDefault.Settings">
-        <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="CellBroadcastListActivityTheme" parent="@android:style/Theme.DeviceDefault.Settings">
-    </style>
+    <style name="CellBroadcastSettingsTheme" parent="@style/Theme.SubSettingsBase" />
 
-    <style name="CellBroadcastListItemTheme" parent="SettingsPreference">
-        <item name="android:paddingStart">16dp</item>
-        <item name="android:paddingTop">16dp</item>
-        <item name="android:paddingEnd">16dp</item>
-        <item name="android:paddingBottom">16dp</item>
-        <item name="android:background">?android:attr/colorBackground</item>
-    </style>
-    <style name="CellBroadcastListViewTheme">
+    <style name="CellBroadcastListActivityTheme" parent="@style/Theme.SubSettingsBase">
+        <item name="android:windowActionModeOverlay">true</item>
+        <item name="android:actionModeBackground">?android:attr/colorBackground</item>
     </style>
 
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 8c59624a7..6cc3a2ea0 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -71,6 +71,12 @@
                           android:summary="@string/enable_public_safety_messages_summary"
                           android:title="@string/enable_public_safety_messages_title" />
 
+        <!-- Enable public safety full screen messages -->
+        <SwitchPreference android:defaultValue="@bool/public_safety_messages_full_screen_enabled_default"
+            android:key="enable_public_safety_messages_full_screen"
+            android:summary="@string/enable_full_screen_public_safety_messages_summary"
+            android:title="@string/enable_full_screen_public_safety_messages_title" />
+
         <!-- Enable state/local test alerts -->
         <SwitchPreference android:defaultValue="@bool/state_local_test_alerts_enabled_default"
                           android:key="enable_state_local_test_alerts"
diff --git a/res/xml/watch_preferences.xml b/res/xml/watch_preferences.xml
index b8eedf103..5c6878319 100644
--- a/res/xml/watch_preferences.xml
+++ b/res/xml/watch_preferences.xml
@@ -37,6 +37,18 @@
                           android:key="enable_cmas_amber_alerts"
                           android:title="@string/enable_cmas_amber_alerts_title" />
 
+        <!-- Enable public safety messages -->
+        <SwitchPreference android:defaultValue="@bool/public_safety_messages_enabled_default"
+            android:key="enable_public_safety_messages"
+            android:summary="@string/enable_public_safety_messages_summary"
+            android:title="@string/enable_public_safety_messages_title" />
+
+        <!-- Enable public safety full screen messages -->
+        <SwitchPreference android:defaultValue="@bool/public_safety_messages_full_screen_enabled_default"
+            android:key="enable_public_safety_messages_full_screen"
+            android:summary="@string/enable_full_screen_public_safety_messages_summary"
+            android:title="@string/enable_full_screen_public_safety_messages_title" />
+
         <SwitchPreference android:defaultValue="true"
                           android:key="enable_emergency_alerts"
                           android:title="@string/enable_alerts_master_toggle_title" />
@@ -64,6 +76,11 @@
                           android:key="enable_test_alerts"
                           android:title="@string/enable_cmas_test_alerts_title" />
 
+        <!-- Enable state/local test alerts -->
+        <SwitchPreference android:defaultValue="true"
+                          android:key="enable_state_local_test_alerts"
+                          android:title="@string/enable_state_local_test_alerts_title" />
+
         <!-- Default value is true for Brazil and India. This preference is ignored and hidden
         unless the boolean "config_showAreaUpdateInfoSettings" is set to true in the global resource. -->
         <SwitchPreference android:defaultValue="true"
@@ -74,4 +91,8 @@
         <Preference android:key="emergency_alert_history"
                             android:title="@string/emergency_alert_history_title" />
 
+        <!-- Show additional language on/off switch in settings -->
+        <SwitchPreference android:defaultValue="false"
+                          android:key="receive_cmas_in_second_language"
+                          android:title="@string/receive_cmas_in_second_language_title" />
 </PreferenceScreen>
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
index ba016e34e..04a8eb99f 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
@@ -23,10 +23,8 @@ import static com.android.cellbroadcastreceiver.CellBroadcastReceiver.DBG;
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.app.Service;
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.res.AssetFileDescriptor;
 import android.content.res.Resources;
@@ -84,7 +82,7 @@ public class CellBroadcastAlertAudio extends Service implements TextToSpeech.OnI
     public static final String ALERT_AUDIO_TONE_TYPE =
             "com.android.cellbroadcastreceiver.ALERT_AUDIO_TONE_TYPE";
 
-    /** Extra for alert vibration pattern (unless master volume is silent). */
+    /** Extra for alert vibration pattern (unless main volume is silent). */
     public static final String ALERT_AUDIO_VIBRATION_PATTERN_EXTRA =
             "com.android.cellbroadcastreceiver.ALERT_AUDIO_VIBRATION_PATTERN";
 
@@ -143,7 +141,6 @@ public class CellBroadcastAlertAudio extends Service implements TextToSpeech.OnI
     private AudioManager mAudioManager;
     private TelephonyManager mTelephonyManager;
     private int mInitialCallState;
-    private ScreenOffReceiver mScreenOffReceiver;
 
     // Internal messages
     private static final int ALERT_SOUND_FINISHED = 1000;
@@ -473,13 +470,6 @@ public class CellBroadcastAlertAudio extends Service implements TextToSpeech.OnI
             log("vibrate: effect=" + effect + ", attr=" + attr + ", duration="
                     + customAlertDuration);
             mVibrator.vibrate(effect, attr);
-            // Android default behavior will stop vibration when screen turns off.
-            // if mute by physical button is not allowed, press power key should not turn off
-            // vibration.
-            if (!res.getBoolean(R.bool.mute_by_physical_button)) {
-                mScreenOffReceiver = new ScreenOffReceiver(effect, attr);
-                registerReceiver(mScreenOffReceiver, new IntentFilter(Intent.ACTION_SCREEN_OFF));
-            }
         }
 
         if (mEnableLedFlash) {
@@ -651,14 +641,6 @@ public class CellBroadcastAlertAudio extends Service implements TextToSpeech.OnI
 
         // Stop vibrator
         mVibrator.cancel();
-        if (mScreenOffReceiver != null) {
-            try {
-                unregisterReceiver(mScreenOffReceiver);
-            } catch (Exception e) {
-                // already unregistered
-            }
-            mScreenOffReceiver = null;
-        }
         if (mEnableLedFlash) {
             enableLedFlash(false);
         }
@@ -801,28 +783,6 @@ public class CellBroadcastAlertAudio extends Service implements TextToSpeech.OnI
         return mState;
     }
 
-    /**
-     * BroadcastReceiver for screen off events. Used for Latam.
-     * CMAS requirements to make sure vibration continues when screen goes off
-     */
-    private class ScreenOffReceiver extends BroadcastReceiver {
-        VibrationEffect mVibrationEffect;
-        AudioAttributes mAudioAttr;
-
-        public ScreenOffReceiver(VibrationEffect effect, AudioAttributes attributes) {
-            this.mVibrationEffect = effect;
-            this.mAudioAttr = attributes;
-        }
-
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            // Restart the vibration after screen off
-            if (getState() == STATE_ALERTING) {
-                mVibrator.vibrate(mVibrationEffect, mAudioAttr);
-            }
-        }
-    }
-
     private static void log(String msg) {
         Log.d(TAG, msg);
     }
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java
index 3a62abcac..1b3bf33d3 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java
@@ -22,9 +22,9 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.KeyguardManager;
 import android.app.NotificationManager;
-import android.app.StatusBarManager;
 import android.app.PendingIntent;
 import android.app.RemoteAction;
+import android.app.StatusBarManager;
 import android.content.BroadcastReceiver;
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ -44,7 +44,6 @@ import android.preference.PreferenceManager;
 import android.provider.Telephony;
 import android.telephony.SmsCbCmasInfo;
 import android.telephony.SmsCbMessage;
-import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -76,8 +75,7 @@ import com.android.internal.annotations.VisibleForTesting;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -356,8 +354,7 @@ public class CellBroadcastAlertDialog extends Activity {
                 | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
 
         // Disable home button when alert dialog is showing if mute_by_physical_button is false.
-        if (!CellBroadcastSettings.getResources(getApplicationContext(),
-                SubscriptionManager.DEFAULT_SUBSCRIPTION_ID)
+        if (!CellBroadcastSettings.getResourcesForDefaultSubId(getApplicationContext())
                 .getBoolean(R.bool.mute_by_physical_button)) {
             final View decorView = win.getDecorView();
             decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
@@ -454,10 +451,6 @@ public class CellBroadcastAlertDialog extends Activity {
                 mAnimationHandler.startIconAnimation(subId);
             }
         }
-        // Some LATAM carriers mandate to disable navigation bars, quick settings etc when alert
-        // dialog is showing. This is to make sure users to ack the alert before switching to
-        // other activities.
-        setStatusBarDisabledIfNeeded(true);
     }
 
     /**
@@ -468,7 +461,6 @@ public class CellBroadcastAlertDialog extends Activity {
     public void onPause() {
         Log.d(TAG, "onPause called");
         mAnimationHandler.stopIconAnimation();
-        setStatusBarDisabledIfNeeded(false);
         super.onPause();
     }
 
@@ -708,20 +700,11 @@ public class CellBroadcastAlertDialog extends Activity {
         TextView titleTextView = findViewById(R.id.alertTitle);
 
         if (titleTextView != null) {
-            if (res.getBoolean(R.bool.show_date_time_title)) {
+            String timeFormat = res.getString(R.string.date_time_format);
+            if (!TextUtils.isEmpty(timeFormat)) {
                 titleTextView.setSingleLine(false);
-                int flags = DateUtils.FORMAT_NO_NOON_MIDNIGHT | DateUtils.FORMAT_SHOW_TIME
-                                | DateUtils.FORMAT_ABBREV_ALL | DateUtils.FORMAT_SHOW_DATE
-                                | DateUtils.FORMAT_CAP_AMPM;
-                if (res.getBoolean(R.bool.show_date_time_with_year_title)) {
-                    flags |= DateUtils.FORMAT_SHOW_YEAR;
-                }
-                if (res.getBoolean(R.bool.show_date_in_numeric_format)) {
-                    flags |= DateUtils.FORMAT_NUMERIC_DATE;
-                }
-                title += "\n" + DateUtils.formatDateTime(context, message.getReceivedTime(), flags);
+                title += "\n" + new SimpleDateFormat(timeFormat).format(message.getReceivedTime());
             }
-
             setTitle(title);
             titleTextView.setText(title);
         }
@@ -1175,49 +1158,4 @@ public class CellBroadcastAlertDialog extends Activity {
             setFinishOnTouchOutside(mMessageList.size() > 0 && mMessageList.size() == dismissCount);
         }
     }
-
-    /**
-     * To disable navigation bars, quick settings etc. Force users to engage with the alert dialog
-     * before switching to other activities.
-     *
-     * @param disable if set to {@code true} to disable the status bar. {@code false} otherwise.
-     */
-    private void setStatusBarDisabledIfNeeded(boolean disable) {
-        if (!CellBroadcastSettings.getResourcesForDefaultSubId(getApplicationContext())
-                .getBoolean(R.bool.disable_status_bar)) {
-            return;
-        }
-        try {
-            // TODO change to system API in S.
-            StatusBarManager statusBarManager = getSystemService(StatusBarManager.class);
-            Method disableMethod = StatusBarManager.class.getDeclaredMethod(
-                    "disable", int.class);
-            Method disableMethod2 = StatusBarManager.class.getDeclaredMethod(
-                    "disable2", int.class);
-            if (disable) {
-                // flags to be disabled
-                int disableHome = StatusBarManager.class.getDeclaredField("DISABLE_HOME")
-                        .getInt(null);
-                int disableRecent = StatusBarManager.class
-                        .getDeclaredField("DISABLE_RECENT").getInt(null);
-                int disableBack = StatusBarManager.class.getDeclaredField("DISABLE_BACK")
-                        .getInt(null);
-                int disableQuickSettings = StatusBarManager.class.getDeclaredField(
-                        "DISABLE2_QUICK_SETTINGS").getInt(null);
-                int disableNotificationShaded = StatusBarManager.class.getDeclaredField(
-                        "DISABLE2_NOTIFICATION_SHADE").getInt(null);
-                disableMethod.invoke(statusBarManager, disableHome | disableBack | disableRecent);
-                disableMethod2.invoke(statusBarManager, disableQuickSettings
-                        | disableNotificationShaded);
-            } else {
-                int disableNone = StatusBarManager.class.getDeclaredField("DISABLE_NONE")
-                        .getInt(null);
-                disableMethod.invoke(statusBarManager, disableNone);
-                disableMethod2.invoke(statusBarManager, disableNone);
-            }
-        } catch (NoSuchFieldException | IllegalAccessException
-                | NoSuchMethodException | InvocationTargetException e) {
-            Log.e(TAG, "Failed to disable navigation when showing alert: " + e);
-        }
-    }
 }
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
index bf9056cf7..86b172d76 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
@@ -19,6 +19,7 @@ package com.android.cellbroadcastreceiver;
 import static android.telephony.SmsCbMessage.MESSAGE_FORMAT_3GPP;
 import static android.telephony.SmsCbMessage.MESSAGE_FORMAT_3GPP2;
 
+import android.annotation.NonNull;
 import android.app.ActivityManager;
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -193,10 +194,32 @@ public class CellBroadcastAlertService extends Service {
     }
 
     /**
+     * Check if the enabled message should be displayed to users in the form of pop-up dialog.
+     *
+     * @param message
+     * @return True if the full screen alert should be displayed to the users. False otherwise.
+     */
+    public boolean shouldDisplayFullScreenMessage(@NonNull SmsCbMessage message) {
+        CellBroadcastChannelManager channelManager =
+                new CellBroadcastChannelManager(mContext, message.getSubscriptionId());
+        CellBroadcastChannelRange range = channelManager
+                .getCellBroadcastChannelRangeFromMessage(message);
+        // check the full-screen message settings to hide or show message to users.
+        if (channelManager.checkCellBroadcastChannelRange(message.getServiceCategory(),
+                R.array.public_safety_messages_channels_range_strings)) {
+            return PreferenceManager.getDefaultSharedPreferences(this)
+                    .getBoolean(CellBroadcastSettings.KEY_ENABLE_PUBLIC_SAFETY_MESSAGES_FULL_SCREEN,
+                            true);
+        }
+        // if no separate full-screen message settings exists, then display the message by default.
+        return true;
+    }
+
+    /**
      * Check if we should display the received cell broadcast message.
      *
      * @param message Cell broadcast message
-     * @return True if the message should be displayed to the user
+     * @return True if the message should be displayed to the user.
      */
     @VisibleForTesting
     public boolean shouldDisplayMessage(SmsCbMessage message) {
@@ -560,7 +583,7 @@ public class CellBroadcastAlertService extends Service {
                     .getBoolean(CellBroadcastSettings.KEY_ENABLE_STATE_LOCAL_TEST_ALERTS,
                             false);
         }
-        
+
         Log.e(TAG, "received undefined channels: " + channel);
         return false;
     }
@@ -570,6 +593,11 @@ public class CellBroadcastAlertService extends Service {
      * @param message the alert to display
      */
     private void openEmergencyAlertNotification(SmsCbMessage message) {
+        if (!shouldDisplayFullScreenMessage(message)) {
+            Log.d(TAG, "openEmergencyAlertNotification: do not show full screen alert "
+                    + "due to user preference");
+            return;
+        }
         // Close dialogs and window shade
         Intent closeDialogs = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
         sendBroadcast(closeDialogs);
@@ -855,6 +883,7 @@ public class CellBroadcastAlertService extends Service {
         Intent intent = new Intent(context, intentClass);
         intent.putParcelableArrayListExtra(CellBroadcastAlertService.SMS_CB_MESSAGE_EXTRA,
                 messageList);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NO_USER_ACTION);
         return intent;
     }
 
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java b/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java
index 7c9c168b2..ef9ba9e00 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java
@@ -68,6 +68,7 @@ public class CellBroadcastChannelManager {
             ));
 
     private static ArrayList<CellBroadcastChannelRange> sAllCellBroadcastChannelRanges = null;
+    private static final Object channelRangesLock = new Object();
 
     private final Context mContext;
 
@@ -340,16 +341,31 @@ public class CellBroadcastChannelManager {
      * @return all cell broadcast channels
      */
     public @NonNull ArrayList<CellBroadcastChannelRange> getAllCellBroadcastChannelRanges() {
-        if (sAllCellBroadcastChannelRanges != null) return sAllCellBroadcastChannelRanges;
+        synchronized(channelRangesLock) {
+            if (sAllCellBroadcastChannelRanges != null) return sAllCellBroadcastChannelRanges;
 
-        ArrayList<CellBroadcastChannelRange> result = new ArrayList<>();
+            Log.d(TAG, "Create new channel range list");
+            ArrayList<CellBroadcastChannelRange> result = new ArrayList<>();
 
-        for (int key : sCellBroadcastRangeResourceKeys) {
-            result.addAll(getCellBroadcastChannelRanges(key));
+            for (int key : sCellBroadcastRangeResourceKeys) {
+                result.addAll(getCellBroadcastChannelRanges(key));
+            }
+
+            sAllCellBroadcastChannelRanges = result;
+            return result;
         }
+    }
 
-        sAllCellBroadcastChannelRanges = result;
-        return result;
+    /**
+     * Clear broadcast channel range list
+     */
+    public static void clearAllCellBroadcastChannelRanges() {
+        synchronized(channelRangesLock) {
+            if (sAllCellBroadcastChannelRanges != null) {
+                Log.d(TAG, "Clear channel range list");
+                sAllCellBroadcastChannelRanges = null;
+            }
+        }
     }
 
     /**
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
index edded2450..9b9b75af4 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
@@ -36,6 +36,7 @@ import androidx.annotation.NonNull;
 
 import com.android.cellbroadcastreceiver.CellBroadcastChannelManager.CellBroadcastChannelRange;
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.modules.utils.build.SdkLevel;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -138,13 +139,17 @@ public class CellBroadcastConfigService extends IntentService {
         } else {
             manager = SmsManager.getDefault();
         }
-
-        // TODO: Call manager.resetAllCellBroadcastRanges() in Android S.
-        try {
-            Method method = SmsManager.class.getDeclaredMethod("resetAllCellBroadcastRanges");
-            method.invoke(manager);
-        } catch (Exception e) {
-            log("Can't reset cell broadcast ranges. e=" + e);
+        // SmsManager.resetAllCellBroadcastRanges is a new @SystemAPI in S. We need to support
+        // backward compatibility as the module need to run on R build as well.
+        if (SdkLevel.isAtLeastS()) {
+            manager.resetAllCellBroadcastRanges();
+        } else {
+            try {
+                Method method = SmsManager.class.getDeclaredMethod("resetAllCellBroadcastRanges");
+                method.invoke(manager);
+            } catch (Exception e) {
+                log("Can't reset cell broadcast ranges. e=" + e);
+            }
         }
     }
 
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastCursorAdapter.java b/src/com/android/cellbroadcastreceiver/CellBroadcastCursorAdapter.java
index 5159b892c..c27b7cd02 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastCursorAdapter.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastCursorAdapter.java
@@ -24,9 +24,11 @@ import android.telephony.SmsCbEtwsInfo;
 import android.telephony.SmsCbLocation;
 import android.telephony.SmsCbMessage;
 import android.telephony.SubscriptionManager;
+import android.util.ArrayMap;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.CheckedTextView;
 import android.widget.CursorAdapter;
 
 /**
@@ -34,9 +36,14 @@ import android.widget.CursorAdapter;
  */
 public class CellBroadcastCursorAdapter extends CursorAdapter {
 
-    public CellBroadcastCursorAdapter(Context context) {
+    private static boolean sIsActionMode = false;
+    private CheckedTextView mCheckedTextView;
+    private ArrayMap<Integer, Long> mSelectedMessages;
+
+    public CellBroadcastCursorAdapter(Context context, ArrayMap<Integer, Long> selectedMessages) {
         // don't set FLAG_AUTO_REQUERY or FLAG_REGISTER_CONTENT_OBSERVER
         super(context, null, 0);
+        mSelectedMessages = selectedMessages;
     }
 
     /**
@@ -215,6 +222,29 @@ public class CellBroadcastCursorAdapter extends CursorAdapter {
     public void bindView(View view, Context context, Cursor cursor) {
         SmsCbMessage message = createFromCursor(context, cursor);
         CellBroadcastListItem listItem = (CellBroadcastListItem) view;
+        mCheckedTextView = view.findViewById(R.id.checkBox);
+        updateCheckTextViewVisibility();
+        checkIsSelected(cursor.getPosition());
         listItem.bind(message);
     }
+
+    static void setIsActionMode(boolean value) {
+        sIsActionMode = value;
+    }
+
+    void updateCheckTextViewVisibility() {
+        if (sIsActionMode) {
+            mCheckedTextView.setVisibility(View.VISIBLE);
+        } else {
+            mCheckedTextView.setVisibility(View.GONE);
+        }
+    }
+
+    void checkIsSelected(int position) {
+        if (mSelectedMessages.containsKey(position)) {
+            mCheckedTextView.setChecked(true);
+        } else {
+            mCheckedTextView.setChecked(false);
+        }
+    }
 }
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastDatabaseHelper.java b/src/com/android/cellbroadcastreceiver/CellBroadcastDatabaseHelper.java
index 44a290b17..2946fba6f 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastDatabaseHelper.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastDatabaseHelper.java
@@ -133,6 +133,8 @@ public class CellBroadcastDatabaseHelper extends SQLiteOpenHelper {
     private final Context mContext;
     final boolean mLegacyProvider;
 
+    private ContentProviderClient mOverrideContentProviderClient = null;
+
     @VisibleForTesting
     public CellBroadcastDatabaseHelper(Context context, boolean legacyProvider) {
         super(context, DATABASE_NAME_V13, null, DATABASE_VERSION);
@@ -214,6 +216,19 @@ public class CellBroadcastDatabaseHelper extends SQLiteOpenHelper {
         return super.getWritableDatabase();
     }
 
+    @VisibleForTesting
+    public void setOverrideContentProviderClient(ContentProviderClient client) {
+        mOverrideContentProviderClient = client;
+    }
+
+    private ContentProviderClient getContentProviderClient() {
+        if (mOverrideContentProviderClient != null) {
+            return mOverrideContentProviderClient;
+        }
+        return mContext.getContentResolver()
+                .acquireContentProviderClient(Telephony.CellBroadcasts.AUTHORITY_LEGACY);
+    }
+
     /**
      * This is the migration logic to accommodate OEMs move to mainlined CBR for the first time.
      * When the db is initially created, this is called once to
@@ -228,8 +243,7 @@ public class CellBroadcastDatabaseHelper extends SQLiteOpenHelper {
             return;
         }
 
-        try (ContentProviderClient client = mContext.getContentResolver()
-                .acquireContentProviderClient(Telephony.CellBroadcasts.AUTHORITY_LEGACY)) {
+        try (ContentProviderClient client = getContentProviderClient()) {
             if (client == null) {
                 log("No legacy provider available for migration");
                 return;
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastListActivity.java b/src/com/android/cellbroadcastreceiver/CellBroadcastListActivity.java
index 23a794e73..1b8ac8584 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastListActivity.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastListActivity.java
@@ -19,8 +19,6 @@ package com.android.cellbroadcastreceiver;
 import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
 
 import android.annotation.Nullable;
-import android.app.ActionBar;
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -39,19 +37,22 @@ import android.os.Bundle;
 import android.os.UserManager;
 import android.provider.Telephony;
 import android.telephony.SmsCbMessage;
+import android.util.ArrayMap;
 import android.util.Log;
+import android.view.ActionMode;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnCreateContextMenuListener;
 import android.view.ViewGroup;
+import android.widget.AbsListView.MultiChoiceModeListener;
 import android.widget.CursorAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
 
 import java.util.ArrayList;
 
@@ -59,7 +60,7 @@ import java.util.ArrayList;
  * This activity provides a list view of received cell broadcasts. Most of the work is handled
  * in the inner CursorLoaderListFragment class.
  */
-public class CellBroadcastListActivity extends Activity {
+public class CellBroadcastListActivity extends CollapsingToolbarBaseActivity {
 
     @VisibleForTesting
     public CursorLoaderListFragment mListFragment;
@@ -68,20 +69,16 @@ public class CellBroadcastListActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        ActionBar actionBar = getActionBar();
-        if (actionBar != null) {
-            // android.R.id.home will be triggered in onOptionsItemSelected()
-            actionBar.setDisplayHomeAsUpEnabled(true);
-        }
-
         setTitle(getString(R.string.cb_list_activity_title));
 
         FragmentManager fm = getFragmentManager();
 
         // Create the list fragment and add it as our sole content.
-        if (fm.findFragmentById(android.R.id.content) == null) {
+        if (fm.findFragmentById(com.android.settingslib.collapsingtoolbar.R.id.content_frame)
+                == null) {
             mListFragment = new CursorLoaderListFragment();
-            fm.beginTransaction().add(android.R.id.content, mListFragment).commit();
+            fm.beginTransaction().add(com.android.settingslib.collapsingtoolbar.R.id.content_frame,
+                    mListFragment).commit();
         }
     }
 
@@ -177,12 +174,16 @@ public class CellBroadcastListActivity extends Activity {
 
         private int mCurrentLoaderId = 0;
 
+        private MenuItem mInformationMenuItem;
+        private ArrayMap<Integer, Long> mSelectedMessages;
+
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
 
             // We have a menu item to show in action bar.
             setHasOptionsMenu(true);
+            mSelectedMessages = new ArrayMap<Integer, Long>();
         }
 
         @Override
@@ -197,12 +198,73 @@ public class CellBroadcastListActivity extends Activity {
 
             // Set context menu for long-press.
             ListView listView = getListView();
-            listView.setOnCreateContextMenuListener(mOnCreateContextMenuListener);
 
             // Create a cursor adapter to display the loaded data.
-            mAdapter = new CellBroadcastCursorAdapter(getActivity());
+            mAdapter = new CellBroadcastCursorAdapter(getActivity(), mSelectedMessages);
             setListAdapter(mAdapter);
 
+            listView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE_MODAL);
+            listView.setMultiChoiceModeListener(new MultiChoiceModeListener() {
+                @Override
+                public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+                    mode.getMenuInflater().inflate(R.menu.cell_broadcast_list_action_menu, menu);
+                    mInformationMenuItem = menu.findItem(R.id.action_detail_info);
+                    CellBroadcastCursorAdapter.setIsActionMode(true);
+                    mAdapter.notifyDataSetChanged();
+                    updateActionIconsVisibility();
+                    return true;
+                }
+
+                @Override
+                public void onDestroyActionMode(ActionMode mode) {
+                    CellBroadcastCursorAdapter.setIsActionMode(false);
+                    clearSelectedMessages();
+                    mAdapter.notifyDataSetChanged();
+                }
+
+                @Override
+                public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+                    if (item.getItemId() == R.id.action_detail_info) {
+                        Cursor cursor = getSelectedItemSingle();
+                        if (cursor != null) {
+                            showBroadcastDetails(CellBroadcastCursorAdapter.createFromCursor(
+                                    getContext(), cursor), getLocationCheckTime(cursor),
+                                    wasMessageDisplayed(cursor), getGeometryString(cursor));
+                        } else {
+                            Log.e(TAG, "Multiple items selected with action_detail_info");
+                        }
+                        mode.finish();
+                        return true;
+                    } else if (item.getItemId() == R.id.action_delete) {
+                        long[] selectedRowId = getSelectedItemsRowId();
+                        confirmDeleteThread(selectedRowId);
+                        mode.finish();
+                        return true;
+                    } else {
+                        Log.e(TAG, "onActionItemClicked: unsupported action return false");
+                        return false;
+                    }
+                }
+
+                @Override
+                public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+                    return false;
+                }
+
+                @Override
+                public void onItemCheckedStateChanged(
+                        ActionMode mode, int position, long id, boolean checked) {
+                    int checkedCount = listView.getCheckedItemCount();
+                    Cursor cursor = mAdapter.getCursor();
+                    long rowId = cursor.getLong(cursor.getColumnIndexOrThrow(
+                            Telephony.CellBroadcasts._ID));
+
+                    toggleSelectedItem(position, rowId);
+                    mode.setTitle(String.valueOf(checkedCount));
+                    mAdapter.notifyDataSetChanged();
+                }
+            });
+
             mCurrentLoaderId = LOADER_NORMAL_HISTORY;
             if (savedInstanceState != null && savedInstanceState.containsKey(KEY_LOADER_ID)) {
                 mCurrentLoaderId = savedInstanceState.getInt(KEY_LOADER_ID);
@@ -327,20 +389,60 @@ public class CellBroadcastListActivity extends Activity {
                     .show();
         }
 
-        private final OnCreateContextMenuListener mOnCreateContextMenuListener =
-                (menu, v, menuInfo) -> {
-                    menu.setHeaderTitle(R.string.message_options);
-                    menu.add(0, MENU_VIEW_DETAILS, 0, R.string.menu_view_details);
-                    if (mCurrentLoaderId == LOADER_NORMAL_HISTORY) {
-                        menu.add(0, MENU_DELETE, 0, R.string.menu_delete);
-                    }
-                };
+        private void updateActionIconsVisibility() {
+            if (mInformationMenuItem != null) {
+                if (mSelectedMessages.size() == 1) {
+                    mInformationMenuItem.setVisible(true);
+                } else {
+                    mInformationMenuItem.setVisible(false);
+                }
+            }
+        }
+
+        private Cursor getSelectedItemSingle() {
+            if (mSelectedMessages.size() == 1) {
+                Cursor cursor = (Cursor) mAdapter.getItem(mSelectedMessages.keyAt(0));
+                return cursor;
+            }
+            return null;
+        }
+
+        private long[] getSelectedItemsRowId() {
+            Long[] arr = mSelectedMessages.values().toArray(new Long[mSelectedMessages.size()]);
+            long[] selectedRowId = new long[arr.length];
+            for (int i = 0; i < arr.length; i++) {
+                selectedRowId[i] = arr[i].longValue();
+            }
+            return selectedRowId;
+        }
+
+        /**
+         * Record the position and the row ID of the selected items.
+         */
+        public void toggleSelectedItem(int position, long rowId) {
+            if (mSelectedMessages.containsKey(position)) {
+                mSelectedMessages.remove(position);
+            } else {
+                mSelectedMessages.put(position, rowId);
+            }
+            updateActionIconsVisibility();
+        }
+
+        /**
+         * Clear the position and the row ID of the selected items in the ArrayMap.
+         */
+        public void clearSelectedMessages() {
+            mSelectedMessages.clear();
+        }
 
         private void updateNoAlertTextVisibility() {
             TextView noAlertsTextView = getActivity().findViewById(R.id.empty);
             if (noAlertsTextView != null) {
                 noAlertsTextView.setVisibility(!hasAlertsInHistory()
                         ? View.VISIBLE : View.INVISIBLE);
+                if (!hasAlertsInHistory()) {
+                    getListView().setContentDescription(getString(R.string.no_cell_broadcasts));
+                }
             }
         }
 
@@ -396,8 +498,8 @@ public class CellBroadcastListActivity extends Activity {
             if (cursor != null && cursor.getPosition() >= 0) {
                 switch (item.getItemId()) {
                     case MENU_DELETE:
-                        confirmDeleteThread(cursor.getLong(cursor.getColumnIndexOrThrow(
-                                Telephony.CellBroadcasts._ID)));
+                        long[] selectedRowId = getSelectedItemsRowId();
+                        confirmDeleteThread(selectedRowId);
                         break;
 
                     case MENU_VIEW_DETAILS:
@@ -417,7 +519,8 @@ public class CellBroadcastListActivity extends Activity {
         public boolean onOptionsItemSelected(MenuItem item) {
             switch(item.getItemId()) {
                 case MENU_DELETE_ALL:
-                    confirmDeleteThread(-1);
+                    long[] deleteAll = {-1};
+                    confirmDeleteThread(deleteAll);
                     break;
 
                 case MENU_SHOW_ALL_MESSAGES:
@@ -441,12 +544,13 @@ public class CellBroadcastListActivity extends Activity {
 
         /**
          * Start the process of putting up a dialog to confirm deleting a broadcast.
-         * @param rowId the row ID of the broadcast to delete, or -1 to delete all broadcasts
+         * @param rowId array of the row ID that the broadcast to delete,
+         *        or rowId[0] = -1 to delete all broadcasts
          */
-        public void confirmDeleteThread(long rowId) {
+        public void confirmDeleteThread(long[] rowId) {
             DeleteDialogFragment dialog = new DeleteDialogFragment();
             Bundle dialogArgs = new Bundle();
-            dialogArgs.putLong(DeleteDialogFragment.ROW_ID, rowId);
+            dialogArgs.putLongArray(DeleteDialogFragment.ROW_ID, rowId);
             dialog.setArguments(dialogArgs);
             dialog.show(getFragmentManager(), KEY_DELETE_DIALOG);
         }
@@ -460,8 +564,8 @@ public class CellBroadcastListActivity extends Activity {
             @Override
             public Dialog onCreateDialog(Bundle savedInstanceState) {
                 setRetainInstance(true);
-                long rowId = getArguments().getLong(ROW_ID);
-                boolean deleteAll = rowId == -1;
+                long[] rowId = getArguments().getLongArray(ROW_ID);
+                boolean deleteAll = rowId[0] == -1;
                 DeleteThreadListener listener = new DeleteThreadListener(getActivity(), rowId);
                 AlertDialog.Builder builder = new AlertDialog.Builder(
                         DeleteDialogFragment.this.getActivity());
@@ -485,10 +589,10 @@ public class CellBroadcastListActivity extends Activity {
         }
 
         public static class DeleteThreadListener implements OnClickListener {
-            private final long mRowId;
+            private final long[] mRowId;
             private final Context mContext;
 
-            public DeleteThreadListener(Context context, long rowId) {
+            public DeleteThreadListener(Context context, long[] rowId) {
                 mContext = context;
                 mRowId = rowId;
             }
@@ -499,8 +603,13 @@ public class CellBroadcastListActivity extends Activity {
                 new CellBroadcastContentProvider.AsyncCellBroadcastTask(
                         mContext.getContentResolver()).execute(
                                 (CellBroadcastContentProvider.CellBroadcastOperation) provider -> {
-                                    if (mRowId != -1) {
-                                        return provider.deleteBroadcast(mRowId);
+                                    if (mRowId[0] != -1) {
+                                        for (int i = 0; i < mRowId.length; i++) {
+                                            if (!provider.deleteBroadcast(mRowId[i])) {
+                                                Log.e(TAG, "failed to delete at row " + mRowId[i]);
+                                            }
+                                        }
+                                        return true;
                                     } else {
                                         return provider.deleteAllBroadcasts();
                                     }
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
index 084e17b66..6460b60c8 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
@@ -192,6 +192,14 @@ public class CellBroadcastReceiver extends BroadcastReceiver {
                         provider.resyncToSmsInbox(mContext);
                         return true;
                     });
+        } else if (TelephonyManager.ACTION_SIM_CARD_STATE_CHANGED.equals(action)) {
+            int sim_state = intent.getIntExtra(
+                TelephonyManager.EXTRA_SIM_STATE, TelephonyManager.SIM_STATE_UNKNOWN);
+
+            if (sim_state == TelephonyManager.SIM_STATE_ABSENT
+                || sim_state == TelephonyManager.SIM_STATE_PRESENT) {
+                CellBroadcastChannelManager.clearAllCellBroadcastChannelRanges();
+            }
         } else {
             Log.w(TAG, "onReceive() unexpected action " + action);
         }
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java
index e76aeef53..c1cfba56c 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java
@@ -112,6 +112,10 @@ public class CellBroadcastSearchIndexableProvider extends SearchIndexablesProvid
             return null;
         }
 
+        if (isDisableAllCbMessages()) {
+            return null;
+        }
+
         MatrixCursor cursor = new MatrixCursor(INDEXABLES_XML_RES_COLUMNS);
         final int count = INDEXABLE_RES.length;
         for (int n = 0; n < count; n++) {
@@ -134,6 +138,10 @@ public class CellBroadcastSearchIndexableProvider extends SearchIndexablesProvid
             return null;
         }
 
+        if (isDisableAllCbMessages()) {
+            return null;
+        }
+
         MatrixCursor cursor = new MatrixCursor(INDEXABLES_RAW_COLUMNS);
         final Resources res = getResourcesMethod();
 
@@ -282,4 +290,21 @@ public class CellBroadcastSearchIndexableProvider extends SearchIndexablesProvid
         return getContextMethod().getPackageManager().hasSystemFeature(
                 PackageManager.FEATURE_AUTOMOTIVE);
     }
+
+    /**
+     * Check disable Cell Broadcast resource.
+     * @return true if Cell Broadcast disable configured by OEM.
+     */
+    @VisibleForTesting
+    public boolean isDisableAllCbMessages() {
+        boolean disable = false;
+        try {
+            Resources res = Resources.getSystem();
+            int id = res.getIdentifier("config_disable_all_cb_messages", "bool", "android");
+            disable = res.getBoolean(id);
+        } catch (Exception e) {
+            disable = false;
+        }
+        return disable;
+    }
 }
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
index cdb5ed5a9..fa33138b5 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
@@ -17,8 +17,6 @@
 package com.android.cellbroadcastreceiver;
 
 import android.annotation.NonNull;
-import android.app.ActionBar;
-import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.Fragment;
 import android.app.backup.BackupManager;
@@ -32,6 +30,7 @@ import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.PersistableBundle;
 import android.os.UserManager;
+import android.os.Vibrator;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
 import android.util.Log;
@@ -47,6 +46,7 @@ import androidx.preference.PreferenceScreen;
 import androidx.preference.TwoStatePreference;
 
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -54,7 +54,7 @@ import java.util.Map;
 /**
  * Settings activity for the cell broadcast receiver.
  */
-public class CellBroadcastSettings extends Activity {
+public class CellBroadcastSettings extends CollapsingToolbarBaseActivity {
 
     private static final String TAG = "CellBroadcastSettings";
 
@@ -67,16 +67,22 @@ public class CellBroadcastSettings extends Activity {
     // Preference key for alert header (A text view, not clickable).
     public static final String KEY_ALERTS_HEADER = "alerts_header";
 
-    // Preference key for a master toggle to enable/disable all alerts message (default enabled).
+    // Preference key for a main toggle to enable/disable all alerts message (default enabled).
     public static final String KEY_ENABLE_ALERTS_MASTER_TOGGLE = "enable_alerts_master_toggle";
 
     // Preference key for whether to enable public safety messages (default enabled).
     public static final String KEY_ENABLE_PUBLIC_SAFETY_MESSAGES = "enable_public_safety_messages";
 
+    // Preference key for whether to show full-screen public safety message (pop-up dialog), If set
+    // to false, only display from message history and sms inbox if enabled. A foreground
+    // notification might also be shown if enabled.
+    public static final String KEY_ENABLE_PUBLIC_SAFETY_MESSAGES_FULL_SCREEN =
+            "enable_public_safety_messages_full_screen";
+
     // Preference key for whether to enable emergency alerts (default enabled).
     public static final String KEY_ENABLE_EMERGENCY_ALERTS = "enable_emergency_alerts";
 
-    // Enable vibration on alert (unless master volume is silent).
+    // Enable vibration on alert (unless main volume is silent).
     public static final String KEY_ENABLE_ALERT_VIBRATE = "enable_alert_vibrate";
 
     // Speak contents of alert after playing the alert sound.
@@ -172,12 +178,6 @@ public class CellBroadcastSettings extends Activity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        ActionBar actionBar = getActionBar();
-        if (actionBar != null) {
-            // android.R.id.home will be triggered in onOptionsItemSelected()
-            actionBar.setDisplayHomeAsUpEnabled(true);
-        }
-
         UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE);
         if (userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_CELL_BROADCASTS)) {
             setContentView(R.layout.cell_broadcast_disallowed_preference_screen);
@@ -185,12 +185,13 @@ public class CellBroadcastSettings extends Activity {
         }
 
         // We only add new CellBroadcastSettingsFragment if no fragment is restored.
-        Fragment fragment = getFragmentManager().findFragmentById(android.R.id.content);
+        Fragment fragment = getFragmentManager().findFragmentById(
+                com.android.settingslib.collapsingtoolbar.R.id.content_frame);
         if (fragment == null) {
             fragment = new CellBroadcastSettingsFragment();
             getFragmentManager()
                     .beginTransaction()
-                    .add(android.R.id.content, fragment)
+                    .add(com.android.settingslib.collapsingtoolbar.R.id.content_frame, fragment)
                     .commit();
         }
     }
@@ -225,6 +226,7 @@ public class CellBroadcastSettings extends Activity {
                 .remove(KEY_ENABLE_CMAS_SEVERE_THREAT_ALERTS)
                 .remove(KEY_ENABLE_CMAS_AMBER_ALERTS)
                 .remove(KEY_ENABLE_PUBLIC_SAFETY_MESSAGES)
+                .remove(KEY_ENABLE_PUBLIC_SAFETY_MESSAGES_FULL_SCREEN)
                 .remove(KEY_ENABLE_EMERGENCY_ALERTS)
                 .remove(KEY_ALERT_REMINDER_INTERVAL)
                 .remove(KEY_ENABLE_ALERT_SPEECH)
@@ -282,6 +284,7 @@ public class CellBroadcastSettings extends Activity {
         private TwoStatePreference mAmberCheckBox;
         private TwoStatePreference mMasterToggle;
         private TwoStatePreference mPublicSafetyMessagesChannelCheckBox;
+        private TwoStatePreference mPublicSafetyMessagesChannelFullScreenCheckBox;
         private TwoStatePreference mEmergencyAlertsCheckBox;
         private ListPreference mReminderInterval;
         private TwoStatePreference mSpeechCheckBox;
@@ -329,6 +332,8 @@ public class CellBroadcastSettings extends Activity {
                     findPreference(KEY_ENABLE_ALERTS_MASTER_TOGGLE);
             mPublicSafetyMessagesChannelCheckBox = (TwoStatePreference)
                     findPreference(KEY_ENABLE_PUBLIC_SAFETY_MESSAGES);
+            mPublicSafetyMessagesChannelFullScreenCheckBox = (TwoStatePreference)
+                    findPreference(KEY_ENABLE_PUBLIC_SAFETY_MESSAGES_FULL_SCREEN);
             mEmergencyAlertsCheckBox = (TwoStatePreference)
                     findPreference(KEY_ENABLE_EMERGENCY_ALERTS);
             mReminderInterval = (ListPreference)
@@ -465,6 +470,10 @@ public class CellBroadcastSettings extends Activity {
                 mPublicSafetyMessagesChannelCheckBox.setOnPreferenceChangeListener(
                         startConfigServiceListener);
             }
+            if (mPublicSafetyMessagesChannelFullScreenCheckBox != null) {
+                mPublicSafetyMessagesChannelFullScreenCheckBox.setOnPreferenceChangeListener(
+                        startConfigServiceListener);
+            }
             if (mEmergencyAlertsCheckBox != null) {
                 mEmergencyAlertsCheckBox.setOnPreferenceChangeListener(startConfigServiceListener);
             }
@@ -586,6 +595,14 @@ public class CellBroadcastSettings extends Activity {
                                         R.array.public_safety_messages_channels_range_strings)
                                 .isEmpty());
             }
+            // this is the matching full screen settings for public safety toggle. shown only if
+            // public safety toggle is displayed.
+            if (mPublicSafetyMessagesChannelFullScreenCheckBox != null) {
+                mPublicSafetyMessagesChannelFullScreenCheckBox.setVisible(
+                        res.getBoolean(R.bool.show_public_safety_full_screen_settings)
+                                && (mPublicSafetyMessagesChannelCheckBox != null
+                                && mPublicSafetyMessagesChannelCheckBox.isVisible()));
+            }
 
             if (mTestCheckBox != null) {
                 mTestCheckBox.setVisible(isTestAlertsToggleVisible(getContext()));
@@ -650,7 +667,9 @@ public class CellBroadcastSettings extends Activity {
                 // override DND default is turned off.
                 // In some countries, override DND is always on, which means vibration is always on.
                 // In that case, no need to show vibration toggle for users.
-                mEnableVibrateCheckBox.setVisible(res.getBoolean(R.bool.show_vibration_settings)
+                Vibrator vibrator = getContext().getSystemService(Vibrator.class);
+                boolean supportVibration = (vibrator != null) && vibrator.hasVibrator();
+                mEnableVibrateCheckBox.setVisible(supportVibration
                         && (res.getBoolean(R.bool.show_override_dnd_settings) ||
                         !res.getBoolean(R.bool.override_dnd)));
             }
diff --git a/tests/testapp/Android.bp b/tests/testapp/Android.bp
index 0624356fd..62d6f6fed 100644
--- a/tests/testapp/Android.bp
+++ b/tests/testapp/Android.bp
@@ -12,6 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_CellBroadcastReceiver_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: [
+        "packages_apps_CellBroadcastReceiver_license",
+    ],
+}
+
 android_test {
     name: "CellBroadcastReceiverTests",
     // We only want this apk build for tests.
@@ -34,3 +45,12 @@ android_test {
     certificate: "platform",
     instrumentation_for: "CellBroadcastApp",
 }
+
+// used to share src with sl4a test app
+filegroup {
+    name: "cellbroadcast-shared-with-sl4a",
+    srcs: [
+        "src/com/android/cellbroadcastreceiver/tests/SendTestMessages.java",
+        "src/com/android/cellbroadcastreceiver/tests/GsmSmsCbMessage.java",
+    ],
+}
diff --git a/tests/testapp/AndroidManifest.xml b/tests/testapp/AndroidManifest.xml
index 62349850f..f71f258cb 100644
--- a/tests/testapp/AndroidManifest.xml
+++ b/tests/testapp/AndroidManifest.xml
@@ -33,6 +33,7 @@
         <activity android:name="SendTestBroadcastActivity"
                   android:label="@string/app_label"
                   android:configChanges="orientation|keyboardHidden"
+                  android:exported="true"
                   android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 4b8d067c0..6259a8176 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -12,6 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_CellBroadcastReceiver_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: [
+        "packages_apps_CellBroadcastReceiver_license",
+    ],
+}
+
 java_defaults {
     name: "CellBroadcastTestCommon",
     libs: [
@@ -55,7 +66,11 @@ android_test {
         "androidx.preference_preference",
         "androidx.appcompat_appcompat",
         "androidx.legacy_legacy-preference-v14",
+        "SettingsLibSettingsTheme",
+        "SettingsLibCollapsingToolbarBaseActivity",
+        "modules-utils-build_system",
     ],
+    min_sdk_version: "30",
 }
 
 
diff --git a/tests/unit/AndroidManifest_OemTesting.xml b/tests/unit/AndroidManifest_OemTesting.xml
index 57290f196..e3ae78ce7 100644
--- a/tests/unit/AndroidManifest_OemTesting.xml
+++ b/tests/unit/AndroidManifest_OemTesting.xml
@@ -16,17 +16,18 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.cellbroadcastreceiver.tests.unit">
+    <uses-permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS" />
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
     <uses-permission android:name="android.permission.RECEIVE_SMS" />
     <uses-permission android:name="android.permission.RECEIVE_EMERGENCY_BROADCAST" />
     <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
     <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
+    <uses-permission android:name="android.permission.MODIFY_CELL_BROADCASTS" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
     <uses-permission android:name="android.permission.MANAGE_USERS" />
     <uses-permission android:name="android.permission.DEVICE_POWER" />
-    <uses-permission android:name="android.permission.GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS" />
     <uses-permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />
     <uses-permission android:name="android.permission.READ_CELL_BROADCASTS" />
     <uses-permission android:name="com.android.cellbroadcastservice.FULL_ACCESS_CELL_BROADCAST_HISTORY" />
@@ -39,6 +40,7 @@
         android:targetPackage="com.android.cellbroadcastreceiver.tests.unit"
         android:label="CellBroadcastReceiver OEM Unit Test Cases">
     </instrumentation>
+    <uses-sdk android:minSdkVersion="30" android:targetSdkVersion="30" />
 
 </manifest>
 
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastActivityTestCase.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastActivityTestCase.java
index f06a533ba..8cb5c462e 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastActivityTestCase.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastActivityTestCase.java
@@ -62,8 +62,13 @@ public class CellBroadcastActivityTestCase<T extends Activity> extends ActivityU
         return mActivity;
     }
 
-    protected void stopActivity() throws Exception {
-        getInstrumentation().callActivityOnStop(mActivity);
+    protected void stopActivity() throws Throwable {
+        runTestOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                getInstrumentation().callActivityOnStop(mActivity);
+            }
+        });
     }
 
     public static void waitForMs(long ms) {
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertDialogTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertDialogTest.java
index dda561023..b3969f48c 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertDialogTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertDialogTest.java
@@ -16,7 +16,6 @@
 
 package com.android.cellbroadcastreceiver.unit;
 
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.atLeastOnce;
@@ -27,11 +26,8 @@ import static org.mockito.Mockito.verify;
 
 import android.app.Notification;
 import android.app.NotificationManager;
-import android.content.ClipboardManager;
-import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.IPowerManager;
 import android.os.IThermalService;
@@ -208,34 +204,6 @@ public class CellBroadcastAlertDialogTest extends
                 eq(CellBroadcastAlertService.NOTIFICATION_ID));
     }
 
-    public void testCopyMessageToClipboard() {
-        Context mockContext = mock(Context.class);
-        ClipboardManager mockClipboardManager = mock(ClipboardManager.class);
-        Resources mockResources = mock(Resources.class);
-        doReturn(mockClipboardManager).when(mockContext).getSystemService(
-                eq(Context.CLIPBOARD_SERVICE));
-        doReturn(mockResources).when(mockContext).getResources();
-        CellBroadcastSettings.setUseResourcesForSubId(false);
-
-
-        SmsCbMessage testMessage =
-                CellBroadcastAlertServiceTest.createMessageForCmasMessageClass(12412,
-                        mServiceCategory,
-                        mCmasMessageClass);
-
-        boolean madeToast = false;
-        try {
-            CellBroadcastAlertDialog.copyMessageToClipboard(testMessage, mockContext);
-        } catch (NullPointerException e) {
-            // exception expected from creating the toast at the end of copyMessageToClipboard
-            madeToast = true;
-        }
-
-        assertTrue(madeToast);
-        verify(mockContext).getSystemService(eq(Context.CLIPBOARD_SERVICE));
-        verify(mockClipboardManager).setPrimaryClip(any());
-    }
-
     public void testAnimationHandler() throws Throwable {
         CellBroadcastAlertDialog activity = startActivity();
         CellBroadcastSettings.setUseResourcesForSubId(false);
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBootupConfigTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBootupConfigTest.java
index 7d76d4e6f..59bbbdd4d 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBootupConfigTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBootupConfigTest.java
@@ -46,6 +46,8 @@ import android.content.Intent;
 import android.os.IBinder;
 import android.telephony.SmsCbMessage;
 
+import androidx.test.filters.FlakyTest;
+
 import com.android.cellbroadcastreceiver.CellBroadcastConfigService;
 import com.android.cellbroadcastreceiver.CellBroadcastSettings;
 import com.android.internal.telephony.ISms;
@@ -133,6 +135,8 @@ public class CellBroadcastBootupConfigTest extends
     }
 
     // Test if CellbroadcastConfigService properly configure all the required channels.
+
+    @FlakyTest
     public void testConfiguration() throws Exception {
         String[] preferenceKeys = {
                 CellBroadcastSettings.KEY_ENABLE_ALERTS_MASTER_TOGGLE,
@@ -196,7 +200,7 @@ public class CellBroadcastBootupConfigTest extends
                         SmsCbMessage.MESSAGE_FORMAT_3GPP),
         };
 
-        verify(mSmsService, timeout(WAIT_TIMEOUT_MS).times(configs.length))
+        verify(mSmsService, timeout(10000).times(configs.length))
                 .enableCellBroadcastRangeForSubscriber(
                         anyInt(), mStartIds.capture(), mEndIds.capture(), mTypes.capture());
 
@@ -206,4 +210,4 @@ public class CellBroadcastBootupConfigTest extends
             assertEquals("i=" + i, configs[i].type, mTypes.getAllValues().get(i).intValue());
         }
      }
-}
+}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastDatabaseHelperTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastDatabaseHelperTest.java
index cac94959a..4a63e1dda 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastDatabaseHelperTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastDatabaseHelperTest.java
@@ -22,13 +22,12 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 
+import android.content.ContentProviderClient;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.IContentProvider;
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.database.MatrixCursor;
@@ -38,17 +37,19 @@ import android.provider.Telephony;
 import android.provider.Telephony.CellBroadcasts;
 import android.telephony.SmsCbCmasInfo;
 import android.util.Log;
-import com.android.cellbroadcastreceiver.CellBroadcastDatabaseHelper;
-import java.util.Arrays;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 
 import androidx.test.InstrumentationRegistry;
 
+import com.android.cellbroadcastreceiver.CellBroadcastDatabaseHelper;
+
 import org.junit.Before;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Arrays;
 
 @RunWith(JUnit4.class)
 public class CellBroadcastDatabaseHelperTest {
@@ -62,7 +63,7 @@ public class CellBroadcastDatabaseHelperTest {
     @Mock
     ContentResolver mContentResolver;
     @Mock
-    IContentProvider mContentProviderClient;
+    ContentProviderClient mContentProviderClient;
     @Mock
     Cursor mCursor;
     @Mock
@@ -131,8 +132,7 @@ public class CellBroadcastDatabaseHelperTest {
     public void testMigration() throws Exception {
         Log.d(TAG, "dataBaseHelper_testMigration");
         // mock a legacy provider for data migration
-        doReturn(mContentProviderClient).when(mContentResolver).acquireContentProviderClient(
-                Telephony.CellBroadcasts.AUTHORITY_LEGACY);
+        mHelper.setOverrideContentProviderClient(mContentProviderClient);
         MatrixCursor mc = new MatrixCursor(CellBroadcastDatabaseHelper.QUERY_COLUMNS);
         mc.addRow(new Object[]{
                 1,              // _ID
@@ -158,7 +158,7 @@ public class CellBroadcastDatabaseHelperTest {
                 0,              // CMAS_CERTAINTY
         });
 
-        doReturn(mc).when(mContentProviderClient).query(any(), any(), any(), any(), any(), any());
+        doReturn(mc).when(mContentProviderClient).query(any(), any(), any(), any(), any());
         SQLiteDatabase db = mInMemoryDbHelper.getWritableDatabase();
         // version 11 -> 12 trigger in onUpgrade
         mHelper.onUpgrade(db, 11, 12);
@@ -168,7 +168,7 @@ public class CellBroadcastDatabaseHelperTest {
 
         mHelper.migrateFromLegacyIfNeeded(db);
         // verify insertion from legacy provider is succeed
-        verify(mContentProviderClient).query(any(), any(), any(), any(), any(), any());
+        verify(mContentProviderClient).query(any(), any(), any(), any(), any());
         cursor = db.query(CellBroadcastDatabaseHelper.TABLE_NAME,
                 CellBroadcastDatabaseHelper.QUERY_COLUMNS, null, null, null, null, null);
         assertEquals(1, cursor.getCount());
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastListActivityTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastListActivityTest.java
index c9583e0fb..c2ac96c00 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastListActivityTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastListActivityTest.java
@@ -47,8 +47,6 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import android.app.Fragment;
-import android.app.FragmentManager;
 import android.app.NotificationManager;
 import android.database.Cursor;
 import android.database.MatrixCursor;
@@ -57,7 +55,6 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.UserManager;
 import android.provider.Telephony;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -222,6 +219,7 @@ public class CellBroadcastListActivityTest extends
         // create mock delete menu item
         MenuItem mockMenuItem = mock(MenuItem.class);
         doReturn(MENU_DELETE).when(mockMenuItem).getItemId();
+        activity.mListFragment.toggleSelectedItem(1, 1);
 
         // must call looper.prepare to create alertdialog
         Looper.prepare();
@@ -233,6 +231,7 @@ public class CellBroadcastListActivityTest extends
                         CellBroadcastListActivity.CursorLoaderListFragment.KEY_DELETE_DIALOG));
 
         verify(mockCursor, atLeastOnce()).getColumnIndexOrThrow(eq(Telephony.CellBroadcasts._ID));
+        activity.mListFragment.clearSelectedMessages();
         stopActivity();
     }
 
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastSearchIndexableProviderTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastSearchIndexableProviderTest.java
index 6d7505cef..deb41895a 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastSearchIndexableProviderTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastSearchIndexableProviderTest.java
@@ -40,6 +40,7 @@ public class CellBroadcastSearchIndexableProviderTest extends CellBroadcastTest
         mSearchIndexableProvider = spy(new CellBroadcastSearchIndexableProvider());
         doReturn(mContext).when(mSearchIndexableProvider).getContextMethod();
         doReturn(false).when(mSearchIndexableProvider).isAutomotive();
+        doReturn(false).when(mSearchIndexableProvider).isDisableAllCbMessages();
         doReturn("testPackageName").when(mContext).getPackageName();
         doReturn(mResources).when(mSearchIndexableProvider).getResourcesMethod();
         doReturn("testString").when(mResources).getString(anyInt());
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastServiceTestCase.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastServiceTestCase.java
index 25896bccb..7609829c0 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastServiceTestCase.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastServiceTestCase.java
@@ -50,9 +50,6 @@ import java.util.function.BooleanSupplier;
 
 public abstract class CellBroadcastServiceTestCase<T extends Service> extends ServiceTestCase<T> {
 
-    static final long WAIT_TIMEOUT_MS = 5000;
-    static final long WAIT_INTERVAL_MS = 100;
-
     @Mock
     protected CarrierConfigManager mMockedCarrierConfigManager;
     @Mock
@@ -86,13 +83,12 @@ public abstract class CellBroadcastServiceTestCase<T extends Service> extends Se
         if (condition.getAsBoolean()) {
             return;
         }
-        long startTime = SystemClock.uptimeMillis();
-        do {
-            SystemClock.sleep(WAIT_INTERVAL_MS);
+        for (int i = 0; i < 50; i++) {
+            SystemClock.sleep(100);
             if (condition.getAsBoolean()) {
                 return;
             }
-        } while (SystemClock.uptimeMillis() - startTime < WAIT_TIMEOUT_MS);
+        }
     }
 
     protected void enablePreference(String pref) {